[Plplot-cvs] SF.net SVN: plplot:[11312] trunk/examples/python

[<ai...@us...>]

Revision: 11312
          http://plplot.svn.sourceforge.net/plplot/?rev=11312&view=rev
Author:   airwin
Date:     2010-11-10 02:12:35 +0000 (Wed, 10 Nov 2010)

Log Message:
-----------
Propagate plstring and new version of pllegend to python examples.
Examples 4 and 26 in python mimic the corresponding C results.

Modified Paths:
--------------
    trunk/examples/python/xw04.py
    trunk/examples/python/xw26.py

Modified: trunk/examples/python/xw04.py
===================================================================
--- trunk/examples/python/xw04.py	2010-11-10 02:11:28 UTC (rev 11311)
+++ trunk/examples/python/xw04.py	2010-11-10 02:12:35 UTC (rev 11312)
@@ -74,7 +74,7 @@
 	plbox("", 0.0, 0, "cmstv", 30.0, 3)
 	plcol0(3)
 	plline(freql, phase)
-	plpoin(freql, phase, 3)
+	plstring(freql, phase, "*")
 	plcol0(3)
 	plmtex("r", 5.0, 0.5, 0.5, "Phase shift (degrees)")
         nlegend = 2
@@ -95,7 +95,7 @@
     symbol_colors = zeros(nlegend, "int")
     symbol_scales = zeros(nlegend)
     symbol_numbers = zeros(nlegend, "int")
-    symbols = zeros(nlegend, "int")
+    symbols = zeros(nlegend, "S10")
     # Only specify legend data that are required according to the
     # value of opt_array for that entry.
 
@@ -118,15 +118,14 @@
         symbol_colors[1]  = 3
         symbol_scales[1]  = 1.
         symbol_numbers[1] = 4
-        symbols[1]        = 3
+        symbols[1]        = "*"
 
-    plscol0a( 15, 32, 32, 32, 0.90 )
-#    pllegend( PL_LEGEND_BACKGROUND, 0.57, 0.85, 0.06, 15,
-#              opt_array,
-#              1.0, 1.0, 2.0,
-#              1., text_colors, text,
-#              box_colors, box_patterns, box_scales,
-#              line_colors, line_styles, line_widths,
-#              symbol_colors, symbol_scales, symbol_numbers, symbols )
+    plscol0a( 15, 32, 32, 32, 0.70 ) 
 
+    pllegend( PL_LEGEND_BACKGROUND | PL_LEGEND_BOUNDING_BOX, 0.0, 0.0,
+              0.1, 15, 1, 1, 0, 0, opt_array, 1.0, 1.0, 2.0,
+              1., text_colors, text, box_colors, box_patterns,
+              box_scales, line_colors, line_styles, line_widths,
+              symbol_colors, symbol_scales, symbol_numbers, symbols )
+
 main()

Modified: trunk/examples/python/xw26.py
===================================================================
--- trunk/examples/python/xw26.py	2010-11-10 02:11:28 UTC (rev 11311)
+++ trunk/examples/python/xw26.py	2010-11-10 02:12:35 UTC (rev 11312)
@@ -142,7 +142,7 @@
 	plbox("", 0.0, 0, "cmstv", 30.0, 3)
 	plcol0(3)
 	plline(freql, phase)
-	plpoin(freql, phase, 3)
+	plstring(freql, phase, "*")
 	plcol0(3)
 	plmtex("r", 5.0, 0.5, 0.5, alty_label)
         nlegend = 2
@@ -165,7 +165,7 @@
     symbol_colors = zeros(nlegend, "int")
     symbol_scales = zeros(nlegend)
     symbol_numbers = zeros(nlegend, "int")
-    symbols = zeros(nlegend, "int")
+    symbols = zeros(nlegend, "S10")
     # Only specify legend data that are required according to the
     # value of opt_array for that entry.
 
@@ -188,16 +188,15 @@
         symbol_colors[1]  = 3
         symbol_scales[1]  = 1.
         symbol_numbers[1] = 4
-        symbols[1]        = 3
+        symbols[1]        = "*"
 
-    plscol0a( 15, 32, 32, 32, 0.90 )
-#    pllegend( PL_LEGEND_BACKGROUND, 0.57, 0.85, 0.06, 15,
-#              opt_array,
-#              1.0, 1.0, 2.0,
-#              1., text_colors, text,
-#              box_colors, box_patterns, box_scales,
-#              line_colors, line_styles, line_widths,
-#              symbol_colors, symbol_scales, symbol_numbers, symbols )
+    plscol0a( 15, 32, 32, 32, 0.70 )
 
+    pllegend( PL_LEGEND_BACKGROUND | PL_LEGEND_BOUNDING_BOX, 0.0, 0.0,
+              0.1, 15, 1, 1, 0, 0, opt_array, 1.0, 1.0, 2.0,
+              1., text_colors, text, box_colors, box_patterns,
+              box_scales, line_colors, line_styles, line_widths,
+              symbol_colors, symbol_scales, symbol_numbers, symbols )
 
+
 main()


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.