Changeset 21fa45b in sasview

Timestamp:

Oct 16, 2018 11:26:47 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:

d2007a8

Parents:

fc9d9a3

Message:

Changing error message to include structure factor

If you copy the parameters then change model a popup occurs to alert user that the parameters are different to copied model so not all will copy across. This now includes if model stays the same but structure factor is changed.

File:

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

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

@@ -3475 +3475 @@
         param_list.append(['model_name', str(self.cbModel.currentText())])
 
+        try:
+            param_list.append(['structure_factor', str(self.cbStructureFactor.currentText())])
+        except:
+            pass
+
         def gatherParams(row):
             """
@@ -3480 +3485 @@
             """
             param_name = str(self._model_model.item(row, 0).text())
-            param_checked = str(self._model_model.item(row, 0).checkState() == QtCore.Qt.Checked)
-            param_value = str(self._model_model.item(row, 1).text())
-            param_error = None
-            param_min = None
-            param_max = None
-            column_offset = 0
-            if self.has_error_column:
-                param_error = str(self._model_model.item(row, 2).text())
-                column_offset = 1
-
-            try:
-                param_min = str(self._model_model.item(row, 2+column_offset).text())
-                param_max = str(self._model_model.item(row, 3+column_offset).text())
-            except:
-                pass
 
             if param_name == str(self.cbModel.currentText()):
@@ -3501 +3491 @@
                 pass
             else:
+                param_checked = str(self._model_model.item(row, 0).checkState() == QtCore.Qt.Checked)
+                param_value = str(self._model_model.item(row, 1).text())
+                param_error = None
+                param_min = None
+                param_max = None
+                column_offset = 0
+                if self.has_error_column:
+                    param_error = str(self._model_model.item(row, 2).text())
+                    column_offset = 1
+
+                try:
+                    param_min = str(self._model_model.item(row, 2 + column_offset).text())
+                    param_max = str(self._model_model.item(row, 3 + column_offset).text())
+                except:
+                    pass
+
                 param_list.append([param_name, param_checked, param_value, param_error, param_min, param_max])
 
@@ -3550 +3556 @@
             formatted_output = FittingUtilities.formatParameters(param_list)
         elif format == "Excel":
-            formatted_output = FittingUtilities.formatParametersExcel(param_list[1:])
+            formatted_output = FittingUtilities.formatParametersExcel(param_list[2:])
         elif format == "Latex":
-            formatted_output = FittingUtilities.formatParametersLatex(param_list[1:])
+            formatted_output = FittingUtilities.formatParametersLatex(param_list[2:])
         else:
             raise AttributeError("Bad format specifier.")
@@ -3575 +3581 @@
 
         model = lines[1].split(',')
-        print(model)
 
         if model[0] != 'model_name':
             return False
 
+        StrucFac = lines[2].split(',')
+
+        if StrucFac[0] != 'structure_factor':
+            return False
+
         context['model_name'] = [model[1]]
-
-        for line in lines[2:-1]:
+        context['structure_factor'] = [StrucFac[1]]
+
+        for line in lines[3:-1]:
             if len(line) != 0:
                 item = line.split(',')
@@ -3612 +3623 @@
                         pass
 
-        if str(self.cbModel.currentText()) != str(context['model_name'][0]):
+        if str(self.cbModel.currentText()) != str(context['model_name'][0]) or \
+                str(self.cbStructureFactor.currentText()) != str(context['structure_factor'][0]):
             msg = QtWidgets.QMessageBox()
             msg.setIcon(QtWidgets.QMessageBox.Information)