Changeset 412e069e in sasview for src/sas/qtgui/Perspectives/Fitting/FittingWidget.py

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

File:

• src/sas/qtgui/Perspectives/Fitting/FittingWidget.py (modified) (8 diffs)

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 generate
@@ -50 +54 @@
 DEFAULT_POLYDISP_FUNCTION = 'gaussian'
 
-USING_TWISTED = True
+#USING_TWISTED = True
+USING_TWISTED = False
 
 class ToolTippedItemModel(QtGui.QStandardItemModel):
@@ -463 +468 @@
         menu = QtWidgets.QMenu()
         label = QtWidgets.QLabel(msg)
-        action = QtGui.QWidgetAction(self)
+        action = QtWidgets.QWidgetAction(self)
         action.setDefaultWidget(label)
         menu.addAction(action)
@@ -472 +477 @@
         Respond to select Model from list event
         """
-        model = str(self.cbModel.currentText())
+        model = self.cbModel.currentText()
 
         # empty combobox forced to be read
@@ -528 +533 @@
         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:
@@ -674 +679 @@
             helpfile = "mag_help.html"
         help_location = tree_location + helpfile
+
+        content = QtCore.QUrl(help_location)
         self.helpView.load(QtCore.QUrl(help_location))
         self.helpView.show()
@@ -727 +734 @@
             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,
@@ -1513 +1525 @@
         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):