Merge pull request #9458 from osamahammad21/gui-dbuperuu

GUI: use db getDbuPerMicron

Author: maliberty

src/gui/src/gui.cpp

@@ -764,27 +764,22 @@ void Gui::saveImage(const std::string& filename,
     if (chip == nullptr) {
       logger_->error(utl::GUI, 64, "No design loaded.");
     }
-
+    save_region = chip->getBBox();
     auto* block = chip->getBlock();
-    if (block == nullptr) {
-      logger_->error(utl::GUI, 65, "No design loaded.");
+
+    if (block != nullptr) {
+      save_region = block->getBBox()->getBox();
     }
 
-    save_region
-        = block->getBBox()
-              ->getBox();  // get die area since screen area is not reliable
+    // get die area since screen area is not reliable
     const double bloat_by = 0.05;  // 5%
     const int bloat = std::min(save_region.dx(), save_region.dy()) * bloat_by;
 
     save_region.bloat(bloat, save_region);
   }
 
   if (!enabled()) {
-    auto* tech = db_->getTech();
-    if (tech == nullptr) {
-      logger_->error(utl::GUI, 16, "No design loaded.");
-    }
-    const double dbu_per_micron = tech->getDbUnitsPerMicron();
+    const double dbu_per_micron = db_->getDbuPerMicron();
 
     std::string save_cmds;
 

src/gui/src/gui.i

@@ -47,16 +47,16 @@ odb::dbBlock* get_block()
 // converts from microns to DBU
 odb::Rect make_rect(double xlo, double ylo, double xhi, double yhi)
 {
-  auto block = get_block();
-  int dbuPerUU = block->getDbUnitsPerMicron();
+  auto db = ord::OpenRoad::openRoad()->getDb();
+  int dbuPerUU = db->getDbuPerMicron();
   return odb::Rect(xlo * dbuPerUU, ylo * dbuPerUU, xhi * dbuPerUU, yhi * dbuPerUU);
 }
 
 // converts from microns to DBU
 odb::Point make_point(double x, double y)
 {
-  auto block = get_block();
-  int dbuPerUU = block->getDbUnitsPerMicron();
+  auto db = ord::OpenRoad::openRoad()->getDb();
+  int dbuPerUU = db->getDbuPerMicron();
   return odb::Point(x * dbuPerUU, y * dbuPerUU);
 }
 

src/gui/src/gui.tcl

@@ -96,14 +96,11 @@ proc save_image { args } {
   set resolution 0
   if { [info exists keys(-resolution)] } {
     sta::check_positive_float "-resolution" $keys(-resolution)
-    set tech [ord::get_db_tech]
-    if { $tech == "NULL" } {
-      utl::error GUI 17 "No technology loaded."
-    }
-    set resolution [expr $keys(-resolution) * [$tech getDbUnitsPerMicron]]
+    set db [ord::get_db]
+    set resolution [expr $keys(-resolution) * [$db getDbuPerMicron]]
     if { $resolution < 1 } {
       set resolution 1.0
-      set res_per_pixel [expr $resolution / [$tech getDbUnitsPerMicron]]
+      set res_per_pixel [expr $resolution / [$db getDbuPerMicron]]
       utl::warn GUI 31 "Resolution too high for design, defaulting to ${res_per_pixel}um per pixel"
     }
   }
@@ -153,14 +150,11 @@ proc save_animated_gif { args } {
   set resolution 0
   if { [info exists keys(-resolution)] } {
     sta::check_positive_float "-resolution" $keys(-resolution)
-    set tech [ord::get_db_tech]
-    if { $tech == "NULL" } {
-      utl::error GUI 52 "No technology loaded."
-    }
-    set resolution [expr $keys(-resolution) * [$tech getDbUnitsPerMicron]]
+    set db [ord::get_db]
+    set resolution [expr $keys(-resolution) * [$db getDbuPerMicron]]
     if { $resolution < 1 } {
       set resolution 1.0
-      set res_per_pixel [expr $resolution / [$tech getDbUnitsPerMicron]]
+      set res_per_pixel [expr $resolution / [$db getDbuPerMicron]]
       utl::warn GUI 55 "Resolution too high for design, defaulting to ${res_per_pixel}um per pixel"
     }
   }

src/odb/src/db/dbMarker.cpp

@@ -634,6 +634,19 @@ std::string dbMarker::getName() const
       case dbChipInstObj:
         sources += static_cast<dbChipInst*>(src)->getName();
         break;
+      case dbChipConnObj: {
+        const dbChipConn* conn = static_cast<dbChipConn*>(src);
+        sources += fmt::format(
+            "{}:{}", conn->getParentChip()->getName(), conn->getName());
+        break;
+      }
+      case dbChipRegionInstObj: {
+        const dbChipRegionInst* region = static_cast<dbChipRegionInst*>(src);
+        sources += fmt::format("{}.regions.{}",
+                               region->getChipInst()->getName(),
+                               region->getChipRegion()->getName());
+        break;
+      }
       default:
         obj->getLogger()->error(
             utl::ODB, 290, "Unsupported object type: {}", src->getTypeName());