Changeset cef847c in sasview for invariantview

Timestamp:

Jul 26, 2010 5:50:45 PM (14 years ago)

Author:

Gervaise Alina <gervyh@…>

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:

b281210

Parents:

72a6bf8

Message:

working in combobox

File:

• invariantview/perspectives/invariant/invariant_panel.py (modified) (17 diffs)

invariantview/perspectives/invariant/invariant_panel.py

@@ -82 +82 @@
         self.new_state = False
         self.is_power_out = False
-        
+
         #container of invariant value
         self.inv_container = None
@@ -96 +96 @@
         ## Default file location for save
         self._default_save_location = os.getcwd()
- 
+        
     def err_check_on_data(self):
         """
@@ -216 +216 @@
 
             num = self.state.saved_state['state_num']
-            self.get_state_by_num(state_num=num)
             
             if num > 0 :
@@ -223 +222 @@
                 self._redo_enable()
                 
-            
             # get bookmarks
             self.bookmark_num = len(self.state.bookmark_list)
+
             total_bookmark_num = self.bookmark_num+1
             for ind in range(1,total_bookmark_num):
@@ -234 +233 @@
                 id = wx.NewId()
                 self.popUpMenu.Append(id,name,str(''))
-                 wx.EVT_MENU(self, id, self._back_to_bookmark) 
+                wx.EVT_MENU(self, id, self._back_to_bookmark) 
 
             self.get_state_by_num(state_num=str(num))
             
             self._get_input_list() 
-          
             
             self.new_state = False 
@@ -507 +505 @@
             msg= "\n\nStarting a new invariant computation..."            
             wx.PostEvent(self.parent, StatusEvent(status=msg))
+            
 
         if self._data is None or self.err_check_on_data():
@@ -593 +592 @@
             self.is_power_out = False
             wx.PostEvent(self.parent, StatusEvent(status = msg ))
-        
+
         #enable the button_ok for more details
         self.button_details.Enable()
@@ -600 +599 @@
             self.button_report.Enable(True)
             wx.PostEvent(self.parent, StatusEvent(status = '\nFinished invariant computation...'))
-    
+        
     def undo(self,event=None):
         """
@@ -670 +669 @@
 
         backup_state_list = copy.deepcopy(self.state.state_list)
-
+        
         # get the previous state
         try:
@@ -678 +677 @@
         except :
             raise ValueError,  "No such state exists in history"
-
+        
         # get the state at pre_compute_num
         comp_state = copy.deepcopy(self.state.state_list[current_compute_num])
@@ -691 +690 @@
             except:
                 pass
-            
+          
         self.compute_invariant(event=None)
         # set the input params at the state at pre_state_num
@@ -715 +714 @@
         self.state.saved_state = current_state
         self.state.state_num = state_num
-
+        
+        
         
     def get_bookmark_by_num(self, num=None):
@@ -755 +755 @@
                 pass
         self.state.saved_state = copy.deepcopy(current_state)
-
+       
         self._enable_high_q_section(event=None)
         self._enable_low_q_section(event=None)
@@ -875 +875 @@
         self._redo_disable()
         
+        
     def _reset_state_list(self,data=None):
         """
@@ -1142 +1143 @@
         else:
             return False
+
         
     def _reset_output(self):
@@ -1235 +1237 @@
         data_name_txt = wx.StaticText(self, -1, 'Data : ')  
        
-        self.data_name_tcl = OutputTextCtrl(self, -1,size=(260,20), style=0, 
-                                            name='data_name_tcl') 
+        self.data_name_tcl = OutputTextCtrl(self, -1,size=(260,20), style=0, name='data_name_tcl') 
         self.data_name_tcl.SetToolTipString("Data's name.")
         self.loaded_data_name_sizer.AddMany([(self.data_txt, 0,
@@ -1252 +1253 @@
         self.data_max_tcl = OutputTextCtrl(self, -1, size=(_BOX_WIDTH, 20), style=0, name='data_max_tcl') 
         self.data_max_tcl.SetToolTipString("The maximum value of q range.")
-       
         self.data_range_sizer.AddMany([(data_range_txt, 0, wx.RIGHT, 10),
                                        (data_min_txt, 0, wx.RIGHT, 10),