Changeset cc1ead1 in sasview

Timestamp:

May 17, 2010 9:48:29 AM (15 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:

4708f3a

Parents:

c1d2af4

Message:

remove thread when loading

File:

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

guiframe/data_loader.py

@@ -139 +139 @@
     wx.PostEvent(parent, StatusEvent(status="Load cancel..", info="warning",
                                                 type="stop"))
+    
 def plot_data(parent, path):
     """
@@ -144 +145 @@
         @param path: the path of the data to load
     """
-    #Load data
-    from load_thread import DataReader
-    if parent is not None:
-        wx.PostEvent(parent, StatusEvent(status="Loading...", info="info",
-                                            type="progress"))
-        reader = DataReader(path=path,
-                             parent=parent,
-                             err_fct=load_error,
-                             msg_fct=on_load_error,
-                            completefn=complete_loading)
-        reader.queue()
+    from sans.guicomm.events import NewPlotEvent, StatusEvent
+    from DataLoader.loader import  Loader
    
-def complete_loading(output, path, parent):
+    # Instantiate a loader 
+    L = Loader()
+    
+    # Load data 
+    try:
+        output = L.load(path)
+    except:
+        load_error(sys.exc_value)
+        return
+    
     # Notify user if the loader completed the load but no data came out
     if output == None:
-        msg = "The data file appears to be empty."
-        load_error(msg)
-        wx.PostEvent(parent, StatusEvent(status=msg, info="warning",
-                                            type="stop"))
+        load_error("The data file appears to be empty.")
         return
-    
+  
+     
     filename = os.path.basename(path)
     
@@ -277 +276 @@
             wx.PostEvent(parent, NewPlotEvent(plot=new_plot, title=str(title)))
             i+=1
-           
-            
+