From: <and...@us...> - 2008-08-19 10:54:07
|
Revision: 8674 http://plplot.svn.sourceforge.net/plplot/?rev=8674&view=rev Author: andrewross Date: 2008-08-19 10:54:16 +0000 (Tue, 19 Aug 2008) Log Message: ----------- Shift the restoring of the colour to tcldemos.tcl rather than in the x??.tcl files. This means that the interactive examples still all work correctly with tcldemos.tcl, but the ctest results are not confused by the additional call to plcol in the individual examples. With this change most of the tcl examples now pass the ctest compare test. Currently examples 11 and 26 produce different results. Modified Paths: -------------- trunk/examples/tcl/tcldemos.tcl trunk/examples/tcl/x01.tcl trunk/examples/tcl/x02.tcl trunk/examples/tcl/x03.tcl trunk/examples/tcl/x04.tcl trunk/examples/tcl/x05.tcl trunk/examples/tcl/x06.tcl trunk/examples/tcl/x07.tcl trunk/examples/tcl/x08.tcl trunk/examples/tcl/x09.tcl trunk/examples/tcl/x10.tcl trunk/examples/tcl/x11.tcl trunk/examples/tcl/x12.tcl trunk/examples/tcl/x13.tcl trunk/examples/tcl/x15.tcl trunk/examples/tcl/x16.tcl trunk/examples/tcl/x18.tcl Modified: trunk/examples/tcl/tcldemos.tcl =================================================================== --- trunk/examples/tcl/tcldemos.tcl 2008-08-19 08:33:39 UTC (rev 8673) +++ trunk/examples/tcl/tcldemos.tcl 2008-08-19 10:54:16 UTC (rev 8674) @@ -23,9 +23,13 @@ for {set i 1} {$i <= 19} {incr i} { set demo x[format "%02d" $i] source $demo.tcl + # restore defaults + plcol0 1 proc $i {} "$demo" } set i 22 set demo x[format "%02d" $i] source $demo.tcl +# restore defaults +plcol0 1 proc $i {} "$demo" Modified: trunk/examples/tcl/x01.tcl =================================================================== --- trunk/examples/tcl/x01.tcl 2008-08-19 08:33:39 UTC (rev 8673) +++ trunk/examples/tcl/x01.tcl 2008-08-19 10:54:16 UTC (rev 8674) @@ -39,8 +39,8 @@ plot3 $w # Restore defaults - $w cmd plcol0 1 - $w cmd plssub 1 1 +# $w cmd plcol0 1 +# $w cmd plssub 1 1 $w cmd pleop } Modified: trunk/examples/tcl/x02.tcl =================================================================== --- trunk/examples/tcl/x02.tcl 2008-08-19 08:33:39 UTC (rev 8673) +++ trunk/examples/tcl/x02.tcl 2008-08-19 10:54:16 UTC (rev 8674) @@ -10,7 +10,7 @@ # Restore defaults $w cmd plssub 1 1 $w cmd plfont 1 - $w cmd plcol0 1 + # $w cmd plcol0 1 } # Demonstrates multiple windows and default color map 0 palette. Modified: trunk/examples/tcl/x03.tcl =================================================================== --- trunk/examples/tcl/x03.tcl 2008-08-19 08:33:39 UTC (rev 8673) +++ trunk/examples/tcl/x03.tcl 2008-08-19 10:54:16 UTC (rev 8674) @@ -80,5 +80,5 @@ $w cmd plmtex "t" 2.0 0.5 0.5 "#frPLplot Example 3 - r(#gh)=sin 5#gh" # Restore defaults - $w cmd plcol0 1 +# $w cmd plcol0 1 } Modified: trunk/examples/tcl/x04.tcl =================================================================== --- trunk/examples/tcl/x04.tcl 2008-08-19 08:33:39 UTC (rev 8673) +++ trunk/examples/tcl/x04.tcl 2008-08-19 10:54:16 UTC (rev 8674) @@ -10,7 +10,7 @@ # Restore defaults $w cmd plfont 1 - $w cmd plcol0 1 + # $w cmd plcol0 1 } Modified: trunk/examples/tcl/x05.tcl =================================================================== --- trunk/examples/tcl/x05.tcl 2008-08-19 08:33:39 UTC (rev 8673) +++ trunk/examples/tcl/x05.tcl 2008-08-19 10:54:16 UTC (rev 8674) @@ -20,5 +20,5 @@ $w cmd pllab "#frValue" "#frFrequency" \ "#frPLplot Example 5 - Probability function of Oscillator" # Restore defaults - $w cmd plcol0 1 + # $w cmd plcol0 1 } Modified: trunk/examples/tcl/x06.tcl =================================================================== --- trunk/examples/tcl/x06.tcl 2008-08-19 08:33:39 UTC (rev 8673) +++ trunk/examples/tcl/x06.tcl 2008-08-19 10:54:16 UTC (rev 8674) @@ -49,5 +49,5 @@ $w cmd plmtex "t" 1.5 0.5 0.5 "PLplot Example 6 - plpoin symbols" # Restore defaults - $w cmd plcol0 1 + # $w cmd plcol0 1 } Modified: trunk/examples/tcl/x07.tcl =================================================================== --- trunk/examples/tcl/x07.tcl 2008-08-19 08:33:39 UTC (rev 8673) +++ trunk/examples/tcl/x07.tcl 2008-08-19 10:54:16 UTC (rev 8674) @@ -53,5 +53,5 @@ $w cmd plmtex "t" 1.5 0.5 0.5 "PLplot Example 7 - PLSYM symbols" } # Restore defaults - $w cmd plcol0 1 + # $w cmd plcol0 1 } Modified: trunk/examples/tcl/x08.tcl =================================================================== --- trunk/examples/tcl/x08.tcl 2008-08-19 08:33:39 UTC (rev 8673) +++ trunk/examples/tcl/x08.tcl 2008-08-19 10:54:16 UTC (rev 8674) @@ -194,6 +194,6 @@ } # Restore defaults - $w cmd plcol0 1 + # $w cmd plcol0 1 restore_cmap1_8 $w } Modified: trunk/examples/tcl/x09.tcl =================================================================== --- trunk/examples/tcl/x09.tcl 2008-08-19 08:33:39 UTC (rev 8673) +++ trunk/examples/tcl/x09.tcl 2008-08-19 10:54:16 UTC (rev 8674) @@ -159,7 +159,7 @@ # x09_potential $w # Restore defaults - $w cmd plcol0 1 + # $w cmd plcol0 1 # $w cmd pl_setcontlabelparam 0.006 0.3 0.1 0 } Modified: trunk/examples/tcl/x10.tcl =================================================================== --- trunk/examples/tcl/x10.tcl 2008-08-19 08:33:39 UTC (rev 8673) +++ trunk/examples/tcl/x10.tcl 2008-08-19 10:54:16 UTC (rev 8674) @@ -12,5 +12,5 @@ $w cmd plbox bc 0.0 0 bc 0.0 0 $w cmd plptex 0.5 0.5 1.0 0.0 0.5 "BOX at (50,150,50,100)" # Restore defaults - $w cmd plcol0 1 + # $w cmd plcol0 1 } Modified: trunk/examples/tcl/x11.tcl =================================================================== --- trunk/examples/tcl/x11.tcl 2008-08-19 08:33:39 UTC (rev 8673) +++ trunk/examples/tcl/x11.tcl 2008-08-19 10:54:16 UTC (rev 8674) @@ -165,6 +165,6 @@ } } # Restore defaults - $w cmd plcol0 1 + # $w cmd plcol0 1 restore_cmap1_11 $w } Modified: trunk/examples/tcl/x12.tcl =================================================================== --- trunk/examples/tcl/x12.tcl 2008-08-19 08:33:39 UTC (rev 8673) +++ trunk/examples/tcl/x12.tcl 2008-08-19 10:54:16 UTC (rev 8674) @@ -33,7 +33,7 @@ $w cmd plmtex "b" 1.0 [expr ($i + 1) * .1 - .05] 0.5 $string } # Restore defaults - $w cmd plcol0 1 + # $w cmd plcol0 1 } proc plfbox {w x0 y0} { Modified: trunk/examples/tcl/x13.tcl =================================================================== --- trunk/examples/tcl/x13.tcl 2008-08-19 08:33:39 UTC (rev 8673) +++ trunk/examples/tcl/x13.tcl 2008-08-19 10:54:16 UTC (rev 8674) @@ -67,5 +67,5 @@ $w cmd plschr 0. 1.3 $w cmd plptex 5.0 9.0 1.0 0.0 0.5 "Percentage of Sales" # Restore defaults - $w cmd plcol0 1 + # $w cmd plcol0 1 } Modified: trunk/examples/tcl/x15.tcl =================================================================== --- trunk/examples/tcl/x15.tcl 2008-08-19 08:33:39 UTC (rev 8673) +++ trunk/examples/tcl/x15.tcl 2008-08-19 10:54:16 UTC (rev 8674) @@ -122,5 +122,5 @@ $w cmd plcol0 2 $w cmd pllab "distance" "altitude" "Bogon flux" # Restore defaults - $w cmd plcol0 1 + # $w cmd plcol0 1 } Modified: trunk/examples/tcl/x16.tcl =================================================================== --- trunk/examples/tcl/x16.tcl 2008-08-19 08:33:39 UTC (rev 8673) +++ trunk/examples/tcl/x16.tcl 2008-08-19 10:54:16 UTC (rev 8674) @@ -219,5 +219,5 @@ $w cmd plcol0 2 $w cmd pllab "" "" "Tokamak Bogon Instability" # Restore defaults - $w cmd plcol0 1 + # $w cmd plcol0 1 } Modified: trunk/examples/tcl/x18.tcl =================================================================== --- trunk/examples/tcl/x18.tcl 2008-08-19 08:33:39 UTC (rev 8673) +++ trunk/examples/tcl/x18.tcl 2008-08-19 10:54:16 UTC (rev 8674) @@ -57,7 +57,7 @@ $w cmd plmtex t 1.0 0.5 0.5 "$title" } # Restore defaults - $w cmd plcol0 1 + # $w cmd plcol0 1 } proc test_poly {{w loopback} k} { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |