Second conversion Remove epsilon FINISHED!!!

* Some functionality moved from RegExpToFA to class of Algorithm.
* Add to this conversion functionality of show correct solution and bact to user solution.
* Finished EpsilonCloserWidget and it autonomous - check correct epsilon closer automaticaly.
* Fully finished RemoveEpsilon and add also 2 examples.
* Send sichnal about FA changed also from class Arrow.
* Add assign operator to ComputationalRules - without this asighn wasnt always correct.
* Repair of "random" generate of nodes in scene - seed for generating nodes is set only once.
* When removing last rule with some symbol also remove this symbol in class FiniteAutomata.
* Finished notification about changing FA throw many classes.
* Cleaned and refactor MainWindow.
* Repaired bug when trying qsetToQstring(QSet<QString> set) with empty set in set_of_sets.cpp.

Author: navrkald

RegularConvertor/algorithms/algorithm.cpp

@@ -3,6 +3,8 @@
 Algorithm::Algorithm(QObject* parent)
     : QStandardItemModel(parent), actInstructionBackroundColor(Qt::yellow), normalInstructionBackroundColor(Qt::white)
 {
+    play_timer = new QTimer();
+    check_step_timer = new QTimer();
 }
 
 void Algorithm::initBreakpoints(int _num)
@@ -17,7 +19,15 @@ void Algorithm::initBreakpoints(int _num)
 int Algorithm::setActInstruction()
 {
     clearActInstruction();
-    QModelIndex index = this->index(actInstruction,0,QModelIndex());
+    QModelIndex index;
+    if(actInstruction != last_instruction)
+    {
+        index = this->index(actInstruction,0,QModelIndex());
+    }
+    else
+    {
+        index = this->index(prewInstruction,0,QModelIndex());
+    }
     setData(index,QBrush(actInstructionBackroundColor),Qt::BackgroundRole);
 }
 
@@ -35,3 +45,13 @@ void Algorithm::getData(QModelIndex _index)
 {
     breakpoints[_index.row()] = data(_index, Algorithm::Breakpoint_Role).toBool();
 }
+
+void Algorithm::runAlgorithm(int mil_sec)
+{
+    play_timer->start(mil_sec);
+}
+
+void Algorithm::stop()
+{
+    play_timer->stop();
+}

RegularConvertor/algorithms/algorithm.h

@@ -3,8 +3,10 @@
 #include <QVector>
 #include <QString>
 #include <qstandarditemmodel.h>
+#include <QTimer>
 
 #define INDENT "&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;"
+#define CHECK_STEP_TIMEOUT 1000
 
 class Algorithm : public QStandardItemModel
 {
@@ -18,29 +20,30 @@ class Algorithm : public QStandardItemModel
 
     static const int HasBreakpoint_Role = Qt::UserRole;
     static const int Breakpoint_Role = Qt::UserRole +1 ;
+    static const int last_instruction = -1 ;
 
     virtual void initInstructions() = 0;
+    virtual void removeFuture() = 0;
     void initBreakpoints(int _num);
 
 
     QColor actInstructionBackroundColor;
     QColor normalInstructionBackroundColor;
 
+    int num;
     int instruction_count;
     int actInstruction;
     int prewInstruction;
+    int actPos;
     int setActInstruction();
     int clearActInstruction();
 public slots:
     void getData(QModelIndex _index);
-//signals:
-//    instructionChanged(int _instruction);
-    //    struct steps
-//    {
-//        QString formal_text;
-//        QString informal_text;
-//        int pos;
-//    };
+    void runAlgorithm(int mil_sec);
+    void stop();
+protected:
+    QTimer *play_timer;
+    QTimer *check_step_timer;
 };
 
 #endif // ALGORITHM_H

RegularConvertor/algorithms/algorithmwidget.cpp

@@ -73,14 +73,44 @@ void AlgorithmWidget::setWidgets(Algorithm::modes mode)
     }
 }
 
+void AlgorithmWidget::disableNext()
+{
+    ui->nextButton->setEnabled(false);
+}
+
+void AlgorithmWidget::enableNext()
+{
+    ui->nextButton->setEnabled(true);
+}
+
+void AlgorithmWidget::enablePrev()
+{
+    ui->prewButton->setEnabled(true);
+}
+
+void AlgorithmWidget::disablePrev()
+{
+    ui->prewButton->setEnabled(false);
+}
+
 void AlgorithmWidget::hideSpacer(QSpacerItem *s)
 {
    s->changeSize(0,0, QSizePolicy::Fixed, QSizePolicy::Fixed);
 }
 
 void AlgorithmWidget::showSpacer(QSpacerItem *s)
 {
-     s->changeSize(1,1, QSizePolicy::Expanding, QSizePolicy::Fixed);
+    s->changeSize(1,1, QSizePolicy::Expanding, QSizePolicy::Fixed);
+}
+
+void AlgorithmWidget::enableShowButton()
+{
+    ui->showButton->setEnabled(true);
+}
+
+void AlgorithmWidget::disableShowButton()
+{
+    ui->showButton->setEnabled(false);
 }
 
 void AlgorithmWidget::emitPlay()
