caiyu/nextpnr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Preserve ArchArgs and reinit Context when applicable in GUI

Browse Source
This commit is contained in:
Miodrag Milanovic 2021-06-30 10:10:18 +02:00
parent 6c23fe202c
commit 5c6b8a5f04
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
common/command.cc
View File

@ -475,15 +475,6 @@ int CommandHandler::exec()
void CommandHandler::load_json(Context *ctx, std::string filename) 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); setupContext(ctx);
setupArchContext(ctx); setupArchContext(ctx);
{ {

6
common/context.h
View File

@ -37,7 +37,11 @@ struct Context : Arch, DeterministicRNG
// Should we disable printing of the location of nets in the critical path? // Should we disable printing of the location of nets in the critical path?
bool disable_critical_path_source_print = false; 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; }
// -------------------------------------------------------------- // --------------------------------------------------------------

7
gui/basewindow.cc
View File

@ -365,6 +365,11 @@ void BaseMainWindow::open_json()
QString fileName = QFileDialog::getOpenFileName(this, QString("Open JSON"), QString(), QString("*.json")); QString fileName = QFileDialog::getOpenFileName(this, QString("Open JSON"), QString(), QString("*.json"));
if (!fileName.isEmpty()) { if (!fileName.isEmpty()) {
disableActions(); 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()); handler->load_json(ctx.get(), fileName.toStdString());
Q_EMIT updateTreeView(); Q_EMIT updateTreeView();
log("Loading design successful.\n"); log("Loading design successful.\n");
@ -523,7 +528,7 @@ void BaseMainWindow::place() { Q_EMIT task->place(timing_driven); }
void BaseMainWindow::disableActions() void BaseMainWindow::disableActions()
{ {
actionLoadJSON->setEnabled(false); actionLoadJSON->setEnabled(true);
actionPack->setEnabled(false); actionPack->setEnabled(false);
actionAssignBudget->setEnabled(false); actionAssignBudget->setEnabled(false);
actionPlace->setEnabled(false); actionPlace->setEnabled(false);