Proper implementation of individual deletion

Author: jellybean2004

src/sas/qtgui/Plotting/SlicerParameters.py

@@ -406,9 +406,9 @@ def onDelete(self):
         # Remove the slicer from the dictionary
         if slicer_item in self.parent.slicers:
             slicer_obj = self.parent.slicers[slicer_item]
-            # Clear the slicer from the plot
-            if hasattr(slicer_obj, 'clear'):
-                slicer_obj.clear()
+            # Clear only this slicer's markers without affecting other slicers
+            # Use clear_markers() which uses connect.clear(*markers) instead of clearall()
+            self._clear_slicer_markers(slicer_obj)
             # Remove from dictionary
             del self.parent.slicers[slicer_item]
             # Remove from slicer_models cache
@@ -578,6 +578,17 @@ def onHelp(self):
         url = "/user/qtgui/MainWindow/graph_help.html#d-data-averaging"
         self.manager.parent.showHelp(url)
 
+    def _clear_slicer_markers(self, slicer_obj):
+        """
+        Clear the slicer by calling its clear() method.
+        The slicer's clear() method handles all cleanup for that specific slicer type.
+        """
+        if hasattr(slicer_obj, 'clear'):
+            try:
+                slicer_obj.clear()
+            except (ValueError, AttributeError):
+                pass
+
     def updateSlicersList(self):
         """
         Update the slicers list when slicers are added or removed

src/sas/qtgui/Plotting/Slicers/AnnulusSlicer.py

@@ -333,10 +333,6 @@ def clear(self):
             self.inner_circle.remove()
         except (ValueError, AttributeError):
             pass
-        try:
-            self.base.connect.clearall()
-        except (ValueError, AttributeError):
-            pass
 
     def get_radius(self):
         """

src/sas/qtgui/Plotting/Slicers/BoxSlicer.py

@@ -138,10 +138,6 @@ def clear(self):
             self.vertical_lines.clear()
         except (ValueError, AttributeError):
             pass
-        try:
-            self.base.connect.clearall()
-        except (ValueError, AttributeError):
-            pass
         try:
             self.center.clear()
         except (ValueError, AttributeError):
@@ -526,9 +522,18 @@ def clear(self):
         """
         Clear this figure and its markers
         """
-        self.clear_markers()
-        self.center.remove()
-        self.center_marker.remove()
+        try:
+            self.clear_markers()
+        except (ValueError, AttributeError):
+            pass
+        try:
+            self.center.remove()
+        except (ValueError, AttributeError):
+            pass
+        try:
+            self.center_marker.remove()
+        except (ValueError, AttributeError):
+            pass
 
     def update(self, center_x=None, center_y=None):
         """
@@ -854,10 +859,22 @@ def clear(self):
         """
         Clear this figure and its markers
         """
-        self.clear_markers()
-        self.top_marker.remove()
-        self.bottom_line.remove()
-        self.top_line.remove()
+        try:
+            self.clear_markers()
+        except (ValueError, AttributeError):
+            pass
+        try:
+            self.top_marker.remove()
+        except (ValueError, AttributeError):
+            pass
+        try:
+            self.bottom_line.remove()
+        except (ValueError, AttributeError):
+            pass
+        try:
+            self.top_line.remove()
+        except (ValueError, AttributeError):
+            pass
 
     def update(self, x1=None, x2=None, y1=None, y2=None, half_width=None, half_height=None, center=None):
         """

src/sas/qtgui/Plotting/Slicers/BoxSum.py

@@ -182,10 +182,6 @@ def clear(self):
             self.center.clear()
         except (ValueError, AttributeError):
             pass
-        try:
-            self.base.connect.clearall()
-        except (ValueError, AttributeError):
-            pass
 
     def update(self):
         """

src/sas/qtgui/Plotting/Slicers/SectorSlicer.py

@@ -94,10 +94,6 @@ def clear(self):
             self.right_line.clear()
         except (ValueError, AttributeError):
             pass
-        try:
-            self.base.connect.clearall()
-        except (ValueError, AttributeError):
-            pass
 
     def update(self):
         """
@@ -378,12 +374,12 @@ def clear(self):
         try:
             self.inner_marker.remove()
             self.outer_marker.remove()
-            for line in list(self.axes.lines):
-                line.remove()
-        except:
-            # Old version of matplotlib
-            for item in range(len(self.axes.lines)):
-                del self.axes.lines[0]
+        except (ValueError, AttributeError):
+            pass
+        try:
+            self.line.remove()
+        except (ValueError, AttributeError):
+            pass
 
     def update(self, phi=None, delta=None, mline=None, side=False, left=False, right=False):
         """
@@ -569,8 +565,7 @@ def clear(self):
         except (ValueError, AttributeError):
             pass
         try:
-            for line in list(self.axes.lines):
-                line.remove()
+            self.line.remove()
         except (ValueError, AttributeError):
             pass
 

src/sas/qtgui/Plotting/Slicers/WedgeSlicer.py

@@ -96,26 +96,10 @@ def clear(self):
         """
         self.averager = None
         self.clear_markers()
-        try:
-            self.outer_arc.clear()
-        except (ValueError, AttributeError):
-            pass
-        try:
-            self.inner_arc.clear()
-        except (ValueError, AttributeError):
-            pass
-        try:
-            self.radial_lines.clear()
-        except (ValueError, AttributeError):
-            pass
-        try:
-            self.central_line.clear()
-        except (ValueError, AttributeError):
-            pass
-        try:
-            self.base.connect.clearall()
-        except (ValueError, AttributeError):
-            pass
+        self.outer_arc.clear()
+        self.inner_arc.clear()
+        self.radial_lines.clear()
+        self.central_line.clear()
 
     def update(self):
         """