Changeset 8b480d27 in sasview for src/sas/qtgui/Perspectives

Timestamp:

Mar 21, 2018 8:24:36 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:

8ac3551

Parents:

3b3b40b

Message:

Code cleanup and minor fixes

Location:

src/sas/qtgui/Perspectives/Fitting

Files:

• ConstraintWidget.py (modified) (1 diff)
• FittingWidget.py (modified) (3 diffs)

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

@@ -171 +171 @@
                     # No such tab!
                     return
-                sim_fitter_list, fitter_id = tab_object.prepareFitters(fitter=sim_fitter_list[0], fit_id=fitter_id)
+                sim_fitter_list, fitter_id = \
+                    tab_object.prepareFitters(fitter=sim_fitter_list[0], fit_id=fitter_id)
                 page_ids.append([tab_object.page_id])
         except ValueError:

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

@@ -424 +424 @@
             self.onSelectModel()
 
-    def customModels(self):
+    @classmethod
+    def customModels(cls):
         """ Reads in file names in the custom plugin directory """
         return ModelUtilities._find_models()
@@ -1051 +1052 @@
             self._model_model.clear()
             return
-            
+
         # Safely clear and enable the model combo
         self.cbModel.blockSignals(True)
@@ -1357 +1358 @@
         smearing, accuracy, smearing_min, smearing_max = self.smearing_widget.state()
 
-        constraints = self.getConstraintsForFitting()
+        # Get the constraints.
+        constraints = self.getComplexConstraintsForModel()
+        if fitter is None:
+            # For single fits - check for inter-model constraints
+            constraints = self.getConstraintsForFitting()
 
         smearer = None