From e770f16a22d5255de53f23f9a95e8ef3fc664107 Mon Sep 17 00:00:00 2001
From: Miodrag Milanovic <mmicko@gmail.com>
Date: Tue, 26 Jun 2018 13:49:32 +0200
Subject: [PATCH] Added Save ASC option

---
 gui/ice40/mainwindow.cc          |  39 ++++++++++++++++++++++++++++---
 gui/ice40/mainwindow.h           |   3 +++
 gui/ice40/nextpnr.qrc            |   1 +
 gui/ice40/resources/save_asc.png | Bin 0 -> 1384 bytes
 gui/ice40/worker.cc              |  15 ++++++++++++
 gui/ice40/worker.h               |   4 ++++
 6 files changed, 59 insertions(+), 3 deletions(-)
 create mode 100644 gui/ice40/resources/save_asc.png

diff --git a/gui/ice40/mainwindow.cc b/gui/ice40/mainwindow.cc
index 34769abe..4c9ef0ef 100644
--- a/gui/ice40/mainwindow.cc
+++ b/gui/ice40/mainwindow.cc
@@ -48,6 +48,7 @@ MainWindow::MainWindow(Context *_ctx, QWidget *parent) : BaseMainWindow(_ctx, pa
 
     connect(task, SIGNAL(loadfile_finished(bool)), this, SLOT(loadfile_finished(bool)));
     connect(task, SIGNAL(loadpcf_finished(bool)), this, SLOT(loadpcf_finished(bool)));
+    connect(task, SIGNAL(saveasc_finished(bool)), this, SLOT(saveasc_finished(bool)));
     connect(task, SIGNAL(pack_finished(bool)), this, SLOT(pack_finished(bool)));
     connect(task, SIGNAL(budget_finish(bool)), this, SLOT(budget_finish(bool)));
     connect(task, SIGNAL(place_finished(bool)), this, SLOT(place_finished(bool)));
@@ -107,6 +108,14 @@ void MainWindow::createMenu()
     connect(actionRoute, SIGNAL(triggered()), task, SIGNAL(route()));
     actionRoute->setEnabled(false);
 
+    actionSaveAsc = new QAction("Save ASC", this);
+    QIcon iconSaveAsc;
+    iconSaveAsc.addFile(QStringLiteral(":/icons/resources/save_asc.png"));
+    actionSaveAsc->setIcon(iconSaveAsc);
+    actionSaveAsc->setStatusTip("Save ASC file");
+    connect(actionSaveAsc, SIGNAL(triggered()), this, SLOT(save_asc()));
+    actionSaveAsc->setEnabled(false);
+
     QToolBar *taskFPGABar = new QToolBar();
     addToolBar(Qt::TopToolBarArea, taskFPGABar);
 
@@ -115,12 +124,14 @@ void MainWindow::createMenu()
     taskFPGABar->addAction(actionAssignBudget);
     taskFPGABar->addAction(actionPlace);
     taskFPGABar->addAction(actionRoute);
+    taskFPGABar->addAction(actionSaveAsc);
 
     menu_Design->addAction(actionLoadPCF);
     menu_Design->addAction(actionPack);
     menu_Design->addAction(actionAssignBudget);
     menu_Design->addAction(actionPlace);
     menu_Design->addAction(actionRoute);
+    menu_Design->addAction(actionSaveAsc);
 
     actionPlay = new QAction("Play", this);
     QIcon iconPlay;
@@ -169,7 +180,7 @@ void MainWindow::open()
 
 void MainWindow::open_pcf()
 {
-    QString fileName = QFileDialog::getOpenFileName(this, QString(), QString(), QString("*.pcf"));
+    QString fileName = QFileDialog::getOpenFileName(this, QString("Open PCF"), QString(), QString("*.pcf"));
     if (!fileName.isEmpty()) {
         tabWidget->setCurrentWidget(info);
 
@@ -181,6 +192,16 @@ void MainWindow::open_pcf()
 
 bool MainWindow::save() { return false; }
 
+void MainWindow::save_asc()
+{
+    QString fileName = QFileDialog::getSaveFileName(this, QString("Save ASC"), QString(), QString("*.asc"));
+    if (!fileName.isEmpty()) {
+        std::string fn = fileName.toStdString();
+        disableActions();
+        Q_EMIT task->saveasc(fn);
+    }
+}
+
 void MainWindow::disableActions()
 {
     actionLoadPCF->setEnabled(false);
@@ -188,6 +209,7 @@ void MainWindow::disableActions()
     actionAssignBudget->setEnabled(false);
     actionPlace->setEnabled(false);
     actionRoute->setEnabled(false);
+    actionSaveAsc->setEnabled(false);
 
     actionPlay->setEnabled(false);
     actionPause->setEnabled(false);
@@ -217,6 +239,16 @@ void MainWindow::loadpcf_finished(bool status)
     }
 }
 
+void MainWindow::saveasc_finished(bool status)
+{
+    disableActions();
+    if (status) {
+        log("Saving ASC successful.\n");
+    } else {
+        log("Saving ASC failed.\n");
+    }
+}
+
 void MainWindow::pack_finished(bool status)
 {
     disableActions();
@@ -253,9 +285,10 @@ void MainWindow::place_finished(bool status)
 void MainWindow::route_finished(bool status)
 {
     disableActions();
-    if (status)
+    if (status) {
         log("Routing design successful.\n");
-    else
+        actionSaveAsc->setEnabled(true);
+    } else
         log("Routing design failed.\n");
 }
 
diff --git a/gui/ice40/mainwindow.h b/gui/ice40/mainwindow.h
index 66814d32..1e20f892 100644
--- a/gui/ice40/mainwindow.h
+++ b/gui/ice40/mainwindow.h
@@ -43,9 +43,11 @@ class MainWindow : public BaseMainWindow
     void open_pcf();
     void budget();
     void place();
+    void save_asc();
 
     void loadfile_finished(bool status);
     void loadpcf_finished(bool status);
+    void saveasc_finished(bool status);
     void pack_finished(bool status);
     void budget_finish(bool status);
     void place_finished(bool status);
@@ -64,6 +66,7 @@ class MainWindow : public BaseMainWindow
     QAction *actionAssignBudget;
     QAction *actionPlace;
     QAction *actionRoute;
+    QAction *actionSaveAsc;
     QAction *actionPlay;
     QAction *actionPause;
     QAction *actionStop;
diff --git a/gui/ice40/nextpnr.qrc b/gui/ice40/nextpnr.qrc
index 4a73d791..40966dba 100644
--- a/gui/ice40/nextpnr.qrc
+++ b/gui/ice40/nextpnr.qrc
@@ -8,5 +8,6 @@
         <file>resources/route.png</file>
         <file>resources/time_add.png</file>
         <file>resources/open_pcf.png</file>
+        <file>resources/save_asc.png</file>
     </qresource>
 </RCC>
diff --git a/gui/ice40/resources/save_asc.png b/gui/ice40/resources/save_asc.png
new file mode 100644
index 0000000000000000000000000000000000000000..15b59ca141903691c7545347d08b643b82ce3470
GIT binary patch
literal 1384
zcmV-u1(*7XP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru;szQE8VTYU|Lgz&1ocTo
zK~z}7#g<)&RaF$nf9K;mGZ~FdehrA}=tyDZOc0@&7!LWM_~46>NLtaC5@ZgHmQdJ(
z4?zae2O649gHtIIAth0SG7=<eh*AhTjx*^rHP^8k=bp3I>fwCcv+uo54^6h=a@c3@
zv(|t8|Np)Abr@x|wY4c@Ft%^s?%Zh2|EG_enws!D57%|^JrB?K@%<dW?~}`U_<oL@
zpTqM#e9y=CJzURAzuC2G*QoJR01b<GEOI>mFi=%oz7##wCc?p<Ydr5d*2QlF19V@!
zNNa0rx;|^k+nEn^Wa!fOD}Vi|y$cxfqvUTkJD&e_+r}lih0W7(V#4;kwJlAVeJTzP
zpc=n-iVUmcAYxZ}@WZt!<ikgQu6p-<Jy^Itu;FU=mj_$`$IEqX+^{IOuz7k~uvN5E
zVug~tPG+;CitF0jlXxo7vY?SAEqCQ6HY|GwXim0PKk{G$iXzD`6I4s{YXwjlaDq*N
z(I}ol5rt=0&!>8Pl?OcFTS+tuP?iv<L~}qhPH-pzYg14vi2~P$3jmW+0HSeVNmG=j
zOy4>v>S!@<>2@h+AcNf6UIZXoF_vwz;+{$ed;a_d_<nQ*Ej%#*6;Q`cQo=w)Ll(rz
zlPCXmBQi$OL|Rb`eG0(Dv}wk4E1%wMv!WmwklA81Hh^k5iza@lmdvF95}8yJsmj|;
zCYzSXrCIQ5>s;JlF0;izauO1q((USiqfz5gMN&Y~Mx!tiDuD=L2!SY}D4|4*iA1R#
z2V4i{OsuW|z-U^*&aR967vtf^Nf?FDXgPquXw+QdwU5@#8`I=#cAtt8I}l0*0AV5l
z720Ur!6Y`45#o9DKADFS(QP#Hlt^U2Ig@g+&jb`gBjo@Jq1v{l=-MQ)YO!HS0xAPW
zH8Oa1Z>CsGJTa9{L13g}|I?(2SV0v{5|d#<HLf~lAO>m43=}FdU?K^!i=Z4oKNvHh
zR&|MwjKoz-3?lA$N%GlKYst!-6k7&hBou}N;p+8}Y<Fy)aXY5Bk8urmGJLKZsjtTf
z_#f<~=Ji+cu3QG7XE4Czhp2mH6E$Cb0U`{%xP^fyHxwBNCC!x#>)PtSR^Zx*DKnw_
zNhgTleb$+3UbCf@e8+zJ@&P@A0U}WM@=Gv0%!O}%;M}pZ_<g;W1ffyu2$uaP{Ig*D
zKopLj|DCye+ZkH>9JlRl=fv{IQQ*FN?kBhY8S)ET=w9^%!&B;MIrKT-95~8ISc3$>
zQ*F%51S}XWyTvR31u3t-$qZ6;r5D}t2ICuNFfSY=oY6pV=rD5h2$T1BGVO)O=sj`*
z&vlqJrIzrH37GgeS|%)sUnW5zRLg{_;CAlA?eC|y_7=SUesZ7gi%x;-G5pXXuB~2&
z-*W*Y@W-Ren7nlpT>b^}d8TgLZ2dJT7)gCl5kO!hJt~O=VS76#Iu7yO*#VAs96~!j
z=Et5q^|e0J>&8*HY6WN3Z{cj;AV;6yN<M^!#mzJ>xSPK5b(W+-sF4gel)y-d1d2I*
zhM5v~wP{QFYx!yB3aRlzg=&F0s>sv{TzhX1`Ivem_RSZR#4iI7gkpI_lQTU^!;wtG
zF;Z;VlDXbXkKqjgB$tHmMlf!za>w*S3Ph1n0mKyfuE(0)r^fs`4vdb@z>0gPaI;4W
q;I*v>`9DVDx!J(d_<1wOxxWE8x-`zNhrt{G0000<MNUMnLSTZ1c7&Dy

literal 0
HcmV?d00001

diff --git a/gui/ice40/worker.cc b/gui/ice40/worker.cc
index 9986ff3b..f6d6d261 100644
--- a/gui/ice40/worker.cc
+++ b/gui/ice40/worker.cc
@@ -80,6 +80,19 @@ void Worker::loadpcf(const std::string &filename)
     }
 }
 
+void Worker::saveasc(const std::string &filename)
+{
+    Q_EMIT taskStarted();
+    std::string fn = filename;
+    std::ofstream f(fn);
+    try {
+        write_asc(ctx, f);
+        Q_EMIT saveasc_finished(true);
+    } catch (WorkerInterruptionRequested) {
+        Q_EMIT taskCanceled();
+    }
+}
+
 void Worker::pack()
 {
     Q_EMIT taskStarted();
@@ -132,6 +145,7 @@ TaskManager::TaskManager(Context *ctx) : toTerminate(false), toPause(false)
 
     connect(this, &TaskManager::loadfile, worker, &Worker::loadfile);
     connect(this, &TaskManager::loadpcf, worker, &Worker::loadpcf);
+    connect(this, &TaskManager::saveasc, worker, &Worker::saveasc);
     connect(this, &TaskManager::pack, worker, &Worker::pack);
     connect(this, &TaskManager::budget, worker, &Worker::budget);
     connect(this, &TaskManager::place, worker, &Worker::place);
@@ -140,6 +154,7 @@ TaskManager::TaskManager(Context *ctx) : toTerminate(false), toPause(false)
     connect(worker, &Worker::log, this, &TaskManager::info);
     connect(worker, &Worker::loadfile_finished, this, &TaskManager::loadfile_finished);
     connect(worker, &Worker::loadpcf_finished, this, &TaskManager::loadpcf_finished);
+    connect(worker, &Worker::saveasc_finished, this, &TaskManager::saveasc_finished);
     connect(worker, &Worker::pack_finished, this, &TaskManager::pack_finished);
     connect(worker, &Worker::budget_finish, this, &TaskManager::budget_finish);
     connect(worker, &Worker::place_finished, this, &TaskManager::place_finished);
diff --git a/gui/ice40/worker.h b/gui/ice40/worker.h
index 2995a851..18f4b2c2 100644
--- a/gui/ice40/worker.h
+++ b/gui/ice40/worker.h
@@ -36,6 +36,7 @@ class Worker : public QObject
   public Q_SLOTS:
     void loadfile(const std::string &);
     void loadpcf(const std::string &);
+    void saveasc(const std::string &);
     void pack();
     void budget(double freq);
     void place(bool timing_driven);
@@ -44,6 +45,7 @@ class Worker : public QObject
     void log(const std::string &text);
     void loadfile_finished(bool status);
     void loadpcf_finished(bool status);
+    void saveasc_finished(bool status);
     void pack_finished(bool status);
     void budget_finish(bool status);
     void place_finished(bool status);
@@ -76,6 +78,7 @@ class TaskManager : public QObject
     void terminate();
     void loadfile(const std::string &);
     void loadpcf(const std::string &);
+    void saveasc(const std::string &);
     void pack();
     void budget(double freq);
     void place(bool timing_driven);
@@ -85,6 +88,7 @@ class TaskManager : public QObject
     void log(const std::string &text);
     void loadfile_finished(bool status);
     void loadpcf_finished(bool status);
+    void saveasc_finished(bool status);
     void pack_finished(bool status);
     void budget_finish(bool status);
     void place_finished(bool status);