Changeset 412e069e in sasview for src/sas/qtgui/Plotting

Timestamp:

Nov 7, 2017 8:29:59 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:

3e8dee3

Parents:

6280464

Message:

More Qt5 related fixes

Location:

src/sas/qtgui/Plotting

Files:

• BoxSum.py (modified) (2 diffs)
• ColorMap.py (modified) (2 diffs)
• LinearFit.py (modified) (4 diffs)
• Plotter2D.py (modified) (3 diffs)
• SetGraphRange.py (modified) (2 diffs)
• SlicerModel.py (modified) (1 diff)
• SlicerParameters.py (modified) (2 diffs)
• Slicers/SectorSlicer.py (modified) (2 diffs)

src/sas/qtgui/Plotting/BoxSum.py

@@ -5 +5 @@
 from PyQt5 import QtGui
 from PyQt5 import QtWidgets
+
+import sas.qtgui.Utilities.GuiUtils as GuiUtils
 
 # Local UI
@@ -17 +19 @@
         assert isinstance(model, QtGui.QStandardItemModel)
 
-        self.txtBoxHeight.setValidator(QtGui.QDoubleValidator())
-        self.txtBoxWidth.setValidator(QtGui.QDoubleValidator())
-        self.txtCenterX.setValidator(QtGui.QDoubleValidator())
-        self.txtCenterY.setValidator(QtGui.QDoubleValidator())
+        self.txtBoxHeight.setValidator(GuiUtils.DoubleValidator())
+        self.txtBoxWidth.setValidator(GuiUtils.DoubleValidator())
+        self.txtCenterX.setValidator(GuiUtils.DoubleValidator())
+        self.txtCenterY.setValidator(GuiUtils.DoubleValidator())
 
         self.model = model

src/sas/qtgui/Plotting/ColorMap.py

@@ -13 +13 @@
 from matplotlib.backends.backend_qt5agg import FigureCanvasQTAgg as FigureCanvas
 from sas.qtgui.Plotting.PlotterData import Data2D
-from sas.qtgui.Utilities.GuiUtils import formatNumber
+from sas.qtgui.Utilities.GuiUtils import formatNumber, DoubleValidator
 from .rangeSlider import RangeSlider
 
@@ -51 +51 @@
 
         # Initialize validators on amplitude textboxes
-        validator_min = QtGui.QDoubleValidator(self.txtMinAmplitude)
+        validator_min = DoubleValidator(self.txtMinAmplitude)
         validator_min.setNotation(0)
         self.txtMinAmplitude.setValidator(validator_min)
-        validator_max = QtGui.QDoubleValidator(self.txtMaxAmplitude)
+        validator_max = DoubleValidator(self.txtMaxAmplitude)
         validator_max.setNotation(0)
         self.txtMaxAmplitude.setValidator(validator_max)

src/sas/qtgui/Plotting/LinearFit.py

@@ -8 +8 @@
 from PyQt5 import QtWidgets
 
-from sas.qtgui.Utilities.GuiUtils import formatNumber
+from sas.qtgui.Utilities.GuiUtils import formatNumber, DoubleValidator
 
 from sas.qtgui.Plotting import Fittings
@@ -43 +43 @@
         self.y_is_log = self.yLabel == "log10(y)"
 
-        self.txtFitRangeMin.setValidator(QtGui.QDoubleValidator())
-        self.txtFitRangeMax.setValidator(QtGui.QDoubleValidator())
+        self.txtFitRangeMin.setValidator(DoubleValidator())
+        self.txtFitRangeMax.setValidator(DoubleValidator())
 
         # Default values in the line edits
@@ -158 +158 @@
         y_model = self.model.run(xmin)
         tempx.append(xminView)
-        tempy.append(numpy.power(10, y_model) if self.y_is_log else y_model)
+        tempy.append(numpy.power(10.0, y_model) if self.y_is_log else y_model)
 
         # load tempy with the maximum transformation
         y_model = self.model.run(xmax)
         tempx.append(xmaxView)
