From e68ca65e9e0a1675a13e607a99f318ce5958c7e9 Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Fri, 3 Aug 2018 18:23:40 +0200 Subject: Unify interfaces for gui --- generic/arch.cc | 2 +- generic/main.cc | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'generic') diff --git a/generic/arch.cc b/generic/arch.cc index 1c22dbf7..ce15a689 100644 --- a/generic/arch.cc +++ b/generic/arch.cc @@ -175,7 +175,7 @@ void Arch::setGroupDecal(GroupId group, DecalXY decalxy) // --------------------------------------------------------------- -Arch::Arch(ArchArgs) {} +Arch::Arch(ArchArgs) : chipName("generic") {} void IdString::initialize_arch(const BaseCtx *ctx) {} diff --git a/generic/main.cc b/generic/main.cc index 3b8b3fe6..8653da01 100644 --- a/generic/main.cc +++ b/generic/main.cc @@ -90,7 +90,8 @@ int main(int argc, char *argv[]) return 1; } - std::unique_ptr ctx = std::unique_ptr(new Context(ArchArgs{})); + ArchArgs chipArgs{}; + std::unique_ptr ctx = std::unique_ptr(new Context(chipArgs)); if (vm.count("verbose")) { ctx->verbose = true; @@ -107,7 +108,7 @@ int main(int argc, char *argv[]) #ifndef NO_GUI if (vm.count("gui")) { Application a(argc, argv); - MainWindow w(std::move(ctx)); + MainWindow w(std::move(ctx), chipArgs); w.show(); return a.exec(); -- cgit v1.2.3 From 7d5dba3ad378563869657b4330c178ecd8c24931 Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Sat, 4 Aug 2018 16:27:33 +0200 Subject: compile fix --- generic/arch.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'generic') diff --git a/generic/arch.cc b/generic/arch.cc index 7c0828e0..a0ab58f8 100644 --- a/generic/arch.cc +++ b/generic/arch.cc @@ -412,7 +412,7 @@ delay_t Arch::getBudgetOverride(const NetInfo *net_info, const PortRef &sink, de // --------------------------------------------------------------- -bool Arch::place() { return placer1(getCtx()\, Placer1Cfg()); } +bool Arch::place() { return placer1(getCtx(), Placer1Cfg()); } bool Arch::route() { return router1(getCtx(), Router1Cfg()); } -- cgit v1.2.3