Changeset 06234fc in sasview

Timestamp:

Feb 14, 2018 7:10:07 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:

fca1f50

Parents:

6e58f2f

Message:

Add model name to constraints on the same model

File:

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

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

@@ -574 +574 @@
         constraint.param = mc_widget.params[0]
         # Function should have the model name preamble
-        constraint.func = c_text
+        model_name = self.kernel_module.name
+        constraint.func = model_name + "." + c_text
         # Which row is the constrained parameter in?
         row = self.getRowFromName(constraint.param)
@@ -703 +704 @@
             self.constraintAddedSignal.emit([row])
             self.modifyViewOnRow(row)
-            break
 
         self.communicate.statusBarUpdateSignal.emit('Constraint removed')
@@ -794 +794 @@
         Return a list of tuples. Each tuple contains constraints mapped as
         ('constrained parameter', 'function to constrain')
-        e.g. [('sld','5*sld_solvent')].
+        e.g. [('sld','5*M2.sld_solvent')].
         Only for constraints with defined VALUE
         """
@@ -1157 +1157 @@
         self.setFittingStopped()
 
-        assert result is not None
+        #assert result is not None
+        if assert in None:
+            msg = "Fitting failed after: %s s.\n" % GuiUtils.formatNumber(elapsed)
+            self.communicate.statusBarUpdateSignal.emit(msg)
+            return
 
         res_list = result[0][0]