Changeset 3595309d in sasview for sansview

Timestamp:

Jun 12, 2009 2:37:57 PM (16 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:

a00ee4c

Parents:

0d88a09

Message:

working on undo and redo

Location:

sansview/perspectives/fitting

Files:

• basepage.py (modified) (6 diffs)
• fitpage.py (modified) (5 diffs)
• fitpanel.py (modified) (3 diffs)
• modelpage.py (modified) (2 diffs)

sansview/perspectives/fitting/basepage.py

@@ -499 +499 @@
             return the current state of the page
         """
-       
         return self.state.clone()
     
@@ -698 +697 @@
             self.npts.SetValue(str(state.npts)) 
             
+            
     def _save_typeOfmodel(self):
         """
@@ -706 +706 @@
         self.state.struct_rbutton = self.struct_rbutton.GetValue()
         self.state.plugin_rbutton = self.plugin_rbutton.GetValue()
+        self.state.structurebox= self.structurebox.GetCurrentSelection()
+        self.state.formfactorbox = self.formfactorbox.GetCurrentSelection()
+        
+        self._undo.Enable(True)
         ## post state to fit panel
         event = PageInfoEvent(page = self)
         wx.PostEvent(self.parent, event)
-        self._undo.Enable(True)
+        
         
     def _save_plotting_range(self ):
@@ -1123 +1127 @@
             self._populate_box( self.formfactorbox,
                                 self.model_list_box["Customized Models"])
+        
+        self._on_select_model(event=None)
         self._save_typeOfmodel()
-        self._on_select_model(event=None)
         self.sizer4_4.Layout()
         self.sizer4.Layout()
@@ -1200 +1205 @@
         ## save current state
         self.save_current_state()
-        
-        event = PageInfoEvent(page = self)
-        wx.PostEvent(self.parent, event)
+        if event !=None:
+            self._undo.Enable(True)
+            event = PageInfoEvent(page = self)
+            wx.PostEvent(self.parent, event)
             
         if check_float(tcrtl):
@@ -1305 +1311 @@
         self.save_current_state()
         if event !=None:
+            self._undo.Enable(True)
             event = PageInfoEvent(page = self)
             wx.PostEvent(self.parent, event)
-        
+       
         self.sizer4_4.Layout()
         self.sizer4.Layout()

sansview/perspectives/fitting/fitpage.py

@@ -549 +549 @@
         self.state.enable_disp = self.enable_disp.GetValue()
         self.state.disable_disp = self.disable_disp.GetValue()
-        ## post state to fit panel
-        event = PageInfoEvent(page = self)
-        wx.PostEvent(self.parent, event) 
+        if event !=None:
+            self._undo.Enable(True)
+            ## post state to fit panel
+            event = PageInfoEvent(page = self)
+            wx.PostEvent(self.parent, event) 
      
    
@@ -582 +584 @@
         ## new state posted
         if self.state_change:
+            self._undo.Enable(True)
             event = PageInfoEvent(page = self)
             wx.PostEvent(self.parent, event)
@@ -601 +604 @@
             ## new state posted
             if self.state_change:
-                 event = PageInfoEvent(page = self)
-                 wx.PostEvent(self.parent, event)
-                 self.state_change= False
+                self._undo.Enable(True)
+                event = PageInfoEvent(page = self)
+                wx.PostEvent(self.parent, event)
+                self.state_change= False
         else:
             msg= "Cannot Plot :Must enter a number!!!  "
@@ -936 +940 @@
            
         #self.save_current_state()  
-        
+        if event !=None:
+            self._undo.Enable(True)
+            ## post state to fit panel
+            event = PageInfoEvent(page = self)
+            wx.PostEvent(self.parent, event) 
+     
                 
                 
@@ -978 +987 @@
         
         #self.save_current_state()
-        
+        if event !=None:
+            self._undo.Enable(True)
+            ## post state to fit panel
+            event = PageInfoEvent(page = self)
+            wx.PostEvent(self.parent, event) 
+     
     
         

sansview/perspectives/fitting/fitpanel.py

@@ -356 +356 @@
             else:
                 self.model_page.select_model(model)
-                self.fit_page_name[name]=ListOfState()
+                self.fit_page_name[page_title]=ListOfState()
                 #self.fit_page_name[page_title].insert(0,self.model_page.createMemento())
       
@@ -453 +453 @@
         self.model_page=self.GetPage(self.GetSelection())
      
-        ##  resetting page
+        ##resetting page
         if reset:
             if page_title in self.fit_page_name.keys():
@@ -462 +462 @@
             self.fit_page_name[page_title]=ListOfState()
             #self.fit_page_name[page_title]=[]
-            self.fit_page_name[page_title].insert(0,panel.createMemento())
+            #self.fit_page_name[page_title].insert(0,panel.createMemento())
        
   

sansview/perspectives/fitting/modelpage.py

@@ -317 +317 @@
         self.state.enable2D =  copy.deepcopy(self.enable2D)
         ## post state to fit panel
+        self._undo.Enable(True)
         event = PageInfoEvent(page = self)
         wx.PostEvent(self.parent, event)
@@ -348 +349 @@
             self._draw_model()
         ## post state to fit panel
+        self._undo.Enable(True)
         event = PageInfoEvent(page = self)
         wx.PostEvent(self.parent, event)