Changeset 48c7477 in sasview

Timestamp:

Oct 20, 2008 10:39:28 AM (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:

a8b073d

Parents:

693ab78

Message:

remove metadata classes

File:

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

guiframe/data_loader.py

@@ -3 +3 @@
 from danse.common.plottools.plottables import Data1D, Theory1D, Data2D
 from DataLoader.loader import Loader
-class MetaData1D(Data1D):
-    def __init__(self, output):
-        self.datainfo = output
-        Data1D.__init__(self,x=output.x, y=output.y, dy=output.dy)
-        
-class MetaTheory1D(Theory1D):
-    def __init__(self, output):
-        self.datainfo = output
-        Theory1D.__init__(self, x=output.x, y=output.y)
-        
-
-class MetaData2D(Data2D):
-    def __init__(self, output):
-        self.datainfo = output
-        Data2D.__init__(self,image= output.data,err_image=output.err_data,
-                       xmin=output.xmin,xmax=output.xmax,ymin=output.ymin,ymax=output.ymax)
-class MetaTheory2D(Data2D):
-    def __init__(self, output):
-        self.datainfo = output
-        Data2D.__init__(self,image= output.data,err_image=output.err_data,
-                       xmin=output.xmin,xmax=output.xmax,ymin=output.ymin,ymax=output.ymax)
-        
-        
-    
+class Theory2D(Data2D):
+    def __init__(self,image=None,err_image=None,xmin=None,
+                 xmax=None,ymin=None,ymax=None,zmin=None,zmax=None):
+        Data2D.__init__(self,image,err_image,xmin,
+                        xmax,ymin,ymax,zmin,zmax)
 def choose_data_file(parent, location=None):
     path = None
@@ -99 +80 @@
         return
     if hasattr(output,'data'):
-        new_plot = MetaData2D(output)
+        new_plot = Data2D(image=output.data,err_image=output.err_data,
+                          xmin=output.xmin,xmax=output.xmax,
+                          ymin=output.ymin,ymax=output.ymax)
         new_plot.x_bins=output.x_bins
         new_plot.y_bins=output.y_bins
     else:
         if output.dy==None:
-            new_plot = MetaTheory1D(output)
+            new_plot = Theory1D(output.x,output.y)
         else:
-            new_plot = MetaData1D(output)
+            new_plot = Data1D(x=output.x,y=output.y,dy=output.dy)
         
     filename = os.path.basename(path)
-        
+    new_plot.source=output   
     new_plot.name = name
     new_plot.interactive = True