Changeset 9b18735 in sasview for sansview

Timestamp:

Aug 11, 2010 5:35:03 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:

b63dc6e

Parents:

3eb2811

Message:

now all panels are reset when opening svs files: except prview

Location:

sansview/perspectives/fitting

Files:

• fitpanel.py (modified) (4 diffs)
• fitting.py (modified) (7 diffs)
• pagestate.py (modified) (1 diff)

sansview/perspectives/fitting/fitpanel.py

@@ -187 +187 @@
         self.Bind(basepage.EVT_NEXT_STATE, self._onRedo)
         
-        #add default page
-        from hint_fitpage import HintFitPage
-        self.hint_page = HintFitPage(self) 
-        self.AddPage(page=self.hint_page, caption="Hint")
-        
-        
-            
-        #Add the first fit page
-        self.add_empty_page()
+        #add default pages
+        self.add_default_pages()
         
         # increment number for model name
@@ -203 +196 @@
         self.Center()
         
+    def add_default_pages(self):
+        """
+        Add default pages such as a hint page and an empty fit page
+        """
+        #add default page
+        from hint_fitpage import HintFitPage
+        self.hint_page = HintFitPage(self) 
+        self.AddPage(page=self.hint_page, caption="Hint")
+         
+        #Add the first fit page
+        self.add_empty_page()
+
+    
     def close_all(self):
         """
@@ -241 +247 @@
                     panel.reset_page(state=state)
                     
+    def clear_panel(self, format='.svs'):
+        """
+        Clear and close all panels, used by guimanager
+        """
+        if format == '.svs':
+            #close all panels only when svs file opened
+            self.close_all()
+            self.manager.mypanels = []
+                       
     def on_close_page(self, event=None):
         """
@@ -438 +453 @@
             panel = self.add_page(page_info=page_info)
             return panel
-    
+        
     def  _onGetstate(self, event):
         """

sansview/perspectives/fitting/fitting.py

@@ -261 +261 @@
         loader.associate_file_reader(".fitv", self.state_reader)
         loader.associate_file_reader(".svs", self.state_reader)
-        self.format = None
+
         #Send the fitting panel to guiframe
         self.mypanels.append(self.fit_panel)
@@ -295 +295 @@
         pass
     
-    def set_state(self, state, datainfo=None, format=None):
+    def set_state(self, state, datainfo=None):
         """
         Call-back method for the fit page state reader.
@@ -302 +302 @@
         : param state: PageState object
         : param datainfo: data
-        : param format: file extension in lower case with dot in front
         """
         # store fitting state in temp_state
@@ -308 +307 @@
         # index to start with for a new set_state
         self.state_index = 0
-        #file format (extension of the file) opened
-        self.format = format
 
     def  on_set_state_helper(self,event=None):
@@ -315 +312 @@
         Set_state_helper. This actually sets state after plotting data from state file.
         
-        : event: FitStateUpdateEvent called by plot_data from guiframe, data_loader
+        : event: FitStateUpdateEvent called by dataloader.plot_data from guiframe
         """
         if self.temp_state == None or len(self.temp_state) == 0:
+            if self.state_index==0 and len(self.mypanels) <= 0:
+                self.fit_panel.add_default_pages()
             return
         
         try:
-            #close all panels only when svs file opened
-            if self.format == '.svs':
-                self.fit_panel.close_all()
             # Load fitting state
             state = self.temp_state[self.state_index]
@@ -333 +329 @@
                 #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)
+                panel = self.fit_panel.add_page(page_info)
+                self.store_page(page=panel, data=state.data)
                 
-            # get ready for the next set state
+            # get ready for the next set_state
             self.state_index += 1
-            
+
             #reset state variables to default when all set_state is finished. 
             if len(self.temp_state) == self.state_index:
+                
                 self.temp_state = []
                 # Make sure the user sees the fitting panel after loading
@@ -345 +343 @@
         except:
             self.temp_state = []
-            self.format = None 
             raise
                  

sansview/perspectives/fitting/pagestate.py

@@ -1158 +1158 @@
                     state.data.group_id = name
                     #store state in fitting
-                    self.call_back(state=state, datainfo=output[ind], format=extension.lower())
+                    self.call_back(state=state, datainfo=output[ind])
                     
                 return output