Changeset ec489f5 in sasview for guiframe

Timestamp:

Feb 2, 2011 7:18:18 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:

13913ec

Parents:

6886000

Message:

put original sansview save state

Location:

guiframe

Files:

• gui_manager.py (modified) (1 diff)
• local_perspectives/data_loader/data_loader.py (modified) (5 diffs)

guiframe/gui_manager.py

@@ -1041 +1041 @@
             avalaible_data = self._data_manager.get_all_data()
             
-        if flag:
+        if True:
             #reading a state file
             for plug in self.plugins:

guiframe/local_perspectives/data_loader/data_loader.py

@@ -65 +65 @@
         if not file_list or file_list[0] is None:
             return
-        self.get_data(file_list, flag=flag)
+        self.get_state(file_list)
        
     def load_folder(self, event):
@@ -165 +165 @@
                                   file) for file in os.listdir(path)]
     
+    def get_state(self, path, format=None):
+        """
+        read state
+        """
+        output = []
+        for p_file in path:
+            basename  = os.path.basename(p_file)
+            root, extension = os.path.splitext(basename)
+            for extension in EXTENSIONS:
+                temp = self.loader.load(p_file, extension)
+                if temp.__class__.__name__ == "list":
+                    for item in temp:
+                        data = self.create_data(item, p_file)
+                else:
+                    data = self.create_data(temp, p_file)
+                output.append(data)
+            self.load_complete(output=output, path=path)
+                   
     def get_data(self, path, format=None, flag=True):
         """
@@ -190 +208 @@
                     continue
             try:
-                temp =  self.loader.load(p_file)
+                temp =  self.loader.load(p_file, format)
                 if temp.__class__.__name__ == "list":
                     print "list", temp
@@ -197 +215 @@
                         output.append(data)
                 else:
-                    print "list", temp
+                    print "not list", [temp]
                     data = self.create_data(temp, p_file)
                     output.append(data)
@@ -214 +232 @@
             
    
-    def old_get_data(self, path, format=None, flag=True):
-        """
-        :param flag: is True load only data file, else load state file
-        Receive a list of file paths and return a list of Data objects
-        """
-        from .load_thread import DataReader
-        message = "Start Loading \n"
-        wx.PostEvent(self.parent, StatusEvent(status=message,
-                                              info="info", type="progress"))
-        calc_load = DataReader(loader=self.loader,
-                               path=path,
-                               flag=flag,
-                               transform_data=self.create_data,
-                               updatefn=self.load_update,
-                               completefn=self.load_complete)
-        calc_load.queue()
-        
     def load_update(self, output=None, message=""):
         """