*** empty log message ***

1 files changed, 68 insertions, 50 deletions

diff --git a/sandbox/testzinc.pl b/sandbox/testzinc.pl
index 8770fff..37dc558 100644
--- a/sandbox/testzinc.pl
+++ b/sandbox/testzinc.pl
@@ -1,9 +1,32 @@
-#!/usr/bin/perl
+#!/usr/bin/perl -w
+
+# Before `make install' is performed this script should be runnable with
+# `make test'. After `make install' it should work as `perl zinc.t'
+
+######################### We start with some black magic to print on failure.
+
+# Change 1..1 below to 1..last_test_to_print .
+# (It may become useful if the test is moved to ./t subdirectory.)
+
+BEGIN { $| = 1; print "1..1\n"; }
+END {print "not ok 1\n" unless $loaded;}
+use Tk::Zinc;
+$loaded = 1;
+print "ok 1\n";
+
+######################### End of black magic.
+
+# Insert your test code below (better if it prints "ok 13"
+# (correspondingly "not ok 13") depending on the success of chunk 13
+# of the test code):
 
 use Tk;
 
+$map_path = "/usr/share/toccata/maps";
+$image_path = "/usr/share/toccata/images";
+
 $mw = MainWindow->new;
-$logo = $mw->Photo(-file => "logo.gif");
+$logo = $mw->Photo(-file => "$image_path/logo.gif");
 # $canvas = $mw->Canvas;
 # $canvas->pack(-expand => t, -fill => 'both');
 # $text = $canvas->create('text', 30, 20, -width => 45, -text => "hello");
@@ -20,8 +43,9 @@ $logo = $mw->Photo(-file => "logo.gif");
 
 #$mw->Zinc()->pack;
 #MainLoop; exit;
+$top = 1;
 $zinc = $mw->Zinc(-backcolor => 'skyblue', -relief => 'sunken');
-$zinc->pack(-expand => t, -fill => 'both');
+$zinc->pack(-expand => 't', -fill => 'both');
 
 $zinc->configure(-width => 800, -height => 500);
 $color = $zinc->cget("-backcolor"); print "zinc backcolor=$color\n";
@@ -29,7 +53,7 @@ $color = $zinc->cget("-backcolor"); print "zinc backcolor=$color\n";
 ###################################################
 # creation track
 ###################################################
-$track = $zinc->add("track", 10);
+$track = $zinc->add("track", $top, 10);
 #$zinc->itemconfigure($track, -tags => 'toto');
 
 $zinc->itemconfigure($track, -position => [1, 1]); 
@@ -55,8 +79,7 @@ $size = $zinc->itemcget($track, -markersize); print "track markersize=$size\n";
 print "track position=",$coords[0],"+",$coords[1],"\n";
 
 
-$zinc->itemconfigure($track, -labelformat =>
-		      "150x60|40+20|40+20|40+20,0:40x20+0+0,1:40x20+40+0,2:150x60+0+0");
+$zinc->itemconfigure($track, -labelformat => "x40x20+0+0 x40x20+40+0 x150x60+0+0");
 
 $zinc->itemconfigure($track, 0, -filled => 1 , -backcolor => "red",
  		      -border => "contour");
