gui: more chiplet display progress

Can render design0 correctly with bumps.

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

Author: maliberty

src/gui/src/displayControls.cpp

@@ -2157,18 +2157,34 @@ void DisplayControls::blockLoaded(odb::dbBlock* block)
   addTech(block->getTech());
 }
 
-void DisplayControls::setCurrentBlock(odb::dbBlock* block)
+void DisplayControls::setCurrentChip(odb::dbChip* chip)
 {
-  if (!block) {
+  if (!chip) {
     return;
   }
-  auto tech = block->getTech();
-  addTech(tech);
 
-  std::set<odb::dbTech*> visible_techs{tech};
-  for (auto child : block->getChildren()) {
-    visible_techs.insert(child->getTech());
-  }
+  std::set<odb::dbTech*> visible_techs;
+
+  std::function<void(odb::dbChip*)> collect_techs = [&](odb::dbChip* chip) {
+    auto tech = chip->getTech();
+    if (tech) {
+      addTech(tech);
+      visible_techs.insert(tech);
+    }
+
+    odb::dbBlock* block = chip->getBlock();
+    if (block) {
+      for (auto child : block->getChildren()) {
+        visible_techs.insert(child->getTech());
+      }
+    }
+
+    for (auto* inst : chip->getChipInsts()) {
+      collect_techs(inst->getMasterChip());
+    }
+  };
+
+  collect_techs(chip);
 
   for (auto& [layer, row] : layer_controls_) {
     const bool visible

src/gui/src/displayControls.h

@@ -271,7 +271,7 @@ class DisplayControls : public QDockWidget,
   // options displayed need to match
   void blockLoaded(odb::dbBlock* block);
 
-  void setCurrentBlock(odb::dbBlock* block);
+  void setCurrentChip(odb::dbChip* chip);
 
   // This is called by the check boxes to update the state
   void itemChanged(QStandardItem* item);

src/gui/src/layoutTabs.cpp

@@ -67,16 +67,16 @@ void LayoutTabs::updateBackgroundColor(LayoutViewer* viewer)
   viewer->setAutoFillBackground(true);
 }
 
-void LayoutTabs::blockLoaded(odb::dbBlock* block)
+void LayoutTabs::chipLoaded(odb::dbChip* chip)
 {
   // Check if we already have a tab for this block
   for (LayoutViewer* viewer : viewers_) {
-    if (viewer->getBlock() == block) {
+    if (viewer->getChip() == chip) {
       return;
     }
   }
 
-  populateModuleColors(block);
+  populateModuleColors(chip->getBlock());
   auto viewer = new LayoutViewer(options_,
                                  output_widget_,
                                  selected_,
@@ -99,10 +99,11 @@ void LayoutTabs::blockLoaded(odb::dbBlock* block)
   }
   auto scroll = new LayoutScroll(
       viewer, default_mouse_wheel_zoom_, arrow_keys_scroll_step_, this);
-  viewer->blockLoaded(block);
+  viewer->chipLoaded(chip);
 
-  auto tech = block->getTech();
-  const auto name = fmt::format("{} ({})", block->getName(), tech->getName());
+  auto tech = chip->getTech();
+  const auto name
+      = fmt::format("{} ({})", chip->getName(), tech ? tech->getName() : "-");
   addTab(scroll, name.c_str());
 
   updateBackgroundColor(viewer);
@@ -131,7 +132,7 @@ void LayoutTabs::tabChange(int index)
 {
   current_viewer_ = viewers_[index];
 
-  emit setCurrentBlock(current_viewer_->getBlock());
+  emit setCurrentChip(current_viewer_->getChip());
 }
 
 void LayoutTabs::setLogger(utl::Logger* logger)

src/gui/src/layoutTabs.h

@@ -71,7 +71,7 @@ class LayoutTabs : public QTabWidget
   void clearNetTracks();
 
  signals:
-  void setCurrentBlock(odb::dbBlock* block);
+  void setCurrentChip(odb::dbChip* chip);
   void newViewer(LayoutViewer* viewer);
 
   // These are just forwarding from the LayoutViewer(s).  Only the
@@ -95,7 +95,7 @@ class LayoutTabs : public QTabWidget
   void zoomIn();
   void zoomOut();
   void zoomTo(const odb::Rect& rect_dbu);
-  void blockLoaded(odb::dbBlock* block);
+  void chipLoaded(odb::dbChip* chip);
   void fit();
   void fullRepaint();
   void startRulerBuild();