aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlecoanet2003-03-31 15:56:01 +0000
committerlecoanet2003-03-31 15:56:01 +0000
commit5cc459c9d6af72783f9d9febee9d3a8129bcfd35 (patch)
treec0d659a94e6bc66da81b452bc809560ad1e003d0
parent90834467e88065c377170df0ba7514489d1f15b6 (diff)
downloadtkzinc-5cc459c9d6af72783f9d9febee9d3a8129bcfd35.zip
tkzinc-5cc459c9d6af72783f9d9febee9d3a8129bcfd35.tar.gz
tkzinc-5cc459c9d6af72783f9d9febee9d3a8129bcfd35.tar.bz2
tkzinc-5cc459c9d6af72783f9d9febee9d3a8129bcfd35.tar.xz
Ajourt de script et petites corrections
-rw-r--r--demos/contours.tcl2
-rw-r--r--demos/labelformat.tcl7
-rw-r--r--demos/tiger.tcl1
-rw-r--r--demos/tkZincLogo.tcl4
-rw-r--r--demos/zinc-widget1
5 files changed, 7 insertions, 8 deletions
diff --git a/demos/contours.tcl b/demos/contours.tcl
index ea3aab3..efa13de 100644
--- a/demos/contours.tcl
+++ b/demos/contours.tcl
@@ -141,7 +141,6 @@ set yOrig 0
proc press {item action x y} {
global w xOrig yOrig
- puts "item $item"
set xOrig $x
set yOrig $y
bind $w.zinc <Motion> "$action $item %x %y"
@@ -172,7 +171,6 @@ proc motionWithHandle {item x y} {
proc moveHandle {handle x y} {
global w xOrig yOrig curve4 index
- puts "$handle $x $y"
$w.zinc translate $handle [expr $x - $xOrig] [expr $y - $yOrig];
foreach {vertxX vertxY} [$w.zinc coords $curve4 0 $index] break
diff --git a/demos/labelformat.tcl b/demos/labelformat.tcl
index 9095992..8d9f2a3 100644
--- a/demos/labelformat.tcl
+++ b/demos/labelformat.tcl
@@ -26,7 +26,10 @@ pack $w.buttons.dismiss $w.buttons.code -side left -expand 1
text $w.text -relief sunken -borderwidth 2 -height 4
pack $w.text -expand yes -fill both
-$w.text insert end "This toy-appli demonstrates the use of labelformat for tabular items.\nThe fieldPos (please, refer to the labelformat type description\nin the Zinc reference manual) of each field as described in\nthe labelformat is displayed inside the field."
+$w.text insert end {This scipt demonstrates the use of labelformat for tabular items.
+The fieldPos (please, refer to the labelformat type description
+in the Zinc reference manual) of each field as described in
+the labelformat is displayed inside the field.}
###########################################
@@ -40,10 +43,8 @@ pack $w.zinc
proc setLabelContent {item labelformat} {
global w
set i 0
- puts "Label: $item: $labelformat"
foreach fieldSpec $labelformat {
set posSpec $i
- puts ":$i:$fieldSpec:"
regexp {^.\d+.\d+(.*)} $fieldSpec "" posSpec
$w.zinc itemconfigure $item $i -text "$i: $posSpec" -border "contour"
incr i
diff --git a/demos/tiger.tcl b/demos/tiger.tcl
index c494c7b..74b455c 100644
--- a/demos/tiger.tcl
+++ b/demos/tiger.tcl
@@ -40,7 +40,6 @@ set topGroup [$w.zinc add group 1]
set text {
Drag-Button 1 for moving the tiger,
Drag-Button 2 for zooming the tiger,
-esc for getting help on ZincDebug functions.
}
set clip [$w.zinc add curve 1 { {0 150} {150 0} {470 20} {580 200}
diff --git a/demos/tkZincLogo.tcl b/demos/tkZincLogo.tcl
index 2e72f36..96891f3 100644
--- a/demos/tkZincLogo.tcl
+++ b/demos/tkZincLogo.tcl
@@ -13,11 +13,11 @@ if {![info exists zincDemo]} {
package require zincLogo
-set w .zincLogo
+set w .tkZincLogo
catch {destroy $w}
toplevel $w
wm title $w "Zinc logo Demonstration"
-wm iconname $w zincLogo
+wm iconname $w tkZincLogo
set defaultfont "-adobe-helvetica-bold-r-normal-*-120-*-*-*-*-*-*"
diff --git a/demos/zinc-widget b/demos/zinc-widget
index f09baa3..0051f53 100644
--- a/demos/zinc-widget
+++ b/demos/zinc-widget
@@ -150,6 +150,7 @@ set lastLine ""
.t insert end "5. Axial color variation on the Y axis.\n" {demo demo-colorY}
.t insert end "6. Circular color variation.\n" {demo demo-colorCircular}
.t insert end "7. The triangles item.\n" {demo demo-triangles}
+.t insert end "8. Relief testbed (Better with openGL).\n" {demo demo-reliefs}
.t configure -state disabled
focus .s