Slicer extension 1344

src/sas/qtgui/Plotting/Plotter2D.py

@@ -136,6 +136,7 @@ def plot(self, data=None, marker=None, show_colorbar=True, update=False):
                       update=update)
 
         self.updateCircularAverage()
+        self.updateSlicer()
 
     def calculateDepth(self):
         """
@@ -338,8 +339,7 @@ def circularAverage(self):
         else:
             new_plot.yaxis("\\rm{Intensity} ", "cm^{-1}")
 
-        new_plot.group_id = "2daverage" + self.data0.name
-        new_plot.id = "Circ avg " + self.data0.name
+        new_plot.id = "2daverage" + self.data0.name
         new_plot.is_data = True
 
         return new_plot
@@ -375,8 +375,8 @@ def updateCircularAverage(self):
         # See if current item plots contain 2D average plot
         has_plot = False
         for plot in plots:
-            if plot.group_id is None: continue
-            if ca_caption in plot.group_id: has_plot = True
+            if plot.id is None: continue
+            if ca_caption in plot.id: has_plot = True
         # return prematurely if no circular average plot found
         if not has_plot: return
 
@@ -388,6 +388,32 @@ def updateCircularAverage(self):
         # Show the new plot, if already visible
         self.manager.communicator.plotUpdateSignal.emit([new_plot])
 
+    def updateSlicer(self):
+        """
+        Update slicer plot on Data2D change
+        """
+        if not hasattr(self, '_item'): return
+        item = self._item
+        if self._item.parent() is not None:
+            item = self._item.parent()
+
+        # Get all plots for current item
+        plots = GuiUtils.plotsFromModel("", item)
+        if plots is None: return
+        slicer_caption = 'Slicer' + self.data0.name
+        # See if current item plots contain slicer plot
+        has_plot = False
+        for plot in plots:
+            if not hasattr(plot, 'type_id') or plot.type_id is None: continue
+            if slicer_caption in plot.type_id: has_plot = True
+        # return prematurely if no slicer plot found
+        if not has_plot: return
+
+        # Now that we've identified the right plot, update the 2D data the slicer uses
+        self.slicer.data = self.data0
+        # Replot now that the 2D data is updated
+        self.slicer._post_data()
+
     def setSlicer(self, slicer, reset=True):
         """
         Clear the previous slicer and create a new one.
@@ -396,6 +422,65 @@ def setSlicer(self, slicer, reset=True):
         # Clear current slicer
         if self.slicer is not None:
             self.slicer.clear()
+
+        # Clear the old slicer plots so they don't reappear later
+        if hasattr(self, '_item'):
+            item = self._item
+            if self._item.parent() is not None:
+                item = self._item.parent()
+
+            # Go through all items and see if they are a plot. The checks done here are not as thorough
+            # as GuiUtils.deleteRedundantPlots (which this takes a lot from). Will this cause problems?
+            # Primary concern is the check (plot_data.plot_role == DataRole.ROLE_DELETABLE) as I don't
+            # know what it does. The other checks seem to be related to keeping the new plots for that function
+            # TODO: generalize this and put it in GuiUtils so that we can use it elsewhere
+            tempPlotsToRemove = []
+            slicer_type_id = 'Slicer' + self.data0.name
+            for itemIndex in range(item.rowCount()):
+                # GuiUtils.plotsFromModel tests if the data is of type Data1D or Data2D to determine
+                # if it is a plot, so let's try that
+                if isinstance(item.child(itemIndex).data(), (Data1D, Data2D)):
+                    # First take care of this item, then we'll take care of its children
+                    if hasattr(item.child(itemIndex).data(), 'type_id'):
+                        if slicer_type_id in item.child(itemIndex).data().type_id:
+                            # At the time of writing, this should never be the case, but at some point the slicers may
+                            # have relevant children (e.g. plots). We don't want to delete these slicers.
+                            tempHasImportantChildren = False
+                            for tempChildCheck in range(item.child(itemIndex).rowCount()):
+                                # The data explorer uses the "text" attribute to set the name. If this has text='' then
+                                # it can be deleted.
+                                if item.child(itemIndex).child(tempChildCheck).text():
+                                    tempHasImportantChildren = True
+                            if not tempHasImportantChildren:
+                                # Store this plot to be removed later. Removing now
+                                # will cause the next plot to be skipped
+                                tempPlotsToRemove.append(item.child(itemIndex))
+                # It looks like the slicers are children of items that do not have data of instance Data1D or Data2D.
+                # Now do the children (1 level deep as is done in GuiUtils.plotsFromModel). Note that the slicers always
+                # seem to be the first entry (index2 == 0)
+                for itemIndex2 in range(item.child(itemIndex).rowCount()):
+                    # Repeat what we did above (these if statements could probably be combined
+                    # into one, but I'm not confident enough with how these work to say it wouldn't
+                    # have issues if combined)
+                    if isinstance(item.child(itemIndex).child(itemIndex2).data(), (Data1D, Data2D)):
+                        if hasattr(item.child(itemIndex).child(itemIndex2).data(), 'type_id'):
+                            if slicer_type_id in item.child(itemIndex).child(itemIndex2).data().type_id:
+                                # Check for children we might want to keep (see the above loop)
+                                tempHasImportantChildren = False
+                                for tempChildCheck in range(item.child(itemIndex).child(itemIndex2).rowCount()):
+                                    # The data explorer uses the "text" attribute to set the name. If this has text=''
+                                    # then it can be deleted.
+                                    if item.child(itemIndex).child(itemIndex2).child(tempChildCheck).text():
+                                        tempHasImportantChildren = True
+                                if not tempHasImportantChildren:
+                                    # Remove the parent since each slicer seems to generate a new entry in item
+                                    tempPlotsToRemove.append(item.child(itemIndex))
+            # Remove all the parent plots with matching criteria
+            for plot in tempPlotsToRemove:
+                item.removeRow(plot.row())
+            # Delete the temporary list of plots to remove
+            del tempPlotsToRemove
+
         # Create a new slicer
         self.slicer_z += 1
         self.slicer = slicer(self, self.ax, item=self._item, zorder=self.slicer_z)

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

@@ -138,8 +138,8 @@ def _post_data(self, nbins=None):
             new_plot.ytransform = 'y'
             new_plot.yaxis("\\rm{Residuals} ", "/")
 
-        new_plot.group_id = "AnnulusPhi" + self.data.name
         new_plot.id = "AnnulusPhi" + self.data.name
+        new_plot.type_id = "Slicer" + self.data.name # Used to remove plots after changing slicer so they don't keep showing up after closed
         new_plot.is_data = True
         new_plot.xtransform = "x"
         new_plot.ytransform = "y"

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

@@ -1,3 +1,5 @@
+import logging
+
 interface_color = 'black'
 disable_color = 'gray'
 active_color = 'red'
@@ -138,8 +140,6 @@ def onDrag(self, ev):
         if inside:
             self.clickx, self.clicky = ev.xdata, ev.ydata
             self.move(ev.xdata, ev.ydata, ev)
-        else:
-            self.restore(ev)
         return True
 
     def onKey(self, ev):