@@ -94,11 +124,11 @@ void AlgorithmWidget::on_showButton_clicked()
     if(showSolution)
     {
         ui->showButton->setText("Show solution");
-        emit showCorrectSolutionPressed();
+        emit showUserSolutionPressed();
     }
     else
     {
         ui->showButton->setText("Back");
-        emit showUserSolutionPressed();
+        emit showCorrectSolutionPressed();
     }
 }

RegularConvertor/algorithms/algorithmwidget.h

@@ -25,6 +25,8 @@ class AlgorithmWidget : public QWidget
 
     void hideSpacer(QSpacerItem * s);
     void showSpacer(QSpacerItem * s);
+    void enableShowButton();
+    void disableShowButton();
 
     bool showSolution;
 
@@ -41,6 +43,11 @@ class AlgorithmWidget : public QWidget
 public slots:
     void emitPlay();
     void setWidgets(Algorithm::modes mode);
+    void disableNext();
+    void enableNext();
+    void disablePrev();
+    void enablePrev();
+
 
 
 private slots:

RegularConvertor/algorithms/epsiloncloserwidget.cpp

@@ -1,27 +1,49 @@
 #include "algorithms/epsiloncloserwidget.h"
 
-EpsilonCloserWidget::EpsilonCloserWidget(QString _state, QList<QString> _epsilon_closer_list, QWidget *parent):
-    QWidget(parent), state(_state), epsilon_closer_list(_epsilon_closer_list)
+EpsilonCloserWidget::EpsilonCloserWidget(QString _state, QList<QString> _user_epsilon_closer_list, QList<QString> _correct_epsilon_closer_list, QWidget *parent):
+    QWidget(parent), state(_state), user_epsilon_closer_list(_user_epsilon_closer_list), correct_epsilon_closer_list(_correct_epsilon_closer_list)
 {
-    QLabel* label1 = new QLabel("ɜ-uzávěr(" + state + ") = {",this);
-    QLabel* label2 = new QLabel("}", this);
-    QTextEdit* text_edit = new QTextEdit(state,this);
-    //unknown_icon.addFile(":/algorithms/algorithms/pictures/unknown.png");
-    correct_icon.addFile(":/algorithms/algorithms/pictures/ok.png");
-    wrong_icon.addFile(":/algorithms/algorithms/pictures/wrong.png");
-    icon = unknown_icon;
+    label1 = new QLabel("ɜ-uzávěr(<b>" + state + "</b>) = {",this);
+    label2 = new QLabel("}", this);
+    line_edit = new QLineEdit(user_epsilon_closer_list.join(", "),this);
+    line_edit->show();
+    unknown = QPixmap(":/algorithms/algorithms/pictures/unknown.png");
+    correct = QPixmap(":/algorithms/algorithms/pictures/ok.png");
+    wrong =  QPixmap(":/algorithms/algorithms/pictures/wrong.png");
     layout = new QHBoxLayout(this);
     layout->addWidget(label1);
-    layout->addWidget(text_edit);
+    layout->addWidget(line_edit);
     layout->addWidget(label2);
-    QPixmap* map = new QPixmap(":/algorithms/algorithms/pictures/unknown.png");
-    QLabel* label = new QLabel(this);
-    label->setPixmap(*map);
-    layout->addWidget(label);
-    //layout->add;
+    label3 = new QLabel(this);
+    label3->setPixmap(unknown.scaledToHeight(iconHeight));
+    layout->addWidget(label3);
+
+    connect(line_edit,SIGNAL(textEdited(QString)),this,SLOT(statesEdited(QString)));
+}
+
+void EpsilonCloserWidget::setCorrectness(bool correct)
+{
+    if(correct)
+    {
+        label3->setPixmap(this->correct.scaledToHeight(iconHeight));
+    }
+    else
+    {
+        label3->setPixmap(this->wrong.scaledToHeight(iconHeight));
+    }
 }
 
-void EpsilonCloserWidget::setIsCorrect(bool correct)
+void EpsilonCloserWidget::setCompleter(MultiSelectCompleter *_completer)
 {
+    completer = _completer;
+    line_edit->setCompleter(completer);
+}
 
+void EpsilonCloserWidget::statesEdited(QString s)
+{
+    user_epsilon_closer_list =  FA_widget::getSortedUniqueList(s);
+    if(user_epsilon_closer_list.empty())
+        label3->setPixmap(unknown.scaledToHeight(iconHeight));
+    else
+        setCorrectness(user_epsilon_closer_list == correct_epsilon_closer_list);
 }

RegularConvertor/algorithms/epsiloncloserwidget.h

@@ -3,26 +3,43 @@
 
 #include <QWidget>
 #include <QtWidgets>
