Changeset 8897d66 in sasview

Timestamp:

Aug 10, 2010 3:09:40 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:

3eb2811

Parents:

ac2dc0e

Message:

added ability to reset the panels when a new svs file is opened

Location:

sansview/perspectives/fitting

Files:

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

sansview/perspectives/fitting/fitpanel.py

@@ -205 +205 @@
     def close_all(self):
         """
-        remove all pages
-        """
-        for index in range(self.GetPageCount()):
-            self.DeletePage(index)
-        self.model_list_box = {}
+        remove all pages, used when a svs file is opened
+        """
+        #get number of pages
+        nop = self.GetPageCount()
+        #use while-loop, for-loop will not do the job well.
+        while (nop>0):
+            #delete the first page until no page exists
+            page = self.GetPage(0)
+            self._close_helper(selected_page=page)
+            self.DeletePage(0)
+            nop = nop - 1
         ## save the title of the last page tab added
         self.fit_page_name = {}

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)
@@ -294 +295 @@
         pass
     
-    def set_state(self, state, datainfo=None):
+    def set_state(self, state, datainfo=None, format=None):
         """
         Call-back method for the fit page state reader.
-        This method is called when a .fitv file is loaded.
-        
-        :param state: PageState object
-        
+        This method is called when a .fitv/.svs file is loaded.
+        
+        : param state: PageState object
+        : param datainfo: data
+        : param format: file extension in lower case with dot in front
         """
         # store fitting state in temp_state
@@ -306 +308 @@
         # 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):
         """
-        Set_state_helper. This acutally sets state after plotting data from state file.
+        Set_state_helper. This actually sets state after plotting data from state file.
         
         : event: FitStateUpdateEvent called by plot_data from guiframe, data_loader
@@ -316 +320 @@
             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]
@@ -329 +336 @@
                 self.parent.set_perspective(self.perspective) 
         except:
-            self.temp_state = [] 
+            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])
+                    self.call_back(state=state, datainfo=output[ind], format=extension.lower())
                     
                 return output