Fix traceback when calling itemsBoundingRect()

GNS3 · Jul 31, 2024 · 1844bc0 · 1844bc0
1 parent 80360c0
commit 1844bc0
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/gns3/graphics_view.py b/gns3/graphics_view.py
@@ -127,10 +127,10 @@ def setZoom(self, zoom):
             self.scale(factor, factor)
 
             # Calculate the bounding rectangle of all items
-            bounding_rect = self.scene.itemsBoundingRect()
+            bounding_rect = self.scene().itemsBoundingRect()
 
             # Set the scene rectangle to the bounding rectangle
-            self.scene.setSceneRect(bounding_rect)
+            self.scene().setSceneRect(bounding_rect)
 
     def setNodeGridSize(self, grid_size):
         """

diff --git a/gns3/main_window.py b/gns3/main_window.py
@@ -754,11 +754,13 @@ def _zoomInActionSlot(self):
         self.uiGraphicsView.scaleView(factor_in)
         self._updateZoomSettings()
 
+        scene = self.uiGraphicsView.scene()
+
         # Calculate the bounding rectangle of all items
-        bounding_rect = self.scene.itemsBoundingRect()
+        bounding_rect = scene.itemsBoundingRect()
 
         # Set the scene rectangle to the bounding rectangle
-        self.scene.setSceneRect(bounding_rect)
+        scene.setSceneRect(bounding_rect)
 
     def _zoomOutActionSlot(self):
         """
@@ -769,11 +771,13 @@ def _zoomOutActionSlot(self):
         self.uiGraphicsView.scaleView(factor_out)
         self._updateZoomSettings()
 
+        scene = self.uiGraphicsView.scene()
+
         # Calculate the bounding rectangle of all items
-        bounding_rect = self.scene.itemsBoundingRect()
+        bounding_rect = scene.itemsBoundingRect()
 
         # Set the scene rectangle to the bounding rectangle
-        self.scene.setSceneRect(bounding_rect)
+        scene.setSceneRect(bounding_rect)
 
     def _zoomResetActionSlot(self):
         """
@@ -783,11 +787,13 @@ def _zoomResetActionSlot(self):
         self.uiGraphicsView.resetTransform()
         self._updateZoomSettings()
 
+        scene = self.uiGraphicsView.scene()
+
         # Calculate the bounding rectangle of all items
-        bounding_rect = self.scene.itemsBoundingRect()
+        bounding_rect = scene.itemsBoundingRect()
 
         # Set the scene rectangle to the bounding rectangle
-        self.scene.setSceneRect(bounding_rect)
+        scene.setSceneRect(bounding_rect)
 
     def _fitInViewActionSlot(self):
         """