Changeset 645f9b6 in sasview

Timestamp:

Aug 17, 2010 11:14:25 AM (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:

4523b68

Parents:

5069a18

Message:

fixed minor bugs on set_state that did not totally update state information and not pass to state object.

Files:

• invariantview/perspectives/invariant/invariant_panel.py (modified) (5 diffs)
• sansview/perspectives/fitting/fitpanel.py (modified) (2 diffs)

invariantview/perspectives/invariant/invariant_panel.py

@@ -165 +165 @@
         set state when loading it from a .inv/.svs file
         """
-        if state == None or data == None:
+        if state == None and data == None:
             self.state = IState()
+        elif state == None or data == None: return
         else:
             self.new_state = True
@@ -173 +174 @@
             self.state = state 
             self.state.file = data.name   
+
             num = self.state.saved_state['state_num']
-            
             if num > 0 :
                 self._undo_enable()
@@ -198 +199 @@
             #make sure that the data is reset (especially when loaded from a inv file)
             self.state.data = self._data
+
             self.new_state = False 
             self.is_state_data = False
@@ -567 +569 @@
         #display a message
         self.set_message()
-        
+
         # reset power_out to default to get ready for another '_on_text'
         if self.is_power_out == True:
@@ -579 +581 @@
         #enable the button_ok for more details
         self.button_details.Enable()
-
+        
         if event != None: 
             if not self.button_report.IsEnabled(): self.button_report.Enable(True)
             if not self.button_save.IsEnabled(): self.button_save.Enable(True)
             wx.PostEvent(self.parent, StatusEvent(status = '\nFinished invariant computation...'))
-        
+            
+
     def undo(self,event=None):
         """

sansview/perspectives/fitting/fitpanel.py

@@ -239 +239 @@
                     # the page is still opened
                     panel.reset_page(state=state)
+                    panel.save_current_state() 
                     page_is_opened = True
             if not page_is_opened:
@@ -246 +247 @@
                     self.manager.store_page(page=panel, data=state.data)
                     panel.reset_page(state=state)
+                    panel.save_current_state()
                     
     def clear_panel(self, format='.svs'):