more task control

gui/CMakeLists.txt

@@ -3,7 +3,7 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 aux_source_directory(. GUI_SOURCE_FILES)
 aux_source_directory(${family}/ GUI_SOURCE_FILES)
-set(_RESOURCES nextpnr.qrc)
+set(_RESOURCES base.qrc ${family}/nextpnr.qrc)
   
 qt5_add_resources(GUI_RESOURCE_FILES ${_RESOURCES})
 

gui/basewindow.cc

@@ -13,7 +13,7 @@
 BaseMainWindow::BaseMainWindow(Context *_ctx, QWidget *parent)
         : QMainWindow(parent), ctx(_ctx)
 {
-    Q_INIT_RESOURCE(nextpnr);
+    Q_INIT_RESOURCE(base);
     qRegisterMetaType<std::string>();
 
     log_files.clear();

gui/dummy/nextpnr.qrc

@@ -0,0 +1,2 @@
+<RCC>
+</RCC>

gui/ice40/mainwindow.cc

@@ -14,6 +14,8 @@
 MainWindow::MainWindow(Context *_ctx, QWidget *parent)
         : BaseMainWindow(_ctx, parent)
 {
+    Q_INIT_RESOURCE(nextpnr);
+ 
     std::string title = "nextpnr-ice40 - " + ctx->getChipName();
     setWindowTitle(title.c_str());
 
@@ -30,11 +32,36 @@ void MainWindow::createMenu()
     QMenu *menu_Custom = new QMenu("&ICE 40", menuBar);
     menuBar->addAction(menu_Custom->menuAction());
 
-    QAction *actionTerminate = new QAction("Terminate", this);
-    actionTerminate->setStatusTip("Terminate running task");
-    connect(actionTerminate, SIGNAL(triggered()), task,
+    QAction *actionPlay = new QAction("Play", this);
+    QIcon icon1;
+    icon1.addFile(QStringLiteral(":/icons/resources/control_play.png"));
+    actionPlay->setIcon(icon1);
+    actionPlay->setStatusTip("Continue running task");
+    connect(actionPlay, SIGNAL(triggered()), task,
+            SLOT(continue_thread()));
+
+    QAction *actionPause = new QAction("Pause", this);
+    QIcon icon2;
+    icon2.addFile(QStringLiteral(":/icons/resources/control_pause.png"));
+    actionPause->setIcon(icon2);
+    actionPause->setStatusTip("Pause running task");
+    connect(actionPause, SIGNAL(triggered()), task,
+            SLOT(pause_thread()));
+
+    QAction *actionStop = new QAction("Stop", this);
+    QIcon icon3;
+    icon3.addFile(QStringLiteral(":/icons/resources/control_stop.png"));
+    actionStop->setIcon(icon3);
+    actionStop->setStatusTip("Stop running task");
+    connect(actionStop, SIGNAL(triggered()), task,
             SLOT(terminate_thread()));
-    menu_Custom->addAction(actionTerminate);
+
+    QToolBar *taskToolBar = new QToolBar();
+    addToolBar(Qt::TopToolBarArea, taskToolBar);
+
+    taskToolBar->addAction(actionPlay);
+    taskToolBar->addAction(actionPause);
+    taskToolBar->addAction(actionStop);
 }
 
 void MainWindow::open()

gui/ice40/nextpnr.qrc

@@ -0,0 +1,7 @@
+<RCC>
+    <qresource prefix="/icons">
+        <file>resources/control_play.png</file>
+        <file>resources/control_pause.png</file>
+        <file>resources/control_stop.png</file>
+    </qresource>
+</RCC>

gui/ice40/worker.cc

@@ -22,6 +22,9 @@ Worker::Worker(Context *_ctx, TaskManager *parent) : ctx(_ctx)
             parent->clearTerminate();
             throw WorkerInterruptionRequested();
         }
+        while (parent->isPaused()){
+            QThread::sleep(1);
+        }
     };
 }
 
@@ -49,7 +52,7 @@ void Worker::parsejson(const std::string &filename)
     }
 }
 
-TaskManager::TaskManager(Context *ctx) : toTerminate(false)
+TaskManager::TaskManager(Context *ctx) : toTerminate(false), toPause(false)
 {
     Worker *worker = new Worker(ctx, this);
     worker->moveToThread(&workerThread);
@@ -86,3 +89,20 @@ void TaskManager::clearTerminate()
     QMutexLocker locker(&mutex);
     toTerminate = false;
 }
+
+void TaskManager::pause_thread()
+{
+    QMutexLocker locker(&mutex);
+    toPause = true;
+}
+
+void TaskManager::continue_thread()
+{
+    QMutexLocker locker(&mutex);
+    toPause = false;
+}
+bool TaskManager::isPaused()
+{
+    QMutexLocker locker(&mutex);
+    return toPause;
+}

gui/ice40/worker.h

@@ -34,9 +34,12 @@ class TaskManager : public QObject
     ~TaskManager();
     bool shouldTerminate();
     void clearTerminate();
+    bool isPaused();
   public Q_SLOTS:
     void info(const std::string &text);
     void terminate_thread();
+    void pause_thread();
+    void continue_thread();
   Q_SIGNALS:
     void terminate();
     void parsejson(const std::string &);
@@ -45,6 +48,7 @@ class TaskManager : public QObject
   private:
     QMutex mutex;
     bool toTerminate;
+    bool toPause;
 };
 
 #endif // WORKER_H