Changeset c3b4dcb in sasview for sansview/perspectives/fitting

Timestamp:

Jun 8, 2009 10:20:34 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:

e5c6fff

Parents:

a7bd562

Message:

modify data1D initialization

File:

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

sansview/perspectives/fitting/fitting.py

@@ -2 +2 @@
 import sys, wx, logging
 import string, numpy, math
-
-from danse.common.plottools.plottables import Data2D,Theory1D
+import time
+import thread
+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 import dataFitting 
-from danse.common.plottools.PlotPanel import PlotPanel
+
 from sans.guicomm.events import NewPlotEvent, StatusEvent  
 from sans.guicomm.events import EVT_SLICER_PANEL,ERR_DATA,EVT_REMOVE_DATA
 from sans.guicomm.events import EVT_SLICER_PARS_UPDATE
-from sans.guiframe import dataFitting
+
 from sans.fit.AbstractFitEngine import Model
-
+from sans.fit.AbstractFitEngine import FitAbort
 
 from fitproblem import FitProblem
@@ -19 +24 @@
 import fitpage
 
-
 DEFAULT_BEAM = 0.005
 DEFAULT_QMIN = 0.0001
 DEFAULT_QMAX = 0.13
 DEFAULT_NPTS = 50
-import time
-import thread
-from sans.fit.AbstractFitEngine import FitAbort
 
 (PageInfoEvent, EVT_PAGE_INFO)   = wx.lib.newevent.NewEvent()
+
+
 class PlotInfo:
     """
@@ -169 +172 @@
         #      multiple times.
         self.graph=graph
+       
         for item in graph.plottables:
             if item.__class__.__name__ is "Data2D":
+                
                 if hasattr(item,"is_data"):
                     if item.is_data:
@@ -278 +283 @@
             
         
-        data= dataFitting.Data1D(x=item.x, y=item.y,dx=dx, dy=dy, dxl=dxl, dxw=dxw)
+        data= Data1D(x=item.x, y=item.y,dx=dx, dy=dy)
+        data.dxl = dxl
+        data.dxw = dxw
         
         data.name = item.name
@@ -294 +301 @@
         data.yaxis(copy.deepcopy(item._yaxis),copy.deepcopy(item._yunit))
         ##group_id specify on which panel to plot this data
-        data.group_id = copy.deepcopy(item.group_id)
+        data.group_id = item.group_id
         return data
 
@@ -675 +682 @@
                     data.is_data=True
                 
+               
             ## create anew page                   
             if item.name == self.panel.graph.selected_plottable or\
@@ -1065 +1073 @@
            
             from DataLoader import data_info
-            info= data_info.Data1D(x= new_plot.x, y=new_plot.y)
+            info= Data1D(x= new_plot.x, y=new_plot.y)
             info.title= new_plot.name
             title= my_info.title