-        tempy.append(numpy.power(10, y_model) if self.y_is_log else y_model)
+        tempy.append(numpy.power(10.0, y_model) if self.y_is_log else y_model)
 
         # Set the fit parameter display when  FitDialog is opened again
@@ -247 +247 @@
             return numpy.sqrt(numpy.sqrt(x))
         elif self.xLabel == "log10(x)":
-            return numpy.power(10, x)
+            return numpy.power(10.0, x)
         elif self.xLabel == "ln(x)":
             return numpy.exp(x)
         elif self.xLabel == "log10(x^(4))":
-            return numpy.sqrt(numpy.sqrt(numpy.power(10, x)))
+            return numpy.sqrt(numpy.sqrt(numpy.power(10.0, x)))
         return x
 

src/sas/qtgui/Plotting/Plotter2D.py

@@ -3 +3 @@
 import pylab
 import functools
+import logging
 
 from PyQt5 import QtCore
@@ -126 +127 @@
         zmax_temp = self.zmax
         # self.scale predefined in the baseclass
+        # in numpy > 1.12 power(int, -int) raises ValueException
+        # "Integers to negative integer powers are not allowed."
         if self.scale == 'log_{10}':
             if self.zmin is not None:
-                zmin_temp = numpy.power(10, self.zmin)
+                zmin_temp = numpy.power(10.0, self.zmin)
             if self.zmax is not None:
-                zmax_temp = numpy.power(10, self.zmax)
+                zmax_temp = numpy.power(10.0, self.zmax)
         else:
             if self.zmin is not None:
@@ -289 +292 @@
         new_plot.is_data = True
         GuiUtils.updateModelItemWithPlot(self._item, new_plot, new_plot.id)
+
         self.manager.communicator.plotUpdateSignal.emit([new_plot])
 

src/sas/qtgui/Plotting/SetGraphRange.py

@@ -5 +5 @@
 from PyQt5 import QtGui
 from PyQt5 import QtWidgets
+
+import sas.qtgui.Utilities.GuiUtils as GuiUtils
 
 # Local UI
@@ -18 +20 @@
         assert(isinstance(y_range, tuple))
 
-        self.txtXmin.setValidator(QtGui.QDoubleValidator())
-        self.txtXmax.setValidator(QtGui.QDoubleValidator())
-        self.txtYmin.setValidator(QtGui.QDoubleValidator())
-        self.txtYmax.setValidator(QtGui.QDoubleValidator())
+        self.txtXmin.setValidator(GuiUtils.DoubleValidator())
+        self.txtXmax.setValidator(GuiUtils.DoubleValidator())
+        self.txtYmin.setValidator(GuiUtils.DoubleValidator())
+        self.txtYmax.setValidator(GuiUtils.DoubleValidator())
 
         self.txtXmin.setText(str(x_range[0]))

src/sas/qtgui/Plotting/SlicerModel.py

@@ -1 +1 @@
 from PyQt5 import QtGui
+from PyQt5 import QtCore
 
 import sas.qtgui.Utilities.GuiUtils as GuiUtils

src/sas/qtgui/Plotting/SlicerParameters.py

@@ -8 +8 @@
 from PyQt5 import QtWidgets
 from PyQt5 import QtWebKitWidgets
+
+import sas.qtgui.Utilities.GuiUtils as GuiUtils
 
 # Local UI
@@ -126 +128 @@
             super(PositiveDoubleEditor, self).__init__(parent)
             self.setAutoFillBackground(True)
-            validator = QtGui.QDoubleValidator()
+            validator = GuiUtils.DoubleValidator()
             # Don't use the scientific notation, cause 'e'.
-            validator.setNotation(QtGui.QDoubleValidator.StandardNotation)
+            validator.setNotation(GuiUtils.DoubleValidator.StandardNotation)
 
             self.setValidator(validator)

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

@@ -3 +3 @@
 """
 import numpy
+import logging
 
 from .BaseInteractor import BaseInteractor
@@ -167 +168 @@
         new_plot.is_data = True
         GuiUtils.updateModelItemWithPlot(self._item, new_plot, new_plot.id)
+
         self.base.manager.communicator.plotUpdateSignal.emit([new_plot])