modification des coordonn�es de shape du logo

1 files changed, 27 insertions, 24 deletions

diff --git a/Perl/Zinc/Logo.pm b/Perl/Zinc/Logo.pm
index b601f0d..3a787b9 100644
--- a/Perl/Zinc/Logo.pm
+++ b/Perl/Zinc/Logo.pm
@@ -1,8 +1,7 @@
 #!/usr/bin/perl
 #---------------------------------------------------------------
-#  Project         : Harmony
-#  Module          : Harmony
-#  File            : Logo.pm
+#
+#  Module          : Logo.pm
 #
 #  Copyright (C) 2001
 #  Centre d'Études de la Navigation Aérienne
@@ -26,29 +25,31 @@ my %builder = (-gradset => {'logoshape' => '=axial 270 |#ffffff;100 0 28|#66848c
 			    },
 
 	       -shape => {-form => {-itemtype => 'curve',
-				    -coords => [[0, 0],[106, 0],[106, 58],[122, 41],[156, 41],[131, 69],
-						[153, 99],[203, 41],[155, 41],[155, 0],[218, 0],[240, 0, 'c'],
-						[252, 17, 'c'],[252, 34],[252, 40, 'c'],[249, 50, 'c'],
-						[244, 56],[202, 105],[246, 105],[246, 87],[246, 60, 'c'],
-						[271, 37, 'c'],[297, 37],[323, 37, 'c'],[342, 57, 'c'],[344, 68],
-						[347, 64, 'c'],[350, 60, 'c'],[353, 56],[363, 46, 'c'],[375, 37, 'c'],
-						[395, 37],[395, 79],[393, 79],[385, 79, 'c'],[379, 86, 'c'],
-						[379, 93],[379, 100, 'c'],[385, 107, 'c'],[393, 107],[409, 107],
-						[409, 148],[397, 148],[378, 148, 'c'],[364, 144, 'c'],[354, 133],
-						[346, 124],[346, 148],[305, 148],[305, 87],[305, 83, 'c'],[301, 79, 'c'],
-						[297, 79],[293, 79, 'c'],[289, 83, 'c'],[289, 87],[289, 150],[251, 150],
-						[251, 130],[251, 126, 'c'],[247, 122, 'c'],[243, 122],[239, 122, 'c'],
-						[235, 126, 'c'],[235, 130],[235, 150],[176, 150],[154, 150,'c'],
-						[146, 131,'c'],[146, 114],[148, 105],[120, 105],[104, 81],[104, 105],
-						[74, 105],[74, 41],[52, 41],[52, 105],[20, 105],[20, 41],[0, 41],
-					       ],
-
-				    -params => {-priority => 50,
-						-linewidth => 3,
-						-linecolor => '#000000;100',
+				    -coords => [[0,0],[106,0],[106,58],[122,41],[156,41],[131,69],[153,99],[203,41],
+						[155,41],[155,0],[225.71,0],[251.34,0,'c'],[265.17,29.63,'c'],
+						[248.71,49.27],[202,105],[246,105],[246,87],[246,59.385,'c'],[268.38,37,'c'],
+						[296,37],[323.62,37,'c'],[346,59.385,'c'],[346,87],[346,148],[305,148],
+						[305,87],[305,82.58,'c'],[301.42,79,'c'],[297,79],[292.58,79,'c'],
+						[289,82.58,'c'],[289,87],[289,150],[251,150],[251,130],[251,125.58,'c'],
+						[247.42,122,'c'],[243,122],[243,122],[238.58,122,'c'],[235,125.58,'c'],
+						[235,130],[235,150],[168.12,150],[144.7,150,'c'],[132.38,122.57,'c'],
+						[147.94,105.06],[148,105],[120,105],[104,81],[104,105],[74,105],[74,41],
+						[52,41],[52,105],[20,105],[20,41],[0,41]],
+
+				    -contour => ['add', -1, [[395,78],[395,37],[364.62,37,'c'],[340,61.62,'c'],[340,92],
+							    [340,93],[340,123.38,'c'],[364.62,148,'c'],[395,148],[409,148],
+							    [409,107],[395,107],[386.72,107,'c'],[380,100.28,'c'],[380,92],
+							    [380,93],[380,84.72,'c'],[386.72,78,'c'],[395,78]]],
+
+
+				    -params => {-closed => 0,
 						-filled => 1,
-						-closed => 0,
+						-visible => 1,
 						-fillcolor => 'logoshape',
+						-linewidth => 2.5,
+						-linecolor => '#000000',
+						-priority => 40,
+						-fillrule => 'nonzero',
 					       },
 				   },
 
@@ -146,6 +147,8 @@ sub drawLogo {
 			%{$formstyle->{'-params'}},
 		       );
 
+  $zinc->contour($shape, @{$formstyle->{'-contour'}});
+
   # ombre portée de la shape
   my $shadstyle = $builder{'-shape'}->{'-shadow'};
   my $shadow = $zinc->clone($shape, %{$shadstyle->{'-params'}});