diff options
author | Miodrag Milanovic <mmicko@gmail.com> | 2019-06-14 15:18:35 +0200 |
---|---|---|
committer | Miodrag Milanovic <mmicko@gmail.com> | 2019-06-14 15:18:35 +0200 |
commit | 66ea9f39f7f5d6e1152105328f9a48a367bd8ce0 (patch) | |
tree | c00f2c07205988f67d24a4f6a22ee8f8f301ecf2 /gui/basewindow.cc | |
parent | aca372de99b960ca808e49fec27d2aaf890574d3 (diff) | |
download | nextpnr-66ea9f39f7f5d6e1152105328f9a48a367bd8ce0.tar.gz nextpnr-66ea9f39f7f5d6e1152105328f9a48a367bd8ce0.tar.bz2 nextpnr-66ea9f39f7f5d6e1152105328f9a48a367bd8ce0.zip |
enable lading of jsons and setting up context
Diffstat (limited to 'gui/basewindow.cc')
-rw-r--r-- | gui/basewindow.cc | 25 |
1 files changed, 8 insertions, 17 deletions
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> context, ArchArgs args, QWidget *parent)
- : QMainWindow(parent), chipArgs(args), ctx(std::move(context)), timing_driven(false)
+BaseMainWindow::BaseMainWindow(std::unique_ptr<Context> context, CommandHandler *handler, QWidget *parent)
+ : QMainWindow(parent), handler(handler), ctx(std::move(context)), timing_driven(false)
{
initBasenameResource();
qRegisterMetaType<std::string>();
@@ -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();
}
}
|