pdn/pad/gui: use return value of getGrid* for routing tracks

Signed-off-by: Peter Gadfort <[email protected]>

Author: gadfort

src/gui/src/renderThread.cpp

@@ -325,7 +325,6 @@ void RenderThread::drawTracks(dbTechLayer* layer,
   painter->setBrush(Qt::NoBrush);
 
   bool is_horizontal = layer->getDirection() == dbTechLayerDir::HORIZONTAL;
-  std::vector<int> grids;
   if ((!is_horizontal && viewer_->options_->arePrefTracksVisible())
       || (is_horizontal && viewer_->options_->areNonPrefTracksVisible())) {
     bool show_grid = true;
@@ -336,8 +335,7 @@ void RenderThread::drawTracks(dbTechLayer* layer,
     }
 
     if (show_grid) {
-      grid->getGridX(grids);
-      for (int x : grids) {
+      for (int x : grid->getGridX()) {
         if (restart_) {
           break;
         }
@@ -362,8 +360,7 @@ void RenderThread::drawTracks(dbTechLayer* layer,
     }
 
     if (show_grid) {
-      grid->getGridY(grids);
-      for (int y : grids) {
+      for (int y : grid->getGridY()) {
         if (restart_) {
           break;
         }

src/pad/src/RDLRouter.cpp

@@ -1206,18 +1206,13 @@ void RDLRouter::makeGraph()
 
   graph_weight_ = boost::get(boost::edge_weight, graph_);
 
-  std::vector<int> x_grid;
-  std::vector<int> y_grid;
-
   odb::dbTrackGrid* tracks = block_->findTrackGrid(layer_);
-  tracks->getGridX(x_grid);
-  tracks->getGridY(y_grid);
 
   // filter grid points based on spacing requirements
   const int pitch = width_ + spacing_ - 1;
   const int start = width_ / 2 + 1;
   x_grid_.clear();
-  for (const auto& x : x_grid) {
+  for (const auto& x : tracks->getGridX()) {
     bool add = false;
     if (x_grid_.empty()) {
       if (x >= start) {
@@ -1234,7 +1229,7 @@ void RDLRouter::makeGraph()
     }
   }
   y_grid_.clear();
-  for (const auto& y : y_grid) {
+  for (const auto& y : tracks->getGridY()) {
     bool add = false;
     if (y_grid_.empty()) {
       if (y >= start) {

src/pdn/src/techlayer.cpp

@@ -47,11 +47,11 @@ void TechLayer::populateGrid(odb::dbBlock* block, odb::dbTechLayerDir dir)
 
   auto* tracks = block->findTrackGrid(layer_);
   if (dir == odb::dbTechLayerDir::HORIZONTAL) {
-    tracks->getGridY(grid_);
+    grid_ = tracks->getGridY();
   } else if (dir == odb::dbTechLayerDir::VERTICAL) {
-    tracks->getGridX(grid_);
+    grid_ = tracks->getGridX();
   } else {
-    tracks->getGridY(grid_);
+    grid_ = tracks->getGridY();
   }
 }