enable remaining buttons in game view

qt/buffer.cpp

@@ -50,3 +50,9 @@ bool Buffer::empty() const
   return buffer.isEmpty();
 }
 
+void Buffer::clear()
+{
+  QMutexLocker locker(&lock);
+  buffer.clear();
+}
+

qt/buffer.h

@@ -23,6 +23,7 @@ class Buffer : public QObject
   void put(const Sudoku& s);
   Sudoku get();
   bool empty() const;
+  void clear();
 
 signals:
   void added(); //  emitted if item added

qt/mainwindow.cpp

@@ -19,7 +19,7 @@ static unsigned SudokuIn[9][9] = {
 };
 
 MainWindow::MainWindow(QWidget *parent) :
-  QMainWindow(parent), sudoku(9)
+  QMainWindow(parent), sudoku(9), startGame(9)
 {
   setupUi(this);
   initSudoku();
@@ -105,16 +105,72 @@ void MainWindow::refreshView()
 void MainWindow::on_generateButton_clicked()
 {
   qDebug("generate sudoku");
+  viewRefresh->stop();
+  while (solver) {
+    bool res = solver->wait();
+    if (res) {
+      solver->deleteLater();
+      solver = nullptr;
+    }
+  }
+  buffer.clear();
+  state = State::IDLE;
   sudoku.generate();
+  startGame = sudoku;
   showSudoku(sudoku);
   qDebug("generate sudoku finished");
 }
 
 void MainWindow::on_playButton_clicked()
 {
-  Solver *solv = new Solver(&buffer, sudoku, this);
-  connect(solv, SIGNAL(finished()), this, SLOT(solverFinished()));
-  solv->start();
-  solverRunning = true;
-  viewRefresh->start(0);
+  if (state == State::SOLVER_PAUSING or state == State::IDLE) {
+    if (!solver) {
+      startGame = sudoku;
+      solver = new Solver(&buffer, sudoku, this);
+      connect(solver, SIGNAL(finished()), this, SLOT(solverFinished()));
+      solver->start();
+      solverRunning = true;
+    }
+    viewRefresh->start(0);
+    playButton->setText("Stop");
+    state = State::SOLVER_PLAYING;
+  }
+  else if (state == State::SOLVER_PLAYING) {
+    viewRefresh->stop();
+    playButton->setText("Play");
+    state = State::SOLVER_PAUSING;
+  }
+}
+
+void MainWindow::on_resetButton_clicked()
+{
+  viewRefresh->stop();
+  while (solver) {
+    bool res = solver->wait();
+    if (res) {
+      solver->deleteLater();
+      solver = nullptr;
+    }
+  }
+  buffer.clear();
+  sudoku = startGame;
+  showSudoku(sudoku);
+  state = State::IDLE;
+  playButton->setText("Play");
+}
+
+void MainWindow::on_nextButton_clicked()
+{
+
+  viewRefresh->stop();
+  if (!solver) {
+    startGame = sudoku;
+    solver = new Solver(&buffer, sudoku, this);
+    connect(solver, SIGNAL(finished()), this, SLOT(solverFinished()));
+    solver->start();
+    solverRunning = true;
+  }
+  state = State::SOLVER_PAUSING;
+  playButton->setText("Play");
+  refreshView();
 }

qt/mainwindow.h

@@ -10,16 +10,20 @@
 #include <vector>
 
 class SudokuLabel;
+class Solver;
 
 class MainWindow : public QMainWindow, private Ui::MainWindow
 {
   Q_OBJECT
-  Sudoku sudoku;
+  enum class State { IDLE, SOLVER_PLAYING, SOLVER_PAUSING };
+  State state = State::IDLE;
+  Sudoku sudoku, startGame;
   Buffer buffer;
   QTimer *viewRefresh;
   bool solverRunning;
   std::vector<SudokuLabel*> labelVec; // speed up access to labels
   QElapsedTimer *bencher = 0;
+  Solver *solver = 0;
 public:
   explicit MainWindow(QWidget *parent = 0);
   void showSudoku(const Sudoku& s);
@@ -30,6 +34,8 @@ private slots:
   void refreshView(); // gets item from buffer and displays it
   void on_generateButton_clicked();
   void on_playButton_clicked();
+  void on_resetButton_clicked();
+  void on_nextButton_clicked();
 };
 
 #endif // MAINWINDOW_H

qt/mainwindow.ui

@@ -50,14 +50,14 @@ p, li { white-space: pre-wrap; }
        </widget>
       </item>
       <item>
-       <widget class="QPushButton" name="pushButton_2">
+       <widget class="QPushButton" name="nextButton">
         <property name="text">
          <string>Next</string>
         </property>
        </widget>
       </item>
       <item>
-       <widget class="QPushButton" name="pushButton">
+       <widget class="QPushButton" name="resetButton">
         <property name="text">
          <string>Reset</string>
         </property>