Changeset 3eb2811 in sasview for sansview/perspectives/fitting

Timestamp:

Aug 10, 2010 4:29:45 PM (14 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:

9b18735

Parents:

8897d66

Message:

fixed minor bug when a file is saved without model selection: fit_panel

File:

• sansview/perspectives/fitting/fitting.py (modified) (2 diffs)

sansview/perspectives/fitting/fitting.py

@@ -319 +319 @@
         if self.temp_state == None or len(self.temp_state) == 0:
             return
+        
         try:
             #close all panels only when svs file opened
@@ -325 +326 @@
             # Load fitting state
             state = self.temp_state[self.state_index]
-            #set state
-            page = self.fit_panel.set_state(state) 
+            #panel state should have model selection to set_state
+            if state.formfactorcombobox != None:
+                #set state
+                page = self.fit_panel.set_state(state)   
+            else:
+                #just set data because set_state won't work
+                page_info = self.fit_panel.get_page_info(data=state.data)
+                self.fit_panel.add_page(page_info)
+                
             # get ready for the next set state
             self.state_index += 1