Changeset 10fee37 in sasview

Timestamp:

Aug 13, 2018 6:29:08 AM (6 years ago)

Author:

Torin Cooper-Bennun <torin.cooper-bennun@…>

Branches:

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

Children:

c0de493

Parents:

8dd7b79

Message:

misc fixes to fitpage save

Location:

src/sas/qtgui/Perspectives/Fitting

Files:

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

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

@@ -115 +115 @@
         Add a new tab for passed data
         """
-        tab     = FittingWidget(parent=self.parent, data=data, tab_id=self.maxIndex+1)
+        tab     = FittingWidget(parent=self.parent, data=data, tab_id=self.maxIndex)
         tab.is_batch_fitting = is_batch
 

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

@@ -2767 +2767 @@
         state_reader = Reader(self.loadPageStateCallback)
         filepath = self.saveAsAnalysisFile()
-        if filepath is None:
+        if filepath is None or filepath == "":
             return
         state_reader.write(filename=filepath, fitstate=state)
@@ -2819 +2819 @@
         state.formfactorcombobox = self.cbModel.currentText()
         if self.cbStructureFactor.isEnabled():
-            state.structureCombobox = self.cbStructureFactor.currentText()
+            state.structurecombobox = self.cbStructureFactor.currentText()
         state.tcChi = self.chi2
 
@@ -2851 +2851 @@
         p = self.model_parameters
         # save checkbutton state and txtcrtl values
-        state.parameters = FittingUtilities.getStandardParam()
-        state.orientation_params_disp = FittingUtilities.getOrientationParam()
+        state.parameters = FittingUtilities.getStandardParam(self._model_model)
+        state.orientation_params_disp = FittingUtilities.getOrientationParam(self.kernel_module)
 
         #self._copy_parameters_state(self.orientation_params_disp, self.state.orientation_params_disp)