Changes in src/sas/qtgui/Plotting/Plotter2D.py [133812c7:c30822c] in sasview

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)
 
         self.manager.communicator.plotUpdateSignal.emit([new_plot])
-
         self.manager.communicator.forcePlotDisplaySignal.emit([item, new_plot])
 
-        # Show the plot
+    def updateCircularAverage(self):
+        """
+        Update circular averaging 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
+        ca_caption = '2daverage'+self.data.name
+        # 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
+        # return prematurely if no circular average plot found
+        if not has_plot: 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):
@@ -536 +574 @@
         self.plot(data=new_plot)
 
+    def onMplMouseDown(self, event):
+        """
+        Display x/y/intensity on click
+        """
+        # Check that the LEFT button was pressed
+        if event.button != 1:
+            return
+
+        if event.inaxes is None:
+            return
+        x_click = 0.0
+        y_click = 0.0
+        try:
+            x_click = float(event.xdata)  # / size_x
+            y_click = float(event.ydata)  # / size_y
+        except:
+            self.position = None
+        x_str = GuiUtils.formatNumber(x_click)
+        y_str = GuiUtils.formatNumber(y_click)
+        coord_str = "x: {}, y: {}".format(x_str, y_str)
+        self.manager.communicator.statusBarUpdateSignal.emit(coord_str)
 
 class Plotter2D(QtWidgets.QDialog, Plotter2DWidget):