Changeset eb1a386 in sasview

Timestamp:

Jan 24, 2018 3:52:41 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:

116dd4c1

Parents:

0764593

Message:

Fixed text add functionality on plots - SASVIEW-859

Location:

src/sas/qtgui

Files:

• Perspectives/Fitting/ConstraintWidget.py (modified) (1 diff)
• Plotting/Plotter.py (modified) (2 diffs)
• Plotting/PlotterBase.py (modified) (3 diffs)

src/sas/qtgui/Perspectives/Fitting/ConstraintWidget.py

@@ -142 +142 @@
         is_good_moniker = self.validateMoniker(new_moniker)
         if not is_good_moniker:
+            self.tblTabList.blockSignals(True)
             item.setBackground(QtCore.Qt.red)
+            self.tblTabList.blockSignals(False)
             self.cmdFit.setEnabled(False)
             return

src/sas/qtgui/Plotting/Plotter.py

@@ -282 +282 @@
         Show a dialog allowing adding custom text to the chart
         """
-        if self.addText.exec_() == QtWidgets.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()
-                pass
+        if self.addText.exec_() != QtWidgets.QDialog.Accepted:
+            return
+
+        # 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 the click location
+        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(pos_x,
+                                    pos_y,
+                                    extra_text,
+                                    color=extra_color,
+                                    fontproperties=mpl_font)
+
+            # Update the list of annotations
+            self.textList.append(new_text)
+            self.canvas.draw()
 
     def onRemoveText(self):
@@ -325 +327 @@
         txt = self.textList[num_text - 1]
         text_remove = txt.get_text()
-        txt.remove()
+        try:
+            txt.remove()
+        except ValueError:
+            # Text got already deleted somehow
+            pass
         self.textList.remove(txt)
 

src/sas/qtgui/Plotting/PlotterBase.py

@@ -6 +6 @@
 from PyQt5 import QtWidgets, QtPrintSupport
 
-# TODO: Replace the qt4agg calls below with qt5 equivalent.
-# Requires some code modifications.
-# https://www.boxcontrol.net/embedding-matplotlib-plot-on-pyqt5-gui.html
-#
-# matplotlib.use("Qt5Agg")
 from matplotlib.backends.backend_qt5agg import FigureCanvasQTAgg as FigureCanvas
 from matplotlib.backends.backend_qt5agg import NavigationToolbar2QT as NavigationToolbar
@@ -36 +31 @@
 
         #plt.style.use('ggplot')
-        plt.style.use('seaborn-darkgrid')
+        #plt.style.use('seaborn-darkgrid')
 
         # a figure instance to plot on
@@ -176 +171 @@
     def xscale(self, scale='linear'):
         """ X-axis scale setter """
+        self.ax.cla()
         self.ax.set_xscale(scale)
         self._xscale = scale