Changeset ef16f59 in sasview

Timestamp:

Aug 9, 2010 11:38:42 AM (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:

e683abb

Parents:

4da35bc

Message:

Now it saves and opens all states of fitv taps.

Files:

• guiframe/data_loader.py (modified) (6 diffs)
• sansview/perspectives/fitting/fitting.py (modified) (2 diffs)
• sansview/perspectives/fitting/pagestate.py (modified) (3 diffs)

guiframe/data_loader.py

@@ -181 +181 @@
      
     filename = os.path.basename(path)
-    
     if not  output.__class__.__name__ == "list":
         ## Creating a Data2D with output
@@ -202 +201 @@
         ## name of the data allow to differentiate data when plotted
         name = parse_name(name=output.filename, expression="_")
-        #if not name in parent.indice_load_data.keys():
-        #    parent.indice_load_data[name] = 0
-        #else:
-            ## create a copy of the loaded data
-        #    parent.indice_load_data[name] += 1
-        #    name = name +"[%i]"%parent.indice_load_data[name]
        
         new_plot.name = name
@@ -233 +226 @@
                         #add this plot the an existing panel
                         new_plot.group_id = existing_panel.group_id
+        # 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())
     ## the output of the loader is a list , some xml files contain more than one data
     else:
-        
-        i=1
-        for item in output:
+        i=0
+        for item in output: 
             try:
                 ## Creating a Data2D with output
@@ -261 +255 @@
         
                     new_plot = Data1D(x=item.x,y=item.y,dx=dx,dy=item.dy)
+                    if dxl != None:
+                        new_plot.dxl = dxl
+                    if dxl != None:
+                        new_plot.dxw = dxw
+                
+                new_plot.copy_from_datainfo(item)    
+                item.clone_without_data(clone=new_plot)    
+                
+                name = parse_name(name=str(item.run[0]), expression="_")
                     
-                    new_plot.dxl = dxl
-                    new_plot.dxw = dxw
-                    
-                item.clone_without_data(clone=new_plot)    
-                new_plot.copy_from_datainfo(item)
-                name = parse_name(name=str(item.run[0]), expression="_")
-                #if not name in parent.indice_load_data.keys():
-                #    parent.indice_load_data[name] = 0
-                #else:
-                    ## create a copy of the loaded data
-                    
-                    #TODO: this is a very annoying feature. We should make this
-                    # an option. Excel doesn't do this. Why should we?
-                    # What is the requirement for this feature, and are the
-                    # counter arguments stronger? Is this feature developed
-                    # to please at least 80% of the users or a special few?
-                    #parent.indice_load_data[name] += 1
-                    #name = name + "(copy %i)"%parent.indice_load_data[name]
-                    
+                #TODO: this is a very annoying feature. We should make this
+                # an option. Excel doesn't do this. Why should we?
+                # What is the requirement for this feature, and are the
+                # counter arguments stronger? Is this feature developed
+                # to please at least 80% of the users or a special few?                    
                 new_plot.name = name
                 new_plot.interactive = True
@@ -286 +275 @@
                 new_plot.id = name
                 new_plot.is_data = True
-            
+                title = item.filename
+                
                 if hasattr(item,"title"):
                     title = item.title.lstrip().rstrip()
@@ -301 +291 @@
                             #add this plot the an existing panel
                             new_plot.group_id = existing_panel.group_id
+                # 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())
-                i+=1
             except:
-                pass
+                raise

sansview/perspectives/fitting/fitting.py

@@ -118 +118 @@
         self.state_reader = None 
         self.temp_state = []
+        self.state_index = 0
         # Log startup
         logging.info("Fitting plug-in started") 
@@ -301 +302 @@
         
         """
-        #print "state", state
-        #return
-        #working on reading state
-        self.temp_state = []
-        try: 
-            # state
+        # store fitting state in temp_state
+        self.temp_state.append(state) 
+        # index to start with for a new set_state
+        self.state_index = 0
+
+    def  on_set_state_helper(self,event=None):
+        """
+        Set_state_helper. This acutally sets state after plotting data from state file.
+        
+        : event: FitStateUpdateEvent called by plot_data from guiframe, data_loader
+        """
+        if self.temp_state == None or len(self.temp_state) == 0:
+            return
+        try:
             # Load fitting state
-            self.temp_state.append(state) 
-            # Make sure the user sees the fitting panel after loading
-            #self.parent.set_perspective(self.perspective)   
-                   
+            state = self.temp_state[self.state_index]
+            #set state
+            page = self.fit_panel.set_state(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
+                self.parent.set_perspective(self.perspective) 
         except:
+            self.temp_state = [] 
             raise
-        
-    def  on_set_state_helper(self,event=None):
-        """
-        """
-        if self.temp_state == None:
-            return
-        # Load fitting state
-        for index in range(len(self.temp_state)):
-            page = self.fit_panel.set_state(self.temp_state[index]) 
-            # Make sure the user sees the fitting panel after loading
-            self.parent.set_perspective(self.perspective)  
-             
-        self.temp_state = []   
                  
     def save_fit_state(self, filepath, fitstate):  

sansview/perspectives/fitting/pagestate.py

@@ -1139 +1139 @@
                     if max_char < 0:
                         max_char = len(state.file)
-                    state.file = state.file[0:max_char] +' [' + time_str + ']'
+                    original_fname = state.file[0:max_char]
+                    state.file = original_fname +' [' + time_str + ']'
                    
                         
@@ -1149 +1150 @@
                     state.data.name = output[ind].filename #state.data_name
                     state.data.id = state.data_id
-                    state.data.id = state.data_id
                     if state.is_data is not None:
                         state.data.is_data = state.is_data
-                    state.data.group_id = output[ind].filename
-                  
-                    # make sure to put run name if none
-                    #if output[ind].run == None or output[ind].run ==[]:
-                    #    exec 'output[%d].run = [output[%d].filename]'% (ind,ind)
+                    if output[ind].run_name is not None and len(output[ind].run_name) != 0 :
+                        name = output[ind].run_name
+                    else: 
+                        name=original_fname
+                    state.data.group_id = name
+                    #store state in fitting
                     self.call_back(state=state, datainfo=output[ind])
-                return output[ind]
+                    
+                return output
               
         except:
@@ -1176 +1178 @@
             
             # Add fitting information to the XML document
-            self.write_toXML(datainfo, fitstate)
+            doc = self.write_toXML(datainfo, fitstate)
             # Write the XML document
             fd = open(filename, 'w')