[Plplot-cvs] SF.net SVN: plplot:[9917] trunk

[<and...@us...>]

Revision: 9917
          http://plplot.svn.sourceforge.net/plplot/?rev=9917&view=rev
Author:   andrewross
Date:     2009-05-05 11:35:31 +0000 (Tue, 05 May 2009)

Log Message:
-----------
Fix up problems with tcl example 2 and 24 so they work with plserver as well.

Modified Paths:
--------------
    trunk/examples/tcl/x02.tcl
    trunk/examples/tcl/x24.tcl
    trunk/plplot_test/plplot-test-interactive.sh.in

Modified: trunk/examples/tcl/x02.tcl
===================================================================
--- trunk/examples/tcl/x02.tcl	2009-05-05 11:15:34 UTC (rev 9916)
+++ trunk/examples/tcl/x02.tcl	2009-05-05 11:35:31 UTC (rev 9917)
@@ -71,7 +71,7 @@
     # Use max saturation
         set s 1.0
 
-        plhlsrgb $h $l $s r1 g1 b1
+        $w cmd plhlsrgb $h $l $s r1 g1 b1
 	# puts [format "%3d %15.9f %15.9f %15.9f %15.9f %15.9f %15.9f" $i1 $h $l $s $r1 $g1 $b1]
         if $see_the_bug {
             r $i1 = [expr int($r1 * 255.001)]
@@ -82,7 +82,7 @@
             set g2 [expr int($g1 * 255.001)]
             set b2 [expr int($b1 * 255.001)]
   	    # puts [format "%3d %3d %3d %3d" $i1 $r2 $g2 $b2]
-            plscol0 $i1 $r2 $g2 $b2
+            $w cmd plscol0 $i1 $r2 $g2 $b2
         }
     }
 
@@ -102,7 +102,7 @@
   	  puts [format "%3d %3d %3d %3d" $i $r1 $g1 $b1]
        }
        # The following call currently segfaults.
-       plscmap0 r g b $ntot
+       $w cmd plscmap0 r g b $ntot
     }
 
     x02_draw_windows $w 100 $offset

Modified: trunk/examples/tcl/x24.tcl
===================================================================
--- trunk/examples/tcl/x24.tcl	2009-05-05 11:15:34 UTC (rev 9916)
+++ trunk/examples/tcl/x24.tcl	2009-05-05 11:35:31 UTC (rev 9917)
@@ -126,8 +126,8 @@
     $w cmd plscmap0n 7
     $w cmd plscmap0 red green blue 7
 
-    plschr 0 4.0
-    plfont 1
+    $w cmd plschr 0 4.0
+    $w cmd plfont 1
 
     for {set i 0} {$i < 4} {incr i} {
 	$w cmd plcol0 [expr {$i + 1}]

Modified: trunk/plplot_test/plplot-test-interactive.sh.in
===================================================================
--- trunk/plplot_test/plplot-test-interactive.sh.in	2009-05-05 11:15:34 UTC (rev 9916)
+++ trunk/plplot_test/plplot-test-interactive.sh.in	2009-05-05 11:35:31 UTC (rev 9917)
@@ -165,13 +165,12 @@
 EOF
     cd ../tk
     pwd
-# Drop 2 to avoid 'invalid command name "plhlsrgb"' error.
 # Drop 14 because multiple devices do not seem to work in this context.
-# Drop 24 to avoid 'invalid command name "plschr"' error.
 # Drop 31 since it produces empty plot (by design).
     plserver <<EOF
 source tkdemos.tcl
 1
+2
 3
 4
 5
@@ -192,6 +191,7 @@
 21
 22
 23
+24
 25
 26
 27


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