@@ -66,7 +89,7 @@ $zinc->itemconfigure($track, 1, -filled => 1 , -backcolor => "green",
 $zinc->itemconfigure($track, 1, -filled => 1 , -backcolor => "green",
 		      -border => "contour");
 $zinc->itemconfigure($track, 2, -image => $logo , -alignment => "center");
-$mk = $zinc->itemcget($track, -markercolor);
+#$mk = $zinc->itemcget($track, -markercolor);
 
 $zinc->itemconfigure($track, 0, -reliefthickness =>  2, -relief => "sunken",
 		      -bordercolor => "red", -border => "noborder");
@@ -81,11 +104,11 @@ $zinc->bind($track.":-3", "<Leave>",
 # creation way point
 ###################################################
 print "creating way point\n";
-my $wp = $zinc->add("waypoint", 10);
+my $wp = $zinc->add("waypoint", $top, 10);
 $zinc->itemconfigure($wp,
     -symbolcolor => "green",
     -position => [0, 80],
-    -labelformat => "80x40|40+20|40+20|40+20,0:40x20+0+0,1:40x20+40+0,2:80x40+0+0"
+    -labelformat => "x40x20+0+0x40x20+40+0x80x40+0+0"
     );
 $zinc->itemconfigure($wp, 0 ,-filled => 1 ,-backcolor => "tan",-text => "TO");
 $zinc->itemconfigure($wp, 1 ,-filled => 1 ,-backcolor => "wheat",-text => "TO");
@@ -97,15 +120,15 @@ $zinc->bind($wp, "<Leave>", [ \&borders, "off"]);
 # creation 2nd track
 ###################################################
 print "creating second track\n";
-$track2 = $zinc->add("track", 10, -speedvector => [-20, 0], -position => [0, 50]);
+$track2 = $zinc->add("track", $top, 10, -speedvector => [-20, 0], -position => [0, 50]);
 $zinc->itemconfigure($track2, -connecteditem => $track);
 
 ###################################################
 # creation macro
 ###################################################
 print "creating macro\n";
-$macro = $zinc->add("macro", 10,
-    -labelformat => "80x40|40+20|40+20|40+20,0:40x20+0+0,1:40x20+40+0"
+$macro = $zinc->add("tabular", $top, 10,
+    -labelformat => "x40x20+0+0 x40x20+40+0"
     );
 $zinc->itemconfigure($macro, 0 , -text => "une");
 $zinc->itemconfigure($macro, 1, -text => "macro");
@@ -117,8 +140,8 @@ $zinc->bind($macro.":0", "<Leave>", [ \&borders, "off"]);
 # creation ministrip
 ###################################################
 print "creating ministrip\n";
-$ministrip = $zinc->add("ministrip", 10,
-    -labelformat => "80x40|40+20|40+20|40+20,0:40x20+0+0,1:40x20+40+0",
+$ministrip = $zinc->add("tabular", $top, 10,
+    -labelformat => "x40x20+0+0 x40x20+40+0",
     -position => [100, 10]
     );
 $zinc->itemconfigure($ministrip, 0 , -text => 'ministrip');
@@ -127,20 +150,20 @@ $zinc->itemconfigure($ministrip, 0 , -text => 'ministrip');
 # creation map
 ###################################################
 print "creating map\n";
-$mw->videomap("load", "/home/etienne/tmp/videomap_paris-w_90_2", 0, "paris-w");
-$mw->videomap("load", "/home/etienne/tmp/videomap_orly", 17, "orly");
-$mw->videomap("load", "/home/etienne/tmp/hegias_parouest_TE.vid", 0, "paris-ouest");
+$mw->videomap("load", "$map_path/videomap_paris-w_90_2", 0, "paris-w");
+$mw->videomap("load", "$map_path/videomap_orly", 17, "orly");
+$mw->videomap("load", "$map_path/hegias_parouest_TE.vid", 0, "paris-ouest");
 
 print "videomap ids : ",
-    join('|', $mw->videomap("ids", "/home/etienne/tmp/videomap_orly")),"\n";
-$map = $zinc->add("map", -color => red);
-$zinc->itemconfigure($map,-mapinfo => orly);
+    join('|', $mw->videomap("ids", "$map_path/videomap_orly")),"\n";
+$map = $zinc->add("map", $top, -color => 'red');
+$zinc->itemconfigure($map,-mapinfo => 'orly');
 
-$map2 = $zinc->add("map", -color => green, -filled => 1, -priority => 0,
-    -fillpattern => AlphaStipple6);
-#$zinc->itemconfigure($map2, -mapinfo => paris-ouest);
+#$map2 = $zinc->add("map", $top, -color => 'green', -filled => 1, -priority => 0,
+#   -fillpattern => AlphaStipple6);
+#$zinc->itemconfigure($map2, -mapinfo => 'paris-ouest');
 
-$map3 = $zinc->add("map", -color => orange);
+$map3 = $zinc->add("map", $top, -color => 'orange');
 $zinc->itemconfigure($map3,-mapinfo => "paris-w");
 
 
@@ -148,38 +171,38 @@ $zinc->itemconfigure($map3,-mapinfo => "paris-w");
 #creation rectangle, arc, curve
 ###################################################
 
-$rect = $zinc->add(rectangle, -50, -50, 50, -80, -linecolor => bisque);
-$zinc->bind($rect, '<Enter>', sub { $zinc->itemconfigure($rect, -linecolor => red)});
-$zinc->bind($rect, '<Leave>', sub { $zinc->itemconfigure($rect, -linecolor => bisque)});
+$rect = $zinc->add('rectangle', $top, [-50, -50, 50, -80], -linecolor => 'bisque');
+$zinc->bind($rect, '<Enter>', sub { $zinc->itemconfigure($rect, -linecolor => 'red')});
+$zinc->bind($rect, '<Leave>', sub { $zinc->itemconfigure($rect, -linecolor => 'bisque')});
 
-$arc = $zinc->add(arc, -100, 80, -50, 30, -linecolor => bisque,
+$arc = $zinc->add('arc', $top, [-100, 80, -50, 30], -linecolor => 'bisque',
     -tags => ["arc"]);
 #$zinc->addtag("fleche",'withtag', $arc);
 #$zinc->addtag("carquois",'withtag', $arc);
-$zinc->add(rectangle, -101, 81, -49, 29, -linecolor => green);
+$zinc->add('rectangle', $top, [-101, 81, -49, 29], -linecolor => 'green');
 $zinc->raise($arc);
-$zinc->bind($arc, '<Enter>', sub {$zinc->itemconfigure($arc, -linecolor => red)});
-$zinc->bind($arc, '<Leave>', sub {$zinc->itemconfigure($arc, -linecolor => bisque)});
+$zinc->bind($arc, '<Enter>', sub {$zinc->itemconfigure($arc, -linecolor => 'red')});
+$zinc->bind($arc, '<Leave>', sub {$zinc->itemconfigure($arc, -linecolor => 'bisque')});
 print "arc tags=", join('|',$zinc->gettags($arc)),"\n";
 
 $zinc->itemconfigure($arc, -startangle => 0, -extent => 360);
 
-$mp = $zinc->add(curve, -300, 0, -250, 100, -80, 20);
-$zinc->itemconfigure($mp, -filled => 1, -linewidth => 4, -linecolor => yellow,
-    -fillcolor => tan, -fillpattern => AlphaStipple8);
-$zinc->itemconfigure($mp, -marker => AtcSymbol9 , -markercolor => red);
+$mp = $zinc->add('curve', $top, [-300, 0, -250, 100, -80, 20]);
+$zinc->itemconfigure($mp, -filled => 1, -linewidth => 4, -linecolor => 'yellow',
+    -fillcolor => 'tan', -fillpattern => AlphaStipple8);
+$zinc->itemconfigure($mp, -marker => AtcSymbol9 , -markercolor => 'red');
 
 ###################################################
 # Map info
 ###################################################
 $mw->mapinfo('mpessai', 'create');
-$mw->mapinfo('mpessai', add, text, normal, simple, 0, 200, "Et voilą");
-$mw->mapinfo(mpessai, add, line, simple, 0,  0, 0, 0, 200);
-#$mw->mapinfo('mpessai', add, line, simple, 5, -100, 100, 0, 0);
-$zinc->itemconfigure($map3, -mapinfo => mpessai);
+$mw->mapinfo('mpessai', 'add', 'text', 'normal', 'simple', 0, 200, "Et voilą");
+$mw->mapinfo('mpessai', 'add', 'line', 'simple', 0,  0, 0, 0, 200);
+#$mw->mapinfo('mpessai', 'add', 'line', 'simple', 5, -100, 100, 0, 0);
+$zinc->itemconfigure($map3, -mapinfo => 'mpessai');
 
-print "mapinfo count line : ", $mw->mapinfo(mpessai, count, line),"\n";
-print "mapinfo get line 3: ", join('|',$mw->mapinfo(mpessai, get, line, 0)),"\n";
+print "mapinfo count line : ", $mw->mapinfo('mpessai', 'count', 'line'),"\n";
+print "mapinfo get line 3: ", join('|',$mw->mapinfo('mpessai', 'get', 'line', 0)),"\n";
 ###################################################
 # tests diverses methodes 
 ###################################################
@@ -199,15 +222,8 @@ $zinc->Tk::bind('<ButtonPress-1>',
 $zinc->Tk::bind('<ButtonRelease-1>',
     [ sub {&finditems($_[1], $_[2]); }, Ev('x'), Ev('y') ]);
 
-$zinc->Tk::bind("<2>", sub {$zinc->translate('all', 10,10); });
-$zinc->Tk::bind("<3>", sub {$zinc->scale(1.1, 1.1); });
-
-
-@position = [20, 40, 50, 80];
-#@xy = $zinc -> worldcoords (0, @position);
-@xy = $zinc -> worldcoords (0, [10, 23, 45, 65]);
-print ("x = ",$xy[0],"   y = ",$xy[1],"\n");
-
+$zinc->Tk::bind("<2>", sub {$zinc->translate($top, 10,10); });
+$zinc->Tk::bind("<3>", sub {$zinc->scale($top, 1.1, 1.1); });
 
 
 MainLoop;
@@ -227,3 +243,5 @@ sub finditems {
     print "--- overlapping --->",
     join('|',$zinc->find('overlapping',$origx, $origy, $cornerx, $cornery)),"\n\n";
 }
+
+1;