Changeset b63dc6e in sasview

Timestamp:

Aug 11, 2010 10:50:58 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:

7a07864

Parents:

9b18735

Message:

minor fixes of state

Files:

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

guiframe/data_loader.py

@@ -172 +172 @@
         load_error(sys.exc_value)
         return
-    
+    basename  = os.path.basename(path)
     # Notify user if the loader completed the load but no data came out
     if output == None:
-        basename  = os.path.basename(path)
         if  not basename.endswith('.svs'):
             load_error("The data file appears to be empty.")
         return
   
-     
+    root, extension = os.path.splitext(basename)
+    ext =  extension.lower()
     filename = os.path.basename(path)
     if not  output.__class__.__name__ == "list":
@@ -229 +229 @@
         # plot data
         wx.PostEvent(parent, NewPlotEvent(plot=new_plot, title=title))
-        if format in SVS_FILE_EXT:
+        if ext in SVS_FILE_EXT:
             # set state and plot computation if exists
             wx.PostEvent(parent,InvStateUpdateEvent())
@@ -299 +299 @@
                 wx.PostEvent(parent, NewPlotEvent(plot=new_plot, title=str(title)))
                 
-                if format in SVS_FILE_EXT:
+                if ext in SVS_FILE_EXT:
                     # set state and plot computation if exists
                     wx.PostEvent(parent,InvStateUpdateEvent())

guiframe/gui_manager.py

@@ -795 +795 @@
             fd.close()
         else:
+            print "Nothing to save..."
             raise RuntimeError, "%s is not a SansView (.svs) file..." % path
 

sansview/perspectives/fitting/fitting.py

@@ -119 +119 @@
         self.temp_state = []
         self.state_index = 0
+        self.sfile_ext = None
         # Log startup
         logging.info("Fitting plug-in started") 
@@ -295 +296 @@
         pass
     
-    def set_state(self, state, datainfo=None):
+    def set_state(self, state=None, datainfo=None, format=None):
         """
         Call-back method for the fit page state reader.
@@ -303 +304 @@
         : param datainfo: data
         """
-        # store fitting state in temp_state
-        self.temp_state.append(state) 
+        if state != None:
+            # store fitting state in temp_state
+            self.temp_state.append(state) 
+        else:
+            self.temp_state = []
         # index to start with for a new set_state
         self.state_index = 0
+        # state file format
+        self.sfile_ext = format
 
     def  on_set_state_helper(self,event=None):
@@ -314 +320 @@
         : event: FitStateUpdateEvent called by dataloader.plot_data from guiframe
         """
-        if self.temp_state == None or len(self.temp_state) == 0:
+        if len(self.temp_state) == 0 and self.sfile_ext =='.svs':
             if self.state_index==0 and len(self.mypanels) <= 0:
                 self.fit_panel.add_default_pages()
+                self.temp_state = []
+                self.state_index = 0
             return
         
@@ -331 +339 @@
                 panel = self.fit_panel.add_page(page_info)
                 self.store_page(page=panel, data=state.data)
+                self.mypanels.append(panel) 
                 
             # get ready for the next set_state
@@ -339 +348 @@
                 
                 self.temp_state = []
+                #self.state_index = 0
                 # Make sure the user sees the fitting panel after loading
                 self.parent.set_perspective(self.perspective) 
         except:
+            self.state_index==0
             self.temp_state = []
             raise

sansview/perspectives/fitting/pagestate.py

@@ -1096 +1096 @@
         """
         output = []
+        basename  = os.path.basename(path)
+        root, extension = os.path.splitext(basename)
+        ext = extension.lower()
         try:
             if os.path.isfile(path):
-                basename  = os.path.basename(path)
-                root, extension = os.path.splitext(basename)
+                
                 #TODO: eventually remove the check for .xml once
                 # the P(r) writer/reader is truly complete.
-                if  extension.lower() in self.ext or \
-                    extension.lower() == '.xml':
+                if  ext in self.ext or \
+                    ext == '.xml':
                     
                     tree = etree.parse(path, parser=etree.ETCompatXMLParser())
@@ -1124 +1126 @@
                             output.append(sas_entry)
             else:
+                self.call_back(format=ext)
                 raise RuntimeError, "%s is not a file" % path
 
             # Return output consistent with the loader's api
             if len(output)==0:
+                self.call_back(state=None, datainfo=None,format=ext)
                 return None
             else:
@@ -1158 +1162 @@
                     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=ext)
                 return output
               
         except:
+            self.call_back(format=ext)
             raise