Merge branch 'master' of gitlab.com:SymbioticEDA/nextpnr

# Conflicts:
#	common/route.cc

3 files changed, 34 insertions, 38 deletions

diff --git a/gui/ice40/mainwindow.cc b/gui/ice40/mainwindow.cc
index dafd92e9..934798bb 100644
--- a/gui/ice40/mainwindow.cc
+++ b/gui/ice40/mainwindow.cc
@@ -20,8 +20,7 @@ MainWindow::MainWindow(Context *_ctx, QWidget *parent)
     createMenu();

 

     task = new TaskManager(_ctx);

-    connect(task, SIGNAL(log(std::string)), this,

-            SLOT(writeInfo(std::string)));

+    connect(task, SIGNAL(log(std::string)), this, SLOT(writeInfo(std::string)));

 }

 

 MainWindow::~MainWindow() {}

@@ -43,7 +42,4 @@ void MainWindow::open()
         task->parsejson(fn);

     }

 }

-bool MainWindow::save()

-{

-    return false;

-}
\ No newline at end of file
+bool MainWindow::save() { return false; }
\ No newline at end of file
diff --git a/gui/ice40/worker.cc b/gui/ice40/worker.cc
index bd22f552..5702137b 100644
--- a/gui/ice40/worker.cc
+++ b/gui/ice40/worker.cc
@@ -1,13 +1,13 @@
 #include "worker.h"
 #include <fstream>
+#include "bitstream.h"
+#include "design_utils.h"
 #include "jsonparse.h"
 #include "log.h"
 #include "pack.h"
 #include "pcf.h"
 #include "place_sa.h"
 #include "route.h"
-#include "bitstream.h"
-#include "design_utils.h"
 #include "timing.h"
 
 Worker::Worker(Context *_ctx) : ctx(_ctx)
@@ -15,28 +15,29 @@ Worker::Worker(Context *_ctx) : ctx(_ctx)
     log_write_function = [this](std::string text) { Q_EMIT log(text); };
 }
 
-void Worker::parsejson(const std::string &filename) 
+void Worker::parsejson(const std::string &filename)
 {
     std::string fn = filename;
     std::ifstream f(fn);
-
-    parse_json_file(f, fn, ctx);
-    if (!pack_design(ctx))
-        log_error("Packing design failed.\n");
-    double freq = 50e6;
-    assign_budget(ctx, freq);
-    print_utilisation(ctx);
-
-    if (!place_design_sa(ctx))
-        log_error("Placing design failed.\n");
-    if (!route_design(ctx))
-        log_error("Routing design failed.\n");
-    print_utilisation(ctx);
-    Q_EMIT log("done");
+    try {
+        if (!parse_json_file(f, fn, ctx))
+            log_error("Loading design failed.\n");
+        if (!pack_design(ctx))
+            log_error("Packing design failed.\n");
+        double freq = 50e6;
+        assign_budget(ctx, freq);
+        print_utilisation(ctx);
+
+        if (!place_design_sa(ctx))
+            log_error("Placing design failed.\n");
+        if (!route_design(ctx))
+            log_error("Routing design failed.\n");
+        Q_EMIT log("done");
+    } catch (log_execution_error_exception) {
+    }
 }
 
-
-TaskManager::TaskManager(Context *ctx) 
+TaskManager::TaskManager(Context *ctx)
 {
     Worker *worker = new Worker(ctx);
     worker->moveToThread(&workerThread);
@@ -46,13 +47,10 @@ TaskManager::TaskManager(Context *ctx)
     workerThread.start();
 }
 
-TaskManager::~TaskManager() 
+TaskManager::~TaskManager()
 {
     workerThread.quit();
     workerThread.wait();
 }
 
-void TaskManager::info(const std::string &result)
-{
-    Q_EMIT log(result);
-}
\ No newline at end of file
+void TaskManager::info(const std::string &result) { Q_EMIT log(result); }
\ No newline at end of file
diff --git a/gui/ice40/worker.h b/gui/ice40/worker.h
index 5dc25d89..12d740dd 100644
--- a/gui/ice40/worker.h
+++ b/gui/ice40/worker.h
@@ -1,8 +1,8 @@
 #ifndef WORKER_H
 #define WORKER_H
 
-#include "nextpnr.h"
 #include <QThread>
+#include "nextpnr.h"
 
 // FIXME
 USING_NEXTPNR_NAMESPACE
@@ -10,13 +10,14 @@ USING_NEXTPNR_NAMESPACE
 class Worker : public QObject
 {
     Q_OBJECT
-public:
+  public:
     Worker(Context *ctx);
-public Q_SLOTS:
+  public Q_SLOTS:
     void parsejson(const std::string &filename);
-Q_SIGNALS:
+  Q_SIGNALS:
     void log(const std::string &text);
-private:
+
+  private:
     Context *ctx;
 };
 
@@ -24,12 +25,13 @@ class TaskManager : public QObject
 {
     Q_OBJECT
     QThread workerThread;
-public:
+
+  public:
     TaskManager(Context *ctx);
     ~TaskManager();
-public Q_SLOTS:
+  public Q_SLOTS:
     void info(const std::string &text);
-Q_SIGNALS:
+  Q_SIGNALS:
     void parsejson(const std::string &);
     void log(const std::string &text);
 };