Changeset b3644f3 in sasview

Timestamp:

Apr 12, 2010 1:08:59 PM (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:

04349fe

Parents:

261b864

Message:

working on loading large data

Location:

guiframe

Files:

• data_loader.py (modified) (5 diffs)
• gui_manager.py (modified) (1 diff)
• load_thread.py (added)
• statusbar.py (modified) (3 diffs)

guiframe/data_loader.py

@@ +1 @@
+
 import os, sys,numpy
 import wx
 import re
+
 from dataFitting import Data1D
 from dataFitting import Data2D
 from DataLoader.loader import Loader
+from load_thread import DataReader
+
+from sans.guicomm.events import NewPlotEvent, StatusEvent
+
 
 def parse_name(name, expression):
@@ -116 +122 @@
     dial.ShowModal()    
 
+def on_load_error(parent):
+    """
+    """
+    wx.PostEvent(parent, StatusEvent(status="Load cancel..", info="warning",
+                                                type="stop"))
 def plot_data(parent, path):
     """
@@ -121 +132 @@
         @param path: the path of the data to load
     """
-    from sans.guicomm.events import NewPlotEvent, StatusEvent
-    from DataLoader.loader import  Loader
+    #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()
    
-    # Instantiate a loader 
-    L = Loader()
-    
-    # Load data 
-    try:
-        output = L.load(path)
-    except:
-        load_error(sys.exc_value)
-        return
-    
+def complete_loading(output, path, parent):
     # Notify user if the loader completed the load but no data came out
     if output == None:
-        load_error("The data file appears to be empty.")
+        msg = "The data file appears to be empty."
+        load_error(msg)
+        wx.PostEvent(parent, StatusEvent(status=msg, info="warning",
+                                            type="stop"))
         return
-  
+    
     filename = os.path.basename(path)
     
@@ -147 +161 @@
       
         else:
-            msg = "Loading 1D data: "
-            wx.PostEvent(parent, StatusEvent(status="%s %s"%(msg, output.filename)))
+            msg = "Loading 1D data: %s"%output.filename
+            wx.PostEvent(parent, StatusEvent(status=msg, info="info", type="stop"))
             new_plot = Data1D(x=[], y=[], dx=None, dy=None)
             
@@ -198 +212 @@
         i=1
         for item in output:
+            msg = "Loading 1D data: %s"%str(item.run[0])
+            wx.PostEvent(parent, StatusEvent(status=msg, info="info", type="stop"))
             try:
                 dx = item.dx

guiframe/gui_manager.py

@@ -677 +677 @@
    
     def _on_open(self, event):
-   
+        """
+        """
+        print "_on_open"
+        path = self.choose_file()
+        if path is None:
+            return
+        
         from data_loader import plot_data
-        path = self.choose_file()
-
-        if path ==None:
-            return
         if path and os.path.isfile(path):
             plot_data(self, path)

guiframe/statusbar.py

@@ -35 +35 @@
          
          #status bar icon
-         icon_bmp =  wx.ArtProvider.GetBitmap(wx.ART_INFORMATION, wx.ART_TOOLBAR)
          self.bitmap_bt_warning = wx.BitmapButton(self, -1, size=(BUTTON_SIZE,-1),
                                                   style=wx.NO_BORDER)
-         self.bitmap_bt_warning.SetBitmapLabel(icon_bmp)
          rect = self.GetFieldRect(ICON_POSITION)
          self.bitmap_bt_warning.SetPosition((rect.x+5, rect.y-2))
@@ -75 +73 @@
             count += 1
         self.timer_stop.Stop() 
-        self.clear_gauge(msg="Complete")
+        self.clear_gauge(msg="")
        
     def OnTimer(self, evt): 
@@ -107 +105 @@
             Hide the gauge
         """
-        self.SetStatusText(str(msg), MSG_POSITION)
+        #self.SetStatusText(str(msg), MSG_POSITION)
         self.progress = 0
         self.gauge.SetValue(0)