Changeset 49b3ddd in sasview

Timestamp:

Jul 10, 2008 6:13:46 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:

159db3b

Parents:

4dd63eb

Message:

loading changed

Location:

guiframe

Files:

• data_loader.py (modified) (1 diff)
• local_perspectives/plotting/plotting.py (modified) (1 diff)

guiframe/data_loader.py

@@ -62 +62 @@
     
     #Recieves data 
-    x,y,dy=L.load(path)
-   
+    output=L.load(path)
+    
     import numpy
     
-    if dy==None:
-        new_plot = Theory1D(x, y)
+    if output.dy==None:
+        new_plot = Theory1D(output.x, output.y)
     else:
-        new_plot = Data1D(x, y, dy=dy)
+        new_plot = Data1D(output.x, output.y, dy=output.dy)
     new_plot.name = name
     new_plot.interactive = True

guiframe/local_perspectives/plotting/plotting.py

@@ -64 +64 @@
         self.graph.yaxis("\\rm{Intensity} ","cm^{-1}")
         self.graph.render(self)
-        
+   
     def _reset(self):
         """