Changeset 9290b1a in sasview for src/sas/qtgui/Plotter.py

Timestamp:

Dec 16, 2016 12:43:18 PM (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:

d3ca363

Parents:

0ba0774

Message:

Added AddText? to plot, enabled legend drag - SASVIEW-378

File:

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

src/sas/qtgui/Plotter.py

@@ -2 +2 @@
 
 import matplotlib.pyplot as plt
-
+from matplotlib.font_manager import FontProperties
+
+from sas.sasgui.guiframe.dataFitting import Data1D
 from sas.sasgui.plottools import transform
 from sas.sasgui.plottools.convert_units import convert_unit
 from sas.qtgui.PlotterBase import PlotterBase
+from sas.qtgui.AddText import AddText
 
 class PlotterWidget(PlotterBase):
@@ -27 +30 @@
         self.title(title=value.title)
 
-    def plot(self, marker=None, linestyle=None, hide_error=False):
+    def plot(self, data=None, marker=None, linestyle=None, hide_error=False):
         """
         Plot self._data
         """
+        # Data1D
+        if isinstance(data, Data1D):
+            self.data = data
+        assert(self._data)
+
         # Shortcut for an axis
         ax = self.ax
@@ -45 +53 @@
                     marker=marker,
                     linestyle=linestyle,
-                    label=self._title)
+                    label=self._title,
+                    picker=True)
         else:
             ax.errorbar(self._data.view.x, self._data.view.y,
@@ -54 +63 @@
                         lolims=False, uplims=False,
                         xlolims=False, xuplims=False,
-                        label=self._title)
+                        label=self._title,
+                        picker=True)
 
         # Now add the legend with some customizations.
-        legend = ax.legend(loc='upper right', shadow=True)
+        self.legend = ax.legend(loc='upper right', shadow=True)
+        #self.legend.get_frame().set_alpha(0.4)
+        self.legend.set_picker(True)
 
         # Current labels for axes
@@ -142 +154 @@
         Show a dialog allowing adding custom text to the chart
         """
-        print("onAddText")
-        pass
+        self.addText = AddText(self)
+        if self.addText.exec_() == QtGui.QDialog.Accepted:
+            # Retrieve the new text, its font and color
+            extra_text = self.addText.text()
+            extra_font = self.addText.font()
+            extra_color = self.addText.color()
+
+            # Place the text on the screen at (0,0)
+            pos_x = self.x_click
+            pos_y = self.y_click
+
+            # Map QFont onto MPL font
+            mpl_font = FontProperties()
+            mpl_font.set_size(int(extra_font.pointSize()))
+            mpl_font.set_family(str(extra_font.family()))
+            mpl_font.set_weight(int(extra_font.weight()))
+            # MPL style names
+            styles = ['normal', 'italic', 'oblique']
+            # QFont::Style maps directly onto the above
+            try:
+                mpl_font.set_style(styles[extra_font.style()])
+            except:
+                pass
+
+            if len(extra_text) > 0:
+                new_text = self.ax.text(str(pos_x),
+                                        str(pos_y),
+                                        extra_text,
+                                        color=extra_color,
+                                        fontproperties=mpl_font)
+                # Update the list of annotations
+                self.textList.append(new_text)
+                self.canvas.draw_idle()
 
     def onRemoveText(self):
         """
-        Remove the most recent added text
-        """
-        print("onRemoveText")
-        pass
+        Remove the most recently added text
+        """
+        num_text = len(self.textList)
+        if num_text < 1:
+            return
+        txt = self.textList[num_text - 1]
+        text_remove = txt.get_text()
+        txt.remove()
+        self.textList.remove(txt)
+
+        self.canvas.draw_idle()
 
     def onSetGraphRange(self):
@@ -172 +222 @@
         # Clear the plot first
         plt.cla()
+        self.ax.cla()
 
         # Changing the scale might be incompatible with