Changeset 7c427a6 in sasview

Timestamp:

Apr 16, 2009 2:29:52 PM (16 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:

3fef0a8

Parents:

a8088d7

Message:

loading 1D data as data1D for all

File:

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

guiframe/data_loader.py

@@ -89 +89 @@
         wx.PostEvent(parent, StatusEvent(status="Problem loading file: %s" % sys.exc_value))
         return
+    if output==None:
+        msg="Could not open this page"
+        wx.PostEvent(parent, StatusEvent(status=msg))
+        return
     filename = os.path.basename(path)
     
@@ -115 +119 @@
         else:
             ##dy values checked
-            if output.dy ==None :
-                new_plot = Theory1D(output.x,output.y, dxl, dxw)
-        
-            else:
-                msg="Loading 1D data: "
-                wx.PostEvent(parent, StatusEvent(status= "%s %s"%(msg, output.filename)))
-                new_plot = Data1D(x=output.x, y=output.y, dx=output.dx,
-                                  dy=output.dy, dxl=dxl, dxw=dxw)
+            dy= output.dy
+            if dy ==None:
+                dy= numpy.zeros(len(output.y))
+            
+            msg="Loading 1D data: "
+            wx.PostEvent(parent, StatusEvent(status= "%s %s"%(msg, output.filename)))
+            new_plot = Data1D(x=output.x, y=output.y, dx=output.dx,
+                              dy= dy, dxl=dxl, dxw=dxw)
                 
         ## source will request in dataLoader .manipulation module
@@ -129 +133 @@
         name= output.filename
         
-            
-        #print "data_name_list",data_name_list
         new_plot.name = name
         ## allow to highlight data when plotted
@@ -161 +163 @@
                 dxl=None
                 dxw=None
-                
-            if item.dy ==None:
-                new_plot = Theory1D(item.x,item.y,dxl,dxw)
-            else:
-                new_plot = Data1D(x=item.x,y=item.y,dx=dx,dy=item.dy,dxl=dxl,dxw=dxw)
-           
+            dy = item.dy  
+            if dy ==None:
+                dy= numpy.zeros(len(item.y))
+               
+            new_plot = Data1D(x=item.x,y=item.y,dx=dx,dy=item.dy,dxl=dxl,dxw=dxw)
             new_plot.source=item.source