Changeset 9b18735 in sasview

Timestamp:

Aug 11, 2010 3: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

Files:

• guiframe/data_loader.py (modified) (5 diffs)
• guiframe/gui_manager.py (modified) (1 diff)
• invariantview/perspectives/invariant/invariant.py (modified) (3 diffs)
• invariantview/perspectives/invariant/invariant_panel.py (modified) (5 diffs)
• sansview/perspectives/fitting/fitpanel.py (modified) (4 diffs)
• sansview/perspectives/fitting/fitting.py (modified) (7 diffs)
• sansview/perspectives/fitting/pagestate.py (modified) (1 diff)

guiframe/data_loader.py

@@ -12 +12 @@
 
 from sans.guicomm.events import NewPlotEvent, StatusEvent
+SVS_FILE_EXT = ['.svs','.inv','.prv','.fitv']
 
 def enable_add_data(existing_panel, new_plot):
@@ -228 +229 @@
         # plot data
         wx.PostEvent(parent, NewPlotEvent(plot=new_plot, title=title))
-        # set state and plot computation if exists
-        wx.PostEvent(parent,InvStateUpdateEvent())
-        wx.PostEvent(parent,FitStateUpdateEvent())
+        if format in SVS_FILE_EXT:
+            # set state and plot computation if exists
+            wx.PostEvent(parent,InvStateUpdateEvent())
+            wx.PostEvent(parent,FitStateUpdateEvent())
     ## the output of the loader is a list , some xml files contain more than one data
     else:
@@ -262 +264 @@
                 new_plot.copy_from_datainfo(item)    
                 item.clone_without_data(clone=new_plot)    
-                
+                # find original data file name without timestemp
                 name = parse_name(name=str(item.run[0]), expression="_")
-                    
+                max_char = name.find("[")
+                if max_char < 0:
+                    max_char = len(name)
+                original_name =name[0:max_char]
                 #TODO: this is a very annoying feature. We should make this
                 # an option. Excel doesn't do this. Why should we?
@@ -272 +277 @@
                 new_plot.name = name
                 new_plot.interactive = True
-                new_plot.group_id = name
+                new_plot.group_id = original_name
                 new_plot.id = name
                 new_plot.is_data = True
@@ -293 +298 @@
                 # plot data
                 wx.PostEvent(parent, NewPlotEvent(plot=new_plot, title=str(title)))
-
-                # set state and plot computation if exists
-                wx.PostEvent(parent,InvStateUpdateEvent())
-                wx.PostEvent(parent,FitStateUpdateEvent())
+                
+                if format in SVS_FILE_EXT:
+                    # set state and plot computation if exists
+                    wx.PostEvent(parent,InvStateUpdateEvent())
+                    wx.PostEvent(parent,FitStateUpdateEvent())
             except:
                 raise

guiframe/gui_manager.py

@@ -715 +715 @@
         
         from data_loader import plot_data
+        from sans.perspectives import invariant
         if path and os.path.isfile(path):
              basename  = os.path.basename(path)
              if  basename.endswith('.svs'):
+                #remove panels for new states
+                 for item in self.panels:
+                     try:
+                         self.panels[item].clear_panel()
+                     except: pass
                  plot_data(self, path,'.inv')
                  plot_data(self, path,'.prv')

invariantview/perspectives/invariant/invariant.py

@@ -265 +265 @@
         """
         Call-back method for the state reader.
-        This method is called when a .inv file is loaded.
+        This method is called when a .inv/.svs file is loaded.
         
         :param state: State object
@@ -271 +271 @@
         self.temp_state = None
         try:
+            
             if datainfo is None:
                 raise RuntimeError, "invariant.set_state: datainfo parameter cannot be None in standalone mode"
+            
             datainfo.meta_data['invstate'].file = datainfo.meta_data['invstate'].file
             datainfo.name = datainfo.meta_data['invstate'].file
@@ -283 +285 @@
             # set state
             self.invariant_panel.is_state_data = True
-            # Load the invariant states
+            
             # Make sure the user sees the invariant panel after loading
             self.parent.set_perspective(self.perspective)
+            # Load the invariant states
             self.temp_state = temp_state
             #self.invariant_panel.set_state(state=temp_state,data=self.__data)         
-
+            
         except:
             logging.error("invariant.set_state: %s" % sys.exc_value)
             
-    def on_set_state_helper(self,event=None):
-        """
+    def on_set_state_helper(self, event=None):
+        """
+        Set the state when called by EVT_STATE_UPDATE event from guiframe
+        after a .inv/.svs file is loaded 
         """
         self.invariant_panel.set_state(state=self.temp_state,data=self.__data)
         self.temp_state = None
+        
+        
         
     def plot_theory(self, data=None, name=None):

invariantview/perspectives/invariant/invariant_panel.py

@@ -123 +123 @@
         if self._data is not None:
             self.err_check_on_data()
+            self.get_state_by_num(0)
             data_name = self._data.name
             data_qmin = min (self._data.x)
@@ -132 +133 @@
             self.compute_invariant(event=None)
             self.state.file = self._data.name
+            #Reset the list of states
+            self.state.data = copy.deepcopy(data)
+            self._reset_state_list()
         return True  
     def set_message(self):
@@ -159 +163 @@
     def set_state(self,state=None,data=None):
         """
-        set state when loading it from a .inv file
+        set state when loading it from a .inv/.svs file
         """
         if state == None or data == None:
@@ -197 +201 @@
             self.is_state_data = False
 
-            
+    def clear_panel(self, format='.svs'):
+        """
+        Clear panel to defaults, used by set_state of manager
+        """
+        if format == '.svs':
+            self._data = None
+            # default data testctrl
+            self.hint_msg_txt.SetLabel('')
+            data_name = ''
+            data_qmin = ''
+            data_qmax = ''
+            self.data_name_tcl.SetValue(str(data_name))
+            self.data_min_tcl.SetLabel(str(data_qmin))
+            self.data_max_tcl.SetLabel(str(data_qmax))
+            #reset output textctrl
+            self._reset_output()
+            #reset panel
+            self.reset_panel()
+            #reset state w/o data
+            self.set_state()
+            # default flags for state
+            self.new_state = False
+            self.is_state_data = False
+            self.is_power_out = False
 
     def get_background(self):
@@ -744 +771 @@
         self.button_bookmark.Disable()
         self.button_report.Disable()
+        self.button_save.Disable() 
         self.button_calculate.SetFocus()
         #self.SetupScrolling()

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