Changeset fc9d9a3 in sasview for src/sas

Timestamp:

Oct 16, 2018 11:02:57 AM (6 years ago)

Author:

Laura Forster <Awork@…>

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:

21fa45b

Parents:

1efa4c3

Message:

NAN values on strucutre factor

Just another fix to make it still loops over param values when copying even after a new subheading.

File:

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

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

@@ -3474 +3474 @@
 
         param_list.append(['model_name', str(self.cbModel.currentText())])
+
         def gatherParams(row):
             """
@@ -3496 +3497 @@
 
             if param_name == str(self.cbModel.currentText()):
-                return
-            elif str(self.cbStructureFactor.currentText()):
-                return
-
-            param_list.append([param_name, param_checked, param_value, param_error, param_min, param_max])
+                pass
+            elif param_name == str(self.cbStructureFactor.currentText()):
+                pass
+            else:
+                param_list.append([param_name, param_checked, param_value, param_error, param_min, param_max])
 
         def gatherPolyParams(row):
@@ -3574 +3575 @@
 
         model = lines[1].split(',')
+        print(model)
 
         if model[0] != 'model_name':
@@ -3579 +3581 @@
 
         context['model_name'] = [model[1]]
+
         for line in lines[2:-1]:
             if len(line) != 0:
@@ -3663 +3666 @@
 
             self.setFocus()
-
-
 
         # block signals temporarily, so we don't end up