Changeset 0268aed in sasview for src/sas/qtgui/Plotter.py

Timestamp:

Mar 29, 2017 8:02:34 AM (7 years ago)

Author:

Piotr Rozyczko <rozyczko@…>

Branches:

ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc

Children:

7d077d1

Parents:

6fd4e36

Message:

Plotting residuals in fitting.
PlotHelper? updates.
Minor refactoring.

File:

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

src/sas/qtgui/Plotter.py

@@ -530 +530 @@
         """
         # Check that the LEFT button was pressed
-        if event.button == 1:
-            self.leftdown = True
-            ax = event.inaxes
-            for text in self.textList:
-                if text.contains(event)[0]: # If user has clicked on text
-                    self.selectedText = text
-                    return
-
-            if ax != None:
-                self.xInit, self.yInit = event.xdata, event.ydata
-                try:
-                    self.x_click = float(event.xdata)  # / size_x
-                    self.y_click = float(event.ydata)  # / size_y
-                except:
-                    self.position = None
+        if event.button != 1:
+            return
+
+        self.leftdown = True
+        for text in self.textList:
+            if text.contains(event)[0]: # If user has clicked on text
+                self.selectedText = text
+                return
+        if event.inaxes is None:
+            return
+        try:
+            self.x_click = float(event.xdata)  # / size_x
+            self.y_click = float(event.ydata)  # / size_y
+        except:
+            self.position = None
 
     def onMplMouseUp(self, event):
@@ -556 +556 @@
         if event.button == 1:
             self.leftdown = False
-            #self.leftup = True
             self.selectedText = None
 
@@ -572 +571 @@
             return
 
-        if self.leftdown and self.selectedText is not None:
-            # User has clicked on text and is dragging
-            ax = event.inaxes
-            if ax != None:
-                # Only move text if mouse is within axes
-                self.selectedText.set_position((event.xdata, event.ydata))
-                self.canvas.draw_idle()
-            else:
-                # User has dragged outside of axes
-                self.selectedText = None
-            return
+        #if self.leftdown and self.selectedText is not None:
+        if self.leftdown or self.selectedText is None:
+            return
+        # User has clicked on text and is dragging
+        if event.inaxes is  None:
+            # User has dragged outside of axes
+            self.selectedText = None
+        else:
+            # Only move text if mouse is within axes
+            self.selectedText.set_position((event.xdata, event.ydata))
+            self.canvas.draw_idle()
+        return
 
     def onMplPick(self, event):
@@ -589 +589 @@
         """
         legend = self.legend
-        if event.artist == legend:
-            # Get the box of the legend.
-            bbox = self.legend.get_window_extent()
-            # Get mouse coordinates at time of pick.
-            self.mouse_x = event.mouseevent.x
-            self.mouse_y = event.mouseevent.y
-            # Get legend coordinates at time of pick.
-            self.legend_x = bbox.xmin
-            self.legend_y = bbox.ymin
-            # Indicate we picked up the legend.
-            self.gotLegend = 1
-
-            #self.legend.legendPatch.set_alpha(0.5)
+        if event.artist != legend:
+            return
+        # Get the box of the legend.
+        bbox = self.legend.get_window_extent()
+        # Get mouse coordinates at time of pick.
+        self.mouse_x = event.mouseevent.x
+        self.mouse_y = event.mouseevent.y
+        # Get legend coordinates at time of pick.
+        self.legend_x = bbox.xmin
+        self.legend_y = bbox.ymin
+        # Indicate we picked up the legend.
+        self.gotLegend = 1
+
+        #self.legend.legendPatch.set_alpha(0.5)
 
     def onLegendMotion(self, event):