Changeset d6b8a1d in sasview for src/sas/qtgui/Perspectives/Fitting

Timestamp:

Nov 9, 2017 6:43:56 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:

53c771e

Parents:

fbfc488

git-author:

Piotr Rozyczko <rozyczko@…> (11/07/17 06:29:59)

git-committer:

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

Message:

More Qt5 related fixes

Location:

src/sas/qtgui/Perspectives/Fitting

Files:

• FittingOptions.py (modified) (1 diff)
• FittingWidget.py (modified) (8 diffs)
• OptionsWidget.py (modified) (2 diffs)
• SmearingWidget.py (modified) (2 diffs)
• ViewDelegate.py (modified) (4 diffs)

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

@@ -88 +88 @@
                 validator.setBottom(0)
             elif f_type == float:
-                validator = QtGui.QDoubleValidator()
+                validator = GuiUtils.DoubleValidator()
                 validator.setBottom(0)
             else:

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

@@ -13 +13 @@
 from PyQt5 import QtWidgets
 from PyQt5 import QtWebKitWidgets
+# Officially QtWebEngineWidgets are the way to display HTML in Qt5,
+# but this module isn't ported to PyQt5 yet...
+# let's wait. In the meantime no Help.
+#from PyQt5 import QtWebEngineWidgets
 
 from sasmodels import product
@@ -51 +55 @@
 DEFAULT_POLYDISP_FUNCTION = 'gaussian'
 
-USING_TWISTED = True
+#USING_TWISTED = True
+USING_TWISTED = False
 
 class ToolTippedItemModel(QtGui.QStandardItemModel):
@@ -469 +474 @@
         menu = QtWidgets.QMenu()
         label = QtWidgets.QLabel(msg)
-        action = QtGui.QWidgetAction(self)
+        action = QtWidgets.QWidgetAction(self)
         action.setDefaultWidget(label)
         menu.addAction(action)
@@ -478 +483 @@
         Respond to select Model from list event
         """
-        model = str(self.cbModel.currentText())
+        model = self.cbModel.currentText()
 
         # empty combobox forced to be read
@@ -534 +539 @@
         Select Category from list
         """
-        category = str(self.cbCategory.currentText())
+        category = self.cbCategory.currentText()
         # Check if the user chose "Choose category entry"
         if category == CATEGORY_DEFAULT:
@@ -680 +685 @@
             helpfile = "mag_help.html"
         help_location = tree_location + helpfile
+
+        content = QtCore.QUrl(help_location)
         self.helpView.load(QtCore.QUrl(help_location))
         self.helpView.show()
@@ -733 +740 @@
             fitter = Fit()
             data = GuiUtils.dataFromItem(fit_index)
-            fitter.set_model(model, fit_id, params_to_fit, data=data,
+            try:
+                fitter.set_model(model, fit_id, params_to_fit, data=data,
                              constraints=constraints)
+            except ValueError as ex:
+                logging.error("Setting model parameters failed with: %s" % ex)
+                return
+
             qmin, qmax, _ = self.logic.computeRangeFromData(data)
             fitter.set_data(data=data, id=fit_id, smearer=smearer, qmin=qmin,
@@ -1522 +1534 @@
         residuals_plot.id = "Residual " + residuals_plot.id
         self.createNewIndex(residuals_plot)
-        self.communicate.plotUpdateSignal.emit([residuals_plot])
+        #self.communicate.plotUpdateSignal.emit([residuals_plot])
 
     def calcException(self, etype, value, tb):

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

@@ -8 +8 @@
 
 from sas.qtgui.Plotting.PlotterData import Data2D
+import sas.qtgui.Utilities.GuiUtils as GuiUtils
 
 # Local UI
@@ -66 +67 @@
 
         # Let only floats in the range edits
-        self.txtMinRange.setValidator(QtGui.QDoubleValidator())
-        self.txtMaxRange.setValidator(QtGui.QDoubleValidator())
+        self.txtMinRange.setValidator(GuiUtils.DoubleValidator())
+        self.txtMaxRange.setValidator(GuiUtils.DoubleValidator())
         # Let only ints in the number of points edit
         self.txtNpts.setValidator(QtGui.QIntValidator())

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

@@ -8 +8 @@
 from sas.qtgui.Plotting.PlotterData import Data1D
 from sas.qtgui.Plotting.PlotterData import Data2D
+import sas.qtgui.Utilities.GuiUtils as GuiUtils
 
 # Local UI
@@ -51 +52 @@
         self.parent = parent
         # Let only floats in the line edits
-        self.txtSmearDown.setValidator(QtGui.QDoubleValidator())
-        self.txtSmearUp.setValidator(QtGui.QDoubleValidator())
+        self.txtSmearDown.setValidator(GuiUtils.DoubleValidator())
+        self.txtSmearUp.setValidator(GuiUtils.DoubleValidator())
 
         # Attach slots

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

@@ -4 +4 @@
 
 import sas.qtgui.Utilities.GuiUtils as GuiUtils
-
-class CommaLessValidator(QtGui.QDoubleValidator):
-    """
-    Custom double validator which doesn't allow for commas to be used as decimal point
-    """
-    pass
 
 class ModelViewDelegate(QtWidgets.QStyledItemDelegate):
@@ -87 +81 @@
         if index.column() == self.param_value: #only in the value column
             editor = QtWidgets.QLineEdit(widget)
-            validator = QtGui.QDoubleValidator()
+            validator = GuiUtils.DoubleValidator()
             editor.setValidator(validator)
             return editor
@@ -168 +162 @@
         elif index.column() in self.editableParameters():
             self.editor = QtWidgets.QLineEdit(widget)
-            validator = QtGui.QDoubleValidator()
+            validator = GuiUtils.DoubleValidator()
             self.editor.setValidator(validator)
             return self.editor
@@ -246 +240 @@
         if index.column() in self.editableParameters():
             editor = QtWidgets.QLineEdit(widget)
-            validator = QtGui.QDoubleValidator()
+            validator = GuiUtils.DoubleValidator()
             editor.setValidator(validator)
             return editor