Changeset 4ac8556 in sasview

Timestamp:

Jun 8, 2009 12:22:18 PM (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:

ff3f900b

Parents:

e5c6fff

Message:

change on data_loader

Location:

guiframe/local_perspectives/plotting

Files:

• AnnulusSlicer.py (modified) (3 diffs)
• Plotter1D.py (modified) (6 diffs)
• Plotter2D.py (modified) (3 diffs)
• SectorSlicer.py (modified) (3 diffs)
• boxSlicer.py (modified) (3 diffs)

guiframe/local_perspectives/plotting/AnnulusSlicer.py

@@ -12 +12 @@
 from sans.guicomm.events import NewPlotEvent, StatusEvent,SlicerParameterEvent,EVT_SLICER_PARS
 from BaseInteractor import _BaseInteractor
-
+from sans.guiframe.dataFitting import Data1D
 
 class AnnulusInteractor(_BaseInteractor):
@@ -134 +134 @@
         sector = sect(self.base.data2D)
         
-        from sans.guiframe.dataFitting import Data1D
+        
         if hasattr(sector,"dxl"):
             dxl= sector.dxl
@@ -144 +144 @@
             dxw= None
        
-        new_plot = Data1D(x=sector.x,y=sector.y,dy=sector.dy,dxl=dxl,dxw=dxw)
+        new_plot = Data1D(x=sector.x,y=sector.y,dy=sector.dy)
+        new_plot.dxl = dxl
+        new_plot.dxw = dxw
         new_plot.name = "SectorPhi" +"("+ self.base.data2D.name+")"
         

guiframe/local_perspectives/plotting/Plotter1D.py

@@ -11 +11 @@
 
 import wx
-import sys, os
-import pylab, time,numpy
+import sys
+import os
+import pylab
+import math
+import numpy
+import time
 
 import danse.common.plottools
@@ -22 +26 @@
 from sans.guicomm.events import RemoveDataEvent
 from sans.guiframe.utils import PanelMenu
+from sans.guiframe.dataFitting import Data1D
 
 from binder import BindArtist
@@ -296 +301 @@
                 if hasattr(selected_plot, "dxw"):
                     dxw = selected_plot.dxw
-                new_plot = dataFitting.Data1D( x=selected_plot.x,
+                new_plot = Data1D( x=selected_plot.x,
                               y= selected_plot.y,
                                dx=selected_plot.dx,
-                              dy=dy,
-                              dxl=dxl,
-                              dxw=dxw)
-                            
+                              dy=dy)
+                new_plot.dxl  = dxl
+                new_plot.dxw = dxw
+                             
             else:
                  new_plot = Theory1D(x=selected_plot.x,y=selected_plot.y,dy=dy)
@@ -344 +349 @@
             @param evt: Menu event
         """
-        import math
-        import numpy
-        import time
+       
         
         if not self.graph.selected_plottable == None \
@@ -378 +381 @@
                 if hasattr(selected_plot, "dxw"):
                     dxw = selected_plot.dxw
-                new_plot = dataFitting.Data1D( x=selected_plot.x,
+                new_plot = Data1D( x=selected_plot.x,
                                                y= selected_plot.y,
                                                dx=selected_plot.dx,
-                                               dy=dy,
-                                               dxl=dxl,
-                                               dxw=dxw)
+                                               dy=dy)
+                new_plot.dxl = dxl
+                new_plot.dxw = dxw
+                                      
             else:
                 ## Create a new plottable Theory1D
@@ -428 +432 @@
             from DataLoader.readers import cansas_reader
             reader = cansas_reader.Reader()
-            datainfo= self.plots[self.graph.selected_plottable].info
-            reader.write( path, datainfo)
+            data= self.plots[self.graph.selected_plottable]
+            if hasattr(data, "info"):
+                datainfo= data.info
+            else:
+                datainfo= data
+            try:
+                reader.write( path, datainfo)
+            except:
+                msg= "couldn't save point %s"%sys.exc_value
+                raise 
            
             try:

guiframe/local_perspectives/plotting/Plotter2D.py

@@ -16 +16 @@
 import danse.common.plottools
 from danse.common.plottools.PlotPanel import PlotPanel
-from danse.common.plottools.plottables import Graph,Data1D
+from danse.common.plottools.plottables import Graph
 from sans.guicomm.events import EVT_NEW_PLOT
 from sans.guicomm.events import EVT_SLICER_PARS
@@ -23 +23 @@
 from binder import BindArtist
 from Plotter1D import ModelPanel1D
+ 
+from sans.guiframe.dataFitting import Data1D
 (InternalEvent, EVT_INTERNAL)   = wx.lib.newevent.NewEvent()
 
@@ -397 +399 @@
             dxw= None
         
-        new_plot = Data1D(x=circ.x,y=circ.y,dy=circ.dy,dxl=dxl,dxw=dxw)
+        new_plot = Data1D(x=circ.x,y=circ.y,dy=circ.dy)
+        new_plot.dxl=dxl
+        new_plot.dxw=dxw
         new_plot.name = "Circ avg "+ self.data2D.name
         new_plot.source=self.data2D.source

guiframe/local_perspectives/plotting/SectorSlicer.py

@@ -16 +16 @@
 from sans.guicomm.events import SlicerParameterEvent,EVT_SLICER_PARS
 
+from sans.guiframe.dataFitting import Data1D
 
 class SectorInteractor(_BaseInteractor):
@@ -163 +164 @@
         sector = sect(self.base.data2D)
         ##Create 1D data resulting from average
-        from sans.guiframe.dataFitting import Data1D
+       
         if hasattr(sector,"dxl"):
             dxl= sector.dxl
@@ -173 +174 @@
             dxw= None
        
-        new_plot = Data1D(x=sector.x,y=sector.y,dy=sector.dy,dxl=dxl,dxw=dxw)
+        new_plot = Data1D(x=sector.x,y=sector.y,dy=sector.dy)
+        new_plot.dxl = dxl
+        new_plot.dxw = dxw
         new_plot.name = "SectorQ" +"("+ self.base.data2D.name+")"
         

guiframe/local_perspectives/plotting/boxSlicer.py

@@ -9 +9 @@
 # Debug printout
 #from config import printEVT
+import wx
+import copy
+from copy import deepcopy
+import math
+import numpy
+
+from sans.guicomm.events import NewPlotEvent, StatusEvent,SlicerParameterEvent,EVT_SLICER_PARS
 from BaseInteractor import _BaseInteractor
-from copy import deepcopy
-import math, numpy
-
-from sans.guicomm.events import NewPlotEvent, StatusEvent,SlicerParameterEvent,EVT_SLICER_PARS
+from sans.guiframe.dataFitting import Data1D
+
 import SlicerParameters
-import wx
 
 
@@ -156 +160 @@
         boxavg = box(self.base.data2D)
         #3 Create Data1D to plot
-        from sans.guiframe.dataFitting import Data1D
+        
         if hasattr(boxavg,"dxl"):
             dxl= boxavg.dxl
@@ -166 +170 @@
             dxw= None
        
-        new_plot = Data1D(x=boxavg.x,y=boxavg.y,dy=boxavg.dy,dxl=dxl,dxw=dxw)
+        new_plot = Data1D(x=boxavg.x,y=boxavg.y,dy=boxavg.dy)
+        new_plot.dxl  = dxl
+        new_plot.dxw  = dxw
         new_plot.name = str(self.averager.__name__) +"("+ self.base.data2D.name+")"