From 3c4c1b9c4f7103d1195e88f502acad642ac319a0 Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Tue, 2 Jul 2019 00:07:50 +0200 Subject: [PATCH] WIP: bugfixes 1.) Don't error out in batch mode (without view) 2.) Don't add nets to connectivity when they just serve for device recognition --- src/drc/drc/built-in-macros/_drc_engine.rb | 2 +- src/drc/drc/built-in-macros/_drc_netter.rb | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/drc/drc/built-in-macros/_drc_engine.rb b/src/drc/drc/built-in-macros/_drc_engine.rb index 363c7392e..30143fb5d 100644 --- a/src/drc/drc/built-in-macros/_drc_engine.rb +++ b/src/drc/drc/built-in-macros/_drc_engine.rb @@ -1423,7 +1423,7 @@ CODE _before_cleanup # show the data in the browser - if @show_l2ndb && @netter && @netter.l2n_data + if view && @show_l2ndb && @netter && @netter.l2n_data # NOTE: to prevent the netter destroying the database, we need to take it l2ndb = _take_data diff --git a/src/drc/drc/built-in-macros/_drc_netter.rb b/src/drc/drc/built-in-macros/_drc_netter.rb index 3e9c0d5d9..8f333b0c9 100644 --- a/src/drc/drc/built-in-macros/_drc_netter.rb +++ b/src/drc/drc/built-in-macros/_drc_netter.rb @@ -96,6 +96,8 @@ module DRC register_layer(a.data) register_layer(b.data) + @l2n.connect(a.data) + @l2n.connect(b.data) @l2n.connect(a.data, b.data) end @@ -115,6 +117,7 @@ module DRC l.requires_region("Netter#connect_global (layer argument)") register_layer(l.data) + @l2n.connect(l.data) @l2n.connect_global(l.data, name) end @@ -410,7 +413,6 @@ module DRC # every layer gets registered and intra-layer connections are made @l2n.register(data, "l" + id.to_s) - @l2n.connect(data) end