Changeset 7c845cb in sasview

Timestamp:

Apr 8, 2009 6:31:37 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:

892f246

Parents:

6999659

Message:

open and closing page and simpage update

Location:

sansview/perspectives/fitting

Files:

• basepage.py (modified) (1 diff)
• fitpage.py (modified) (1 diff)
• fitpanel.py (modified) (1 diff)
• fitproblem.py (modified) (1 diff)
• fitting.py (modified) (1 diff)
• modelpage.py (modified) (1 diff)

sansview/perspectives/fitting/basepage.py

@@ -461 +461 @@
         wx.PostEvent(self.parent, event)
     
-    def reset_page(self, state):
+    def reset_page_helper(self, state):
         """
             Use page_state and change the state of existing page

sansview/perspectives/fitting/fitpage.py

@@ -406 +406 @@
         wx.PostEvent(self.event_owner, evt)   
         
-    
+    def reset_page(self, state):
+        """
+            reset the state
+        """
+        self.reset_page_helper(state)
+        evt = ModelEventbox(model=self.model)
+        wx.PostEvent(self.event_owner, evt)   
+        
+        
     def _onparamEnter(self,event):
         """ 

sansview/perspectives/fitting/fitpanel.py

@@ -95 +95 @@
              close page and remove all references to the closed page
         """
-        state = self.get_current_page().createMemento()
-        page_name = self.get_current_page().window_name
+        selected_page = self.GetPage(self.GetSelection())
+        ## removing about page
+        if selected_page==self.about_page:
+            self.about_page=None
+            return 
+        ## removing sim_page
+        if selected_page == self.sim_page:
+            self.manager.sim_page=None 
+            return
+        
+        ## closing other pages
+        state = selected_page.createMemento()
+        page_name = selected_page.window_name
         page_finder = self.manager.get_page_finder() 
         fitproblem = None
-        
-        if self.get_current_page() in page_finder:
-            fitproblem= page_finder[self.get_current_page()]
-            
-        
-        selected_page = self.GetPage(self.GetSelection())
-        page_number = self.GetSelection()
-        
-        if self.sim_page != selected_page and selected_page!=self.about_page:
-            # remove the check box link to the model name of this page (selected_page)
-            if self.sim_page !=None :
+        ## removing model page
+        if selected_page == self.model_page:
+            fitproblem = selected_page.model.clone()
+            self.model_page = None
+            ## page on menu
+            self.manager._add_page_onmenu(page_name, fitproblem)
+        else:
+            if selected_page in page_finder:
+       
+                fitproblem= page_finder[selected_page].clone()
+                ## page on menu
+                self.manager._add_page_onmenu(page_name, fitproblem)
+                del page_finder[selected_page]
+            ##remove the check box link to the model name of this page (selected_page)
+            try:
                 self.sim_page.draw_page()
-            
-            #Delete the page from notebook
-            if selected_page.window_name in self.list_fitpage_name:
-                self.list_fitpage_name.remove(selected_page.window_name)
-           
-            if selected_page.window_name== "Model":
-                fitproblem = self.get_current_page().model.clone()
-                self.model_page=None
+            except:
+                ## that page is already deleted no need to remove check box on
+                ##non existing page
+                pass
                 
-            if  page_number == 1:
-                self.model_page=None
-                
-            
-        elif selected_page==self.about_page:
-            self.about_page=None
-        else:
-            self.manager.sim_page=None 
-        ## page on menu
-        self.manager._add_page_onmenu(page_name, fitproblem)
+        #Delete the name of the page into the list of open page
+        if selected_page.window_name in self.list_fitpage_name:
+            self.list_fitpage_name.remove(selected_page.window_name)
+    
+        
         
         

sansview/perspectives/fitting/fitproblem.py

@@ -35 +35 @@
         """
         import copy 
-        obj          = FitProblem( self.parent,model= model )
+        obj          = FitProblem()
+        model= None
+        if self.model!=None:
+            model = self.model.clone()
+        obj.model = model
         obj.fit_data = copy.deepcopy(self.fit_data)
         obj.model = copy.deepcopy(self.model)

sansview/perspectives/fitting/fitting.py

@@ -476 +476 @@
                     if fitproblem != None:
                         self.page_finder[page]=fitproblem
+                        if self.sim_page != None:
+                            self.sim_page.draw_page()
+                            
                 else:
                     model = fitproblem

sansview/perspectives/fitting/modelpage.py

@@ -225 +225 @@
         self.SetScrollbars(20,20,200,100)
              
+             
+    def reset_page(self, state):
+        """
+            reset the state
+        """
+        self.reset_page_helper(state)
+        
+        
     def _onModel2D(self, event):
         """