Add zoom to fit when selecting a new cell.

Signed-off-by: Chris Lavin <[email protected]>

Author: clavin-xlnx

src/com/xilinx/rapidwright/gui/NetlistBrowser.java

@@ -116,13 +116,14 @@ private void init() {
         addDockWidget(DockWidgetArea.RightDockWidgetArea, schematicWidget);
 
         schematicScene.objectSelected.connect(this, "selectFromSchematic(String)");
+        schematicScene.cellDrawn.connect(schematicView, "zoomToFit()");
     }
 
     public void selectNetlistItem(QModelIndex index) {
         QTreeWidgetItem item = treeWidget.getItemFromIndex(index);
         if (item instanceof HierCellInstTreeWidgetItem) {
             EDIFHierCellInst cellInst = ((HierCellInstTreeWidgetItem) item).getInst();
-            schematicScene.drawCell(cellInst);
+            schematicScene.drawCell(cellInst, true);
         } else if (item.data(0, 0) instanceof EDIFPort) {
             EDIFPort port = (EDIFPort) item.data(0, 0);
             schematicScene.selectObject(item.data(1, 0).toString(), true);

src/com/xilinx/rapidwright/gui/SchematicScene.java

@@ -96,6 +96,7 @@ public class SchematicScene extends QGraphicsScene {
     private Set<String> selectedObjects = new HashSet<>();
 
     public Signal1<String> objectSelected = new Signal1<>();
+    public Signal0 cellDrawn = new Signal0();
 
     private static QFont FONT = new QFont("Arial", 8);
     private static QFont BUTTON_TEXT_FONT = new QFont("Arial", 10, QFont.Weight.Bold.value());
@@ -168,7 +169,7 @@ private void applyElkNodeProperties(ElkNode root) {
         root.setProperty(CoreOptions.SPACING_EDGE_NODE, EDGE_TO_NODE_SPACING);
     }
 
-    public void drawCell(EDIFHierCellInst cellInst) {
+    public void drawCell(EDIFHierCellInst cellInst, boolean zoomFit) {
         clear();
         portInstMap.clear();
         elkNodeTopPortMap.clear();
@@ -185,6 +186,9 @@ public void drawCell(EDIFHierCellInst cellInst) {
         engine.layout(elkRoot, monitor);
 
         renderSchematic();
+        if (zoomFit) {
+            cellDrawn.emit();
+        }
     }
 
     public void renderSchematic() {
@@ -700,7 +704,8 @@ private void toggleCellInstExpansion(String cellInstName) {
         } else {
             expandedCellInsts.add(cellInstName);
         }
-        drawCell(currCellInst);
+        boolean zoomFit = false;
+        drawCell(currCellInst, zoomFit);
     }
 
     private void toggleSelection(String lookup, boolean multipleSelection) {

src/com/xilinx/rapidwright/gui/SchematicView.java

@@ -24,7 +24,9 @@
 
 import com.trolltech.qt.core.QPoint;
 import com.trolltech.qt.core.QPointF;
+import com.trolltech.qt.core.QRectF;
 import com.trolltech.qt.core.Qt;
+import com.trolltech.qt.core.Qt.AspectRatioMode;
 import com.trolltech.qt.core.Qt.CursorShape;
 import com.trolltech.qt.core.Qt.Key;
 import com.trolltech.qt.gui.QCursor;
@@ -159,4 +161,21 @@ public void zoomOut() {
         if (this.matrix().m11() > zoomMin)
             scale(1.0 / scaleFactor, 1.0 / scaleFactor);
     }
+
+    public void zoomToFit() {
+        QRectF sceneRect = scene().sceneRect();
+        if (sceneRect != null) {
+            fitInView(sceneRect, AspectRatioMode.KeepAspectRatio);
+            double zoom = this.matrix().m11();
+            if (zoom > zoomMax) {
+                resetMatrix();
+                scale(zoomMax, zoomMax);
+                fitInView(sceneRect, AspectRatioMode.KeepAspectRatio);
+            } else if (zoom < zoomMin) {
+                resetMatrix();
+                scale(zoomMin, zoomMin);
+                fitInView(sceneRect, AspectRatioMode.KeepAspectRatio);
+            }
+        }
+    }
 }