Changeset fbfc488 in sasview for src/sas/qtgui/Plotting

Timestamp:

Nov 9, 2017 6:43:55 AM (6 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:

d6b8a1d

Parents:

7969b9c

git-author:

Piotr Rozyczko <rozyczko@…> (11/03/17 08:58:39)

git-committer:

Piotr Rozyczko <rozyczko@…> (11/09/17 06:43:55)

Message:

More Qt5 related fixes.

Location:

src/sas/qtgui/Plotting

Files:

• BoxSum.py (modified) (4 diffs)
• Plotter.py (modified) (1 diff)
• Plotter2D.py (modified) (1 diff)
• PlotterBase.py (modified) (1 diff)
• Slicers/BoxSum.py (modified) (2 diffs)

src/sas/qtgui/Plotting/BoxSum.py

@@ -11 +11 @@
 
 class BoxSum(QtWidgets.QDialog, Ui_BoxSumUI):
-    apply_signal = QtCore.pyqtSignal(tuple, str)
     def __init__(self, parent=None, model=None):
         super(BoxSum, self).__init__()
@@ -24 +23 @@
 
         self.model = model
-        self.mapper = QtGui.QDataWidgetMapper()
+        self.mapper = QtWidgets.QDataWidgetMapper()
         self.mapper.setModel(self.model)
 
@@ -32 +31 @@
         self.mapper.addMapping(self.txtCenterX, 2)
         self.mapper.addMapping(self.txtCenterY, 3)
-        self.mapper.addMapping(self.lblAvg, 4, "text")
-        self.mapper.addMapping(self.lblAvgErr, 5, "text")
-        self.mapper.addMapping(self.lblSum, 6, "text")
-        self.mapper.addMapping(self.lblSumErr, 7, "text")
-        self.mapper.addMapping(self.lblNumPoints, 8, "text")
+        self.mapper.addMapping(self.lblAvg, 4, b"text")
+        self.mapper.addMapping(self.lblAvgErr, 5, b"text")
+        self.mapper.addMapping(self.lblSum, 6, b"text")
+        self.mapper.addMapping(self.lblSumErr, 7, b"text")
+        self.mapper.addMapping(self.lblNumPoints, 8, b"text")
 
         # Populate the widgets with data from the first column
@@ -43 +42 @@
         self.setFixedSize(self.minimumSizeHint())
 
+        # Handle the Apply button click
+        self.buttonBox.button(QtWidgets.QDialogButtonBox.Close).clicked.connect(self.onClose)
+
+    def onClose(self):
+        """
+        close the window containing this panel
+        """
+        self.close()
+

src/sas/qtgui/Plotting/Plotter.py

@@ -163 +163 @@
 
         # refresh canvas
-        self.canvas.draw()
+        self.canvas.draw_idle()
 
     def createContextMenu(self):

src/sas/qtgui/Plotting/Plotter2D.py

@@ -123 +123 @@
         """
         # Toggle the scale
-        zmin_temp = self.zmin
+        zmin_temp = self.zmin if self.zmin else MIN_Z
         zmax_temp = self.zmax
         # self.scale predefined in the baseclass

src/sas/qtgui/Plotting/PlotterBase.py

@@ -34 +34 @@
         self.manager = manager
         self.quickplot = quickplot
+
+        #plt.style.use('ggplot')
+        plt.style.use('seaborn-darkgrid')
 
         # a figure instance to plot on

src/sas/qtgui/Plotting/Slicers/BoxSum.py

@@ -6 +6 @@
 from PyQt5 import QtGui
 
-from sas.qtgui.Utilities.GuiUtils import formatNumber
+from sas.qtgui.Utilities.GuiUtils import formatNumber, toDouble
 
 from .BaseInteractor import BaseInteractor
@@ -137 +137 @@
         """
         params = {}
-        params["Height"] = float(self.model().item(0, 0).text())
-        params["Width"] = float(self.model().item(0, 1).text())
-        params["center_x"] = float(self.model().item(0, 2).text())
-        params["center_y"] = float(self.model().item(0, 3).text())
+        params["Height"] = toDouble(self.model().item(0, 0).text())
+        params["Width"] = toDouble(self.model().item(0, 1).text())
+        params["center_x"] = toDouble(self.model().item(0, 2).text())
+        params["center_y"] = toDouble(self.model().item(0, 3).text())
         self.update_model = False
         self.setParams(params)