Lots of wx namespace updates for the wx.lib package and the demo from

[wxWidgets.git] / wxPython / demo / wxPlotCanvas.py

diff --git a/wxPython/demo/wxPlotCanvas.py b/wxPython/demo/wxPlotCanvas.py
index 1a9f7b2271a70857f411501be6749a895438aa4e..4311942af39c36071c719ef915d78771694e6d05 100644 (file)
--- a/wxPython/demo/wxPlotCanvas.py
+++ b/wxPython/demo/wxPlotCanvas.py
@@ -1,6 +1,17 @@
+# 11/20/2003 - Jeff Grimmett (grimmtooth@softhome.net)
+#
+# o Updated for wx namespace
+# 
+# 11/30/2003 - Jeff Grimmett (grimmtooth@softhome.net)
+#
+# o wxPlotCanvas must be updated with new draw mechanics (tuples) before
+#   it can be used with 2.5.
+# 

 
 

-from wxPython.lib.wxPlotCanvas import *
-from wxPython.lib              import wxPlotCanvas
+import  wx
+import  wx.lib.wxPlotCanvas as  plot
+
+import  Numeric

 
 #---------------------------------------------------------------------------
 
 
 #---------------------------------------------------------------------------
 


@@ -9,31 +20,37 @@ def _InitObjects():
     data1 = 2.*Numeric.pi*Numeric.arange(200)/200.
     data1.shape = (100, 2)
     data1[:,1] = Numeric.sin(data1[:,0])
     data1 = 2.*Numeric.pi*Numeric.arange(200)/200.
     data1.shape = (100, 2)
     data1[:,1] = Numeric.sin(data1[:,0])

-    markers1 = PolyMarker(data1, color='green', marker='circle',size=1)
+    markers1 = plot.PolyMarker(data1, color='green', marker='circle',size=1)

 
     # 50 points cos function, plotted as red line
     data1 = 2.*Numeric.pi*Numeric.arange(100)/100.
     data1.shape = (50,2)
     data1[:,1] = Numeric.cos(data1[:,0])
 
     # 50 points cos function, plotted as red line
     data1 = 2.*Numeric.pi*Numeric.arange(100)/100.
     data1.shape = (50,2)
     data1[:,1] = Numeric.cos(data1[:,0])

-    lines = PolyLine(data1, color='red')
+    lines = plot.PolyLine(data1, color='red')

 
     # A few more points...
     pi = Numeric.pi
 
     # A few more points...
     pi = Numeric.pi

-    markers2 = PolyMarker([(0., 0.), (pi/4., 1.), (pi/2, 0.),
+    markers2 = plot.PolyMarker([(0., 0.), (pi/4., 1.), (pi/2, 0.),

                           (3.*pi/4., -1)], color='blue',
                           fillcolor='green', marker='cross')
 
                           (3.*pi/4., -1)], color='blue',
                           fillcolor='green', marker='cross')
 

-    return PlotGraphics([markers1, lines, markers2])
+    return plot.PlotGraphics([markers1, lines, markers2])

 
 
 #---------------------------------------------------------------------------
 
 
 def runTest(frame, nb, log):
 
 
 #---------------------------------------------------------------------------
 
 
 def runTest(frame, nb, log):

-    win = PlotCanvas(nb)
+    win = plot.PlotCanvas(nb)

     win.draw(_InitObjects(),'automatic','automatic');
     return win
 
     win.draw(_InitObjects(),'automatic','automatic');
     return win
 

-overview = wxPlotCanvas.__doc__
+overview = plot.__doc__

 
 #---------------------------------------------------------------------------
 
 #---------------------------------------------------------------------------

+
+
+if __name__ == '__main__':
+    import sys,os
+    import run
+    run.main(['', os.path.basename(sys.argv[0])])