Changeset ea8283d in sasview for fittingview/src/sans

Timestamp:

Oct 12, 2011 5:26:19 PM (13 years ago)

Author:

Jae Cho <jhjcho@…>

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

6b3edc1

Parents:

4a52223

Message:

small fix for loading a state file

Location:

fittingview/src/sans/perspectives/fitting

Files:

• basepage.py (modified) (1 diff)
• fitpanel.py (modified) (1 diff)

fittingview/src/sans/perspectives/fitting/basepage.py

@@ -1223 +1223 @@
         self.pinhole_smearer.SetValue(state.pinhole_smearer)
         self.slit_smearer.SetValue(state.slit_smearer)
-        
-        self.dI_noweight.SetValue(state.dI_noweight)
-        self.dI_didata.SetValue(state.dI_didata)
-        self.dI_sqrdata.SetValue(state.dI_sqrdata)
-        self.dI_idata.SetValue(state.dI_idata)
-        
-        
+        try:
+            self.dI_noweight.SetValue(state.dI_noweight)
+            self.dI_didata.SetValue(state.dI_didata)
+            self.dI_sqrdata.SetValue(state.dI_sqrdata)
+            self.dI_idata.SetValue(state.dI_idata)
+        except:
+            # to support older state file formats
+            self.dI_noweight.SetValue(False)
+            self.dI_didata.SetValue(True)
+            self.dI_sqrdata.SetValue(False)
+            self.dI_idata.SetValue(False)
+ 
         ## we have two more options for smearing
         if self.pinhole_smearer.GetValue(): self.onPinholeSmear(event=None)

fittingview/src/sans/perspectives/fitting/fitpanel.py

@@ -215 +215 @@
                     page_is_opened = True
             if not page_is_opened:
-                panel = self._manager.add_fit_page(data=state.data)
+                if state.data.__class__.__name__ != 'list':
+                    #To support older state file format
+                    list_data = [state.data]
+                else:
+                    #Todo: need new file format for the list
+                    list_data = state.data
+                panel = self._manager.add_fit_page(data=list_data)
                 # add data associated to the page created
                 if panel is not None:  
                     self._manager.store_data(uid=panel.uid, 
-                                             data=state.data,
+                                             data_list=list_data,
                                              caption=panel.window_caption)
                     panel.reset_page(state=state)