Merge pull request #7885 from gadfort/gui-guide-centering

gui: use gcell centers for drawing routing

Author: maliberty

src/gui/src/dbDescriptors.cpp

@@ -1450,53 +1450,74 @@ std::set<odb::Line> DbNetDescriptor::convertGuidesToLines(
     }
   }
 
+  // Build gcell grid centers
+  std::vector<int> grid;
+  net->getBlock()->getGCellGrid()->getGridX(grid);
+  grid.push_back(net->getBlock()->getDieArea().xMax());
+  std::vector<int> x_grid;
+  x_grid.reserve(grid.size() - 1);
+  for (int i = 1; i < grid.size(); i++) {
+    x_grid.push_back((grid[i - 1] + grid[i]) / 2);
+  }
+
+  grid.clear();
+  net->getBlock()->getGCellGrid()->getGridY(grid);
+  grid.push_back(net->getBlock()->getDieArea().yMax());
+  std::vector<int> y_grid;
+  y_grid.reserve(grid.size() - 1);
+  for (int i = 1; i < grid.size(); i++) {
+    y_grid.push_back((grid[i - 1] + grid[i]) / 2);
+  }
+
   for (const auto* guide : guides) {
     const auto& box = guide->getBox();
-    const auto center = box.center();
-    const int width_half = box.minDXDY() / 2;
-    odb::Point p0, p1;
-    switch (box.getDir()) {
-      case 0: {
-        // DX < DY
-        p0 = odb::Point(center.x(), box.yMin() + width_half);
-        p1 = odb::Point(center.x(), box.yMax() - width_half);
-        break;
-      }
-      case 1: {
-        p0 = odb::Point(box.xMin() + width_half, center.y());
-        p1 = odb::Point(box.xMax() - width_half, center.y());
-        break;
+
+    std::vector<odb::Point> guide_pts;
+    for (const auto& x : x_grid) {
+      if (x < box.xMin()) {
+        continue;
       }
-      default: {
-        p0 = center;
-        p1 = center;
+      if (x > box.xMax()) {
         break;
       }
-    }
-    lines.emplace(p0, center);
-    lines.emplace(center, p1);
-
-    if (guide->isConnectedToTerm()) {
-      std::vector<odb::Point> anchors = {p0, center, p1};
-
-      auto find_term_connection = [&anchors, &lines, &io_map, &sources, &sinks](
-                                      odb::dbObject* dbterm,
-                                      const odb::Point& term) {
-        // draw shortest flywire
-        std::stable_sort(anchors.begin(),
-                         anchors.end(),
-                         [&term](const odb::Point& pt0, const odb::Point& pt1) {
-                           return odb::Point::manhattanDistance(term, pt0)
-                                  < odb::Point::manhattanDistance(term, pt1);
-                         });
-        lines.emplace(term, anchors[0]);
-        if (io_map[dbterm].is_sink) {
-          sinks[dbterm].insert(term);
+
+      for (const auto& y : y_grid) {
+        if (y < box.yMin()) {
+          continue;
         }
-        if (io_map[dbterm].is_source) {
-          sources[dbterm].insert(term);
+        if (y > box.yMax()) {
+          break;
         }
-      };
+
+        guide_pts.emplace_back(x, y);
+      }
+    }
+
+    std::sort(guide_pts.begin(), guide_pts.end());
+    for (int i = 1; i < guide_pts.size(); i++) {
+      lines.emplace(guide_pts[i - 1], guide_pts[i]);
+    }
+
+    if (!guide_pts.empty() && guide->isConnectedToTerm()) {
+      auto find_term_connection
+          = [&guide_pts, &lines, &io_map, &sources, &sinks](
+                odb::dbObject* dbterm, const odb::Point& term) {
+              // draw shortest flywire
+              std::stable_sort(
+                  guide_pts.begin(),
+                  guide_pts.end(),
+                  [&term](const odb::Point& pt0, const odb::Point& pt1) {
+                    return odb::Point::manhattanDistance(term, pt0)
+                           < odb::Point::manhattanDistance(term, pt1);
+                  });
+              lines.emplace(term, guide_pts[0]);
+              if (io_map[dbterm].is_sink) {
+                sinks[dbterm].insert(term);
+              }
+              if (io_map[dbterm].is_source) {
+                sources[dbterm].insert(term);
+              }
+            };
 
       for (const auto& [obj, objbox] : terms[guide->getLayer()]) {
         std::vector<const odb::Rect*> candidates;