Added angled text support to demonstration

1 files changed, 45 insertions, 18 deletions

diff --git a/library/demos/ctext.tcl b/library/demos/ctext.tcl
index b65635b..ddfe59f 100644
--- a/library/demos/ctext.tcl
+++ b/library/demos/ctext.tcl
@@ -3,7 +3,7 @@
 # This demonstration script creates a canvas widget with a text
 # item that can be edited and reconfigured in various ways.
 #
-# RCS: @(#) $Id: ctext.tcl,v 1.5 2004/12/21 11:56:35 dkf Exp $
+# RCS: @(#) $Id: ctext.tcl,v 1.6 2008/11/22 23:03:20 dkf Exp $
 
 if {![info exists widgetDemo]} {
     error "This script should be run from the \"widget\" demo."
@@ -19,7 +19,7 @@ wm iconname $w "Text"
 positionWindow $w
 set c $w.c
 
-label $w.msg -font $font -wraplength 5i -justify left -text "This window displays a string of text to demonstrate the text facilities of canvas widgets.  You can click in the boxes to adjust the position of the text relative to its positioning point or change its justification.  The text also supports the following simple bindings for editing:
+label $w.msg -font $font -wraplength 5i -justify left -text "This window displays a string of text to demonstrate the text facilities of canvas widgets.  You can click in the boxes to adjust the position of the text relative to its positioning point or change its justification, and on a pie slice to change its angle.  The text also supports the following simple bindings for editing:
   1. You can point, click, and type.
   2. You can also select with button 1.
   3. You can copy the selection to the mouse position with button 2.
@@ -52,36 +52,63 @@ $c bind text <Return> "textInsert $c \\n"
 $c bind text <Control-h> "textBs $c"
 $c bind text <BackSpace> "textBs $c"
 $c bind text <Delete> "textDel $c"
-$c bind text <2> "textPaste $c @%x,%y" 
+$c bind text <2> "textPaste $c @%x,%y"
 
 # Next, create some items that allow the text's anchor position
 # to be edited.
 
-proc mkTextConfig {w x y option value color} {
+proc mkTextConfigBox {w x y option value color} {
     set item [$w create rect $x $y [expr {$x+30}] [expr {$y+30}] \
 	    -outline black -fill $color -width 1]
     $w bind $item <1> "$w itemconf text $option $value"
     $w addtag config withtag $item
 }
+proc mkTextConfigPie {w x y a option value color} {
+    set item [$w create arc $x $y [expr {$x+90}] [expr {$y+90}] \
+	    -start [expr {$a-15}] -extent 30 -outline black -fill $color \
+	    -width 1]
+    $w bind $item <1> "$w itemconf text $option $value"
+    $w addtag config withtag $item
+}
 
 set x 50
 set y 50
 set color LightSkyBlue1
-mkTextConfig $c $x $y -anchor se $color
-mkTextConfig $c [expr {$x+30}] [expr {$y   }] -anchor s      $color
-mkTextConfig $c [expr {$x+60}] [expr {$y   }] -anchor sw     $color
-mkTextConfig $c [expr {$x   }] [expr {$y+30}] -anchor e      $color
-mkTextConfig $c [expr {$x+30}] [expr {$y+30}] -anchor center $color
-mkTextConfig $c [expr {$x+60}] [expr {$y+30}] -anchor w      $color
-mkTextConfig $c [expr {$x   }] [expr {$y+60}] -anchor ne     $color
-mkTextConfig $c [expr {$x+30}] [expr {$y+60}] -anchor n      $color
-mkTextConfig $c [expr {$x+60}] [expr {$y+60}] -anchor nw     $color
+mkTextConfigBox $c $x $y -anchor se $color
+mkTextConfigBox $c [expr {$x+30}] [expr {$y   }] -anchor s      $color
+mkTextConfigBox $c [expr {$x+60}] [expr {$y   }] -anchor sw     $color
+mkTextConfigBox $c [expr {$x   }] [expr {$y+30}] -anchor e      $color
+mkTextConfigBox $c [expr {$x+30}] [expr {$y+30}] -anchor center $color
+mkTextConfigBox $c [expr {$x+60}] [expr {$y+30}] -anchor w      $color
+mkTextConfigBox $c [expr {$x   }] [expr {$y+60}] -anchor ne     $color
+mkTextConfigBox $c [expr {$x+30}] [expr {$y+60}] -anchor n      $color
+mkTextConfigBox $c [expr {$x+60}] [expr {$y+60}] -anchor nw     $color
 set item [$c create rect \
 	[expr {$x+40}] [expr {$y+40}] [expr {$x+50}] [expr {$y+50}] \
 	-outline black -fill red]
 $c bind $item <1> "$c itemconf text -anchor center"
 $c create text [expr {$x+45}] [expr {$y-5}] \
-	-text {Text Position}  -anchor s  -font {Times 24}  -fill brown
+	-text {Text Position}  -anchor s  -font {Times 20}  -fill brown
+
+# Now create some items that allow the text's angle to be changed.
+
+set x 205
+set y 50
+set color Yellow
+mkTextConfigPie $c $x $y   0 -angle  90 $color
+mkTextConfigPie $c $x $y  30 -angle 120 $color
+mkTextConfigPie $c $x $y  60 -angle 150 $color
+mkTextConfigPie $c $x $y  90 -angle 180 $color
+mkTextConfigPie $c $x $y 120 -angle 210 $color
+mkTextConfigPie $c $x $y 150 -angle 240 $color
+mkTextConfigPie $c $x $y 180 -angle 270 $color
+mkTextConfigPie $c $x $y 210 -angle 300 $color
+mkTextConfigPie $c $x $y 240 -angle 330 $color
+mkTextConfigPie $c $x $y 270 -angle   0 $color
+mkTextConfigPie $c $x $y 300 -angle  30 $color
+mkTextConfigPie $c $x $y 330 -angle  60 $color
+$c create text [expr {$x+45}] [expr {$y-5}] \
+	-text {Text Angle}  -anchor s  -font {Times 20}  -fill brown
 
 # Lastly, create some items that allow the text's justification to be
 # changed.
@@ -89,11 +116,11 @@ $c create text [expr {$x+45}] [expr {$y-5}] \
 set x 350
 set y 50
 set color SeaGreen2
-mkTextConfig $c $x $y -justify left $color
-mkTextConfig $c [expr {$x+30}] $y -justify center $color
-mkTextConfig $c [expr {$x+60}] $y -justify right $color
+mkTextConfigBox $c $x $y -justify left $color
+mkTextConfigBox $c [expr {$x+30}] $y -justify center $color
+mkTextConfigBox $c [expr {$x+60}] $y -justify right $color
 $c create text [expr {$x+45}] [expr {$y-5}] \
-	-text {Justification}  -anchor s  -font {Times 24}  -fill brown
+	-text {Justification}  -anchor s  -font {Times 20}  -fill brown
 
 $c bind config <Enter> "textEnter $c"
 $c bind config <Leave> "$c itemconf current -fill \$textConfigFill"