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

Timestamp:

Nov 13, 2018 7:25:48 AM (6 years ago)

Author:

Piotr Rozyczko <piotr.rozyczko@…>

Branches:

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

Children:

baeac95

Parents:

133812c7

Message:

Added C&S tab serialization.

File:

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

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

@@ -1952 +1952 @@
         Emits plotRequestedSignal for all plots found in the given model under the provided item name.
         """
-        fitpage_name = "" if self.tab_id is None else "M"+str(self.tab_id)
+        fitpage_name = self.kernel_module.name
         plots = GuiUtils.plotsFromFilename(item_name, item_model)
         # Has the fitted data been shown?
@@ -3524 +3524 @@
         param_list.append(['data_name', filenames])
         param_list.append(['data_id', data_ids])
+        param_list.append(['tab_name', self.modelName()])
         # option tab
         param_list.append(['q_range_min', str(self.q_range_min)])
@@ -3596 +3597 @@
             except:
                 pass
-
-            param_list.append([param_name, param_checked, param_value, param_error, param_min, param_max])
+            # Do we have any constraints on this parameter?
+            constraint = self.getConstraintForRow(row)
+            cons = ()
+            if constraint is not None:
+                value = constraint.value
+                func = constraint.func
+                cons = (value, func)
+
+            param_list.append([param_name, param_checked, param_value, param_error, param_min, param_max, cons])
 
         def gatherPolyParams(row):
@@ -3705 +3713 @@
                 self.updateMultiplicityCombo(multip)
 
+        if 'tab_name' in line_dict.keys():
+            self.kernel_module.name = line_dict['tab_name'][0]
         if 'polydisperse_params' in line_dict.keys():
             self.chkPolydispersity.setChecked(line_dict['polydisperse_params'][0]=='True')
@@ -3827 +3837 @@
             ioffset = 0
             joffset = 0
-            if len(param_dict[param_name])>4:
+            if len(param_dict[param_name])>5:
                 # error values are not editable - no need to update
                 ioffset = 1
@@ -3840 +3850 @@
             except:
                 pass
+
+            # constraints
+            cons = param_dict[param_name][4+ioffset]
+            if cons is not None and cons:
+                value = cons[0]
+                function = cons[1]
+                constraint = Constraint()
+                constraint.value = value
+                constraint.func = function
+                self.addConstraintToRow(constraint=constraint, row=row)
 
             self.setFocus()