Many changes, need to rewrite this comment.

* repaired minimalization algorithm
* re -> fa is broken dont now why. Unit tests failing on this conversion... Need to investigate.

Author: navrkald

.gitignore

@@ -6,6 +6,7 @@
 /build-RegularConvertorUnitTests-Desktop_Qt_5_0_2_GCC_64bit-Debug/
 /build-RegularConvertor-Desktop_qt52-Debug/
 /build-RegularConvertorUnitTests-Desktop_qt52-Debug/
+/build-RegularConvertorUnitTests-Desktop_Qt_5_2_1_GCC_64bit_qt_521-Debug/
 
 # User build settings #
 #######################

RegularConvertor/algorithms/algorithm.cpp

@@ -1,5 +1,31 @@
 #include "algorithm.h"
 
 Algorithm::Algorithm()
+    : actInstructionBackroundColor(Qt::yellow), normalInstructionBackroundColor(Qt::white)
 {
 }
+
+void Algorithm::initBreakpoints(int _num)
+{
+    breakpoints.resize(_num);
+    foreach(bool breakpoint,breakpoints)
+    {
+        breakpoint = false;
+    }
+}
+
+int Algorithm::setActInstruction()
+{
+    clearActInstruction();
+    QModelIndex index = this->index(actInstruction,0,QModelIndex());
+    setData(index,QBrush(actInstructionBackroundColor),Qt::BackgroundRole);
+}
+
+int Algorithm::clearActInstruction()
+{
+    for(int i = 0; i<instruction_count; i++)
+    {
+        QModelIndex index = this->index(i,0,QModelIndex());
+        setData(index,QBrush(normalInstructionBackroundColor),Qt::BackgroundRole);
+    }
+}

RegularConvertor/algorithms/algorithm.h

@@ -11,11 +11,26 @@ class Algorithm : public QStandardItemModel
     Algorithm();
     //TODO add bool if brakepoint is set for some step
     QVector <QString> instructions;
+    QVector <bool> breakpoints;
     enum modes {CHECK_MODE, PLAY_MODE, STEP_MODE};
 
-    static const int HasBrakepoint_Role = Qt::UserRole;
-    static const int Brakepoint_Role = Qt::UserRole +1 ;
+    static const int HasBreakpoint_Role = Qt::UserRole;
+    static const int Breakpoint_Role = Qt::UserRole +1 ;
 
+    virtual void initInstructions() = 0;
+    void initBreakpoints(int _num);
+
+
+    QColor actInstructionBackroundColor;
+    QColor normalInstructionBackroundColor;
+
+    int instruction_count;
+    int actInstruction;
+    int prewInstruction;
+    int setActInstruction();
+    int clearActInstruction();
+//signals:
+//    instructionChanged(int _instruction);
     //    struct steps
 //    {
 //        QString formal_text;

RegularConvertor/algorithms/algorithmwidget.cpp

@@ -1,15 +1,20 @@
 #include "algorithmwidget.h"
 #include "ui_algorithmwidget.h"
 
-AlgorithmWidget::AlgorithmWidget(QWidget *parent) :
-    QWidget(parent),
+AlgorithmWidget::AlgorithmWidget(Algorithm::modes _mode, QWidget *parent) :
+    QWidget(parent), mode(_mode),
     ui(new Ui::AlgorithmWidget)
 {
     ui->setupUi(this);
+
+    showSolution = false;
+
     connect(this->ui->nextButton,SIGNAL(clicked()),this,SIGNAL(nextPressed()));
     connect(this->ui->prewButton,SIGNAL(clicked()),this,SIGNAL(prewPressed()));
     connect(this->ui->playButton,SIGNAL(clicked()),this,SLOT(emitPlay()));
     connect(this->ui->stopButton,SIGNAL(clicked()),this,SIGNAL(stopPressed()));
+    connect(this->ui->checkButton,SIGNAL(clicked()),this,SIGNAL(checkSolutionPressed()));
+    setWidgets(mode);
 }
 
 AlgorithmWidget::~AlgorithmWidget()
