Merge pull request #7846 from gadfort/show-hide-guides

gui: update actions in inspector and change button for route guides based on visibility

Author: maliberty

src/gui/src/dbDescriptors.cpp

@@ -1598,24 +1598,32 @@ Descriptor::Actions DbNetDescriptor::getActions(std::any object) const
                        }});
   }
   if (!net->getGuides().empty()) {
-    actions.push_back(Descriptor::Action{"Route Guides", [this, gui, net]() {
-                                           if (guide_nets_.count(net) == 0) {
-                                             gui->addRouteGuides(net);
-                                           } else {
-                                             gui->removeRouteGuides(net);
-                                           }
-                                           return makeSelected(net);
-                                         }});
+    if (guide_nets_.count(net) == 0) {
+      actions.push_back(
+          Descriptor::Action{"Show Route Guides", [this, gui, net]() {
+                               gui->addRouteGuides(net);
+                               return makeSelected(net);
+                             }});
+    } else {
+      actions.push_back(
+          Descriptor::Action{"Hide Route Guides", [this, gui, net]() {
+                               gui->removeRouteGuides(net);
+                               return makeSelected(net);
+                             }});
+    }
   }
   if (!net->getTracks().empty()) {
-    actions.push_back(Descriptor::Action{"Tracks", [this, gui, net]() {
-                                           if (tracks_nets_.count(net) == 0) {
+    if (tracks_nets_.count(net) == 0) {
+      actions.push_back(Descriptor::Action{"Show Tracks", [this, gui, net]() {
                                              gui->addNetTracks(net);
-                                           } else {
+                                             return makeSelected(net);
+                                           }});
+    } else {
+      actions.push_back(Descriptor::Action{"Hide Tracks", [this, gui, net]() {
                                              gui->removeNetTracks(net);
-                                           }
-                                           return makeSelected(net);
-                                         }});
+                                             return makeSelected(net);
+                                           }});
+    }
   }
   return actions;
 }

src/gui/src/inspector.cpp

@@ -836,16 +836,6 @@ void Inspector::unsetReadOnly()
   reload();
 }
 
-void Inspector::highlightChanged()
-{
-  loadActions();
-}
-
-void Inspector::focusNetsChanged()
-{
-  loadActions();
-}
-
 void Inspector::loadActions()
 {
   // remove action buttons and ensure delete
@@ -1057,6 +1047,7 @@ void Inspector::handleAction(QWidget* action)
   }
 
   if (new_selection && new_selection == selection_) {
+    loadActions();
     return;
   }
 

src/gui/src/inspector.h

@@ -194,8 +194,6 @@ class Inspector : public QDockWidget
   void clicked(const QModelIndex& index);
   void doubleClicked(const QModelIndex& index);
   void update(const Selected& object = Selected());
-  void highlightChanged();
-  void focusNetsChanged();
 
   int selectNext();
   int selectPrevious();
@@ -206,6 +204,7 @@ class Inspector : public QDockWidget
   void unsetReadOnly();
 
   void reload();
+  void loadActions();
 
  private slots:
   void focusIndex(const QModelIndex& index);
@@ -218,7 +217,6 @@ class Inspector : public QDockWidget
 
  private:
   void handleAction(QWidget* action);
-  void loadActions();
 
   void adjustHeaders();
 

src/gui/src/layoutTabs.cpp

@@ -258,6 +258,7 @@ void LayoutTabs::addRouteGuides(odb::dbNet* net)
 {
   const auto& [itr, inserted] = route_guides_.insert(net);
   if (inserted) {
+    emit routeGuidesChanged();
     fullRepaint();
   }
 }
@@ -266,6 +267,7 @@ void LayoutTabs::addNetTracks(odb::dbNet* net)
 {
   const auto& [itr, inserted] = net_tracks_.insert(net);
   if (inserted) {
+    emit netTracksChanged();
     fullRepaint();
   }
 }
@@ -281,13 +283,15 @@ void LayoutTabs::removeFocusNet(odb::dbNet* net)
 void LayoutTabs::removeRouteGuides(odb::dbNet* net)
 {
   if (route_guides_.erase(net) > 0) {
+    emit routeGuidesChanged();
     fullRepaint();
   }
 }
 
 void LayoutTabs::removeNetTracks(odb::dbNet* net)
 {
   if (net_tracks_.erase(net) > 0) {
+    emit netTracksChanged();
     fullRepaint();
   }
 }
@@ -305,6 +309,7 @@ void LayoutTabs::clearRouteGuides()
 {
   if (!route_guides_.empty()) {
     route_guides_.clear();
+    emit routeGuidesChanged();
     fullRepaint();
   }
 }
@@ -313,6 +318,7 @@ void LayoutTabs::clearNetTracks()
 {
   if (!net_tracks_.empty()) {
     net_tracks_.clear();
+    emit netTracksChanged();
     fullRepaint();
   }
 }

src/gui/src/layoutTabs.h

@@ -76,6 +76,8 @@ class LayoutTabs : public QTabWidget
   void addSelected(const SelectionSet& selected);
   void addRuler(int x0, int y0, int x1, int y1);
   void focusNetsChanged();
+  void routeGuidesChanged();
+  void netTracksChanged();
 
  public slots:
   void tabChange(int index);

src/gui/src/mainWindow.cpp

@@ -184,6 +184,19 @@ MainWindow::MainWindow(bool load_settings, QWidget* parent)
         addRuler(x0, y0, x1, y1, "", "", default_ruler_style_->isChecked());
       });
 
+  connect(viewers_,
+          &LayoutTabs::focusNetsChanged,
+          inspector_,
+          &Inspector::loadActions);
+  connect(viewers_,
+          &LayoutTabs::routeGuidesChanged,
+          inspector_,
+          &Inspector::loadActions);
+  connect(viewers_,
+          &LayoutTabs::netTracksChanged,
+          inspector_,
+          &Inspector::loadActions);
+
   connect(
       this, &MainWindow::selectionChanged, viewers_, &LayoutTabs::fullRepaint);
   connect(
@@ -223,14 +236,12 @@ MainWindow::MainWindow(bool load_settings, QWidget* parent)
   connect(inspector_, &Inspector::focus, viewers_, &LayoutTabs::selectionFocus);
   connect(
       drc_viewer_, &DRCWidget::focus, viewers_, &LayoutTabs::selectionFocus);
-  connect(this,
-          &MainWindow::highlightChanged,
-          inspector_,
-          &Inspector::highlightChanged);
+  connect(
+      this, &MainWindow::highlightChanged, inspector_, &Inspector::loadActions);
   connect(viewers_,
           &LayoutTabs::focusNetsChanged,
           inspector_,
-          &Inspector::focusNetsChanged);
+          &Inspector::loadActions);
   connect(inspector_,
           &Inspector::removeHighlight,
           [=](const QList<const Selected*>& selected) {