diff options
Diffstat (limited to 'gui/ice40')
| -rw-r--r-- | gui/ice40/mainwindow.cc | 24 | ||||
| -rw-r--r-- | gui/ice40/mainwindow.h | 4 | ||||
| -rw-r--r-- | gui/ice40/worker.cc | 19 |
3 files changed, 24 insertions, 23 deletions
diff --git a/gui/ice40/mainwindow.cc b/gui/ice40/mainwindow.cc index bd7cb091..a0739f92 100644 --- a/gui/ice40/mainwindow.cc +++ b/gui/ice40/mainwindow.cc @@ -45,14 +45,17 @@ MainWindow::MainWindow(Context *_ctx, QWidget *parent) task = new TaskManager(_ctx);
connect(task, SIGNAL(log(std::string)), this, SLOT(writeInfo(std::string)));
- connect(task, SIGNAL(loadfile_finished(bool)), this, SLOT(loadfile_finished(bool)));
+ connect(task, SIGNAL(loadfile_finished(bool)), this,
+ SLOT(loadfile_finished(bool)));
connect(task, SIGNAL(pack_finished(bool)), this, SLOT(pack_finished(bool)));
- connect(task, SIGNAL(place_finished(bool)), this, SLOT(place_finished(bool)));
- connect(task, SIGNAL(route_finished(bool)), this, SLOT(route_finished(bool)));
+ connect(task, SIGNAL(place_finished(bool)), this,
+ SLOT(place_finished(bool)));
+ connect(task, SIGNAL(route_finished(bool)), this,
+ SLOT(route_finished(bool)));
connect(task, SIGNAL(taskCanceled()), this, SLOT(taskCanceled()));
connect(task, SIGNAL(taskStarted()), this, SLOT(taskStarted()));
- connect(task, SIGNAL(taskPaused()), this, SLOT(taskPaused()));
+ connect(task, SIGNAL(taskPaused()), this, SLOT(taskPaused()));
createMenu();
}
@@ -146,7 +149,7 @@ void MainWindow::open() bool MainWindow::save() { return false; }
-void MainWindow::disableActions()
+void MainWindow::disableActions()
{
actionPack->setEnabled(false);
actionPlace->setEnabled(false);
@@ -163,8 +166,7 @@ void MainWindow::loadfile_finished(bool status) if (status) {
log("Loading design successful.\n");
actionPack->setEnabled(true);
- }
- else {
+ } else {
log("Loading design failed.\n");
}
}
@@ -174,8 +176,7 @@ void MainWindow::pack_finished(bool status) if (status) {
log("Packing design successful.\n");
actionPlace->setEnabled(true);
- }
- else {
+ } else {
log("Packing design failed.\n");
}
}
@@ -185,8 +186,7 @@ void MainWindow::place_finished(bool status) if (status) {
log("Placing design successful.\n");
actionRoute->setEnabled(true);
- }
- else {
+ } else {
log("Placing design failed.\n");
}
}
@@ -216,7 +216,7 @@ void MainWindow::taskPaused() {
disableActions();
actionPlay->setEnabled(true);
- actionStop->setEnabled(true);
+ actionStop->setEnabled(true);
}
NEXTPNR_NAMESPACE_END
\ No newline at end of file diff --git a/gui/ice40/mainwindow.h b/gui/ice40/mainwindow.h index 376cb901..c0c4bef8 100644 --- a/gui/ice40/mainwindow.h +++ b/gui/ice40/mainwindow.h @@ -43,7 +43,7 @@ class MainWindow : public BaseMainWindow void pack_finished(bool status);
void place_finished(bool status);
void route_finished(bool status);
-
+
void taskCanceled();
void taskStarted();
void taskPaused();
@@ -57,7 +57,7 @@ class MainWindow : public BaseMainWindow QAction *actionRoute;
QAction *actionPlay;
QAction *actionPause;
- QAction *actionStop;
+ QAction *actionStop;
};
NEXTPNR_NAMESPACE_END
diff --git a/gui/ice40/worker.cc b/gui/ice40/worker.cc index 0c0f800c..ecf473ce 100644 --- a/gui/ice40/worker.cc +++ b/gui/ice40/worker.cc @@ -43,8 +43,7 @@ Worker::Worker(Context *_ctx, TaskManager *parent) : ctx(_ctx) parent->clearTerminate(); throw WorkerInterruptionRequested(); } - if (parent->isPaused()) - { + if (parent->isPaused()) { Q_EMIT taskPaused(); } while (parent->isPaused()) { @@ -102,25 +101,27 @@ void Worker::route() } } - TaskManager::TaskManager(Context *ctx) : toTerminate(false), toPause(false) { Worker *worker = new Worker(ctx, this); worker->moveToThread(&workerThread); - + connect(&workerThread, &QThread::finished, worker, &QObject::deleteLater); - + connect(this, &TaskManager::loadfile, worker, &Worker::loadfile); connect(this, &TaskManager::pack, worker, &Worker::pack); connect(this, &TaskManager::place, worker, &Worker::place); connect(this, &TaskManager::route, worker, &Worker::route); connect(worker, &Worker::log, this, &TaskManager::info); - connect(worker, &Worker::loadfile_finished, this, &TaskManager::loadfile_finished); + connect(worker, &Worker::loadfile_finished, this, + &TaskManager::loadfile_finished); connect(worker, &Worker::pack_finished, this, &TaskManager::pack_finished); - connect(worker, &Worker::place_finished, this, &TaskManager::place_finished); - connect(worker, &Worker::route_finished, this, &TaskManager::route_finished); - + connect(worker, &Worker::place_finished, this, + &TaskManager::place_finished); + connect(worker, &Worker::route_finished, this, + &TaskManager::route_finished); + connect(worker, &Worker::taskCanceled, this, &TaskManager::taskCanceled); connect(worker, &Worker::taskStarted, this, &TaskManager::taskStarted); connect(worker, &Worker::taskPaused, this, &TaskManager::taskPaused); |