Ajustements suite aux diff�rentes modifications.

1 files changed, 8 insertions, 9 deletions

diff --git a/Perl/t/zinc.t b/Perl/t/zinc.t
index 17d1cf1..3350b3f 100644
--- a/Perl/t/zinc.t
+++ b/Perl/t/zinc.t
@@ -59,8 +59,7 @@ $size = $radar->itemcget($track, -markersize); print "track markersize=$size\n";
 print "track position=",$coords[0],"+",$coords[1],"\n";
 
 
-$radar->itemconfigure($track, -labelformat =>
-		      "150x60|40+20|40+20|40+20,0:40x20+0+0,1:40x20+40+0,2:150x60+0+0");
+$radar->itemconfigure($track, -labelformat => "x40x20+0+0 x40x20+40+0 x150x60+0+0");
 
 $radar->itemconfigure($track, 0, -filled => 1 , -backcolor => "red",
  		      -border => "contour");
@@ -89,7 +88,7 @@ my $wp = $radar->add("waypoint", $top, 10);
 $radar->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"
     );
 $radar->itemconfigure($wp, 0 ,-filled => 1 ,-backcolor => "tan",-text => "TO");
 $radar->itemconfigure($wp, 1 ,-filled => 1 ,-backcolor => "wheat",-text => "TO");
@@ -108,8 +107,8 @@ $radar->itemconfigure($track2, -connecteditem => $track);
 # creation macro
 ###################################################
 print "creating macro\n";
-$macro = $radar->add("macro", $top, 10,
-    -labelformat => "80x40|40+20|40+20|40+20,0:40x20+0+0,1:40x20+40+0"
+$macro = $radar->add("tabular", $top, 10,
+    -labelformat => "x40x20+0+0 x40x20+40+0"
     );
 $radar->itemconfigure($macro, 0 , -text => "une");
 $radar->itemconfigure($macro, 1, -text => "macro");
@@ -121,8 +120,8 @@ $radar->bind($macro.":0", "<Leave>", [ \&borders, "off"]);
 # creation ministrip
 ###################################################
 print "creating ministrip\n";
-$ministrip = $radar->add("ministrip", $top, 10,
-    -labelformat => "80x40|40+20|40+20|40+20,0:40x20+0+0,1:40x20+40+0",
+$ministrip = $radar->add("tabular", $top, 10,
+    -labelformat => "x40x20+0+0 x40x20+40+0",
     -position => [100, 10]
     );
 $radar->itemconfigure($ministrip, 0 , -text => 'ministrip');
@@ -152,7 +151,7 @@ $radar->itemconfigure($map3,-mapinfo => "paris-w");
 #creation rectangle, arc, multipoint
 ###################################################
 
-$rect = $radar->add(rectangle, $top, -50, -50, 50, -80, -linecolor => bisque);
+$rect = $radar->add(rectangle, $top, [-50, -50, 50, -80], -linecolor => bisque);
 $radar->bind($rect, '<Enter>', sub { $radar->itemconfigure($rect, -linecolor => red)});
 $radar->bind($rect, '<Leave>', sub { $radar->itemconfigure($rect, -linecolor => bisque)});
 
@@ -160,7 +159,7 @@ $arc = $radar->add(arc, $top, -100, 80, -50, 30, -linecolor => bisque,
     -tags => ["arc"]);
 #$radar->addtag("fleche",'withtag', $arc);
 #$radar->addtag("carquois",'withtag', $arc);
-$radar->add(rectangle, $top, -101, 81, -49, 29, -linecolor => green);
+$radar->add(rectangle, $top, [-101, 81, -49, 29], -linecolor => green);
 $radar->raise($arc);
 $radar->bind($arc, '<Enter>', sub {$radar->itemconfigure($arc, -linecolor => red)});
 $radar->bind($arc, '<Leave>', sub {$radar->itemconfigure($arc, -linecolor => bisque)});