From 68e7b271c395fb4e8c248be7986c83bcf55e61ad Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Sat, 18 Jul 2026 17:49:16 +0200 Subject: [PATCH 1/4] Implemented "cm_grid_increase" and "cm_grid_decrease" Default key bindings are "G" for finer grid and "Shift+G" for coarser grid. Two more enhancements: * The key binding merge in the config page was improved, so key bindings will appear in the config page before the configuration gets updated. * The current grid is shown in the status bar when the grid is changed. --- src/lay/lay/layMainConfigPages.cc | 23 ++++++- src/lay/lay/layMainWindow.cc | 76 ++++++++++++++++++++--- src/lay/lay/layMainWindow.h | 12 ++++ src/layui/layui/layLayoutViewFunctions.cc | 2 + src/layview/layview/layGridNet.cc | 12 ++++ 5 files changed, 112 insertions(+), 13 deletions(-) diff --git a/src/lay/lay/layMainConfigPages.cc b/src/lay/lay/layMainConfigPages.cc index ffe99975b..67f8734a8 100644 --- a/src/lay/lay/layMainConfigPages.cc +++ b/src/lay/lay/layMainConfigPages.cc @@ -27,6 +27,7 @@ #include "layStream.h" #include "layAbstractMenu.h" #include "layMainWindow.h" +#include "tlLog.h" #include "ui_MainConfigPage.h" #include "ui_MainConfigPage2.h" #include "ui_MainConfigPage3.h" @@ -412,15 +413,31 @@ CustomizeMenuConfigPage::apply (const std::vectormenu ()->get_shortcuts (false); + // retained bindings, even if not configured + std::vector::iterator> retained; + std::set shortcuts; + + // initialize configured bindings, clear others (for now) and remember std::map b; b.insert (key_bindings.begin (), key_bindings.end ()); - for (std::map::iterator kb = m_current_bindings.begin (); kb != m_current_bindings.end (); ++kb) { + for (auto kb = m_current_bindings.begin (); kb != m_current_bindings.end (); ++kb) { std::map::iterator bb = b.find (kb->first); if (bb != b.end ()) { lay::Action *a = mp_dispatcher->menu ()->action (kb->first); kb->second = a->get_effective_shortcut_for (bb->second); - } else { - kb->second.clear (); + if (! kb->second.empty ()) { + shortcuts.insert (kb->second); + } + } else if (! kb->second.empty ()) { + retained.push_back (kb); + } + } + + // retain key bindings which don't conflict + for (auto i = retained.begin (); i != retained.end (); ++i) { + if (shortcuts.find ((*i)->second) != shortcuts.end ()) { + tl::warn << tl::sprintf (tl::to_string (tr ("Resetting key binding for '%s' (was '%s') because of conflicts")), (*i)->first, (*i)->second); + (*i)->second.clear (); } } diff --git a/src/lay/lay/layMainWindow.cc b/src/lay/lay/layMainWindow.cc index 6a2582643..b112544e7 100644 --- a/src/lay/lay/layMainWindow.cc +++ b/src/lay/lay/layMainWindow.cc @@ -1970,6 +1970,18 @@ MainWindow::redraw () } } +void +MainWindow::cm_grid_decrease () +{ + change_grid (-1); +} + +void +MainWindow::cm_grid_increase () +{ + change_grid (1); +} + void MainWindow::cm_cancel () { @@ -4041,6 +4053,10 @@ MainWindow::menu_activated (const std::string &symbol) cm_bookmark_view (); } else if (symbol == "cm_cancel") { cm_cancel (); + } else if (symbol == "cm_grid_decrease") { + cm_grid_decrease (); + } else if (symbol == "cm_grid_increase") { + cm_grid_increase (); } else if (symbol == "cm_save_layer_props") { cm_save_layer_props (); } else if (symbol == "cm_load_layer_props") { @@ -4137,6 +4153,54 @@ MainWindow::menu_changed () dm_do_update_menu (); } +std::vector +MainWindow::default_grids () const +{ + lay::TechnologyController *tc = lay::TechnologyController::instance (); + if (tc && tc->active_technology ()) { + std::vector tech_grids = tc->active_technology ()->default_grid_list (); + if (! tech_grids.empty ()) { + return tech_grids; + } + } + + return m_default_grids; +} + +void +MainWindow::change_grid (int dir) +{ + std::vector grids = default_grids (); + if (grids.empty ()) { + return; + } + + std::sort (grids.begin (), grids.end ()); + + size_t i = 0; + for (std::vector::const_iterator g = grids.begin (); g != grids.end (); ++g, ++i) { + if (db::coord_traits::equals (*g, m_grid_micron)) { + break; + } + } + + if (i == grids.size ()) { + i = (dir > 0 ? grids.size () - 1 : 0); + } else { + if (dir > 0) { + if (i + 1 < grids.size ()) { + ++i; + } + } else if (dir < 0) { + if (i > 0) { + --i; + } + } + } + + dispatcher ()->config_set (cfg_grid, grids [i]); +} + void MainWindow::do_update_grids () { @@ -4176,15 +4240,7 @@ MainWindow::do_update_menu () m_default_grids_updated = false; - const std::vector *grids = &m_default_grids; - std::vector tech_grids; - lay::TechnologyController *tc = lay::TechnologyController::instance (); - if (tc && tc->active_technology ()) { - tech_grids = tc->active_technology ()->default_grid_list (); - if (! tech_grids.empty ()) { - grids = &tech_grids; - } - } + std::vector grids = default_grids (); std::vector group = menu ()->group ("default_grids_group"); @@ -4196,7 +4252,7 @@ MainWindow::do_update_menu () } int i = 1; - for (std::vector::const_iterator g = grids->begin (); g != grids->end (); ++g, ++i) { + for (std::vector::const_iterator g = grids.begin (); g != grids.end (); ++g, ++i) { std::string name = "default_grid_" + tl::to_string (i); diff --git a/src/lay/lay/layMainWindow.h b/src/lay/lay/layMainWindow.h index ade27bd24..c0d00b5f7 100644 --- a/src/lay/lay/layMainWindow.h +++ b/src/lay/lay/layMainWindow.h @@ -277,6 +277,14 @@ public: */ double grid_micron () const; + /** + * @brief Gets a list of the default grids + * + * The default grids are globally defined, but may change depending on the technology + * selected in the current view. + */ + std::vector default_grids () const; + /** * @brief Hierarchy level selection setter */ @@ -818,6 +826,8 @@ private: void cm_manage_bookmarks (); void cm_bookmark_view (); void cm_cancel (); + void cm_grid_decrease (); + void cm_grid_increase (); void cm_save_layer_props (); void cm_load_layer_props (); void cm_save_session (); @@ -863,6 +873,8 @@ private: void update_tab_title (int i); void add_view (LayoutViewWidget *view); + void change_grid (int dir); + bool can_close (); lay::CellViewRef create_or_load_layout (const std::string *filename, const db::LoadLayoutOptions *options, const std::string &tech, const int mode); int do_create_view (); diff --git a/src/layui/layui/layLayoutViewFunctions.cc b/src/layui/layui/layLayoutViewFunctions.cc index f965ed152..9511947ac 100644 --- a/src/layui/layui/layLayoutViewFunctions.cc +++ b/src/layui/layui/layLayoutViewFunctions.cc @@ -2154,6 +2154,8 @@ public: menu_entries.push_back (lay::menu_item ("cm_sel_move_interactive", "sel_move_interactive:edit", at, tl::to_string (tr ("Move Interactive")))); menu_entries.push_back (lay::menu_item ("cm_select_next_item", "select_next_item:edit", at, tl::to_string (tr ("Select Next Item(Space)")))); menu_entries.push_back (lay::menu_item ("cm_select_next_item_add", "select_next_item_add:edit", at, tl::to_string (tr ("Select Next Item too(Shift+Space)")))); + menu_entries.push_back (lay::menu_item ("cm_grid_decrease", "grid_decrease:edit", at, tl::to_string (tr ("Select Finer Grid(G)")))); + menu_entries.push_back (lay::menu_item ("cm_grid_increase", "grid_increase:edit", at, tl::to_string (tr ("Select Coarser Grid(Shift+G)")))); at = "edit_menu.edit_options_group"; menu_entries.push_back (lay::menu_item ("cm_undo", "undo:edit", at, tl::to_string (tr ("Undo(Ctrl+Z)")))); diff --git a/src/layview/layview/layGridNet.cc b/src/layview/layview/layGridNet.cc index 8a1e1c4b1..dabe4cb05 100644 --- a/src/layview/layview/layGridNet.cc +++ b/src/layview/layview/layGridNet.cc @@ -216,9 +216,21 @@ GridNet::configure (const std::string &name, const std::string &value) double g = 0; tl::from_string (value, g); if (fabs (g - m_grid) > 1e-6) { + m_grid = g; need_update = true; + + std::string gs; + if (m_grid < 0.4) { + // pick nm units below 400nm + gs = tl::to_string (m_grid * 1000.0) + tl::to_string (QObject::tr (" nm")); + } else { + gs = tl::to_string (m_grid) + tl::to_string (QObject::tr (" um")); + } + mp_view->message (tl::sprintf (tl::to_string (tr ("Grid: %s")), gs)); + } + taken = false; // to let others use the grid too. } else { From 1a4d94355641146033366e9bf84c034e9b38b5cb Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Sat, 18 Jul 2026 18:34:13 +0200 Subject: [PATCH 2/4] Pushing the new functions to the grid menu and adding the 'default' indicator as proposed --- src/lay/lay/layMainWindow.cc | 73 +++++++++++++++++------ src/lay/lay/layMainWindow.h | 14 +++++ src/layui/layui/layLayoutViewFunctions.cc | 2 - 3 files changed, 70 insertions(+), 19 deletions(-) diff --git a/src/lay/lay/layMainWindow.cc b/src/lay/lay/layMainWindow.cc index b112544e7..7371b9a44 100644 --- a/src/lay/lay/layMainWindow.cc +++ b/src/lay/lay/layMainWindow.cc @@ -4167,6 +4167,20 @@ MainWindow::default_grids () const return m_default_grids; } +double +MainWindow::default_grid () const +{ + lay::TechnologyController *tc = lay::TechnologyController::instance (); + if (tc && tc->active_technology ()) { + auto tech_grids = tc->active_technology ()->default_grid_list (); + if (! tech_grids.empty ()) { + return tc->active_technology ()->default_grid (); + } + } + + return m_default_grid; +} + void MainWindow::change_grid (int dir) { @@ -4204,35 +4218,49 @@ MainWindow::change_grid (int dir) void MainWindow::do_update_grids () { - const std::vector *grids = &m_default_grids; - double default_grid = m_default_grid; + std::vector grids = default_grids (); + double def_grid = default_grid (); - std::vector tech_grids; - lay::TechnologyController *tc = lay::TechnologyController::instance (); - if (tc && tc->active_technology ()) { - tech_grids = tc->active_technology ()->default_grid_list (); - if (! tech_grids.empty ()) { - grids = &tech_grids; - default_grid = tc->active_technology ()->default_grid (); - } - } - - if (default_grid > db::epsilon) { - for (auto g = grids->begin (); g != grids->end (); ++g) { + if (def_grid > db::epsilon) { + for (auto g = grids.begin (); g != grids.end (); ++g) { if (db::coord_traits::equals (*g, m_grid_micron)) { - default_grid = 0.0; + def_grid = 0.0; break; } } } - if (default_grid > db::epsilon) { - dispatcher ()->config_set (cfg_grid, default_grid); + if (def_grid > db::epsilon) { + dispatcher ()->config_set (cfg_grid, def_grid); } do_update_menu (); } +namespace { + +class GenericMenuAction + : public Action +{ +public: + GenericMenuAction (lay::Dispatcher *dispatcher, const std::string &title, const std::string &symbol) + : Action (title), mp_dispatcher (dispatcher), m_symbol (symbol) + { } + + void triggered () + { + if (mp_dispatcher) { + mp_dispatcher->menu_activated (m_symbol); + } + } + +private: + Dispatcher *mp_dispatcher; + std::string m_symbol; +}; + +} + void MainWindow::do_update_menu () { @@ -4241,14 +4269,21 @@ MainWindow::do_update_menu () m_default_grids_updated = false; std::vector grids = default_grids (); + double def_grid = default_grid (); std::vector group = menu ()->group ("default_grids_group"); for (std::vector::const_iterator t = group.begin (); t != group.end (); ++t) { + std::vector items = menu ()->items (*t); for (std::vector::const_iterator i = items.begin (); i != items.end (); ++i) { menu ()->delete_item (*i); } + + menu ()->insert_item (*t + ".end", "finer_grid", new GenericMenuAction (dispatcher (), tl::to_string (tr ("Finer Grid(G)")), "cm_grid_decrease")); + menu ()->insert_item (*t + ".end", "coarser_grid", new GenericMenuAction (dispatcher (), tl::to_string (tr ("Coarser Grid(Shift+G)")), "cm_grid_increase")); + menu ()->insert_separator (*t + ".end", "default_grids_group_separator"); + } int i = 1; @@ -4264,6 +4299,10 @@ MainWindow::do_update_menu () gs = tl::to_string (*g) + tl::to_string (QObject::tr (" um")); } + if (def_grid > 0 && db::coord_traits::equals (*g, def_grid)) { + gs += tl::to_string (tr (" \\(default)")); + } + lay::Action *ga = new lay::ConfigureAction (gs, cfg_grid, tl::to_string (*g)); ga->set_checkable (true); ga->set_checked (db::coord_traits::equals (*g, m_grid_micron)); diff --git a/src/lay/lay/layMainWindow.h b/src/lay/lay/layMainWindow.h index c0d00b5f7..7e26be752 100644 --- a/src/lay/lay/layMainWindow.h +++ b/src/lay/lay/layMainWindow.h @@ -285,6 +285,20 @@ public: */ std::vector default_grids () const; + /** + * @brief Gets the default grid + * + * The default (fallback) grid is the one marked with "!" in the grid list + * and it is used, when the current grid is not one of the provided grids + * in the default grid list. + * + * The default grid is globally defined, but my change depending on the technology + * selected in the current view. + * + * If no such grid exists, 0 is returned. + */ + double default_grid () const; + /** * @brief Hierarchy level selection setter */ diff --git a/src/layui/layui/layLayoutViewFunctions.cc b/src/layui/layui/layLayoutViewFunctions.cc index 9511947ac..f965ed152 100644 --- a/src/layui/layui/layLayoutViewFunctions.cc +++ b/src/layui/layui/layLayoutViewFunctions.cc @@ -2154,8 +2154,6 @@ public: menu_entries.push_back (lay::menu_item ("cm_sel_move_interactive", "sel_move_interactive:edit", at, tl::to_string (tr ("Move Interactive")))); menu_entries.push_back (lay::menu_item ("cm_select_next_item", "select_next_item:edit", at, tl::to_string (tr ("Select Next Item(Space)")))); menu_entries.push_back (lay::menu_item ("cm_select_next_item_add", "select_next_item_add:edit", at, tl::to_string (tr ("Select Next Item too(Shift+Space)")))); - menu_entries.push_back (lay::menu_item ("cm_grid_decrease", "grid_decrease:edit", at, tl::to_string (tr ("Select Finer Grid(G)")))); - menu_entries.push_back (lay::menu_item ("cm_grid_increase", "grid_increase:edit", at, tl::to_string (tr ("Select Coarser Grid(Shift+G)")))); at = "edit_menu.edit_options_group"; menu_entries.push_back (lay::menu_item ("cm_undo", "undo:edit", at, tl::to_string (tr ("Undo(Ctrl+Z)")))); From 4e6834d92d7b038d79bce585db22418375a84682 Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Sun, 19 Jul 2026 15:13:13 +0200 Subject: [PATCH 3/4] Trying to fix build errors for Python modules --- src/layview/layview/layGridNet.cc | 1 + 1 file changed, 1 insertion(+) diff --git a/src/layview/layview/layGridNet.cc b/src/layview/layview/layGridNet.cc index dabe4cb05..7646f7113 100644 --- a/src/layview/layview/layGridNet.cc +++ b/src/layview/layview/layGridNet.cc @@ -29,6 +29,7 @@ #include "layPixelBufferPainter.h" #include "laySnap.h" #include "tlColor.h" +#include "tlInternational.h" #include "dbTrans.h" #if defined(HAVE_QT) From efe12377acd53bfd091c38a7e2f736fca9551a95 Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Sun, 19 Jul 2026 16:01:04 +0200 Subject: [PATCH 4/4] Fixing non-Qt builds --- src/layview/layview/layGridNet.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/layview/layview/layGridNet.cc b/src/layview/layview/layGridNet.cc index 7646f7113..b5c479f1d 100644 --- a/src/layview/layview/layGridNet.cc +++ b/src/layview/layview/layGridNet.cc @@ -119,7 +119,7 @@ GridNetPluginDeclaration::get_options (std::vector < std::pairmessage (tl::sprintf (tl::to_string (tr ("Grid: %s")), gs));