|
From: <arj...@us...> - 2010-05-07 06:55:28
|
Revision: 10977
http://plplot.svn.sourceforge.net/plplot/?rev=10977&view=rev
Author: arjenmarkus
Date: 2010-05-07 06:55:22 +0000 (Fri, 07 May 2010)
Log Message:
-----------
Propagating the recent changes to examples 6 and 7 to Tcl.
Modified Paths:
--------------
trunk/examples/tcl/x06.tcl
trunk/examples/tcl/x07.tcl
Modified: trunk/examples/tcl/x06.tcl
===================================================================
--- trunk/examples/tcl/x06.tcl 2010-05-07 04:56:04 UTC (rev 10976)
+++ trunk/examples/tcl/x06.tcl 2010-05-07 06:55:22 UTC (rev 10977)
@@ -7,47 +7,64 @@
matrix x f 1
matrix y f 1
- $w cmd pladv 0
- $w cmd plfont 1
+ for {set kind_font 0} {$kind_font < 2} {incr kind_font} {
+ $w cmd plfontld $kind_font
+ if {$kind_font == 0} {
+ set maxfont 1
+ } else {
+ set maxfont 4
+ }
+
+ for {set font 0} {$font < $maxfont} {incr font} {
+
+ $w cmd plfont [expr {$font+1}]
+
+ $w cmd pladv 0
+
# Set up viewport and window
- $w cmd plcol0 2
- $w cmd plvpor 0.1 1.0 0.1 0.9
- $w cmd plwind 0.0 1.0 0.0 1.3
+ $w cmd plcol0 2
+ $w cmd plvpor 0.1 1.0 0.1 0.9
+ $w cmd plwind 0.0 1.0 0.0 1.3
# Draw the grid using plbox
- $w cmd plbox "bcg" 0.1 0 "bcg" 0.1 0
+ $w cmd plbox "bcg" 0.1 0 "bcg" 0.1 0
# Write the digits below the frame
- $w cmd plcol0 15
- for {set i 0} {$i <= 9} {incr i} {
- $w cmd plmtex "b" 1.5 [expr 0.1 * $i + 0.05] 0.5 $i
- }
+ $w cmd plcol0 15
+ for {set i 0} {$i <= 9} {incr i} {
+ $w cmd plmtex "b" 1.5 [expr 0.1 * $i + 0.05] 0.5 $i
+ }
- set k 0
- for {set i 0} {$i <= 12} {incr i} {
+ set k 0
+ for {set i 0} {$i <= 12} {incr i} {
# Write the digits to the left of the frame
- $w cmd plmtex "lv" 1.0 [expr 1.0 - (2 * $i + 1)/26.0] 1.0 [expr 10*$i]
- for {set j 0} {$j <= 9} {incr j} {
- x 0 = [expr 0.1 * $j + 0.05]
- y 0 = [expr 1.25 - 0.1 * $i]
+ $w cmd plmtex "lv" 1.0 [expr 1.0 - (2 * $i + 1)/26.0] 1.0 [expr 10*$i]
+ for {set j 0} {$j <= 9} {incr j} {
+ x 0 = [expr 0.1 * $j + 0.05]
+ y 0 = [expr 1.25 - 0.1 * $i]
# Display the symbols
- if {$k < 128} {
- $w cmd plpoin 1 x y $k
- }
- incr k
- }
+ if {$k < 128} {
+ $w cmd plpoin 1 x y $k
+ }
+ incr k
+ }
+ }
+
+ if {$kind_font==0} {
+ $w cmd plmtex "t" 1.5 0.5 0.5 "PLplot Example 6 - plpoin symbols (compact)"
+ } else {
+ $w cmd plmtex "t" 1.5 0.5 0.5 "PLplot Example 6 - plpoin symbols (extended)"
+ }
+ }
}
-
- $w cmd plmtex "t" 1.5 0.5 0.5 "PLplot Example 6 - plpoin symbols"
-
# Restore defaults
# $w cmd plcol0 1
}
Modified: trunk/examples/tcl/x07.tcl
===================================================================
--- trunk/examples/tcl/x07.tcl 2010-05-07 04:56:04 UTC (rev 10976)
+++ trunk/examples/tcl/x07.tcl 2010-05-07 06:55:22 UTC (rev 10977)
@@ -4,15 +4,18 @@
proc x07 {{w loopback}} {
- matrix base i 17 = \
- {0, 200, 500, 600, 700, 800, 900, \
+ matrix base i 20 = \
+ {0, 100, 0, 100, 200, 500, 600, 700, 800, 900, \
2000, 2100, 2200, 2300, 2400, 2500, 2600, 2700, 2800, 2900}
matrix x f 1
matrix y f 1
- $w cmd plfontld 1
- for {set l 0} {$l < 17} {incr l} {
+ $w cmd plfontld 0
+ for {set l 0} {$l < 20} {incr l} {
+ if {$l == 2} {
+ $w cmd plfontld 1
+ }
$w cmd pladv 0
# Set up viewport and window
@@ -50,7 +53,11 @@
incr k
}
}
- $w cmd plmtex "t" 1.5 0.5 0.5 "PLplot Example 7 - PLSYM symbols"
+ if {$l < 2} {
+ $w cmd plmtex "t" 1.5 0.5 0.5 "PLplot Example 7 - PLSYM symbols (compact)"
+ } else {
+ $w cmd plmtex "t" 1.5 0.5 0.5 "PLplot Example 7 - PLSYM symbols (extended)"
+ }
}
# Restore defaults
# $w cmd plcol0 1
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|