Changes in src/sas/qtgui/Perspectives/Fitting/FittingWidget.py [10fee37:b4d05bd] in sasview

File:

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

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

@@ -2113 +2113 @@
             self.updateModelIndex(fitted_data)
         else:
-            name = self.nameForFittedData(self.kernel_module.id)
+            if not fitted_data.name:
+                name = self.nameForFittedData(self.kernel_module.id)
+            else:
+                name = fitted_data.name
             fitted_data.title = name
-            fitted_data.name = name
             fitted_data.filename = name
             fitted_data.symbol = "Line"
@@ -2229 +2231 @@
         self.model_data = fitted_data
 
+        # Create plots for intermediate product data
+        pq_data, sq_data = self.logic.new1DProductPlots(return_data, self.tab_id)
+        if pq_data is not None:
+            pq_data.symbol = "Line"
+            self.createNewIndex(pq_data)
+        if sq_data is not None:
+            sq_data.symbol = "Line"
+            self.createNewIndex(sq_data)
+
     def complete2D(self, return_data):
         """
@@ -2767 +2778 @@
         state_reader = Reader(self.loadPageStateCallback)
         filepath = self.saveAsAnalysisFile()
-        if filepath is None or filepath == "":
+        if filepath is None:
             return
         state_reader.write(filename=filepath, fitstate=state)
@@ -2819 +2830 @@
         state.formfactorcombobox = self.cbModel.currentText()
         if self.cbStructureFactor.isEnabled():
-            state.structurecombobox = self.cbStructureFactor.currentText()
+            state.structureCombobox = self.cbStructureFactor.currentText()
         state.tcChi = self.chi2
 
@@ -2851 +2862 @@
         p = self.model_parameters
         # save checkbutton state and txtcrtl values
-        state.parameters = FittingUtilities.getStandardParam(self._model_model)
-        state.orientation_params_disp = FittingUtilities.getOrientationParam(self.kernel_module)
+        state.parameters = FittingUtilities.getStandardParam()
+        state.orientation_params_disp = FittingUtilities.getOrientationParam()
 
         #self._copy_parameters_state(self.orientation_params_disp, self.state.orientation_params_disp)