From de12c6247c4621a52d63296068e4097632e1ab0a Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Sat, 18 Jul 2020 18:08:50 +0200 Subject: [PATCH] Removed confusing LEF import option - there is only import LEF macros or don't --- .../LEFDEFTechnologyComponentEditor.ui | 221 +++++++++++++----- .../lay_plugin/layLEFDEFImportDialogs.cc | 4 +- 2 files changed, 166 insertions(+), 59 deletions(-) diff --git a/src/plugins/streamers/lefdef/lay_plugin/LEFDEFTechnologyComponentEditor.ui b/src/plugins/streamers/lefdef/lay_plugin/LEFDEFTechnologyComponentEditor.ui index 3b849c53f..65c1784f4 100644 --- a/src/plugins/streamers/lefdef/lay_plugin/LEFDEFTechnologyComponentEditor.ui +++ b/src/plugins/streamers/lefdef/lay_plugin/LEFDEFTechnologyComponentEditor.ui @@ -6,7 +6,7 @@ 0 0 - 859 + 628 868 @@ -210,7 +210,7 @@ - FOREIGN macros + LEF import @@ -241,29 +241,10 @@ - - - - - Link to external cells for FOREIGN, LEF macros otherwise - - - - - Ignore FOREIGN, Produce LEF macros always - - - - - Always link to external cells - - - - - Produce a parent cell for each group + Produce a parent cell per group @@ -323,6 +304,13 @@ + + + + Produce LEF geometry + + + @@ -605,26 +593,13 @@ - 0 + 1 Layer Map File - - - - Qt::Vertical - - - - 20 - 278 - - - - @@ -645,14 +620,30 @@ - + If a layer map file is given, pattern based rules are ignored. If used inside a technology, the file will be looked up relative to the technology's base path. + + true + + + + + Qt::Vertical + + + + 20 + 278 + + + + @@ -682,7 +673,14 @@ If used inside a technology, the file will be looked up relative to the technolo 0 - + + + + 0 + 0 + + + @@ -701,10 +699,24 @@ If used inside a technology, the file will be looked up relative to the technolo - + + + + 0 + 0 + + + - + + + + 0 + 0 + + + @@ -714,13 +726,34 @@ If used inside a technology, the file will be looked up relative to the technolo - + + + + 0 + 0 + + + - + + + + 0 + 0 + + + - + + + + 0 + 0 + + + @@ -739,13 +772,34 @@ If used inside a technology, the file will be looked up relative to the technolo - + + + + 0 + 0 + + + - + + + + 0 + 0 + + + - + + + + 0 + 0 + + + @@ -787,7 +841,14 @@ If used inside a technology, the file will be looked up relative to the technolo - + + + + 0 + 0 + + + @@ -845,7 +906,8 @@ If used inside a technology, the file will be looked up relative to the technolo - Layer name suffix ... + Layer name +suffix ... @@ -857,15 +919,30 @@ If used inside a technology, the file will be looked up relative to the technolo - + + + + 0 + 0 + + + - + + + + 0 + 0 + + + - GDS datatype ... + GDS data- +type ... @@ -886,13 +963,34 @@ If used inside a technology, the file will be looked up relative to the technolo - + + + + 0 + 0 + + + - + + + + 0 + 0 + + + - + + + + 0 + 0 + + + @@ -925,19 +1023,28 @@ If used inside a technology, the file will be looked up relative to the technolo - + + + + 0 + 0 + + + - Layer name suffix ... + Layer name +suffix ... - GDS datatype ... + GDS data- +type ... diff --git a/src/plugins/streamers/lefdef/lay_plugin/layLEFDEFImportDialogs.cc b/src/plugins/streamers/lefdef/lay_plugin/layLEFDEFImportDialogs.cc index 2ca27a3d8..0cfded15b 100644 --- a/src/plugins/streamers/lefdef/lay_plugin/layLEFDEFImportDialogs.cc +++ b/src/plugins/streamers/lefdef/lay_plugin/layLEFDEFImportDialogs.cc @@ -452,7 +452,7 @@ LEFDEFReaderOptionsEditor::commit (db::FormatSpecificReaderOptions *options, con data->set_labels_datatype (datatype_labels->text ().toInt ()); data->set_separate_groups (separate_groups->isChecked ()); data->set_map_file (tl::to_string (mapfile_path->text ())); - data->set_macro_resolution_mode (foreign_mode->currentIndex ()); + data->set_macro_resolution_mode (produce_lef_geo->isChecked () ? 0 : 2); data->clear_lef_files (); for (int i = 0; i < lef_files->count (); ++i) { @@ -515,7 +515,7 @@ LEFDEFReaderOptionsEditor::setup (const db::FormatSpecificReaderOptions *options separate_groups->setChecked (data->separate_groups ()); mapfile_path->setText (tl::to_qstring (data->map_file ())); layer_map_mode->setCurrentIndex (data->map_file ().empty () ? 1 : 0); - foreign_mode->setCurrentIndex (data->macro_resolution_mode ()); + produce_lef_geo->setChecked (data->macro_resolution_mode () == 0); checkbox_changed ();