diff options
| -rw-r--r-- | common/command.cc | 9 | ||||
| -rw-r--r-- | common/context.h | 6 | ||||
| -rw-r--r-- | gui/basewindow.cc | 5 |
3 files changed, 10 insertions, 10 deletions
diff --git a/common/command.cc b/common/command.cc index 89bbf90c..7f276193 100644 --- a/common/command.cc +++ b/common/command.cc @@ -475,15 +475,6 @@ int CommandHandler::exec() void CommandHandler::load_json(Context *ctx, std::string filename) { - ctx->cells.clear(); - ctx->nets.clear(); - ctx->net_aliases.clear(); - ctx->ports.clear(); - ctx->hierarchy.clear(); - ctx->settings.erase(ctx->id("pack")); - ctx->settings.erase(ctx->id("place")); - ctx->settings.erase(ctx->id("route")); - setupContext(ctx); setupArchContext(ctx); { diff --git a/common/context.h b/common/context.h index ee7ef0ce..f2b66600 100644 --- a/common/context.h +++ b/common/context.h @@ -37,7 +37,11 @@ struct Context : Arch, DeterministicRNG // Should we disable printing of the location of nets in the critical path? bool disable_critical_path_source_print = false; - Context(ArchArgs args) : Arch(args) { BaseCtx::as_ctx = this; } + ArchArgs arch_args; + + Context(ArchArgs args) : Arch(args) { BaseCtx::as_ctx = this; arch_args = args; } + + ArchArgs getArchArgs() { return arch_args; } // -------------------------------------------------------------- diff --git a/gui/basewindow.cc b/gui/basewindow.cc index de4e8272..e93428cf 100644 --- a/gui/basewindow.cc +++ b/gui/basewindow.cc @@ -365,6 +365,11 @@ void BaseMainWindow::open_json() QString fileName = QFileDialog::getOpenFileName(this, QString("Open JSON"), QString(), QString("*.json"));
if (!fileName.isEmpty()) {
disableActions();
+ if (ctx->settings.find(ctx->id("synth")) == ctx->settings.end()) {
+ ArchArgs chipArgs = ctx->getArchArgs();
+ ctx = std::unique_ptr<Context>(new Context(chipArgs));
+ Q_EMIT contextChanged(ctx.get());
+ }
handler->load_json(ctx.get(), fileName.toStdString());
Q_EMIT updateTreeView();
log("Loading design successful.\n");
|