Changeset 6d4cf68 in sasview for src/sas

Timestamp:

Sep 15, 2016 8:33:57 AM (8 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:

d6e36e44

Parents:

813220f

git-author:

Lewis O'Driscoll <lewis.o'driscoll@…> (08/15/16 11:21:17)

git-committer:

Piotr Rozyczko <rozyczko@…> (09/15/16 08:33:57)

Message:

Allow repositioning of PlotPanel? text (fixes #445)

Text can be moved by clicking on it and dragging

File:

• src/sas/sasgui/plottools/PlotPanel.py (modified) (4 diffs)

src/sas/sasgui/plottools/PlotPanel.py

@@ -150 +150 @@
         #List of texts currently on the plot
         self.textList = []
+        self.selectedText = None
         #User scale
         if xtransform != None:
@@ -352 +353 @@
             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
@@ -373 +379 @@
             self.mousemotion = False
             self.leftup = True
+            self.selectedText = None
 
         #release the legend
@@ -448 +455 @@
             self._on_legend_motion(event)
             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._dragHelper(0, 0)
+            else:
+                # User has dragged outside of axes
+                self.selectedText = None
+            return
+
         if self.enable_toolbar:
             #Disable dragging without the toolbar to allow zooming with toolbar