From 95ba2d44fffe340619c5fdf5624790ac64442d80 Mon Sep 17 00:00:00 2001 From: ribet Date: Mon, 14 May 2007 14:32:34 +0000 Subject: Déplacement de MGroup. Ce déplacement casse du code côté utilisateurs, mais le fichier est enfin à sa place. --- exemples/Comete.pm | 6 +++--- exemples/Lien.pm | 6 +++--- exemples/Rattrapage.pm | 8 ++++---- exemples/Selec.pm | 6 +++--- exemples/Strip.pm | 14 +++++++------- exemples/StripAntiRecouvre.pm | 12 ++++++------ exemples/Target.pm | 6 +++--- exemples/Visage.pm | 6 +++--- exemples/exemple_Rattrapage.pl | 2 +- exemples/exemple_anti_recouvrement.pl | 2 +- exemples/exemple_multi_selection.pl | 2 +- 11 files changed, 35 insertions(+), 35 deletions(-) (limited to 'exemples') diff --git a/exemples/Comete.pm b/exemples/Comete.pm index bb86c66..9256b4e 100644 --- a/exemples/Comete.pm +++ b/exemples/Comete.pm @@ -21,18 +21,18 @@ use MTools; use vars qw /@ISA/; -use MTools::MGroup; +use MTools::GUI::MGroup; use MTools::Comp::MMover; BEGIN { - @ISA = qw /MTools::MGroup/; + @ISA = qw /MTools::GUI::MGroup/; } sub new { my ($class, $parent, $name, $x, $y) = @_; - my $self = new MTools::MGroup ($parent); + my $self = new MTools::GUI::MGroup ($parent); bless $self, $class; $self -> recordProperty ('x', $x); diff --git a/exemples/Lien.pm b/exemples/Lien.pm index d8665bc..b9a6502 100644 --- a/exemples/Lien.pm +++ b/exemples/Lien.pm @@ -18,7 +18,7 @@ package Lien; use strict; use MTools; -use MTools::MGroup; +use MTools::GUI::MGroup; use MTools::GUI::MCurve; use vars qw /@ISA/; @@ -26,12 +26,12 @@ use vars qw /@ISA/; BEGIN { - @ISA = qw /MTools::MGroup/; + @ISA = qw /MTools::GUI::MGroup/; } sub new { my ($class, $parent, $comete_1, $comete_2, %options) = @_; - my $self = new MTools::MGroup ($parent); + my $self = new MTools::GUI::MGroup ($parent); bless $self, $class; $self -> recordProperty ('comete_1', $comete_1); diff --git a/exemples/Rattrapage.pm b/exemples/Rattrapage.pm index c6ec0bc..848b6dd 100644 --- a/exemples/Rattrapage.pm +++ b/exemples/Rattrapage.pm @@ -20,7 +20,7 @@ use strict; use vars qw /@ISA/; use MTools; -use MTools::MGroup; +use MTools::GUI::MGroup; use MTools::Widget::MToggleBouton; use MTools::Widget::MBouton; use Lien; @@ -29,13 +29,13 @@ use Tk; BEGIN { - @ISA = qw /MTools::MGroup/; + @ISA = qw /MTools::GUI::MGroup/; } sub new { my ($class, $parent, $comete1, $comete2, $manager, %options) = @_; my $lien = new Lien ($parent, $comete1, $comete2); - my $self = new MTools::MGroup ($parent); + my $self = new MTools::GUI::MGroup ($parent); bless $self, $class; $self -> {__lien} = $lien; @@ -125,7 +125,7 @@ sub new { e_release => 'DELETE' ); - my $gp_mask = new MTools::MGroup ($self); + my $gp_mask = new MTools::GUI::MGroup ($self); $self -> {__down} = minstanciate ('rattrapage.svg#mask_seuil_down', $gp_mask); $self -> {__down} -> mconfigure (-visible => 0); $self -> {__up} = minstanciate ('rattrapage.svg#mask_seuil', $gp_mask); diff --git a/exemples/Selec.pm b/exemples/Selec.pm index 28237ac..c045d0b 100644 --- a/exemples/Selec.pm +++ b/exemples/Selec.pm @@ -21,19 +21,19 @@ use MTools; use vars qw /@ISA/; -use MTools::MGroup; +use MTools::GUI::MGroup; use MTools::GUI::MRect; use MTools::GUI::MCircle; BEGIN { - @ISA = qw /MTools::MGroup/; + @ISA = qw /MTools::GUI::MGroup/; } sub new { my ($class, $parent, $style, $x, $y) = @_; - my $self = new MTools::MGroup ($parent); + my $self = new MTools::GUI::MGroup ($parent); bless $self, $class; $self -> recordProperty ('barycentre_x' => 0); diff --git a/exemples/Strip.pm b/exemples/Strip.pm index 2997e25..59d800f 100644 --- a/exemples/Strip.pm +++ b/exemples/Strip.pm @@ -20,7 +20,7 @@ use strict; use vars qw /@ISA/; use MTools; -use MTools::MGroup; +use MTools::GUI::MGroup; use MTools::Widget::MToggleBouton; use MTools::Comp::MMover; use MTools::Comp::MReconizer; @@ -28,12 +28,12 @@ use MTools::Comp::MInertie; BEGIN { - @ISA = qw /MTools::MGroup/; + @ISA = qw /MTools::GUI::MGroup/; } sub new { my ($class, $parent, %options) = @_; - my $self = new MTools::MGroup ($parent); + my $self = new MTools::GUI::MGroup ($parent); bless $self, $class; $self -> recordEvent ('SET_FOCUS'); @@ -41,10 +41,10 @@ sub new { $self -> recordProperty ('x', 0); $self -> recordProperty ('y', 0); - my $gp1 = new MTools::MGroup ($self); - my $gp2 = new MTools::MGroup ($self); - my $gp3 = new MTools::MGroup ($self); - my $gp4 = new MTools::MGroup ($self); + my $gp1 = new MTools::GUI::MGroup ($self); + my $gp2 = new MTools::GUI::MGroup ($self); + my $gp3 = new MTools::GUI::MGroup ($self); + my $gp4 = new MTools::GUI::MGroup ($self); # Instanciation d'un petit bouton rouge qui aura pour objectif # de fixer ou non le strip (desactiver le comportement de mover) diff --git a/exemples/StripAntiRecouvre.pm b/exemples/StripAntiRecouvre.pm index 4e2c001..5c1bf0a 100644 --- a/exemples/StripAntiRecouvre.pm +++ b/exemples/StripAntiRecouvre.pm @@ -26,7 +26,7 @@ use MTools; use vars qw /@ISA/; use MTools; -use MTools::MGroup; +use MTools::GUI::MGroup; use MTools::Comp::MMover; use MTools::Comp::MInertie; use MTools::GUI::MAntiRecouvrementGroup; @@ -45,11 +45,11 @@ sub new { $self -> recordProperty('callsign', $options{callsign}); $self -> recordProperty('color', 'grey'); - my $gp1 = new MTools::MGroup ($self); - my $gp2 = new MTools::MGroup ($self); - my $gp3 = new MTools::MGroup ($self); - my $gp4 = new MTools::MGroup ($self); - my $gp5 = new MTools::MGroup ($self); + my $gp1 = new MTools::GUI::MGroup ($self); + my $gp2 = new MTools::GUI::MGroup ($self); + my $gp3 = new MTools::GUI::MGroup ($self); + my $gp4 = new MTools::GUI::MGroup ($self); + my $gp5 = new MTools::GUI::MGroup ($self); $self -> {cadre} = minstanciate ("strip_approche_arrival.svg#cadre_strip", $gp1); plink([$self, 'color'], [mfind($self->{cadre},'cadre'),'-fillcolor']); $self -> {infosavion} = minstanciate ("strip_approche_arrival.svg#infosavion", $gp2); diff --git a/exemples/Target.pm b/exemples/Target.pm index c2fb566..a79fa95 100644 --- a/exemples/Target.pm +++ b/exemples/Target.pm @@ -21,19 +21,19 @@ use MTools; use vars qw /@ISA/; -use MTools::MGroup; +use MTools::GUI::MGroup; use MTools::GUI::MText; use MTools::GUI::MCircle; BEGIN { - @ISA = qw /MTools::MGroup/; + @ISA = qw /MTools::GUI::MGroup/; } sub new { my ($class, $parent, $x, $y) = @_; - my $self = new MTools::MGroup ($parent, -atomic => 1); + my $self = new MTools::GUI::MGroup ($parent, -atomic => 1); bless $self, $class; my $ob = new MTools::GUI::MCircle ($self, $x, $y, 20, -filled => 1); diff --git a/exemples/Visage.pm b/exemples/Visage.pm index 67c0064..ddef0ef 100644 --- a/exemples/Visage.pm +++ b/exemples/Visage.pm @@ -20,17 +20,17 @@ use strict; use vars qw /@ISA/; use MTools; -use MTools::MGroup; +use MTools::GUI::MGroup; use MTools::GUI::MText; BEGIN { - @ISA = qw /MTools::MGroup/; + @ISA = qw /MTools::GUI::MGroup/; } sub new { my ($class, $parent, $file) = @_; - my $self = new MTools::MGroup ($parent); + my $self = new MTools::GUI::MGroup ($parent); bless $self, $class; $self -> recordProperty ('nom', $file); diff --git a/exemples/exemple_Rattrapage.pl b/exemples/exemple_Rattrapage.pl index ca2b0f2..9524676 100755 --- a/exemples/exemple_Rattrapage.pl +++ b/exemples/exemple_Rattrapage.pl @@ -30,7 +30,7 @@ my $com1 = new Comete (1, 'AFR6830', 180, 200); my $com2 = new Comete (1, 'BAW753', 400, 180); my $com3 = new Comete (1, 'AZA322', 350, 340); -my $manager = new MTools::MGroup (1); +my $manager = new MTools::GUI::MGroup (1); $manager -> mconfigure (-visible => 0); new Rattrapage (1, $com1, $com2, $manager); diff --git a/exemples/exemple_anti_recouvrement.pl b/exemples/exemple_anti_recouvrement.pl index dd27cb5..db25c2a 100755 --- a/exemples/exemple_anti_recouvrement.pl +++ b/exemples/exemple_anti_recouvrement.pl @@ -21,7 +21,7 @@ BEGIN { use strict; use MTools; -use MTools::MGroup; +use MTools::GUI::MGroup; use MTools::Comp::MAntiRecouvrement; use StripAntiRecouvre; diff --git a/exemples/exemple_multi_selection.pl b/exemples/exemple_multi_selection.pl index 7cd089b..c0e6251 100755 --- a/exemples/exemple_multi_selection.pl +++ b/exemples/exemple_multi_selection.pl @@ -30,7 +30,7 @@ my $frame = new MTools (800, 600, 'Exemple SVG'); my $bck = new MTools::GUI::MRect (1, 0, 0, 800, 600, -filled => 1, -fillcolor => '#aaaaaa'); -my $objs = new MTools::MGroup (1); +my $objs = new MTools::GUI::MGroup (1); my $multi = new MTools::Comp::MMultiSelection ( $bck, -- cgit v1.1