Made save project work as well

5 files changed, 46 insertions, 11 deletions

diff --git a/gui/basewindow.cc b/gui/basewindow.cc
index 4a225bd6..78c2fe3a 100644
--- a/gui/basewindow.cc
+++ b/gui/basewindow.cc
@@ -116,7 +116,7 @@ void BaseMainWindow::createMenusAndBars()
     actionOpen->setStatusTip("Open an existing project file");

     connect(actionOpen, SIGNAL(triggered()), this, SLOT(open_proj()));

 

-    QAction *actionSave = new QAction("Save", this);

+    actionSave = new QAction("Save", this);

     actionSave->setIcon(QIcon(":/icons/resources/save.png"));

     actionSave->setShortcuts(QKeySequence::Save);

     actionSave->setStatusTip("Save existing project to disk");

diff --git a/gui/basewindow.h b/gui/basewindow.h
index eee426c7..1184fa80 100644
--- a/gui/basewindow.h
+++ b/gui/basewindow.h
@@ -73,6 +73,7 @@ class BaseMainWindow : public QMainWindow
     QStatusBar *statusBar;

     QAction *actionNew;

     QAction *actionOpen;

+    QAction *actionSave;

     QProgressBar *progressBar;

     DesignWidget *designview;

 };

diff --git a/gui/ice40/mainwindow.cc b/gui/ice40/mainwindow.cc
index b58d6e8c..017ca2fa 100644
--- a/gui/ice40/mainwindow.cc
+++ b/gui/ice40/mainwindow.cc
@@ -224,7 +224,9 @@ void MainWindow::new_proj()
 

         if (ok && !item.isEmpty()) {

             disableActions();

-            preload_pcf = "";

+            currentProj = "";

+            currentJson = "";

+            currentPCF = "";

             chipArgs.package = package.toStdString().c_str();

             ctx = std::unique_ptr<Context>(new Context(chipArgs));

             actionLoadJSON->setEnabled(true);

@@ -236,14 +238,16 @@ void MainWindow::new_proj()
 

 void MainWindow::load_json(std::string filename, std::string pcf)

 {

-    preload_pcf = pcf;

     disableActions();

+    currentJson = filename;

+    currentPCF = pcf;

     Q_EMIT task->loadfile(filename);

 }

 

 void MainWindow::load_pcf(std::string filename)

 {

     disableActions();

+    currentPCF = filename;

     Q_EMIT task->loadpcf(filename);

 }

 

@@ -273,6 +277,7 @@ void MainWindow::open_proj()
             namespace pt = boost::property_tree;

 

             std::string fn = fileName.toStdString();

+            currentProj = fn;

             disableActions();

 

             pt::ptree root;

@@ -346,7 +351,35 @@ void MainWindow::open_pcf()
     }

 }

 

-bool MainWindow::save_proj() { return false; }

+bool MainWindow::save_proj()

+{

+    if (currentProj.empty()) {

+        QString fileName = QFileDialog::getSaveFileName(this, QString("Save Project"), QString(), QString("*.proj"));

+        if (fileName.isEmpty())

+            return false;

+        currentProj = fileName.toStdString();

+    }

+    if (!currentProj.empty()) {

+        namespace pt = boost::property_tree;

+        QFileInfo fi(currentProj.c_str());

+        QDir dir(fi.absoluteDir().absolutePath());

+        std::ofstream f(currentProj);

+        pt::ptree root;

+        root.put("project.version", 1);

+        root.put("project.name", fi.baseName().toStdString());

+        root.put("project.arch.name", ctx->archId().c_str(ctx.get()));

+        root.put("project.arch.type", ctx->archArgsToId(chipArgs).c_str(ctx.get()));

+        root.put("project.arch.package", chipArgs.package);

+        if (!currentJson.empty())

+            root.put("project.input.json", dir.relativeFilePath(currentJson.c_str()).toStdString());

+        if (!currentPCF.empty())

+            root.put("project.input.pcf", dir.relativeFilePath(currentPCF.c_str()).toStdString());

+        pt::write_json(f, root);

+        log_info("Project %s saved...\n", fi.baseName().toStdString().c_str());

+        return true;

+    }

+    return false;

+}

 

 void MainWindow::save_asc()

 {

@@ -374,6 +407,7 @@ void MainWindow::disableActions()
 

     actionNew->setEnabled(true);

     actionOpen->setEnabled(true);

+    actionSave->setEnabled(!currentJson.empty());

 }

 

 void MainWindow::loadfile_finished(bool status)

@@ -383,12 +417,12 @@ void MainWindow::loadfile_finished(bool status)
         log("Loading design successful.\n");

         actionLoadPCF->setEnabled(true);

         actionPack->setEnabled(true);

-        if (!preload_pcf.empty())

-            load_pcf(preload_pcf);

+        if (!currentPCF.empty())

+            load_pcf(currentPCF);

         Q_EMIT updateTreeView();

     } else {

         log("Loading design failed.\n");

-        preload_pcf = "";

+        currentPCF = "";

     }

 }

 

diff --git a/gui/ice40/mainwindow.h b/gui/ice40/mainwindow.h
index cfd938f8..4600d1da 100644
--- a/gui/ice40/mainwindow.h
+++ b/gui/ice40/mainwindow.h
@@ -79,7 +79,10 @@ class MainWindow : public BaseMainWindow
 

     bool timing_driven;

     ArchArgs chipArgs;

-    std::string preload_pcf;

+

+    std::string currentProj;

+    std::string currentJson;

+    std::string currentPCF;

 };

 

 NEXTPNR_NAMESPACE_END

diff --git a/ice40/blinky.proj b/ice40/blinky.proj
index 6789a27a..f5bb9f88 100644
--- a/ice40/blinky.proj
+++ b/ice40/blinky.proj
@@ -10,9 +10,6 @@
         "input": {
             "json": "blinky.json",
             "pcf": "blinky.pcf"
-        },
-        "params": {
-            "freq": "50"
         }
     }
 }