Refactor out the unique plot ID generation for slicers

Author: jellybean2004

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

@@ -3,6 +3,7 @@
 import sas.qtgui.Utilities.GuiUtils as GuiUtils
 from sas.qtgui.Plotting.PlotterData import Data1D, DataRole
 from sas.qtgui.Plotting.SlicerModel import SlicerModel
+from sas.qtgui.Plotting.Slicers.SlicerUtils import generate_unique_plot_id
 
 from .BaseInteractor import BaseInteractor
 
@@ -137,21 +138,7 @@ def _post_data(self, nbins=None):
         # Assign unique id per slicer instance and use it as the display name
         if self._plot_id is None:
             base_id = "AnnulusPhi" + self.data.name
-            parent_item = self._item
-            if self._item.parent() is not None:
-                parent_item = self._item.parent()
-            existing = 0
-            for i in range(parent_item.rowCount()):
-                it = parent_item.child(i)
-                d = it.data()
-                if hasattr(d, "id") and isinstance(d.id, str) and d.id.startswith(base_id):
-                    existing += 1
-                for j in range(it.rowCount()):
-                    it2 = it.child(j)
-                    d2 = it2.data()
-                    if hasattr(d2, "id") and isinstance(d2.id, str) and d2.id.startswith(base_id):
-                        existing += 1
-                self._plot_id = base_id if existing == 0 else f"{base_id}_{existing+1}"
+            self._plot_id = generate_unique_plot_id(base_id, self._item)
 
         new_plot.id = self._plot_id
         new_plot.name = new_plot.id

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

@@ -6,6 +6,7 @@
 from sas.qtgui.Plotting.PlotterData import Data1D
 from sas.qtgui.Plotting.SlicerModel import SlicerModel
 from sas.qtgui.Plotting.Slicers.BaseInteractor import BaseInteractor
+from sas.qtgui.Plotting.Slicers.SlicerUtils import generate_unique_plot_id
 
 logger = logging.getLogger(__name__)
 
@@ -262,21 +263,7 @@ def _post_data(self, new_slab=None, nbins=None, direction=None):
         # Assign unique id per slicer instance and use it as the display name
         if self._plot_id is None:
             base_id = "BoxAverage" + self.data.name
-            parent_item = self._item
-            if self._item.parent() is not None:
-                parent_item = self._item.parent()
-            existing = 0
-            for i in range(parent_item.rowCount()):
-                it = parent_item.child(i)
-                d = it.data()
-                if hasattr(d, "id") and isinstance(d.id, str) and d.id.startswith(base_id):
-                    existing += 1
-                for j in range(it.rowCount()):
-                    it2 = it.child(j)
-                    d2 = it2.data()
-                    if hasattr(d2, "id") and isinstance(d2.id, str) and d2.id.startswith(base_id):
-                        existing += 1
-            self._plot_id = base_id if existing == 0 else f"{base_id}_{existing+1}"
+            self._plot_id = generate_unique_plot_id(base_id, self._item)
 
         new_plot.id = self._plot_id
         new_plot.name = self._plot_id

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

@@ -4,6 +4,7 @@
 from sas.qtgui.Plotting.PlotterData import Data1D
 from sas.qtgui.Plotting.SlicerModel import SlicerModel
 from sas.qtgui.Plotting.Slicers.BaseInteractor import BaseInteractor
+from sas.qtgui.Plotting.Slicers.SlicerUtils import generate_unique_plot_id
 
 MIN_PHI = 0.05
 
@@ -174,22 +175,7 @@ def _post_data(self, nbins=None):
         # Assign unique id per slicer instance and use it as the display name
         if self._plot_id is None:
             base_id = "SectorQ" + self.data.name
-            if self._item.parent() is None:
-                parent_item = self._item
-            else:
-                parent_item = self._item.parent()
-            existing = 0
-            for i in range(parent_item.rowCount()):
-                it = parent_item.child(i)
-                d = it.data()
-                if hasattr(d, "id") and isinstance(d.id, str) and d.id.startswith(base_id):
-                    existing += 1
-                for j in range(it.rowCount()):
-                    it2 = it.child(j)
-                    d2 = it2.data()
-                    if hasattr(d2, "id") and isinstance(d2.id, str) and d2.id.startswith(base_id):
-                        existing += 1
-            self._plot_id = base_id if existing == 0 else f"{base_id}_{existing+1}"
+            self._plot_id = generate_unique_plot_id(base_id, self._item)
 
         new_plot.id = self._plot_id
         new_plot.name = new_plot.id

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

@@ -0,0 +1,27 @@
+"""
+Utility functions for slicers
+"""
+
+def generate_unique_plot_id(base_id, item):
+    """
+    Generate a unique plot ID by checking existing plots in the data tree.
+
+    :param base_id: The base identifier string (e.g., "SectorQ" + data.name)
+    :param item: The current item in the data explorer tree
+    :return: A unique ID string, either base_id or base_id_N where N is a number
+    """
+    parent_item = item if item.parent() is None else item.parent()
+
+    existing = 0
+    for i in range(parent_item.rowCount()):
+        it = parent_item.child(i)
+        d = it.data()
+        if hasattr(d, "id") and isinstance(d.id, str) and d.id.startswith(base_id):
+            existing += 1
+        for j in range(it.rowCount()):
+            it2 = it.child(j)
+            d2 = it2.data()
+            if hasattr(d2, "id") and isinstance(d2.id, str) and d2.id.startswith(base_id):
+                existing += 1
+
+    return base_id if existing == 0 else f"{base_id}_{existing + 1}"

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

@@ -7,6 +7,7 @@
 from sas.qtgui.Plotting.Slicers.BaseInteractor import BaseInteractor
 from sas.qtgui.Plotting.Slicers.RadiusInteractor import RadiusInteractor
 from sas.qtgui.Plotting.Slicers.SectorSlicer import LineInteractor
+from sas.qtgui.Plotting.Slicers.SlicerUtils import generate_unique_plot_id
 
 
 class WedgeInteractor(BaseInteractor, SlicerModel):
@@ -213,19 +214,7 @@ def _post_data(self, new_sector=None, nbins=None):
         # Assign unique id per slicer instance and use it as the display name
         if self.plot_id is None:
             base_id = "Wedge" + self.averager.__name__ + self.data.name
-            parent_item = self._item if self._item.parent() is None else self._item.parent()
-            existing = 0
-            for i in range(parent_item.rowCount()):
-                item = parent_item.child(i)
-                data = item.data()
-                if hasattr(data, "id") and isinstance(data.id, str) and data.id.startswith(base_id):
-                    existing += 1
-                for j in range(item.rowCount()):
-                    item2 = item.child(j)
-                    data2 = item2.data()
-                    if hasattr(data2, "id") and isinstance(data2.id, str) and data2.id.startswith(base_id):
-                        existing += 1
-            self.plot_id = base_id if existing == 0 else f"{base_id}_{existing+1}"
+            self.plot_id = generate_unique_plot_id(base_id, self._item)
 
         new_plot.id = self.plot_id
         new_plot.name = new_plot.id