Changeset f468791 in sasview for src/examples

Timestamp:

Oct 24, 2013 10:40:22 AM (11 years ago)

Author:

Mathieu Doucet <doucetm@…>

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:

1f8eecb

Parents:

a9d5684

Message:

Move plottools under sans

Location:

src/examples

Files:

• test_chisq_panel.py (modified) (2 diffs)
• test_copy_print.py (modified) (2 diffs)
• test_panel.py (modified) (1 diff)
• test_panel2D.py (modified) (2 diffs)
• test_text_panel.py (modified) (3 diffs)

src/examples/test_chisq_panel.py

@@ -27 +27 @@
 
 import wx
-from danse.common.plottools.PlotPanel import PlotPanel
-from danse.common.plottools.plottables import Plottable, Graph, Data1D, Theory1D
+from sans.plottools.PlotPanel import PlotPanel
+from sans.plottools.plottables import Plottable, Graph, Data1D, Theory1D
 import  sys
 import numpy
@@ -86 +86 @@
         dy = numpy.sqrt(100*numpy.abs(y))/100
 
-    from danse.common.plottools.plottables import Data1D, Theory1D, Chisq , Graph
+    from sans.plottools.plottables import Data1D, Theory1D, Chisq , Graph
     data = Data1D(x,y,dy=dy)
     data.xaxis('distance', 'm')

src/examples/test_copy_print.py

@@ -26 +26 @@
 
 import wx
-from danse.common.plottools.PlotPanel import PlotPanel
-from danse.common.plottools.plottables import Plottable, Graph, Data1D, Theory1D
+from sans.plottools.PlotPanel import PlotPanel
+from sans.plottools.plottables import Graph, Data1D, Theory1D
 import  sys
 sys.platform = 'win95'
@@ -85 +85 @@
     dy = numpy.sqrt(100*numpy.abs(y))/100
     
-    from danse.common.plottools.plottables import Data1D, Theory1D,  Graph
-    
     data = Data1D(x,y,dy=dy)
     data.xaxis('distance', 'm')

src/examples/test_panel.py

@@ -37 +37 @@
 """
 import wx
-from danse.common.plottools.PlotPanel import PlotPanel
-from danse.common.plottools.plottables import Plottable, Graph, Data1D, Theory1D
+from sans.plottools.PlotPanel import PlotPanel
+from sans.plottools.plottables import Data1D
 import  sys
 import numpy

src/examples/test_panel2D.py

@@ -37 +37 @@
 """
 import wx
-from danse.common.plottools.PlotPanel import PlotPanel
-from danse.common.plottools.plottables import Plottable, Graph, Data1D, Theory1D,Data2D
+from sans.plottools.PlotPanel import PlotPanel
+from sans.plottools.plottables import Data1D, Theory1D, Data2D
 import  sys,os
 import numpy
@@ -200 +200 @@
             path = dlg.GetPath()
             mypath = os.path.basename(path)
-            #from danse.common.plottools.plottables import Data2D
-            from DataLoader.loader import  Loader
+            from sans.dataloader.loader import  Loader
            
             #Instantiate a loader 

src/examples/test_text_panel.py

@@ -27 +27 @@
 
 import wx
-from danse.common.plottools.PlotPanel import PlotPanel
-from danse.common.plottools.plottables import Plottable, Graph, Data1D, Theory1D
-import  sys
-import numpy
-
+from sans.plottools.PlotPanel import PlotPanel
+from sans.plottools.plottables import Text, Graph
 
 class TestPlotPanel(PlotPanel):
@@ -77 +74 @@
 def sample_graph():
     # Construct a simple graph
-
-    from danse.common.plottools.plottables import Text, Graph
     
     T1 = Text(text='text example 1', xpos=0.2, ypos=0.2)
@@ -106 +101 @@
     
 if __name__ == "__main__":
-    pass
     demo_plotter(sample_graph())