+#include <set/set_of_sets.h>
+#include "finite_machine/multiselectcompleter.h"
+#include "finite_machine/fa_widget.h"
+
 class EpsilonCloserWidget : public QWidget
 {
     Q_OBJECT
 public:
-    explicit EpsilonCloserWidget(QString _state, QList<QString> _epsilon_closer_list, QWidget *parent = 0);
-    void setIsCorrect(bool correct);
+    explicit EpsilonCloserWidget(QString _state, QList<QString> _user_epsilon_closer_list, QList<QString> _correct_epsilon_closer_list, QWidget *parent = 0);
+
     QString state;
-    QList<QString> epsilon_closer_list;
+    QStringList user_epsilon_closer_list;
+    QStringList correct_epsilon_closer_list;
     QLabel* label1;
     QLabel* label2;
-    QTextEdit* text_edit;
-    QIcon icon;
-    QIcon unknown_icon;
-    QIcon correct_icon;
-    QIcon wrong_icon;
+    QLabel* label3;
+    QLineEdit* line_edit;
+    QPixmap unknown;
+    QPixmap correct;
+    QPixmap wrong;
     QHBoxLayout* layout;
+    const static int iconHeight = 20;
+    MultiSelectCompleter* completer;
+    QStringList states;
+
+    // Setters
+    void setCompleter(MultiSelectCompleter* _completer);
+    void setCorrectness(bool correct);
+
+    // Getters
+    inline QList<QString> getCloser(){return user_epsilon_closer_list;}
+    inline QString getState(){return state;}
+
 signals:
 
 public slots:
-
+    void statesEdited(QString s);
 };
 
 #endif // EPSILONCLOSERWIDGET_H

RegularConvertor/algorithms/regexptofa.cpp

@@ -71,30 +71,25 @@ RegExpToFA::RegExpToFA(AlgorithmWidget* _algorithm_widget, modes _mode, RegExpWi
                 break;
         }
     }
-
-
-
-    play_timer = new QTimer();
-    check_step_timer = new QTimer();
     setMode(mode, re);
-    //
-    // Connect timers.
-    //
-    connect(play_timer, SIGNAL(timeout()), this, SLOT(nextStep()));
-    connect(check_step_timer, SIGNAL(timeout()), this, SLOT(checkSolution()));
-
 
     //
     // Connect algorithm buttons.
     //
     connect(this->algorithm_widget,SIGNAL(playPressed(int)),this,SLOT(runAlgorithm(int)));
     connect(this->algorithm_widget,SIGNAL(stopPressed()),this,SLOT(stop()));
-    connect(this->algorithm_widget,SIGNAL(prewPressed()),this,SLOT(prewStep()));
+    connect(this->algorithm_widget,SIGNAL(prewPressed()),this,SLOT(prevStep()));
     connect(this->algorithm_widget,SIGNAL(nextPressed()),this,SLOT(nextStep()));
     connect(this->algorithm_widget, SIGNAL(checkSolutionPressed()), this, SLOT(checkSolution()));
     connect(this->algorithm_widget, SIGNAL(showCorrectSolutionPressed()), this, SLOT(showCorrectSolution()));
     connect(this->algorithm_widget, SIGNAL(showUserSolutionPressed()), this, SLOT(showUserSolution()));
 
+    //
+    // Connect timers.
+    //
+    connect(play_timer, SIGNAL(timeout()), this, SLOT(nextStep()));
+    connect(check_step_timer, SIGNAL(timeout()), this, SLOT(checkSolution()));
+
     //
     // Connect regexp widget
     //
@@ -103,6 +98,9 @@ RegExpToFA::RegExpToFA(AlgorithmWidget* _algorithm_widget, modes _mode, RegExpWi
 
     re_widget->setRegExp(_re);
     re_widget->modelChanged();
+
+    // because not implemented
+    algorithm_widget->disableShowButton();
 }
 
 void RegExpToFA::setMode(modes _mode, RegExp* _re)
@@ -283,10 +281,10 @@ void RegExpToFA::computeSolution()
     }
 }
 
-void RegExpToFA::runAlgorithm(int mil_sec)
-{
-    play_timer->start(mil_sec);
-}
+//void RegExpToFA::runAlgorithm(int mil_sec)
+//{
+//    play_timer->start(mil_sec);
+//}
 
 void RegExpToFA::nextStep()
 {
@@ -388,7 +386,7 @@ void RegExpToFA::nextStep()
     }
 }
 
-void RegExpToFA::prewStep()
+void RegExpToFA::prevStep()
 {
     if (actPos > 0)
     {
@@ -413,10 +411,10 @@ void RegExpToFA::removeFuture()
 }
 
 
-void RegExpToFA::stop()
-{
-    play_timer->stop();
-}
+//void RegExpToFA::stop()
+//{
+//    play_timer->stop();
+//}
 
 //void RegExpToFA::getData(QModelIndex _index)
 //{