napari · Czaki · Oct 21, 2024 · Oct 15, 2024 · Oct 15, 2024 · Oct 15, 2024
@@ -722,6 +722,7 @@ def remove(self, index, renumber=True):
                 self._mesh.vertices_index[indices, 0] - 1
             )
             self._update_z_order()
+        self._clear_cache()
 
     @_batch_dec
     def _update_mesh_vertices(self, index, edge=False, face=False):
@@ -756,6 +757,7 @@ def _update_mesh_vertices(self, index, edge=False, face=False):
             indices = self._index == index
             self._vertices[indices] = shape.data_displayed
             self._update_displayed()
+        self._clear_cache()
 
     @_batch_dec
     def _update_z_order(self):

@@ -33,26 +33,45 @@ def test_rectangle():
     assert shape.slice_key.shape == (2, 0)
 
 
+def test_rectangle_bounding_box():
+    """Test that the bounding box is correctly updated based on edge width."""
+    data = [[10, 10], [20, 20]]
+    shape = Rectangle(data)
+    npt.assert_array_equal(
+        shape.bounding_box, np.array([[9.5, 9.5], [20.5, 20.5]])
+    )
+    shape.edge_width = 2
+    npt.assert_array_equal(shape.bounding_box, np.array([[9, 9], [21, 21]]))
+    shape.edge_width = 4
+    npt.assert_array_equal(shape.bounding_box, np.array([[8, 8], [22, 22]]))
+
+
 def test_rectangle_shift():
     shape = Rectangle(np.array([[0, 0], [1, 0], [1, 1], [0, 1]]))
-    npt.assert_array_equal(shape.bounding_box, np.array([[0, 0], [1, 1]]))
+    npt.assert_array_equal(
+        shape.bounding_box, np.array([[-0.5, -0.5], [1.5, 1.5]])
+    )
 
     shape.shift((1, 1))
     npt.assert_array_equal(
         shape.data, np.array([[1, 1], [2, 1], [2, 2], [1, 2]])
     )
-    npt.assert_array_equal(shape.bounding_box, np.array([[1, 1], [2, 2]]))
+    npt.assert_array_equal(
+        shape.bounding_box, np.array([[0.5, 0.5], [2.5, 2.5]])
+    )
 
 
 def test_rectangle_rotate():
     shape = Rectangle(np.array([[1, 2], [-1, 2], [-1, -2], [1, -2]]))
-    npt.assert_array_equal(shape.bounding_box, np.array([[-1, -2], [1, 2]]))
+    npt.assert_array_equal(
+        shape.bounding_box, np.array([[-1.5, -2.5], [1.5, 2.5]])
+    )
     shape.rotate(-90)
     npt.assert_array_almost_equal(
         shape.data, np.array([[-2, 1], [-2, -1], [2, -1], [2, 1]])
     )
     npt.assert_array_almost_equal(
-        shape.bounding_box, np.array([[-2, -1], [2, 1]])
+        shape.bounding_box, np.array([[-2.5, -1.5], [2.5, 1.5]])
     )
 
 
@@ -247,22 +266,28 @@ def test_nD_ellipse():
 
 def test_ellipse_shift():
     shape = Ellipse(np.array([[0, 0], [1, 0], [1, 1], [0, 1]]))
-    npt.assert_array_equal(shape.bounding_box, np.array([[0, 0], [1, 1]]))
+    npt.assert_array_equal(
+        shape.bounding_box, np.array([[-0.5, -0.5], [1.5, 1.5]])
+    )
 
     shape.shift((1, 1))
     npt.assert_array_equal(
         shape.data, np.array([[1, 1], [2, 1], [2, 2], [1, 2]])
     )
-    npt.assert_array_equal(shape.bounding_box, np.array([[1, 1], [2, 2]]))
+    npt.assert_array_equal(
+        shape.bounding_box, np.array([[0.5, 0.5], [2.5, 2.5]])
+    )
 
 
 def test_ellipse_rotate():
     shape = Ellipse(np.array([[1, 2], [-1, 2], [-1, -2], [1, -2]]))
