Changeset 87ca467 in sasview

Timestamp:

Nov 19, 2018 8:34:03 AM (6 years ago)

Author:

Piotr Rozyczko <piotr.rozyczko@…>

Branches:

ESS_GUI, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc

Children:

8c85ac1

Parents:

a2b8607

Message:

Update circular average plot on 2D chart redraw. Show the updated plot
if graph visible - SASVIEW-1205

File:

• src/sas/qtgui/Plotting/Plotter2D.py (modified) (4 diffs)

src/sas/qtgui/Plotting/Plotter2D.py

@@ -107 +107 @@
                       zmax=zmax_2D_temp, show_colorbar=show_colorbar,
                       update=update)
+
+        self.updateCircularAverage()
 
     def calculateDepth(self):
@@ -240 +242 @@
         self.slicer_widget.show()
 
-    def onCircularAverage(self):
-        """
-        Perform circular averaging on Data2D
+    def circularAverage(self):
+        """
+        Calculate the circular average and create the Data object for it
         """
         # Find the best number of bins
@@ -281 +283 @@
         new_plot.id = "Circ avg " + self.data.name
         new_plot.is_data = True
+
+        return new_plot
+
+    def onCircularAverage(self):
+        """
+        Perform circular averaging on Data2D
+        """
+        new_plot = self.circularAverage()
+
         item = self._item
         if self._item.parent() is not None:
             item = self._item.parent()
+
         GuiUtils.updateModelItemWithPlot(item, new_plot, new_plot.id)
 
@@ -290 +302 @@
         self.manager.communicator.forcePlotDisplaySignal.emit([item, new_plot])
 
-        # Show the plot
+    def updateCircularAverage(self):
+        """
+        Update circular averaging plot on Data2D change
+        """
+        item = self._item
+        if self._item.parent() is not None:
+            item = self._item.parent()
+
+        # Get all plots for current item
+        plots = GuiUtils.plotsFromModel("", item)
+        ca_caption = '2daverage'+self.data.name
+        # See if current item plots contain 2D average plot
+        test = [ca_caption in plot.group_id for plot in plots]
+        # return prematurely if no circular average plot found
+        if not any(test): return
+
+        # Create a new plot
+        new_plot = self.circularAverage()
+
+        # Overwrite existing plot
+        GuiUtils.updateModelItemWithPlot(item, new_plot, new_plot.id)
+        # Show the new plot, if already visible
+        self.manager.communicator.plotUpdateSignal.emit([new_plot])
 
     def setSlicer(self, slicer):