Changeset eec8dbb in sasview

Timestamp:

Feb 11, 2011 6:42:40 PM (14 years ago)

Author:

Gervaise Alina <gervyh@…>

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:

90a7bbd

Parents:

d20771f

Message:

working onread state

File:

• guiframe/gui_manager.py (modified) (3 diffs)

guiframe/gui_manager.py

@@ -150 +150 @@
         self.Bind(EVT_PANEL_ON_FOCUS, self.set_panel_on_focus)
         
+  
     def set_panel_on_focus(self, event):
         """
@@ -949 +950 @@
             return
         try:
-            if extension == '.svs':
-                for plug in self.plugins:
-                    temp =  self.loader.load(path)
-                    if temp.__class__.__name__ == "list":
-                        for item in temp:
-                            data = self.create_gui_data(item, path)
-                            output.append(data)
-                    else:
-                        data = self.create_gui_data(temp, path)
-                        output.append(data)
-                    
-                    message = "Loading File..." + str(basename) + "\n"
-                    self.load_update(output=output, message=message)
-            else:
-                temp =  self.loader.load(path, extension)
-                if temp.__class__.__name__ == "list":
-                    for item in temp:
-                        data = self.create_gui_data(item, path)
-                        output.append(data)
-                else:
-                    data = self.create_gui_data(temp, path)
-                    output.append(data)
-            message = "Loading File..." + str(basename) + "\n"
-            self.load_update(output=output, message=message)
+            #reading a state file
+            for plug in self.plugins:
+                reader, ext = plug.get_extensions()
+                if reader is not None:
+                    #read the state of the single plugin
+                    if extension == ext:
+                        reader.read(path)
+                        return
+                    elif extension == '.svs':
+                        reader.read(path)
         except:
             raise
-            error_message = "Error while loading: %s\n" % str(p_file)
-            error_message += str(sys.exc_value) + "\n"
-            self.load_update(output=output, message=error_message)
-            
-        message = "Loading Complete! "
-        self.load_complete(output=output, error_message=error_message,
-                   message=message, path=path, extension=extension)    
-        
+                        
     def load_update(self, output=None, message=""):
         """
@@ -1013 +993 @@
             #plug.on_set_state_helper(event=None)
             _, ext = plug.get_extensions()
-            if extension == ext:
-                plug.set_state(state=None, datainfo=available_data)
-            elif extension == '.svs':
-                plug.set_state(state=None, datainfo=available_data)
+            plug.set_state(state=None, datainfo=available_data)
+            
                 
         style = self.__gui_style & GUIFRAME.MANAGER_ON