Changeset 9a42ea1 in sasview

Timestamp:

Oct 18, 2018 5:40:10 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:

9d23e4c, 1e0296b

Parents:

6040cd7

Message:

Don't forget about weighting in copy/paste parameters.

File:

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

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

@@ -567 +567 @@
         self.communicate.customModelDirectoryChanged.connect(self.onCustomModelChange)
         self.communicate.saveAnalysisSignal.connect(self.savePageState)
+        #self.communicate.loadAnalysisSignal.connect(self.loadPageState)
         self.smearing_widget.smearingChangedSignal.connect(self.onSmearingOptionsUpdate)
 
@@ -3418 +3419 @@
 
         with open(filepath, 'r') as statefile:
-            statefile.read(lines)
+            #column_data = [line.rstrip().split() for line in statefile.readlines()]
+            lines = statefile.readlines()
 
         # convert into list of lists
+        pass
 
     def loadAnalysisFile(self):
@@ -3445 +3448 @@
         param_list = self.getFitParameters()
         if format=="":
+            param_list = self.getFitPage()
+            param_list += self.getFitModel()
             formatted_output = FittingUtilities.formatParameters(param_list)
         elif format == "Excel":
@@ -3459 +3464 @@
     def getFitModel(self):
         """
-        serializes model combos state
+        serializes combobox state
         """
         param_list = []
@@ -3468 +3473 @@
         param_list.append(['fitpage_model', model])
         param_list.append(['fitpage_structure', structure])
+
         return param_list
 
@@ -3477 +3483 @@
         # first - regular params
         param_list = self.getFitParameters()
+
+        param_list.append(['is_data', str(self.data_is_loaded)])
+        if self.data_is_loaded:
+            param_list.append(['data_id', str(self.logic.data.id)])
+            param_list.append(['data_name', str(self.logic.data.filename)])
 
         # option tab
@@ -3482 +3493 @@
         param_list.append(['q_range_max', str(self.q_range_max)])
         param_list.append(['q_weighting', str(self.weighting)])
+        param_list.append(['weighting', str(self.options_widget.weighting)])
 
         # resolution
@@ -3686 +3698 @@
                 pass
         self.options_widget.updateQRange(self.q_range_min, self.q_range_max, self.npts)
+        try:
+            button_id = int(line_dict['weighting'][0])
+            for button in self.options_widget.weightingGroup.buttons():
+                if abs(self.options_widget.weightingGroup.id(button)) == button_id+2:
+                    button.setChecked(True)
+                    break
+        except ValueError:
+            pass
 
         self.updateFullModel(context)