Changeset c202d03 in sasview

Timestamp:

Sep 17, 2009 9:31:05 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:

904168e1

Parents:

e5664f2

Message:

change copy_data and theory1d type

File:

• sansview/perspectives/fitting/fitting.py (modified) (3 diffs)

sansview/perspectives/fitting/fitting.py

@@ -13 +13 @@
 import time
 import thread
-from danse.common.plottools.plottables import Theory1D
+#from danse.common.plottools.plottables import Theory1D
 from danse.common.plottools.PlotPanel import PlotPanel
 
 from sans.guiframe.dataFitting import Data2D
 from sans.guiframe.dataFitting import Data1D
+from sans.guiframe.dataFitting import Theory1D
 from sans.guiframe import dataFitting 
 
@@ -277 +278 @@
             @param return 
         """
-        detector=None
-        source=None
-        info = None
+      
         id=None
-        dxl=None
-        dxw=None
-        dx=None
-        if hasattr(item, "dxl"):
-            dxl = copy.deepcopy(item.dxl)
-        if hasattr(item, "dxw"):
-            dxw = copy.deepcopy(item.dxw)
-        if hasattr(item, "detector"):
-            detector = copy.deepcopy(item.detector)
-        if hasattr(item, "source"):
-            source = copy.deepcopy(item.source)
-        if hasattr(item ,"info"):
-            info= copy.deepcopy(item.info)
+        
         if hasattr(item,"id"):
             id = copy.deepcopy(item.id)
-        if hasattr(item, "dx"):
-            dx= item.dx
-            
-        
-        data= Data1D(x=item.x, y=item.y,dx=dx, dy=dy)
-        data.dxl = dxl
-        data.dxw = dxw
-        
+       
+        
+        data= Data1D(x=item.x, y=item.y,dx=None, dy=None)
+        data.copy_from_datainfo(item) 
+        item.clone_without_data(clone=data)    
+        data.dy=dy
         data.name = item.name
-        if detector!=None:
-            data.detector = detector
-        if source!=None:
-            data.source = source
+       
         ## allow to highlight data when plotted
         data.interactive = copy.deepcopy(item.interactive)
         ## when 2 data have the same id override the 1 st plotted
         data.id = id
-        ## info is a reference to output of dataloader that can be used
-        ## to save  data 1D as cansas xml file
-        data.info= info
-        ## If the data file does not tell us what the axes are, just assume...
-        data.xaxis(copy.deepcopy(item._xaxis),copy.deepcopy(item._xunit))
-        data.yaxis(copy.deepcopy(item._yaxis),copy.deepcopy(item._yunit))
        
         data.group_id = item.group_id
@@ -1099 +1075 @@
                 new_plot.is_data =False 
            
-            from DataLoader import data_info
-            info= Data1D(x= new_plot.x, y=new_plot.y)
-            info.title= new_plot.name
-            title= my_info.title
-            info.xaxis(new_plot._xaxis,  new_plot._xunit)
-            info.yaxis( new_plot._yaxis, new_plot._yunit)
-            new_plot.info = info
+           
+            title= new_plot.name
+           
             # Pass the reset flag to let the plotting event handler
             # know that we are replacing the whole plot