gui: handle bterm selection controls correctly

Previously the control for pins only affect visibility but not
selection.  Pins were not selectable unless route or via were too.

Fixes #7973

Signed-off-by: Matt Liberty <[email protected]>

Author: maliberty

src/gui/src/layoutViewer.cpp

@@ -634,19 +634,23 @@ std::pair<LayoutViewer::Edge, bool> LayoutViewer::searchNearestEdge(
 
     const bool routing_visible = options_->areRoutingSegmentsVisible();
     const bool vias_visible = options_->areRoutingViasVisible();
-    if (routing_visible || vias_visible) {
+    const bool io_pins_visible = options_->areIOPinsVisible();
+    if (routing_visible || vias_visible || io_pins_visible) {
       auto box_shapes = search_.searchBoxShapes(block_,
                                                 layer,
                                                 search_line.xMin(),
                                                 search_line.yMin(),
                                                 search_line.xMax(),
                                                 search_line.yMax(),
                                                 shape_limit);
-      for (const auto& [box, is_via, net] : box_shapes) {
-        if (!routing_visible && !is_via) {
+      for (const auto& [box, type, net] : box_shapes) {
+        if (!routing_visible && type == Search::WIRE) {
           continue;
         }
-        if (!vias_visible && is_via) {
+        if (!vias_visible && type == Search::VIA) {
+          continue;
+        }
+        if (!io_pins_visible && type == Search::BTERM) {
           continue;
         }
         if (isNetVisible(net)) {
@@ -855,7 +859,8 @@ void LayoutViewer::selectAt(odb::Rect region, std::vector<Selected>& selections)
 
     const bool routing_visible = options_->areRoutingSegmentsVisible();
     const bool vias_visible = options_->areRoutingViasVisible();
-    if (routing_visible || vias_visible) {
+    const bool io_pins_visible = options_->areIOPinsVisible();
+    if (routing_visible || vias_visible || io_pins_visible) {
       auto box_shapes = search_.searchBoxShapes(block_,
                                                 layer,
                                                 region.xMin(),
@@ -864,11 +869,14 @@ void LayoutViewer::selectAt(odb::Rect region, std::vector<Selected>& selections)
                                                 region.yMax(),
                                                 shape_limit);
 
-      for (auto& [box, is_via, net] : box_shapes) {
-        if (!routing_visible && !is_via) {
+      for (auto& [box, type, net] : box_shapes) {
+        if (!routing_visible && type == Search::WIRE) {
+          continue;
+        }
+        if (!vias_visible && type == Search::VIA) {
           continue;
         }
-        if (!vias_visible && is_via) {
+        if (!io_pins_visible && type == Search::BTERM) {
           continue;
         }
         if (isNetVisible(net) && options_->isNetSelectable(net)) {

src/gui/src/search.cpp

@@ -272,7 +272,7 @@ void Search::updateShapes(odb::dbBlock* block)
           continue;
         }
         odb::dbTechLayer* layer = box->getTechLayer();
-        net_shapes[layer].emplace_back(box->getBox(), false, term->getNet());
+        net_shapes[layer].emplace_back(box->getBox(), BTERM, term->getNet());
       }
     }
   }
@@ -406,14 +406,14 @@ void Search::addVia(
     for (odb::dbBox* box : via->getBoxes()) {
       odb::Rect bbox = box->getBox();
       bbox.moveDelta(x, y);
-      tree_shapes[box->getTechLayer()].emplace_back(bbox, true, net);
+      tree_shapes[box->getTechLayer()].emplace_back(bbox, VIA, net);
     }
   } else {
     odb::dbVia* via = shape->getVia();
     for (odb::dbBox* box : via->getBoxes()) {
       odb::Rect bbox = box->getBox();
       bbox.moveDelta(x, y);
-      tree_shapes[box->getTechLayer()].emplace_back(bbox, true, net);
+      tree_shapes[box->getTechLayer()].emplace_back(bbox, VIA, net);
     }
   }
 }
@@ -462,7 +462,7 @@ void Search::addNet(
     if (s.isVia()) {
       addVia(net, &s, itr._prev_x, itr._prev_y, tree_shapes);
     } else {
-      tree_shapes[s.getTechLayer()].emplace_back(s.getBox(), false, net);
+      tree_shapes[s.getTechLayer()].emplace_back(s.getBox(), WIRE, net);
     }
   }
 }

src/gui/src/search.h

@@ -39,13 +39,20 @@ class Search : public QObject, public odb::dbBlockCallBackObj
   class PolygonIntersectPredicate;
 
  public:
+  enum RouteBoxType
+  {
+    WIRE,
+    VIA,
+    BTERM
+  };
+
   template <typename T>
   using LayerMap = std::map<odb::dbTechLayer*, T>;
 
   template <typename T>
   using RectValue = std::pair<odb::Rect, T>;
   template <typename T>
-  using RouteBoxValue = std::tuple<odb::Rect, bool, T>;
+  using RouteBoxValue = std::tuple<odb::Rect, RouteBoxType, T>;
   template <typename T>
   using SNetValue = std::tuple<odb::dbSBox*, odb::Polygon, T>;
   template <typename T>