Basic operation on first conversion DONE!

* Next step is good debug if found some errors.
* Next step is also add advanced features.

Author: navrkald

RegularConvertor/algorithms/algorithm.h

@@ -12,7 +12,7 @@ class Algorithm : public QStandardItemModel
     //TODO add bool if brakepoint is set for some step
     QVector <QString> instructions;
     QVector <bool> breakpoints;
-    enum modes {CHECK_MODE, PLAY_MODE, STEP_MODE};
+    enum modes {NONE, CHECK_MODE, PLAY_MODE, STEP_MODE};
 
     static const int HasBreakpoint_Role = Qt::UserRole;
     static const int Breakpoint_Role = Qt::UserRole +1 ;

RegularConvertor/algorithms/algorithmwidget.cpp

@@ -7,7 +7,7 @@ AlgorithmWidget::AlgorithmWidget(Algorithm::modes _mode, QWidget *parent) :
 {
     ui->setupUi(this);
 
-    showSolution = false;
+    showSolution = true;
 
     connect(this->ui->nextButton,SIGNAL(clicked()),this,SIGNAL(nextPressed()));
     connect(this->ui->prewButton,SIGNAL(clicked()),this,SIGNAL(prewPressed()));
@@ -93,12 +93,12 @@ void AlgorithmWidget::on_showButton_clicked()
     showSolution=!showSolution;
     if(showSolution)
     {
-        ui->showButton->setText("Show solution.");
+        ui->showButton->setText("Show solution");
         emit showCorrectSolutionPressed();
     }
     else
     {
-        ui->showButton->setText("Back.");
+        ui->showButton->setText("Back");
         emit showUserSolutionPressed();
     }
 }

RegularConvertor/algorithms/algorithmwidget.ui

@@ -98,7 +98,7 @@
        <item>
         <widget class="QToolButton" name="showButton">
          <property name="text">
-          <string>Show correct solution</string>
+          <string>Show solution</string>
          </property>
         </widget>
        </item>

RegularConvertor/algorithms/regexptofa.cpp

@@ -15,6 +15,7 @@
 
 RegExpToFA::RegExpToFA(RegExp* _re) : Algorithm()
 {
+    mode = NONE;
     setRE(_re);
 }
 
@@ -120,8 +121,7 @@ void RegExpToFA::setRE(RegExp* _re)
     {
         computeSolution();
         postOrder(re->rootNode);
-    }
-
+    }   
 }
 
 void RegExpToFA::selectRegExp(QModelIndex index)
@@ -131,15 +131,15 @@ void RegExpToFA::selectRegExp(QModelIndex index)
     QList<RegExpNode*> children = node->children;
     if(children.count() > 0)
     {
-        left_fa_widget->setFA(new FiniteAutomata(children.at(0)->user_FA));
+        left_fa_widget->setFA(&children.at(0)->user_FA);
     }
     else
     {
         left_fa_widget->setFA(new FiniteAutomata());
     }
     if(children.count() > 1)
     {
-        right_fa_widget->setFA(new FiniteAutomata(children.at(1)->user_FA));
+        right_fa_widget->setFA(&children.at(1)->user_FA);
     }
     else
     {
@@ -152,7 +152,7 @@ void RegExpToFA::selectRegExp(QModelIndex index)
     }
     else
     {
-        center_fa_widget->setFA(new FiniteAutomata(node->user_FA));
+        center_fa_widget->setFA(&node->user_FA);
     }
 
 
@@ -329,7 +329,7 @@ void RegExpToFA::checkSolution()
     QList<RegExpNode*> nodes_to_check(nodesToProcede);
     while(!nodes_to_check.empty())
     {
-        RegExpNode* node = nodesToProcede.first();
+        RegExpNode* node = nodes_to_check.first();
         nodes_to_check.pop_front();
         if(FiniteAutomata::areEquivalent(node->correct_FA, node->user_FA))
         {

RegularConvertor/finite_machine/arrow.cpp

@@ -199,10 +199,12 @@ QWidget *)
         foreach(QString symbol,deletedSymbols)
         {
             FA->removeRule(ComputationalRules(startItem()->getName(),endItem()->getName(),symbol));
+            FA->removeSymbol(symbol);
         }
         foreach(QString symbol,newSymbols)
         {
             FA->addRule(ComputationalRules(startItem()->getName(),endItem()->getName(),symbol));
+            FA->addSymbol(symbol);
         }
         //Setup this
         this->symbols  = editedSymbols;

RegularConvertor/finite_machine/diagramscene.cpp

@@ -191,11 +191,11 @@ void DiagramScene::deleteSelected()
         StateNode* node = dynamic_cast<StateNode*>(item);
         if (node)
         {
+            FA->removeState(node->getName());
             removeItem(node);
             if(node == startingState)
             {
                 this->startingState = NULL;
-                FA->startState = "";
             }
             foreach(Arrow* arrowToRemove,node->arrows)
                 removeItem(arrowToRemove);
@@ -211,6 +211,7 @@ void DiagramScene::deleteSelected()
 void DiagramScene::setStartNode(QString nodeName)
 {
     StateNode* node = getNodeByName(nodeName);
+    startingState = node;
     if(node != NULL)
         node->setStartinState();
 }
@@ -372,12 +373,51 @@ Arrow* DiagramScene::getArrow(StateNode *from, StateNode* to)
     return NULL;
 }
 
+void DiagramScene::clean()
+{
+
+    QList<QGraphicsItem*> items = this->items();
+
+
+    //first delete edges
+    foreach(QGraphicsItem* item,items)
+    {
+        Arrow* arrow = dynamic_cast<Arrow*>(item);
+        if (arrow)
+        {
+            removeItem(arrow);
+            items.removeOne(arrow);
+            delete arrow;
+        }
+    }
+
+
+
+    //then delete nodes
+    foreach(QGraphicsItem* item,items)
+    {
+        StateNode* node = dynamic_cast<StateNode*>(item);
+        if (node)
+        {
+            removeItem(node);
+            foreach(Arrow* arrowToRemove,node->arrows)
+                removeItem(arrowToRemove);
+            delete node;
+            //FA->removeState(node->)
+        }
+        else
+            qDebug() << "Chyba v diagramscene.cpp, ktera by nikdy nemela nastat!";
+    }
+    emit FA_changed(FA);
+
+}
+
 void DiagramScene::setFA(FiniteAutomata* _FA)
 {
-    this->selectAll();
-    this->deleteSelected();
+//    this->selectAll();
+//    this->deleteSelected();
 
-    delete this->FA;
+    clean();
     this->FA = _FA;
     addNodes(FA->states);
     setStartNode(FA->startState);

RegularConvertor/finite_machine/diagramscene.h

@@ -31,7 +31,8 @@ class DiagramScene : public QGraphicsScene
     Mode getMode();
     StateNode* startingState;
     Arrow* getArrow(StateNode* from, StateNode* to);
-
+    //clean scene but not delete or change FA
+    void clean();
 
 public slots:
     void setFA(FiniteAutomata* FA);

RegularConvertor/finite_machine/finiteautomata.cpp

@@ -579,6 +579,10 @@ bool FiniteAutomata::removeState(QString stateName)
 {
     bool retval = this->states.remove(stateName);
     removeFinalState(stateName);
+    if(this->startState == stateName)
+    {
+        this->startState = "";
+    }
     foreach(ComputationalRules rule,this->rules)
     {
         if (rule.from == stateName || rule.to == stateName)