-    npt.assert_array_equal(shape.bounding_box, np.array([[-1, -2], [1, 2]]))
+    npt.assert_array_equal(
+        shape.bounding_box, np.array([[-1.5, -2.5], [1.5, 2.5]])
+    )
     shape.rotate(-90)
     npt.assert_array_almost_equal(
         shape.data, np.array([[-2, 1], [-2, -1], [2, -1], [2, 1]])
     )
     npt.assert_array_almost_equal(
-        shape.bounding_box, np.array([[-2, -1], [2, 1]])
+        shape.bounding_box, np.array([[-2.5, -1.5], [2.5, 1.5]])
     )
@@ -168,7 +168,11 @@ def dims_displayed(self):
     @property
     def bounding_box(self) -> np.ndarray:
         """(2, N) array, bounding box of the object."""
-        return self._bounding_box[:, self.dims_displayed]
+        # We add +-0.5 to handle edge width
+        return self._bounding_box[:, self.dims_displayed] + [
+            [-0.5 * self.edge_width],
+            [0.5 * self.edge_width],
+        ]
 
     @property
     def dims_not_displayed(self):
@@ -341,6 +345,7 @@ def scale(self, scale, center=None):
         if center is None:
             self.transform(transform)
         else:
+            center = np.array(center)
             self.shift(-center)
             self.transform(transform)
             self.shift(center)
@@ -362,6 +367,7 @@ def rotate(self, angle, center=None):
         if center is None:
             self.transform(transform)
         else:
+            center = np.array(center)
             self.shift(-center)
             self.transform(transform)
             self.shift(center)

@@ -1,4 +1,5 @@
 import numpy as np
+import numpy.testing as npt
 import pytest
 
 from napari.layers.shapes._shape_list import ShapeList
@@ -23,6 +24,58 @@ def test_adding_to_shape_list():
     assert shape_list.shapes[0] == shape
 
 
+def test_reset_bounding_box_rotation():
+    """Test if rotating shape resets bounding box."""
+    shape = Rectangle(np.array([[0, 0], [10, 10]]))
+    shape_list = ShapeList()
+    shape_list.add(shape)
+    npt.assert_array_almost_equal(
+        shape_list._bounding_boxes, np.array([[[-0.5, -0.5]], [[10.5, 10.5]]])
+    )
+    shape_list.rotate(0, 45, (5, 5))
+    p = 5 * np.sqrt(2) + 0.5
+    npt.assert_array_almost_equal(
+        shape.bounding_box, np.array([[5 - p, 5 - p], [5 + p, 5 + p]])
+    )
+    npt.assert_array_almost_equal(
+        shape_list._bounding_boxes, shape.bounding_box[:, np.newaxis, :]
+    )
+
+
+def test_reset_bounding_box_shift():
+    """Test if shifting shape resets bounding box."""
+    shape = Rectangle(np.array([[0, 0], [10, 10]]))
+    shape_list = ShapeList()
+    shape_list.add(shape)
+    npt.assert_array_almost_equal(
+        shape_list._bounding_boxes, shape.bounding_box[:, np.newaxis, :]
+    )
+    shape_list.shift(0, np.array([5, 5]))
+    npt.assert_array_almost_equal(
+        shape.bounding_box, np.array([[4.5, 4.5], [15.5, 15.5]])
+    )
+    npt.assert_array_almost_equal(
+        shape_list._bounding_boxes, shape.bounding_box[:, np.newaxis, :]
+    )
+
+
+def test_reset_bounding_box_scale():
+    """Test if scaling shape resets the bounding box."""
+    shape = Rectangle(np.array([[0, 0], [10, 10]]))
+    shape_list = ShapeList()
+    shape_list.add(shape)
+    npt.assert_array_almost_equal(
+        shape_list._bounding_boxes, shape.bounding_box[:, np.newaxis, :]
+    )
+    shape_list.scale(0, 2, (5, 5))
+    npt.assert_array_almost_equal(
+        shape.bounding_box, np.array([[-5.5, -5.5], [15.5, 15.5]])
+    )
+    npt.assert_array_almost_equal(
+        shape_list._bounding_boxes, shape.bounding_box[:, np.newaxis, :]
+    )
+
+
 def test_shape_list_outline():
     """Test ShapeList outline method."""
     np.random.seed(0)