@@ -22,7 +27,78 @@ AlgorithmView *AlgorithmWidget::getAlgorithmView()
     return ui->treeView;
 }
 
+
+
+void AlgorithmWidget::hideWidgets(QList<QWidget *> widgets)
+{
+    foreach(QWidget* w,widgets)
+        w->hide();
+}
+
+void AlgorithmWidget::showWidgets(QList<QWidget *> widgets)
+{
+    foreach(QWidget* w,widgets)
+        w->show();
+}
+
+void AlgorithmWidget::setWidgets(Algorithm::modes mode)
+{
+    switch (mode) {
+    case Algorithm::CHECK_MODE:
+        showWidgets(QList<QWidget*>() << ui->checkButton <<  ui->showButton);
+        showSpacer(ui->checkSpacer);
+        hideWidgets(QList<QWidget*>()
+                    << ui->prewButton << ui->nextButton << ui->playButton << ui->stopButton << ui->spinBox << ui->delay_label
+                    << ui->prew_stepButton << ui->next_stepButton );
+        hideSpacer(ui->stepSpacer);
+        break;
+    case Algorithm::PLAY_MODE:
+        showWidgets(QList<QWidget*>() << ui->prewButton << ui->nextButton << ui->playButton << ui->stopButton << ui->spinBox << ui->delay_label);
+        hideWidgets(QList<QWidget*>()
+                    << ui->checkButton <<  ui->showButton
+                    << ui->prew_stepButton << ui->next_stepButton );
+        hideSpacer(ui->stepSpacer);
+        hideSpacer(ui->checkSpacer);
+        break;
+    case Algorithm::STEP_MODE:
+        showWidgets(QList<QWidget*>()<< ui->prew_stepButton << ui->next_stepButton);
+        hideWidgets(QList<QWidget*>()
+                    << ui->checkButton <<  ui->showButton
+                    << ui->prewButton << ui->nextButton << ui->playButton << ui->stopButton << ui->spinBox << ui->delay_label);
+        showSpacer(ui->stepSpacer);
+        hideSpacer(ui->checkSpacer);
+        break;
+    default:
+        break;
+    }
+}
+
+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);
+}
+
 void AlgorithmWidget::emitPlay()
 {
     emit playPressed(this->ui->spinBox->value());
 }
+
+void AlgorithmWidget::on_showButton_clicked()
+{
+    showSolution=!showSolution;
+    if(showSolution)
+    {
+        ui->showButton->setText("Show solution.");
+        emit showCorrectSolutionPressed();
+    }
+    else
+    {
+        ui->showButton->setText("Back.");
+        emit showUserSolutionPressed();
+    }
+}

RegularConvertor/algorithms/algorithmwidget.h

@@ -3,6 +3,8 @@
 
 #include <QWidget>
 #include "algorithmview.h"
+#include "algorithm.h"
+#include <QSpacerItem>
 
 namespace Ui {
 class AlgorithmWidget;
@@ -13,17 +15,36 @@ class AlgorithmWidget : public QWidget
     Q_OBJECT
 
 public:
-    explicit AlgorithmWidget(QWidget *parent = 0);
+    explicit AlgorithmWidget(Algorithm::modes _mode, QWidget *parent = 0);
     ~AlgorithmWidget();
     AlgorithmView* getAlgorithmView();
+    Algorithm::modes mode;
+
+    void hideWidgets(QList<QWidget*> widgets);
+    void showWidgets(QList<QWidget*> widgets);
+
+    void hideSpacer(QSpacerItem * s);
+    void showSpacer(QSpacerItem * s);
+
+    bool showSolution;
+
 signals:
     void nextPressed();
     void prewPressed();
     void playPressed(int mil_sec);
     void stopPressed();
+    void checkSolutionPressed();
+    void showCorrectSolutionPressed();
+    void showUserSolutionPressed();
+
 
 public slots:
     void emitPlay();
+    void setWidgets(Algorithm::modes mode);
+
+
+private slots:
+    void on_showButton_clicked();
 
 private:
     Ui::AlgorithmWidget *ui;