Changeset e5664f2 in sasview

Timestamp:

Sep 17, 2009 9:30:04 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:

c202d03

Parents:

b2f4f83

Message:

change theory1d used from plottable to datafitting type

Location:

guiframe

Files:

• dataFitting.py (modified) (2 diffs)
• data_loader.py (modified) (2 diffs)
• local_perspectives/plotting/Plotter1D.py (modified) (2 diffs)

guiframe/dataFitting.py

@@ -4 +4 @@
 from danse.common.plottools.plottables import Data1D as PlotData1D
 from danse.common.plottools.plottables import Data2D as PlotData2D
+from danse.common.plottools.plottables import Theory1D as PlotTheory1D
 
 from DataLoader.data_info import Data1D as LoadData1D
@@ -33 +34 @@
         self.yaxis(data1d._yaxis,data1d._yunit)
     
+class Theory1D(PlotTheory1D,LoadData1D):
     
+    def __init__(self,x=[],y=[],dy=None):
+        PlotTheory1D.__init__(self, x, y, dy)
+        LoadData1D.__init__(self, x, y, dy)
+        self.id= None
+        self.group_id =None
+        self.is_data = True
+    
+    def copy_from_datainfo(self, data1d):
+        """
+            copy values of Data1D of type DataLaoder.Data_info
+        """
+        self.x  = copy.deepcopy(data1d.x)
+        self.y  = copy.deepcopy(data1d.y)
+        self.dy = copy.deepcopy(data1d.dy)
+   
+        self.xaxis(data1d._xaxis,data1d._xunit)
+        self.yaxis(data1d._yaxis,data1d._yunit)
       
 class Data2D(PlotData2D,LoadData2D):

guiframe/data_loader.py

@@ -142 +142 @@
         ## when 2 data have the same id override the 1 st plotted
         new_plot.id = name
-        ## info is a reference to output of dataloader that can be used
-        ## to save  data 1D as cansas xml file
-        new_plot.info= output
+      
         ##group_id specify on which panel to plot this data
         new_plot.group_id = name
@@ -195 +193 @@
             new_plot.group_id = name
             new_plot.id = name
-            new_plot.info= item
+     
             new_plot.is_data =True
             if hasattr(item,"title"):

guiframe/local_perspectives/plotting/Plotter1D.py

@@ -20 +20 @@
 import danse.common.plottools
 from danse.common.plottools.PlotPanel import PlotPanel
-from danse.common.plottools.plottables import Graph,Theory1D
+from danse.common.plottools.plottables import Graph
 from sans.guiframe import dataFitting 
 from sans.guicomm.events import EVT_NEW_PLOT
@@ -27 +27 @@
 from sans.guiframe.utils import PanelMenu
 from sans.guiframe.dataFitting import Data1D
-
+from sans.guiframe.dataFitting import Theory1D
 from binder import BindArtist