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

Timestamp:

Sep 8, 2018 7:41:07 AM (6 years ago)

Author:

GitHub <noreply@…>

Branches:

ESS_GUI, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc

Children:

c0de493

Parents:

5181e9b (diff), c8536d6c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Torin Cooper-Bennun <40573959+tcbennun@…> (09/08/18 07:41:07)

git-committer:

GitHub <noreply@…> (09/08/18 07:41:07)

Message:

Merge branch 'ESS_GUI' into ESS_GUI_iss1033

File:

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

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

@@ -48 +48 @@
 from sas.qtgui.Perspectives.Fitting.ReportPageLogic import ReportPageLogic
 
-
 TAB_MAGNETISM = 4
 TAB_POLY = 3
@@ -188 +187 @@
 
         # Overwrite data type descriptor
+
         self.is2D = True if isinstance(self.logic.data, Data2D) else False
 
@@ -563 +563 @@
         When clicked on white space: model description
         """
-        rows = [s.row() for s in self.lstParams.selectionModel().selectedRows()]
+        rows = [s.row() for s in self.lstParams.selectionModel().selectedRows()
+                if self.isCheckable(s.row())]
         menu = self.showModelDescription() if not rows else self.modelContextMenu(rows)
         try:
@@ -799 +800 @@
     def getConstraintForRow(self, row):
         """
-        For the given row, return its constraint, if any
-        """
-        if self.isCheckable(row):
-            item = self._model_model.item(row, 1)
-            try:
-                return item.child(0).data()
-            except AttributeError:
-                # return none when no constraints
-                pass
-        return None
+        For the given row, return its constraint, if any (otherwise None)
+        """
+        if not self.isCheckable(row):
+            return None
+        item = self._model_model.item(row, 1)
+        try:
+            return item.child(0).data()
+        except AttributeError:
+            return None
 
     def rowHasConstraint(self, row):
@@ -814 +814 @@
         Finds out if row of the main model has a constraint child
         """
-        if self.isCheckable(row):
-            item = self._model_model.item(row, 1)
-            if item.hasChildren():
-                c = item.child(0).data()
-                if isinstance(c, Constraint):
-                    return True
+        if not self.isCheckable(row):
+            return False
+        item = self._model_model.item(row, 1)
+        if not item.hasChildren():
+            return False
+        c = item.child(0).data()
+        if isinstance(c, Constraint):
+            return True
         return False
 
@@ -826 +828 @@
         Finds out if row of the main model has an active constraint child
         """
-        if self.isCheckable(row):
-            item = self._model_model.item(row, 1)
-            if item.hasChildren():
-                c = item.child(0).data()
-                if isinstance(c, Constraint) and c.active:
-                    return True
+        if not self.isCheckable(row):
+            return False
+        item = self._model_model.item(row, 1)
+        if not item.hasChildren():
+            return False
+        c = item.child(0).data()
+        if isinstance(c, Constraint) and c.active:
+            return True
         return False
 
@@ -838 +842 @@
         Finds out if row of the main model has an active, nontrivial constraint child
         """
-        if self.isCheckable(row):
-            item = self._model_model.item(row, 1)
-            if item.hasChildren():
-                c = item.child(0).data()
-                if isinstance(c, Constraint) and c.func and c.active:
-                    return True
+        if not self.isCheckable(row):
+            return False
+        item = self._model_model.item(row, 1)
+        if not item.hasChildren():
+            return False
+        c = item.child(0).data()
+        if isinstance(c, Constraint) and c.func and c.active:
+            return True
         return False
 
@@ -1053 +1059 @@
             # Show constraint, if present
             row = rows[0].row()
-            if self.rowHasConstraint(row):
-                func = self.getConstraintForRow(row).func
-                if func is not None:
-                    self.communicate.statusBarUpdateSignal.emit("Active constrain: "+func)
+            if not self.rowHasConstraint(row):
+                return
+            func = self.getConstraintForRow(row).func
+            if func is not None:
+                self.communicate.statusBarUpdateSignal.emit("Active constrain: "+func)
 
     def replaceConstraintName(self, old_name, new_name=""):
@@ -1807 +1814 @@
         # Force data recalculation so existing charts are updated
         self.showPlot()
+        # This is an important processEvent.
+        # This allows charts to be properly updated in order
+        # of plots being applied.
+        QtWidgets.QApplication.processEvents()
         self.recalculatePlotData()
 
@@ -2091 +2102 @@
             return
 
+        product_params = None
+
         if self.kernel_module is None:
             # Structure factor is the only selected model; build it and show all its params
@@ -2096 +2109 @@
             s_params = self.kernel_module._model_info.parameters
             s_params_orig = s_params
-
         else:
             s_kernel = self.models[structure_factor]()
@@ -2113 +2125 @@
             if "radius_effective_mode" in all_param_names:
                 # Show all parameters
+                # In this case, radius_effective is NOT pruned by sasmodels.product
                 s_params = modelinfo.ParameterTable(all_params[p_pars_len:p_pars_len+s_pars_len])
                 s_params_orig = modelinfo.ParameterTable(s_kernel._model_info.parameters.kernel_parameters)
+                product_params = modelinfo.ParameterTable(
+                        self.kernel_module._model_info.parameters.kernel_parameters[p_pars_len+s_pars_len:])
             else:
                 # Ensure radius_effective is not displayed
                 s_params_orig = modelinfo.ParameterTable(s_kernel._model_info.parameters.kernel_parameters[1:])
                 if "radius_effective" in all_param_names:
+                    # In this case, radius_effective is NOT pruned by sasmodels.product
                     s_params = modelinfo.ParameterTable(all_params[p_pars_len+1:p_pars_len+s_pars_len])
+                    product_params = modelinfo.ParameterTable(
+                            self.kernel_module._model_info.parameters.kernel_parameters[p_pars_len+s_pars_len:])
                 else:
+                    # In this case, radius_effective is pruned by sasmodels.product
                     s_params = modelinfo.ParameterTable(all_params[p_pars_len:p_pars_len+s_pars_len-1])
+                    product_params = modelinfo.ParameterTable(
+                            self.kernel_module._model_info.parameters.kernel_parameters[p_pars_len+s_pars_len-1:])
 
         # Add heading row
@@ -2129 +2150 @@
         # Any renamed parameters are stored as data in the relevant item, for later handling
         FittingUtilities.addSimpleParametersToModel(
-                s_params,
-                self.is2D,
-                s_params_orig,
-                self._model_model,
-                self.lstParams)
+                parameters=s_params,
+                is2D=self.is2D,
+                parameters_original=s_params_orig,
+                model=self._model_model,
+                view=self.lstParams)
+
+        # Insert product-only params into QModel
+        if product_params:
+            prod_rows = FittingUtilities.addSimpleParametersToModel(
+                    parameters=product_params,
+                    is2D=self.is2D,
+                    parameters_original=None,
+                    model=self._model_model,
+                    view=self.lstParams,
+                    row_num=2)
+
+            # Since this all happens after shells are dealt with and we've inserted rows, fix this counter
+            self._n_shells_row += len(prod_rows)
 
     def haveParamsToFit(self):
@@ -2800 +2834 @@
         self.current_shell_displayed = index
 
+        # Change 'n' in the parameter model, thereby updating the underlying model
+        self._model_model.item(self._n_shells_row, 1).setText(str(index))
+
         # Update relevant models
         self.setPolyModel()
@@ -3310 +3347 @@
         self._poly_model.blockSignals(False)
 
+
+