|
From: <fu...@us...> - 2009-06-30 19:38:04
|
Revision: 10102
http://plplot.svn.sourceforge.net/plplot/?rev=10102&view=rev
Author: furnish
Date: 2009-06-30 19:37:36 +0000 (Tue, 30 Jun 2009)
Log Message:
-----------
Resuscitation tweaks. Much more work still needed.
Modified Paths:
--------------
trunk/examples/python/pytkdemo
trunk/examples/python/x01.py
trunk/examples/python/x02.py
trunk/examples/python/x03.py
trunk/examples/python/x04.py
trunk/examples/python/x05.py
trunk/examples/python/x07.py
trunk/examples/python/x08.py
trunk/examples/python/x09.py
trunk/examples/python/x10.py
trunk/examples/python/x11.py
trunk/examples/python/x12.py
trunk/examples/python/x13.py
trunk/examples/python/x16.py
Modified: trunk/examples/python/pytkdemo
===================================================================
--- trunk/examples/python/pytkdemo 2009-06-30 19:37:10 UTC (rev 10101)
+++ trunk/examples/python/pytkdemo 2009-06-30 19:37:36 UTC (rev 10102)
@@ -6,6 +6,9 @@
from Tkinter import *
+from plplot import *
+from plplot_widget import *
+
import Plframe
from Plframe import *
@@ -38,12 +41,15 @@
s.create_widgets()
s.pack( expand=1, fill=BOTH )
- plspause(1)
+ #plspause(1)
def create_widgets(s):
s.f = Frame(s)
s.make_demo_bar( s.f )
+ print "Time to register the plframe with the interp..."
+ Pltk_init( s.tk.interpaddr() );
+
s.plf = PlXframe(s, width="17c", height="17c" )
s.f2 = Frame(s)
Modified: trunk/examples/python/x01.py
===================================================================
--- trunk/examples/python/x01.py 2009-06-30 19:37:10 UTC (rev 10101)
+++ trunk/examples/python/x01.py 2009-06-30 19:37:36 UTC (rev 10102)
@@ -16,8 +16,8 @@
sys.path.insert (0, module_dir)
-from Numeric import *
-from pl import *
+from numpy import *
+from plplot import *
# main
#
@@ -104,6 +104,7 @@
global x, y, xscale, yscale, xoff, yoff, xs, ys
+ w.plbop()
## x = []
## y = []
## for i in range(60):
@@ -159,6 +160,7 @@
global x, y, xscale, yscale, xoff, yoff, xs, ys
+ w.plbop()
# Set up the viewport and window using pl.env. The range in X
# is -2.0 to 10.0, and the range in Y is -0.4 to 2.0. The axes
# are scaled separately (just = 0), and we draw a box with
Modified: trunk/examples/python/x02.py
===================================================================
--- trunk/examples/python/x02.py 2009-06-30 19:37:10 UTC (rev 10101)
+++ trunk/examples/python/x02.py 2009-06-30 19:37:36 UTC (rev 10102)
@@ -19,6 +19,7 @@
def main(w):
+ w.plbop()
# Divide screen into 16 regions
w.plssub(4, 4)
Modified: trunk/examples/python/x03.py
===================================================================
--- trunk/examples/python/x03.py 2009-06-30 19:37:10 UTC (rev 10101)
+++ trunk/examples/python/x03.py 2009-06-30 19:37:36 UTC (rev 10102)
@@ -4,7 +4,7 @@
#
# Polar plot demo.
-from Numeric import *
+from numpy import *
import math
#import pl
import sys
Modified: trunk/examples/python/x04.py
===================================================================
--- trunk/examples/python/x04.py 2009-06-30 19:37:10 UTC (rev 10101)
+++ trunk/examples/python/x04.py 2009-06-30 19:37:36 UTC (rev 10102)
@@ -4,7 +4,7 @@
#
# Log plot demo.
-from Numeric import *
+from numpy import *
import math
#import pl
import sys
Modified: trunk/examples/python/x05.py
===================================================================
--- trunk/examples/python/x05.py 2009-06-30 19:37:10 UTC (rev 10101)
+++ trunk/examples/python/x05.py 2009-06-30 19:37:36 UTC (rev 10102)
@@ -4,7 +4,7 @@
#
# Histogram demo.
-from Numeric import *
+from numpy import *
import math
#import pl
import sys
Modified: trunk/examples/python/x07.py
===================================================================
--- trunk/examples/python/x07.py 2009-06-30 19:37:10 UTC (rev 10101)
+++ trunk/examples/python/x07.py 2009-06-30 19:37:36 UTC (rev 10102)
@@ -4,7 +4,7 @@
#
# Font demo.
-import pl
+#import pl
import sys
import os
Modified: trunk/examples/python/x08.py
===================================================================
--- trunk/examples/python/x08.py 2009-06-30 19:37:10 UTC (rev 10101)
+++ trunk/examples/python/x08.py 2009-06-30 19:37:36 UTC (rev 10102)
@@ -4,9 +4,8 @@
#
# 3-d plot demo.
-from Numeric import *
+from numpy import *
import math
-#import pl
import sys
import os
Modified: trunk/examples/python/x09.py
===================================================================
--- trunk/examples/python/x09.py 2009-06-30 19:37:10 UTC (rev 10101)
+++ trunk/examples/python/x09.py 2009-06-30 19:37:36 UTC (rev 10102)
@@ -1,7 +1,7 @@
#!/usr/bin/env python
import math
-from Numeric import *
+from numpy import *
from pl import *
import sys
import os
Modified: trunk/examples/python/x10.py
===================================================================
--- trunk/examples/python/x10.py 2009-06-30 19:37:10 UTC (rev 10101)
+++ trunk/examples/python/x10.py 2009-06-30 19:37:36 UTC (rev 10102)
@@ -4,7 +4,6 @@
#
# Window positioning demo.
-import pl
import sys
import os
Modified: trunk/examples/python/x11.py
===================================================================
--- trunk/examples/python/x11.py 2009-06-30 19:37:10 UTC (rev 10101)
+++ trunk/examples/python/x11.py 2009-06-30 19:37:36 UTC (rev 10102)
@@ -4,7 +4,7 @@
#
# Mesh plot demo.
-from Numeric import *
+from numpy import *
import math
#import pl
import sys
Modified: trunk/examples/python/x12.py
===================================================================
--- trunk/examples/python/x12.py 2009-06-30 19:37:10 UTC (rev 10101)
+++ trunk/examples/python/x12.py 2009-06-30 19:37:36 UTC (rev 10102)
@@ -4,7 +4,6 @@
#
# Bar chart demo.
-import pl
import sys
import os
Modified: trunk/examples/python/x13.py
===================================================================
--- trunk/examples/python/x13.py 2009-06-30 19:37:10 UTC (rev 10101)
+++ trunk/examples/python/x13.py 2009-06-30 19:37:36 UTC (rev 10102)
@@ -5,7 +5,6 @@
# Pie chart demo.
import math
-#import pl
import sys
import os
Modified: trunk/examples/python/x16.py
===================================================================
--- trunk/examples/python/x16.py 2009-06-30 19:37:10 UTC (rev 10101)
+++ trunk/examples/python/x16.py 2009-06-30 19:37:36 UTC (rev 10102)
@@ -8,7 +8,7 @@
# plshade demo, using color fill.
-from Numeric import *
+from numpy import *
from math import *
def main(w):
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|