Functionality to begin/end in stepping mode.

navrkald · navrkald · commit 4d6172b555e7 · 2014-05-14T19:46:59.000+02:00
* Self arrow is now visible when selected by dashed line.
 * Tooltips to FA editing buttons.
 * Make fully functional formal editor of FA.
 * Add functionality when delete symol from FA in formal and internal view, then deletes all transitions with this deleted symbol.
diff --git a/RegularConvertor/algorithms/fatodfa.cpp b/RegularConvertor/algorithms/fatodfa.cpp
@@ -63,7 +63,7 @@ FaToDFA::FaToDFA(modes _mode, AlgorithmWidget* _algorithm_widget, FA_widget* _no
     connect(this->algorithm_widget, SIGNAL(showCorrectSolutionPressed()), this, SLOT(showCorrectSolution()));
     connect(this->algorithm_widget, SIGNAL(showUserSolutionPressed()), this, SLOT(showUserSolution()));
     connect(this->algorithm_widget, SIGNAL(beginPressed()), this, SLOT(toBegin()));
-    connect(this->algorithm_widget, SIGNAL(beginPressed()), this, SLOT(toEnd()));
+    connect(this->algorithm_widget, SIGNAL(endPressed()), this, SLOT(toEnd()));
 
     //
     // Connect timers.
@@ -409,12 +409,37 @@ void FaToDFA::showUserSolution()
 
 void FaToDFA::toBegin()
 {
-     not_dfa_widget->setFA(new FiniteAutomata(FA));
+     algorithm_widget->enableNext();
+     actPos=0;
+     steps s = history.at(actPos);
+
+     num = s.num ;
+     actInstruction = s.actInstruction;
+     prewInstruction = s.prewInstruction;
+     DFA = s.DFA;
+     dfa_widget->setFA(new FiniteAutomata(DFA));
+     act_state = s.act_state;
+     discovered_state = s.discovered_state;
+     Q_new = s.Q_new;
+     a = s.a;
+     p = s.p;
+     q = s.q;
+     r = s.r;
+     r_prime = s.r_prime;
+     alphabet = s.alphabet;
+     rules = s.rules;
+     rules_prime = s.rules_prime;
+
+     showVariables();
+     setActInstruction();
+     dfa_widget->clearStatus();
+     algorithm_widget->disablePrev();
 }
 
 void FaToDFA::toEnd()
 {
-    runAlgorithm(0);
+    while(actInstruction != last_instruction)
+        nextStep();
 }
 
 void FaToDFA::removeFuture()
diff --git a/RegularConvertor/algorithms/regexptofa.cpp b/RegularConvertor/algorithms/regexptofa.cpp
@@ -84,7 +84,7 @@ RegExpToFA::RegExpToFA(AlgorithmWidget* _algorithm_widget, modes _mode, RegExpWi
     connect(this->algorithm_widget, SIGNAL(showCorrectSolutionPressed()), this, SLOT(showCorrectSolution()));
     connect(this->algorithm_widget, SIGNAL(showUserSolutionPressed()), this, SLOT(showUserSolution()));
     connect(this->algorithm_widget, SIGNAL(beginPressed()), this, SLOT(toBegin()));
-    connect(this->algorithm_widget, SIGNAL(beginPressed()), this, SLOT(toEnd()));
+    connect(this->algorithm_widget, SIGNAL(endPressed()), this, SLOT(toEnd()));
 
     //
     // Connect timers.
@@ -448,13 +448,22 @@ void RegExpToFA::setExample(RegExp *_re)
 
 void RegExpToFA::toBegin()
 {
-    re_widget->setRegExp(re);
+    actPos=0;
+    num = history.at(actPos).num;
+    actInstruction = history.at(actPos).actInstruction;
+    RegExp* tmp_re = history.at(actPos).re;
+    re_widget->setRegExp(new RegExp(*tmp_re));
+
     re_widget->modelChanged();
+    setActInstruction();
 }
 
 void RegExpToFA::toEnd()
 {
-    runAlgorithm(0);
+    while(!nodesToProcede.empty())
+    {
+        nextStep();
+    }
 }
 
 
diff --git a/RegularConvertor/algorithms/removeepsilon.cpp b/RegularConvertor/algorithms/removeepsilon.cpp
@@ -71,7 +71,7 @@ RemoveEpsilon::RemoveEpsilon(modes _mode, AlgorithmWidget* _algorithm_widget, FA
     connect(this->algorithm_widget, SIGNAL(showCorrectSolutionPressed()), this, SLOT(showCorrectSolution()));
     connect(this->algorithm_widget, SIGNAL(showUserSolutionPressed()), this, SLOT(showUserSolution()));
     connect(this->algorithm_widget, SIGNAL(beginPressed()), this, SLOT(toBegin()));
-    connect(this->algorithm_widget, SIGNAL(beginPressed()), this, SLOT(toEnd()));
+    connect(this->algorithm_widget, SIGNAL(endPressed()), this, SLOT(toEnd()));
 
     //
     // Connect timers.
@@ -403,8 +403,6 @@ void RemoveEpsilon::prevStep()
         prewInstruction = s.prewInstruction;
         non_epsilon_FA = s.non_epsilon_FA;
         not_epsilon_fa_widget->setFA(new FiniteAutomata(non_epsilon_FA));
-//        epsilon_closer_list_widget = s.epsilon_closer_list_widget;
-//        epsilon_closer_list_widget->setParent((QWidget*)s.parrent);
         p = s.p;
         p_prime = s.p_prime;
         non_epsilon_rule = s.non_epsilon_rule;
@@ -580,12 +578,34 @@ void RemoveEpsilon::showUserSolution()
 
 void RemoveEpsilon::toBegin()
 {
-    epsilon_fa_widget->setFA(new FiniteAutomata(FA));
+    algorithm_widget->enableNext();
+    actPos = 0;
+    steps s = history.at(actPos);
+    num = s.num;
+    actInstruction = s.actInstruction;
+    prewInstruction = s.prewInstruction;
+    non_epsilon_FA = s.non_epsilon_FA;
+    not_epsilon_fa_widget->setFA(new FiniteAutomata(non_epsilon_FA));
+    p = s.p;
+    p_prime = s.p_prime;
+    non_epsilon_rule = s.non_epsilon_rule;
+    non_epsilon_prime_rule = s.non_epsilon_prime_rule;
+    epsilon_closer = s.epsilon_closer;
+    epsilon_closers = s.epsilon_closers;
+    p_list = s.p_list;
+    p_prime_list = s.p_prime_list;
+    non_epsilon_rule_list = s.non_epsilon_rule_list;
+    showVariables();
+    setActInstruction();
+    setEpsilonCloserWidget();
+    not_epsilon_fa_widget->clearStatus();
+    algorithm_widget->disablePrev();
 }
 
 void RemoveEpsilon::toEnd()
 {
-    runAlgorithm(0);
+    while(actInstruction != last_instruction)
+        nextStep();
 }
 
 void RemoveEpsilon::checkSolution()
diff --git a/RegularConvertor/finite_machine/arrow.cpp b/RegularConvertor/finite_machine/arrow.cpp
@@ -167,6 +167,11 @@ QWidget *)
     this->displayText = symbols.join(", ");
     painter->drawText(textPos(),this->displayText);
 
+    if (isSelected())
+    {
+        painter->setPen(QPen(myColor, 1, Qt::DashLine));
+    }
+
     if(getStartItemPos() == getEndItemPos())
     {//jedna se o self smycku
 
diff --git a/RegularConvertor/finite_machine/diagramscene.cpp b/RegularConvertor/finite_machine/diagramscene.cpp
@@ -35,7 +35,7 @@ void DiagramScene::mousePressEvent(QGraphicsSceneMouseEvent *mouseEvent)
          return;
 
      clicked = true;
-     StateNode* newNode;
+     StateNode* newNode = 0;
      switch(this->actMode)
      {
         case AddNode:
@@ -46,6 +46,7 @@ void DiagramScene::mousePressEvent(QGraphicsSceneMouseEvent *mouseEvent)
              FA->coordinates[newNode->getName()] = mouseEvent->scenePos().toPoint();
              if(newNode->getName() == "0" && startingState == NULL)
                  newNode->setStartinState();
+
              emit FA_changed(FA);
              break;
         case AddArrow:
@@ -70,6 +71,11 @@ void DiagramScene::mousePressEvent(QGraphicsSceneMouseEvent *mouseEvent)
 //         elipse->setFlag(QGraphicsItem::ItemIsSelectable, true);
 //         elipse->setFlag(QGraphicsItem::ItemSendsGeometryChanges, true);
      QGraphicsScene::mousePressEvent(mouseEvent);
+
+     //cant unselect node because selection set also mouse release event :(
+//     // Unselect node
+//     if(newNode != 0)
+//         newNode->setSelected(false);
  }
 
  void DiagramScene::mouseMoveEvent(QGraphicsSceneMouseEvent *mouseEvent)
diff --git a/RegularConvertor/finite_machine/fa_widget.cpp b/RegularConvertor/finite_machine/fa_widget.cpp
@@ -33,6 +33,12 @@ FA_widget::FA_widget(QWidget *parent) :
 
     //set init checked to AddNodeBut
     AddNodeBut->setChecked(true);
+    //MoveNodeBut->setChecked(true);
+
+    MoveNodeBut->setToolTip(tr("If this button is activated, you can select and move with items in scene."));
+    AddNodeBut->setToolTip(tr("If this button is activated, left mouse click into screene creates new node."));
+    AddArrowBut->setToolTip(tr("If this button is activated, you can create transition between nodes. <br>(Click on from item, hold mouse left button and release on arrow target.)"));
+    DeleteNodeBut->setToolTip(tr("Click on this button deletes all selected items. <br>(You can select multiple items when holding control button.)"));
 
     //adjust size of button according text in
 //    MoveNodeBut->setMaximumWidth(MoveNodeBut->fontMetrics().boundingRect(MoveNodeBut->text()).width()+15);
@@ -57,7 +63,8 @@ FA_widget::FA_widget(QWidget *parent) :
     //notify changes in formal view
     connect(this->ui->statesLineEdit,SIGNAL(editingFinished()),this,SLOT(statesEdited()));
     connect(this->ui->endingStatesLineEdit,SIGNAL(editingFinished()),this,SLOT(endingStatesEdited()));
-    connect(this->ui->alphabetLineEdit,SIGNAL(editingFinished()),this,SLOT(alphaberEdited()));
+    connect(this->ui->alphabetLineEdit,SIGNAL(editingFinished()),this,SLOT(alphabetEdited()));
+    connect(this->ui->alphabetLineEdit,SIGNAL(textEdited(QString)),this,SLOT(alphabetEdited()));
 
     //add items to scene
     connect(this,SIGNAL(addNodes(QSet<QString>)),this->scene,SLOT(addNodes(QSet<QString>)));
@@ -111,7 +118,7 @@ void FA_widget::setupValidators()
 {
     QRegExp listOfIdentifiers("^(\\w+(,\\s*\\w+)*,?)?$");
     //hint [^,] mean what ever char not ','
-    QRegExp listOfSymbols("^\\S(,\\s*\\S)*$");
+    QRegExp listOfSymbols("^(\\S(,\\s*\\S)*)?$");
     QRegExp emptyRegExp("^$");
     statesValidator = new QRegExpValidator(listOfIdentifiers, this);
     alphabetValidator = new QRegExpValidator(listOfSymbols, this);
@@ -184,7 +191,9 @@ void FA_widget::statesEdited()
     if(ui->statesLineEdit->text() == "")
     {
         emit removeNodes(FA->states);
-        FA->states.clear();
+        FA->removeStates(FA->states);
+        //FA->states.clear();
+
         emit FA_changed(FA);
         return;
     }
@@ -194,19 +203,34 @@ void FA_widget::statesEdited()
     QSet <QString> setOfStatesLineEdit = unique_list_of_states.toSet();
     QSet <QString> statesToDel = FA->states - setOfStatesLineEdit;
     QSet <QString> statesToAdd = setOfStatesLineEdit - FA->states;
-    FA->states =setOfStatesLineEdit;
+    FA->removeStates(statesToDel);
+    foreach(QString state_to_add, statesToAdd)
+        FA->addState(state_to_add);
     if(!statesToDel.empty())
     {
-        emit FA_changed(FA);
+        //remove nodes emits in scene FA_changed()
         emit removeNodes(statesToDel);
+
+        // this block of code removes rules in formal view that consist of
+        foreach(QString state_to_del,statesToDel)
+        {
+            QList<QListWidgetItem *>  items_to_dell = ui->rulesListWidget->findItems(state_to_del+" ",Qt::MatchStartsWith);
+            items_to_dell.append(ui->rulesListWidget->findItems(" "+state_to_del,Qt::MatchEndsWith));
+            foreach(QListWidgetItem* item,items_to_dell.toSet())
+            {
+                ui->rulesListWidget->takeItem(ui->rulesListWidget->row(item));
+                delete item;
+            }
+        }
+
     }
     if(!statesToAdd.empty())
     {
         emit addNodes(statesToAdd);
         emit FA_changed(FA);
     }
     updateStates();
-    emit FA_changed(FA);
+    // not needed  emit FA_changed(FA)(emit only if there is some changes (add or nemove nodes));
 }
 
 void FA_widget::endingStatesEdited()
@@ -220,29 +244,57 @@ void FA_widget::endingStatesEdited()
     QSet <QString> endingStatesToAdd = setOfEndigStates - FA->finalStates;
     FA->finalStates = setOfEndigStates;
     if(!endingStatesToDel.empty())
+    {
         emit removeEndingNodes(endingStatesToDel);
+        //FA changed is emited in node
+    }
     if(!endingStatesToAdd.empty())
+    {
         emit addEndingNodes(endingStatesToAdd);
-
-    emit FA_changed(FA);
+        // FA changed is emited in node
+    }
 }
 
-void FA_widget::alphaberEdited()
+void FA_widget::alphabetEdited()
 {
-    QStringList SortedUniqueList = getSortedUniqueList(ui->alphabetLineEdit->text());
-    ui->alphabetLineEdit->setText(SortedUniqueList.join(", "));
+    QString text = ui->alphabetLineEdit->text();
+    int pos = 0;
+    if (alphabetValidator->validate(text, pos) == QValidator::Acceptable)
+    {
+        QStringList SortedUniqueList = getSortedUniqueList(ui->alphabetLineEdit->text());
+        ui->alphabetLineEdit->setText(SortedUniqueList.join(", "));
 
 
-    QSet <QString> setOfAlphabet =  SortedUniqueList.toSet();
-    QSet <QString> symbolsToDel = FA->alphabet - setOfAlphabet;
-    QSet <QString> symbolsToAdd = setOfAlphabet - FA->alphabet;
-    FA->alphabet = SortedUniqueList.toSet();
-    if(!symbolsToDel.empty())
-        emit removeSymbols(symbolsToDel);
-    if(!symbolsToAdd.empty())
-        emit addSymbols(symbolsToAdd);
+        QSet <QString> setOfAlphabet =  SortedUniqueList.toSet();
+        QSet <QString> symbolsToDel = FA->alphabet - setOfAlphabet;
+        QSet <QString> symbolsToAdd = setOfAlphabet - FA->alphabet;
+        if(!symbolsToDel.empty())
+        {
+            foreach(QString symbol, symbolsToDel)
+            {
+                // This block of code removes rules from formal view where delete symbols appears
+                //QList<QListWidgetItem *>  items_to_dell = ui->rulesListWidget->findItems(" "+symbol+" ->",Qt::MatchContains);
+                QList<QListWidgetItem *>  items_to_dell = ui->rulesListWidget->findItems("^\\S+ "+symbol+" -> \\S+$",Qt::MatchRegExp);
+                foreach(QListWidgetItem* item,items_to_dell.toSet())
+                {
+                    ui->rulesListWidget->takeItem(ui->rulesListWidget->row(item));
+                    delete item;
+                }
+                emit removeEdges(FA->findRule_Symbol(symbol).toSet());
+                FA->removeSymbol(symbol);
+            }
+            emit FA_changed(FA);
+        }
 
-    emit FA_changed(FA);
+        if(!symbolsToAdd.empty())
+        {
+            foreach(QString symbol, symbolsToAdd)
+            {
+                FA->addSymbol(symbol);
+            }
+            emit FA_changed(FA);
+        }
+    }
     //TODO! osetrit kdyz se vyskytuji symboly abecedy v prechodech
 }
 
@@ -268,7 +320,8 @@ void FA_widget::updateStates()
     QStringList items_string_list = items;
     QString awailableStates = "(" + items_string_list.join( "|" ) + ")";
     endingStatesValidator->setRegExp(QRegExp("^" + awailableStates + "+(,\\s*" + awailableStates + ")*,?$")); // RegExp: ^\\w+(,\\s*\\w+)*,?$
-    //TODO! osetrit kdyz se smaze uzel ktery se vyskytuje v prechodech
+    QStringList endingStates = FA->finalStates.toList();
+    ui->endingStatesLineEdit->setText(endingStates.join(", "));
 }
 
 void FA_widget::emitAddEdge(ComputationalRules rule)
@@ -289,6 +342,9 @@ void FA_widget::emitAddEndingNode(QString node)
 void FA_widget::on_startStateComboBox_activated(const QString &arg1)
 {
     statesEdited(); //zavolame explicitne protoze "strati fokus, tak aby to fungovalo"
+    //because prew function erase selected item in gui
+    int index = ui->startStateComboBox->findText(arg1);
+    ui->startStateComboBox->setCurrentIndex(index);
     if(arg1 != "")
     {
         FA->startState = QString(arg1);
@@ -304,7 +360,7 @@ void FA_widget::on_addRuleToolButton_clicked()
 {
     //updatovani stavu a abecedy (zavolame explicitne protoze "nestrati fokus, tak aby to fungovalo")
     statesEdited();
-    alphaberEdited();
+    alphabetEdited();
 
     if(FA->states.isEmpty())
     {
@@ -349,7 +405,7 @@ void FA_widget::on_removeRuleToolButton_clicked()
 {
     //updatovani stavu a abecedy (zavolame explicitne protoze "nestrati fokus, tak aby to fungovalo")
     statesEdited();
-    alphaberEdited();
+    alphabetEdited();
 
     QList<QListWidgetItem *> items = ui->rulesListWidget->selectedItems();
 
@@ -371,7 +427,7 @@ void FA_widget::on_rulesListWidget_itemDoubleClicked(QListWidgetItem *item)
 {
     //updatovani stavu a abecedy (zavolame explicitne protoze "nestrati fokus, tak aby to fungovalo")
     statesEdited();
-    alphaberEdited();
+    alphabetEdited();
 
     ComputationalRules oldrule(item->text());
 
@@ -435,7 +491,7 @@ void FA_widget::on_tabWidget_currentChanged(int index)
         ui->endingStatesLineEdit->setText(endingStates.join(", "));
 
     }
-    emit FA_changed(FA);
+    // not needed emit, we set only old data from FA graphic - emit FA_changed(FA);
 }
 
 //vymaze selected items
diff --git a/RegularConvertor/finite_machine/fa_widget.h b/RegularConvertor/finite_machine/fa_widget.h
diff --git a/RegularConvertor/finite_machine/finiteautomata.cpp b/RegularConvertor/finite_machine/finiteautomata.cpp
diff --git a/RegularConvertor/finite_machine/statenode.cpp b/RegularConvertor/finite_machine/statenode.cpp
