From 66ea9f39f7f5d6e1152105328f9a48a367bd8ce0 Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Fri, 14 Jun 2019 15:18:35 +0200 Subject: enable lading of jsons and setting up context --- common/command.cc | 24 +++++++++++++++++++++++- common/command.h | 3 ++- ecp5/main.cc | 1 + generic/main.cc | 1 + gui/basewindow.cc | 25 ++++++++----------------- gui/basewindow.h | 6 +++--- gui/ecp5/mainwindow.cc | 8 ++++---- gui/ecp5/mainwindow.h | 2 +- gui/generic/mainwindow.cc | 4 ++-- gui/generic/mainwindow.h | 2 +- gui/ice40/mainwindow.cc | 8 ++++---- gui/ice40/mainwindow.h | 2 +- ice40/main.cc | 2 ++ 13 files changed, 53 insertions(+), 35 deletions(-) diff --git a/common/command.cc b/common/command.cc index 7b0b2caa..1a8f810e 100644 --- a/common/command.cc +++ b/common/command.cc @@ -245,7 +245,7 @@ int CommandHandler::executeMain(std::unique_ptr ctx) #ifndef NO_GUI if (vm.count("gui")) { Application a(argc, argv, (vm.count("gui-no-aa") > 0)); - MainWindow w(std::move(ctx), chipArgs); + MainWindow w(std::move(ctx), this); try { if (vm.count("json")) { std::string filename = vm["json"].as(); @@ -378,6 +378,28 @@ int CommandHandler::exec() } } +std::unique_ptr CommandHandler::load_json(std::string filename) +{ + vm.clear(); + std::unordered_map values; + { + std::ifstream f(filename); + if (!load_json_settings(f, filename, values)) + log_error("Loading design failed.\n"); + } + std::unique_ptr ctx = createContext(values); + settings = std::unique_ptr(new Settings(ctx.get())); + setupContext(ctx.get()); + setupArchContext(ctx.get()); + { + std::ifstream f(filename); + if (!parse_json_file(f, filename, ctx.get())) + log_error("Loading design failed.\n"); + } + customAfterLoad(ctx.get()); + return ctx; +} + void CommandHandler::run_script_hook(const std::string &name) { #ifndef NO_PYTHON diff --git a/common/command.h b/common/command.h index 5c5ceb9a..c7b58517 100644 --- a/common/command.h +++ b/common/command.h @@ -22,6 +22,7 @@ #define COMMAND_H #include +#include #include "nextpnr.h" #include "settings.h" @@ -36,6 +37,7 @@ class CommandHandler virtual ~CommandHandler(){}; int exec(); + std::unique_ptr load_json(std::string filename); protected: virtual void setupArchContext(Context *ctx) = 0; @@ -57,7 +59,6 @@ class CommandHandler protected: po::variables_map vm; - ArchArgs chipArgs; std::unique_ptr settings; private: diff --git a/ecp5/main.cc b/ecp5/main.cc index 0620b8b7..9917e217 100644 --- a/ecp5/main.cc +++ b/ecp5/main.cc @@ -111,6 +111,7 @@ static std::string speedString(ArchArgs::SpeedGrade speed) std::unique_ptr ECP5CommandHandler::createContext(std::unordered_map &values) { + ArchArgs chipArgs; chipArgs.type = ArchArgs::NONE; if (vm.count("25k")) diff --git a/generic/main.cc b/generic/main.cc index f0070e92..1f0ee22d 100644 --- a/generic/main.cc +++ b/generic/main.cc @@ -53,6 +53,7 @@ void GenericCommandHandler::customBitstream(Context *ctx) {} std::unique_ptr GenericCommandHandler::createContext(std::unordered_map &values) { + ArchArgs chipArgs; if (values.find("arch.name")!=values.end()) { std::string arch_name = values["arch.name"].str; if (arch_name != "generic") diff --git a/gui/basewindow.cc b/gui/basewindow.cc index 59dd6f7b..5b03b667 100644 --- a/gui/basewindow.cc +++ b/gui/basewindow.cc @@ -38,8 +38,8 @@ static void initBasenameResource() { Q_INIT_RESOURCE(base); } NEXTPNR_NAMESPACE_BEGIN -BaseMainWindow::BaseMainWindow(std::unique_ptr context, ArchArgs args, QWidget *parent) - : QMainWindow(parent), chipArgs(args), ctx(std::move(context)), timing_driven(false) +BaseMainWindow::BaseMainWindow(std::unique_ptr context, CommandHandler *handler, QWidget *parent) + : QMainWindow(parent), handler(handler), ctx(std::move(context)), timing_driven(false) { initBasenameResource(); qRegisterMetaType(); @@ -293,25 +293,16 @@ void BaseMainWindow::createMenusAndBars() setStatusBar(statusBar); } -void BaseMainWindow::load_json(std::string filename) -{ - disableActions(); - std::ifstream f(filename); - if (parse_json_file(f, filename, ctx.get())) { - log("Loading design successful.\n"); - Q_EMIT updateTreeView(); - updateActions(); - } else { - actionLoadJSON->setEnabled(true); - log("Loading design failed.\n"); - } -} - void BaseMainWindow::open_json() { QString fileName = QFileDialog::getOpenFileName(this, QString("Open JSON"), QString(), QString("*.json")); if (!fileName.isEmpty()) { - load_json(fileName.toStdString()); + disableActions(); + ctx = handler->load_json(fileName.toStdString()); + Q_EMIT contextChanged(ctx.get()); + Q_EMIT updateTreeView(); + log("Loading design successful.\n"); + updateActions(); } } diff --git a/gui/basewindow.h b/gui/basewindow.h index d2640813..4276c401 100644 --- a/gui/basewindow.h +++ b/gui/basewindow.h @@ -22,6 +22,7 @@ #include "nextpnr.h" #include "worker.h" +#include "command.h" #include #include @@ -45,7 +46,7 @@ class BaseMainWindow : public QMainWindow Q_OBJECT public: - explicit BaseMainWindow(std::unique_ptr context, ArchArgs args, QWidget *parent = 0); + explicit BaseMainWindow(std::unique_ptr context, CommandHandler *handler, QWidget *parent = 0); virtual ~BaseMainWindow(); Context *getContext() { return ctx.get(); } void updateActions(); @@ -55,7 +56,6 @@ class BaseMainWindow : public QMainWindow protected: void createMenusAndBars(); void disableActions(); - void load_json(std::string filename); virtual void onDisableActions(){}; virtual void onUpdateActions(){}; @@ -88,7 +88,7 @@ class BaseMainWindow : public QMainWindow protected: // state variables - ArchArgs chipArgs; + CommandHandler *handler; std::unique_ptr ctx; TaskManager *task; bool timing_driven; diff --git a/gui/ecp5/mainwindow.cc b/gui/ecp5/mainwindow.cc index 913c2520..b06e10e9 100644 --- a/gui/ecp5/mainwindow.cc +++ b/gui/ecp5/mainwindow.cc @@ -30,8 +30,8 @@ static void initMainResource() { Q_INIT_RESOURCE(nextpnr); } NEXTPNR_NAMESPACE_BEGIN -MainWindow::MainWindow(std::unique_ptr context, ArchArgs args, QWidget *parent) - : BaseMainWindow(std::move(context), args, parent) +MainWindow::MainWindow(std::unique_ptr context, CommandHandler *handler, QWidget *parent) + : BaseMainWindow(std::move(context), handler, parent) { initMainResource(); @@ -47,7 +47,7 @@ MainWindow::~MainWindow() {} void MainWindow::newContext(Context *ctx) { - std::string title = "nextpnr-ecp5 - " + ctx->getChipName() + " ( " + chipArgs.package + " )"; + std::string title = "nextpnr-ecp5 - " + ctx->getChipName() + " ( " + ctx->archArgs().package + " )"; setWindowTitle(title.c_str()); } @@ -113,7 +113,7 @@ void MainWindow::new_proj() bool ok; QString item = QInputDialog::getItem(this, "Select new context", "Chip:", arch.keys(), 0, false, &ok); if (ok && !item.isEmpty()) { - + ArchArgs chipArgs; chipArgs.type = (ArchArgs::ArchArgsTypes)arch.value(item); QString package = QInputDialog::getItem(this, "Select package", "Package:", getSupportedPackages(chipArgs.type), diff --git a/gui/ecp5/mainwindow.h b/gui/ecp5/mainwindow.h index 65493fbc..e60fc5b0 100644 --- a/gui/ecp5/mainwindow.h +++ b/gui/ecp5/mainwindow.h @@ -29,7 +29,7 @@ class MainWindow : public BaseMainWindow Q_OBJECT public: - explicit MainWindow(std::unique_ptr context, ArchArgs args, QWidget *parent = 0); + explicit MainWindow(std::unique_ptr context, CommandHandler *handler, QWidget *parent = 0); virtual ~MainWindow(); public: diff --git a/gui/generic/mainwindow.cc b/gui/generic/mainwindow.cc index eefff39c..f616ca1a 100644 --- a/gui/generic/mainwindow.cc +++ b/gui/generic/mainwindow.cc @@ -26,8 +26,8 @@ static void initMainResource() { Q_INIT_RESOURCE(nextpnr); } NEXTPNR_NAMESPACE_BEGIN -MainWindow::MainWindow(std::unique_ptr context, ArchArgs args, QWidget *parent) - : BaseMainWindow(std::move(context), args, parent) +MainWindow::MainWindow(std::unique_ptr context, CommandHandler *handler, QWidget *parent) + : BaseMainWindow(std::move(context), handler, parent) { initMainResource(); QMessageBox::critical(0, "Error - FIXME", "No GUI support for nextpnr-generic"); diff --git a/gui/generic/mainwindow.h b/gui/generic/mainwindow.h index bb6a4cf1..4d1cf598 100644 --- a/gui/generic/mainwindow.h +++ b/gui/generic/mainwindow.h @@ -29,7 +29,7 @@ class MainWindow : public BaseMainWindow Q_OBJECT public: - explicit MainWindow(std::unique_ptr context, ArchArgs args, QWidget *parent = 0); + explicit MainWindow(std::unique_ptr context, CommandHandler *handler, QWidget *parent = 0); virtual ~MainWindow(); public: diff --git a/gui/ice40/mainwindow.cc b/gui/ice40/mainwindow.cc index 7c8effac..c2ac264f 100644 --- a/gui/ice40/mainwindow.cc +++ b/gui/ice40/mainwindow.cc @@ -35,8 +35,8 @@ static void initMainResource() { Q_INIT_RESOURCE(nextpnr); } NEXTPNR_NAMESPACE_BEGIN -MainWindow::MainWindow(std::unique_ptr context, ArchArgs args, QWidget *parent) - : BaseMainWindow(std::move(context), args, parent) +MainWindow::MainWindow(std::unique_ptr context, CommandHandler *handler, QWidget *parent) + : BaseMainWindow(std::move(context), handler, parent) { initMainResource(); @@ -123,7 +123,7 @@ void MainWindow::new_proj() bool ok; QString item = QInputDialog::getItem(this, "Select new context", "Chip:", arch.keys(), 0, false, &ok); if (ok && !item.isEmpty()) { - + ArchArgs chipArgs; chipArgs.type = (ArchArgs::ArchArgsTypes)arch.value(item); QString package = QInputDialog::getItem(this, "Select package", "Package:", getSupportedPackages(chipArgs.type), @@ -156,7 +156,7 @@ void MainWindow::load_pcf(std::string filename) void MainWindow::newContext(Context *ctx) { - std::string title = "nextpnr-ice40 - " + ctx->getChipName() + " ( " + chipArgs.package + " )"; + std::string title = "nextpnr-ice40 - " + ctx->getChipName() + " ( " + ctx->archArgs().package + " )"; setWindowTitle(title.c_str()); } diff --git a/gui/ice40/mainwindow.h b/gui/ice40/mainwindow.h index ed1b6aaf..6e725a16 100644 --- a/gui/ice40/mainwindow.h +++ b/gui/ice40/mainwindow.h @@ -29,7 +29,7 @@ class MainWindow : public BaseMainWindow Q_OBJECT public: - explicit MainWindow(std::unique_ptr context, ArchArgs args, QWidget *parent = 0); + explicit MainWindow(std::unique_ptr context, CommandHandler *handler, QWidget *parent = 0); virtual ~MainWindow(); public: diff --git a/ice40/main.cc b/ice40/main.cc index f3885f29..de618cbf 100644 --- a/ice40/main.cc +++ b/ice40/main.cc @@ -118,6 +118,8 @@ void Ice40CommandHandler::setupArchContext(Context *ctx) std::unique_ptr Ice40CommandHandler::createContext(std::unordered_map &values) { + ArchArgs chipArgs; + chipArgs.type = ArchArgs::NONE; if (vm.count("lp384")) { chipArgs.type = ArchArgs::LP384; chipArgs.package = "qn32"; -- cgit v1.2.3