Changeset 2add354 in sasview for src/sas/qtgui/Perspectives/Fitting/FittingWidget.py

Timestamp:

May 9, 2017 1:38:40 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:

f7f5796

Parents:

31e4bb8

Message:

Code review fixes for SASVIEW-273

File:

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

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

@@ -12 +12 @@
 from PyQt4 import QtGui
 from PyQt4 import QtCore
+from PyQt4 import QtWebKit
 
 from sasmodels import generate
@@ -32 +33 @@
 from SmearingWidget import SmearingWidget
 from OptionsWidget import OptionsWidget
+from FitPage import FitPage
 
 TAB_MAGNETISM = 4
@@ -73 +75 @@
         self.log_points = False
         self.weighting = 0
+        self.chi2 = None
 
         # Data for chosen model
@@ -132 +135 @@
         """
         self.lstParams.setStyleSheet(stylesheet)
+        self.lstParams.setContextMenuPolicy(QtCore.Qt.CustomContextMenu)
+        self.lstParams.customContextMenuRequested.connect(self.showModelDescription)
 
         # Poly model displayed in poly list
@@ -163 +168 @@
         self.initializeControls()
 
+        # Display HTML content
+        self.helpView = QtWebKit.QWebView()
+
         self._index = None
         if data is not None:
             self.data = data
+
+    def close(self):
+        """
+        Remember to kill off things on exit
+        """
+        self.helpView.close()
+        del self.helpView
 
     @property
@@ -197 +212 @@
         self.lblFilename.setText(self.logic.data.filename)
         self.updateQRange()
-        self.cmdFit.setEnabled(True)
         # Switch off Data2D control
         self.chk2DView.setEnabled(False)
@@ -285 +299 @@
         self.cmdFit.clicked.connect(self.onFit)
         self.cmdPlot.clicked.connect(self.onPlot)
+        self.cmdHelp.clicked.connect(self.onHelp)
 
         # Respond to change in parameters from the UI
@@ -294 +309 @@
         # Signals from separate tabs asking for replot
         self.options_widget.plot_signal.connect(self.onOptionsUpdate)
+
+    def showModelDescription(self, position):
+        """
+        Shows a window with model description, when right clicked in the treeview
+        """
+        msg = 'Model description:\n'
+        info = "Info"
+        if self.kernel_module is not None:
+            if str(self.kernel_module.description).rstrip().lstrip() == '':
+                msg += "Sorry, no information is available for this model."
+            else:
+                msg += self.kernel_module.description + '\n'
+        else:
+            msg += "You must select a model to get information on this"
+
+        menu = QtGui.QMenu()
+        label = QtGui.QLabel(msg)
+        action = QtGui.QWidgetAction(self)
+        action.setDefaultWidget(label)
+        menu.addAction(action)
+        menu.exec_(self.lstParams.viewport().mapToGlobal(position))
 
     def onSelectModel(self):
@@ -321 +357 @@
             # Create default datasets if no data passed
             self.createDefaultDataset()
+
+        #state = self.currentState()
 
     def onSelectStructureFactor(self):
@@ -403 +441 @@
         pass # debug anchor
 
+    def onHelp(self):
+        """
+        Show the "Fitting" section of help
+        """
+        tree_location = self.parent.HELP_DIRECTORY_LOCATION +\
+            "/user/sasgui/perspectives/fitting/fitting_help.html"
+        self.helpView.load(QtCore.QUrl(tree_location))
+        self.helpView.show()
+
     def onFit(self):
         """
@@ -438 +485 @@
         fitter.set_model(model, fit_id, params_to_fit, data=data,
                          constraints=constraints)
+
         fitter.set_data(data=data, id=fit_id, smearer=smearer, qmin=qmin,
                         qmax=qmax)
@@ -501 +549 @@
         self.communicate.statusBarUpdateSignal.emit(msg)
 
-        fitness = res.fitness
+        self.chi2 = res.fitness
         param_list = res.param_list
         param_values = res.pvec
@@ -516 +564 @@
 
         # Read only value - we can get away by just printing it here
-        chi2_repr = GuiUtils.formatNumber(fitness, high=True)
+        chi2_repr = GuiUtils.formatNumber(self.chi2, high=True)
         self.lblChi2Value.setText(chi2_repr)
 
@@ -586 +634 @@
         # Regardless of previous state, this should now be `plot show` functionality only
         self.cmdPlot.setText("Show Plot")
-        self.recalculatePlotData()
         self.showPlot()
 
@@ -685 +732 @@
         checked_list = ['background', '0.001', '-inf', 'inf', '1/cm']
         FittingUtilities.addCheckedListToModel(model, checked_list)
+        last_row = model.rowCount()-1
+        model.item(last_row, 0).setEditable(False)
+        model.item(last_row, 4).setEditable(False)
 
     def addScaleToModel(self, model):
@@ -693 +743 @@
         checked_list = ['scale', '1.0', '0.0', 'inf', '']
         FittingUtilities.addCheckedListToModel(model, checked_list)
+        last_row = model.rowCount()-1
+        model.item(last_row, 0).setEditable(False)
+        model.item(last_row, 4).setEditable(False)
 
     def addWeightingToData(self, data):
@@ -781 +834 @@
         if model_column == 0:
             self.checkboxSelected(item)
+            self.cmdFit.setEnabled(self.parameters_to_fit != [] and self.logic.data_is_loaded)
             return
 
@@ -787 +841 @@
 
         # Extract changed value. Assumes proper validation by QValidator/Delegate
-        value = float(item.text())
+        # TODO: disable model update for uneditable cells/columns
+        try:
+            value = float(item.text())
+        except ValueError:
+            # Unparsable field
+            return
         parameter_name = str(self._model_model.data(name_index).toPyObject()) # sld, background etc.
         property_name = str(self._model_model.headerData(1, model_column).toPyObject()) # Value, min, max, etc.
@@ -944 +1003 @@
         self.createNewIndex(fitted_data)
         # Calculate difference between return_data and logic.data
-        chi2 = FittingUtilities.calculateChi2(fitted_data, self.logic.data)
+        self.chi2 = FittingUtilities.calculateChi2(fitted_data, self.logic.data)
         # Update the control
-        chi2_repr = "---" if chi2 is None else GuiUtils.formatNumber(chi2, high=True)
+        chi2_repr = "---" if self.chi2 is None else GuiUtils.formatNumber(self.chi2, high=True)
         self.lblChi2Value.setText(chi2_repr)