Menu
▾
▴
fudaa-svn-commit — svn commit with diffs
You can subscribe to this list here.
| 2008 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(46) |
Jul
(37) |
Aug
(154) |
Sep
(140) |
Oct
(132) |
Nov
(104) |
Dec
(67) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2009 |
Jan
(113) |
Feb
(73) |
Mar
(102) |
Apr
(106) |
May
(114) |
Jun
(67) |
Jul
(116) |
Aug
(48) |
Sep
(108) |
Oct
(296) |
Nov
(56) |
Dec
(53) |
| 2010 |
Jan
(95) |
Feb
(31) |
Mar
(40) |
Apr
(12) |
May
(10) |
Jun
(27) |
Jul
(19) |
Aug
(81) |
Sep
(48) |
Oct
(45) |
Nov
(40) |
Dec
(7) |
| 2011 |
Jan
(16) |
Feb
(32) |
Mar
(55) |
Apr
(38) |
May
(24) |
Jun
(37) |
Jul
(12) |
Aug
(16) |
Sep
(97) |
Oct
(90) |
Nov
(101) |
Dec
(89) |
| 2012 |
Jan
(18) |
Feb
(2) |
Mar
(54) |
Apr
(69) |
May
(97) |
Jun
(131) |
Jul
(70) |
Aug
(48) |
Sep
(48) |
Oct
(119) |
Nov
(194) |
Dec
(60) |
| 2013 |
Jan
(73) |
Feb
(35) |
Mar
(42) |
Apr
(28) |
May
(7) |
Jun
(17) |
Jul
(27) |
Aug
(10) |
Sep
(38) |
Oct
(12) |
Nov
(4) |
Dec
(16) |
| 2014 |
Jan
(33) |
Feb
(37) |
Mar
(19) |
Apr
(3) |
May
(47) |
Jun
(26) |
Jul
(22) |
Aug
|
Sep
(10) |
Oct
(30) |
Nov
(24) |
Dec
(19) |
| 2015 |
Jan
(13) |
Feb
(16) |
Mar
(36) |
Apr
(19) |
May
(5) |
Jun
(5) |
Jul
(3) |
Aug
(11) |
Sep
(22) |
Oct
(7) |
Nov
(14) |
Dec
|
| 2016 |
Jan
|
Feb
(26) |
Mar
(13) |
Apr
(61) |
May
|
Jun
|
Jul
(4) |
Aug
|
Sep
|
Oct
(27) |
Nov
(14) |
Dec
(21) |
| 2017 |
Jan
(30) |
Feb
(4) |
Mar
(3) |
Apr
(5) |
May
(69) |
Jun
(29) |
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <de...@us...> - 2009-01-14 06:25:27
|
Revision: 4355
http://fudaa.svn.sourceforge.net/fudaa/?rev=4355&view=rev
Author: deniger
Date: 2009-01-14 06:24:50 +0000 (Wed, 14 Jan 2009)
Log Message:
-----------
Modified Paths:
--------------
branches/Prepro-0.92-SNAPSHOT/aide/aide_outils/fudaa_xsl/chunk.xsl
branches/Prepro-0.92-SNAPSHOT/aide/src/albe/Tableauxrecap.html
branches/Prepro-0.92-SNAPSHOT/aide/src/albe/actions.html
branches/Prepro-0.92-SNAPSHOT/aide/src/albe/alphabetique.html
branches/Prepro-0.92-SNAPSHOT/aide/src/albe/coefficientspartiels.html
branches/Prepro-0.92-SNAPSHOT/aide/src/albe/creationprojet.html
branches/Prepro-0.92-SNAPSHOT/aide/src/albe/criteresdimensionnement.html
branches/Prepro-0.92-SNAPSHOT/aide/src/albe/defensesaccostage.html
branches/Prepro-0.92-SNAPSHOT/aide/src/albe/domaineapplication.html
branches/Prepro-0.92-SNAPSHOT/aide/src/albe/geometrie.html
branches/Prepro-0.92-SNAPSHOT/aide/src/albe/index.html
branches/Prepro-0.92-SNAPSHOT/aide/src/albe/introductiondonnees.html
branches/Prepro-0.92-SNAPSHOT/aide/src/albe/lancementcalculs.html
branches/Prepro-0.92-SNAPSHOT/aide/src/albe/methodedecalcul.html
branches/Prepro-0.92-SNAPSHOT/aide/src/albe/notedecalcul.html
branches/Prepro-0.92-SNAPSHOT/aide/src/albe/pieu.html
branches/Prepro-0.92-SNAPSHOT/aide/src/albe/preparationnote.html
branches/Prepro-0.92-SNAPSHOT/aide/src/albe/presentationespacetravail.html
branches/Prepro-0.92-SNAPSHOT/aide/src/albe/resultatsdetailles.html
branches/Prepro-0.92-SNAPSHOT/aide/src/albe/sol.html
branches/Prepro-0.92-SNAPSHOT/aide/src/albe/thematique.html
branches/Prepro-0.92-SNAPSHOT/aide/src/albe/validation.html
branches/Prepro-0.92-SNAPSHOT/aide/src/albe/verificationsaprescalculs.html
branches/Prepro-0.92-SNAPSHOT/aide/src/albe/visualisationnotecalcul.html
branches/Prepro-0.92-SNAPSHOT/aide/src/albe/visualiserresultats.html
branches/Prepro-0.92-SNAPSHOT/aide/src/prepro/build.xml
branches/Prepro-0.92-SNAPSHOT/aide/src/prepro/src/doc/post/target.fr.db
branches/Prepro-0.92-SNAPSHOT/aide/src/prepro/src/doc/reflux/target.fr.db
branches/Prepro-0.92-SNAPSHOT/aide/src/prepro/src/doc/rubar/target.fr.db
branches/Prepro-0.92-SNAPSHOT/aide/src/prepro/src/doc/telemac/target.fr.db
branches/Prepro-0.92-SNAPSHOT/aide/src/prepro/src/web/inc.history.en.html
branches/Prepro-0.92-SNAPSHOT/aide/src/prepro/src/web/inc.history.fr.html
branches/Prepro-0.92-SNAPSHOT/aide/src/prepro/src/web/inc.last-changelog.en.html
branches/Prepro-0.92-SNAPSHOT/aide/src/prepro/src/web/inc.last-changelog.fr.html
branches/Prepro-0.92-SNAPSHOT/aide/src/prepro/src/web/inc.news.en.html
branches/Prepro-0.92-SNAPSHOT/aide/src/prepro/src/web/inc.news.fr.html
Added Paths:
-----------
branches/Prepro-0.92-SNAPSHOT/aide/src/curvi/
branches/Prepro-0.92-SNAPSHOT/aide/src/curvi/alphabetique.html
branches/Prepro-0.92-SNAPSHOT/aide/src/curvi/index.html
branches/Prepro-0.92-SNAPSHOT/aide/src/curvi/installation.html
branches/Prepro-0.92-SNAPSHOT/aide/src/curvi/introduction.html
branches/Prepro-0.92-SNAPSHOT/aide/src/curvi/p-fpparametresinp.html
branches/Prepro-0.92-SNAPSHOT/aide/src/curvi/p-parametres-inp.html
branches/Prepro-0.92-SNAPSHOT/aide/src/curvi/pierre-990303.html
branches/Prepro-0.92-SNAPSHOT/aide/src/curvi/thematique.html
branches/Prepro-0.92-SNAPSHOT/aide/src/fudaa/
branches/Prepro-0.92-SNAPSHOT/aide/src/fudaa/alphabetique.html
branches/Prepro-0.92-SNAPSHOT/aide/src/fudaa/index.cgi
branches/Prepro-0.92-SNAPSHOT/aide/src/fudaa/index.html
branches/Prepro-0.92-SNAPSHOT/aide/src/fudaa/p-rapport.html
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/Bief_html_m284f9f99.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/Bief_html_m34fc962c.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/absence-affichage-bief.html
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/accrochage.html
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/accrochage__m46b2feea.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/accrochage__m787439a2.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/affectation-lois-hydrauliques-extremites-libres-reseau-hydraulique.html
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/alphabetique.html
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/annexe.html
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/annexe__2209b583.gif
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/annexe__2ca94a00.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/annexe__2f703ba8.gif
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/annexe__531284d.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/annexe__56836516.gif
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/annexe__7ac3fcfd.gif
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/annexe__m43030b7.gif
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/annexe__m49c066e8.gif
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/annexe__m4f038439.gif
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/annexe__m71dfc4d2.gif
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/annexe__m73bc5c15.gif
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/annexe_fichiers/
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/annexe_fichiers/annexe__2209b583.gif
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/annexe_fichiers/annexe__2ca94a00.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/annexe_fichiers/annexe__2f703ba8.gif
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/annexe_fichiers/annexe__531284d.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/annexe_fichiers/annexe__56836516.gif
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/annexe_fichiers/annexe__7ac3fcfd.gif
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/annexe_fichiers/annexe__m43030b7.gif
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/annexe_fichiers/annexe__m49c066e8.gif
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/annexe_fichiers/annexe__m4f038439.gif
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/annexe_fichiers/annexe__m71dfc4d2.gif
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/annexe_fichiers/annexe__m73bc5c15.gif
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/barrage seuil.html
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/barrage seuil__11d9f4c2.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/barrage seuil__31b1e8a7.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/barrage seuil__3316ed91.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/bief.html
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons-boite-dialogue.html
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons-boite-dialogue__348120d9.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons-boite-dialogue__54b34cb6.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons-boite-dialogue__58e9611a.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons-boite-dialogue__72f85af5.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons-boite-dialogue__7d635d77.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons-boite-dialogue__d281cf2.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons-boite-dialogue__m1ff7354b.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons-boite-dialogue__m33ee9e7f.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons-boite-dialogue__m362c7843.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons-boite-dialogue__m3b47e103.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons-boite-dialogue__m4465d103.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons-boite-dialogue__m4952c650.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons-boite-dialogue__m6bed2db0.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons-boite-dialogue__m7c2f2179.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons-boite-dialogue_fichiers/
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons-boite-dialogue_fichiers/boutons-boite-dialogue__348120d9.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons-boite-dialogue_fichiers/boutons-boite-dialogue__54b34cb6.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons-boite-dialogue_fichiers/boutons-boite-dialogue__58e9611a.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons-boite-dialogue_fichiers/boutons-boite-dialogue__72f85af5.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons-boite-dialogue_fichiers/boutons-boite-dialogue__7d635d77.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons-boite-dialogue_fichiers/boutons-boite-dialogue__d281cf2.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons-boite-dialogue_fichiers/boutons-boite-dialogue__m1ff7354b.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons-boite-dialogue_fichiers/boutons-boite-dialogue__m33ee9e7f.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons-boite-dialogue_fichiers/boutons-boite-dialogue__m362c7843.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons-boite-dialogue_fichiers/boutons-boite-dialogue__m3b47e103.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons-boite-dialogue_fichiers/boutons-boite-dialogue__m4465d103.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons-boite-dialogue_fichiers/boutons-boite-dialogue__m4952c650.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons-boite-dialogue_fichiers/boutons-boite-dialogue__m6bed2db0.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons-boite-dialogue_fichiers/boutons-boite-dialogue__m7c2f2179.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons-edition-reseau.html
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons-edition-reseau__278285cb.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons-edition-reseau__2c325b85.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons-edition-reseau__2f80e89a.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons-edition-reseau__31a3eaaf.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons-edition-reseau__35f947eb.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons-edition-reseau__38c6eb0d.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons-edition-reseau__3cc11cbc.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons-edition-reseau__525e369c.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons-edition-reseau__5c2b1698.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons-edition-reseau__618cdb1d.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons-edition-reseau__6eb26a.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons-edition-reseau__73ce3ed5.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons-edition-reseau__75c057e6.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons-edition-reseau__7ec63c.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons-edition-reseau__a63d1f9.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons-edition-reseau__m1ac2796d.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons-edition-reseau__m34cecd7a.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons-edition-reseau__m34d0ea1c.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons-edition-reseau__m436557c8.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons-edition-reseau__m4db8fec3.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons-edition-reseau__m510bd37b.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons-edition-reseau__m554611f7.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons-edition-reseau__m565cb415.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons-edition-reseau__m6417ee82.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons-edition-reseau__mdc3b820.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons-edition-reseau_fichiers/
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons-edition-reseau_fichiers/boutons-edition-reseau__278285cb.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons-edition-reseau_fichiers/boutons-edition-reseau__2c325b85.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons-edition-reseau_fichiers/boutons-edition-reseau__2f80e89a.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons-edition-reseau_fichiers/boutons-edition-reseau__31a3eaaf.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons-edition-reseau_fichiers/boutons-edition-reseau__35f947eb.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons-edition-reseau_fichiers/boutons-edition-reseau__38c6eb0d.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons-edition-reseau_fichiers/boutons-edition-reseau__3cc11cbc.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons-edition-reseau_fichiers/boutons-edition-reseau__525e369c.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons-edition-reseau_fichiers/boutons-edition-reseau__5c2b1698.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons-edition-reseau_fichiers/boutons-edition-reseau__618cdb1d.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons-edition-reseau_fichiers/boutons-edition-reseau__6eb26a.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons-edition-reseau_fichiers/boutons-edition-reseau__73ce3ed5.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons-edition-reseau_fichiers/boutons-edition-reseau__75c057e6.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons-edition-reseau_fichiers/boutons-edition-reseau__7ec63c.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons-edition-reseau_fichiers/boutons-edition-reseau__a63d1f9.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons-edition-reseau_fichiers/boutons-edition-reseau__m1ac2796d.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons-edition-reseau_fichiers/boutons-edition-reseau__m34cecd7a.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons-edition-reseau_fichiers/boutons-edition-reseau__m34d0ea1c.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons-edition-reseau_fichiers/boutons-edition-reseau__m436557c8.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons-edition-reseau_fichiers/boutons-edition-reseau__m4db8fec3.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons-edition-reseau_fichiers/boutons-edition-reseau__m510bd37b.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons-edition-reseau_fichiers/boutons-edition-reseau__m554611f7.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons-edition-reseau_fichiers/boutons-edition-reseau__m565cb415.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons-edition-reseau_fichiers/boutons-edition-reseau__m6417ee82.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons-edition-reseau_fichiers/boutons-edition-reseau__mdc3b820.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons.html
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons__278285cb.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons__2c325b85.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons__2f80e89a.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons__31a3eaaf.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons__348120d9.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons__35f947eb.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons__38c6eb0d.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons__3cc11cbc.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons__525e369c.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons__54b34cb6.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons__58e9611a.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons__5c2b1698.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons__618cdb1d.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons__6eb26a.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons__72f85af5.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons__73ce3ed5.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons__75c057e6.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons__7d635d77.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons__7ec63c.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons__a63d1f9.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons__d281cf2.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons__m1ac2796d.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons__m1ff7354b.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons__m33ee9e7f.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons__m34cecd7a.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons__m34d0ea1c.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons__m362c7843.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons__m3b47e103.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons__m436557c8.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons__m4465d103.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons__m4952c650.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons__m4db8fec3.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons__m510bd37b.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons__m554611f7.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons__m565cb415.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons__m6417ee82.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons__m6bed2db0.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons__m7c2f2179.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons__mdc3b820.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons_fichiers/
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons_fichiers/boutons__278285cb.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons_fichiers/boutons__2c325b85.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons_fichiers/boutons__2f80e89a.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons_fichiers/boutons__31a3eaaf.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons_fichiers/boutons__348120d9.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons_fichiers/boutons__35f947eb.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons_fichiers/boutons__38c6eb0d.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons_fichiers/boutons__3cc11cbc.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons_fichiers/boutons__525e369c.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons_fichiers/boutons__54b34cb6.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons_fichiers/boutons__58e9611a.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons_fichiers/boutons__5c2b1698.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons_fichiers/boutons__618cdb1d.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons_fichiers/boutons__6eb26a.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons_fichiers/boutons__72f85af5.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons_fichiers/boutons__73ce3ed5.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons_fichiers/boutons__75c057e6.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons_fichiers/boutons__7d635d77.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons_fichiers/boutons__7ec63c.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons_fichiers/boutons__a63d1f9.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons_fichiers/boutons__d281cf2.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons_fichiers/boutons__m1ac2796d.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons_fichiers/boutons__m1ff7354b.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons_fichiers/boutons__m33ee9e7f.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons_fichiers/boutons__m34cecd7a.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons_fichiers/boutons__m34d0ea1c.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons_fichiers/boutons__m362c7843.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons_fichiers/boutons__m3b47e103.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons_fichiers/boutons__m436557c8.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons_fichiers/boutons__m4465d103.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons_fichiers/boutons__m4952c650.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons_fichiers/boutons__m4db8fec3.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons_fichiers/boutons__m510bd37b.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons_fichiers/boutons__m554611f7.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons_fichiers/boutons__m565cb415.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons_fichiers/boutons__m6417ee82.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons_fichiers/boutons__m6bed2db0.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons_fichiers/boutons__m7c2f2179.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/boutons_fichiers/boutons__mdc3b820.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/calage-automatique.html
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/calage-automatique__2098dbca.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/calage-automatique__2588fe8.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/calage-automatique__45b032fe.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/calage-automatique__54b34cb6.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/calage-automatique__5505f83b.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/calage-automatique__56ac44d.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/calage-automatique__59f60e90.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/calage-automatique__5c566742.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/calage-automatique__6c90fe1e.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/calage-automatique__701a0d6b.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/calage-automatique__m1ff7354b.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/calage-automatique__m2c8adb14.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/calage-automatique__m468d2267.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/calage-automatique__m503e61a.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/calage-automatique__m7205d23a.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/calage-automatique__m7f370901.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/calage-automatique_fichiers/
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/calage-automatique_fichiers/calage-automatique__2098dbca.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/calage-automatique_fichiers/calage-automatique__2588fe8.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/calage-automatique_fichiers/calage-automatique__45b032fe.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/calage-automatique_fichiers/calage-automatique__56ac44d.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/calage-automatique_fichiers/calage-automatique__5c566742.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/calage-automatique_fichiers/calage-automatique__6c90fe1e.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/calage-automatique_fichiers/calage-automatique__m1ff7354b.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/calage-automatique_fichiers/calage-automatique__m2c8adb14.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/calage-automatique_fichiers/calage-automatique__m468d2267.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/calage-automatique_fichiers/calage-automatique__m503e61a.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/calage-automatique_fichiers/calage-automatique__m7205d23a.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/calage-automatique_fichiers/calage-automatique__m7f370901.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/calage-graphes.html
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/calage-graphes__56ac44d.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/calage-graphes__m1ff7354b.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/calage-graphes_fichiers/
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/calage-graphes_fichiers/calage-graphes__56ac44d.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/calage-graphes_fichiers/calage-graphes__m1ff7354b.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/calage-parametres-du-calage.html
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/calage-parametres-du-calage__2098dbca.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/calage-parametres-du-calage__45b032fe.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/calage-parametres-du-calage__6c90fe1e.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/calage-parametres-du-calage_fichiers/
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/calage-parametres-du-calage_fichiers/calage-parametres-du-calage__2098dbca.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/calage-parametres-du-calage_fichiers/calage-parametres-du-calage__45b032fe.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/calage-parametres-du-calage_fichiers/calage-parametres-du-calage__6c90fe1e.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/calage-resultats-generaux.html
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/calage-resultats-generaux__m7205d23a.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/calage-resultats-generaux_fichiers/
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/calage-resultats-generaux_fichiers/calage-resultats-generaux__m7205d23a.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/calage-zones-de-frottement-calees.html
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/calage-zones-de-frottement-calees__5c566742.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/calage-zones-de-frottement-calees_fichiers/
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/calage-zones-de-frottement-calees_fichiers/calage-zones-de-frottement-calees__5c566742.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/calage-zones-de-frottement-initiales.html
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/calage-zones-de-frottement-initiales__2588fe8.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/calage-zones-de-frottement-initiales__m7f370901.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/calage-zones-de-frottement-initiales_fichiers/
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/calage-zones-de-frottement-initiales_fichiers/calage-zones-de-frottement-initiales__2588fe8.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/calage-zones-de-frottement-initiales_fichiers/calage-zones-de-frottement-initiales__m7f370901.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/calage.html
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/calage__m2c8adb14.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/calage_fichiers/
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/calage_fichiers/calage__m2c8adb14.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/callage-donnes-de-crues_fichiers/
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/callage-donnes-de-crues_fichiers/callage-donnes-de-crues__m468d2267.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/callage-donnes-de-crues_fichiers/callage-donnes-de-crues__m503e61a.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/casier.html
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/casier__58e9611a.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/casier__5a917cc6.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/casier__7b441411.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/casier__m4ecf211f.gif
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/casier__m5d36291e.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/casier__m735ff7d1.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/casier__m7a5d755f.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/casier_fichiers/
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/casier_fichiers/casier__58e9611a.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/casier_fichiers/casier__5a917cc6.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/casier_fichiers/casier__7b441411.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/casier_fichiers/casier__m4ecf211f.gif
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/casier_fichiers/casier__m5d36291e.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/casier_fichiers/casier__m735ff7d1.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/casier_fichiers/casier__m7a5d755f.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/changement de nom.html
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/changement de nom__19c0b53d.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/changement de nom_fichiers/
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/changement de nom_fichiers/changement de nom__19c0b53d.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/choix-conditions-limites.html
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/choix-conditions-limites__725241d1.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/choix-conditions-limites_fichiers/
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/choix-conditions-limites_fichiers/choix-conditions-limites__725241d1.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/choix-pas-de-temps.html
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/choix-pas-de-temps__5a40d340.gif
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/choix-pas-de-temps_fichiers/
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/choix-pas-de-temps_fichiers/choix-pas-de-temps__5a40d340.gif
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/choix-temps-initial.html
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/choix_noyau.html
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/clic-extremites-bief.html
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/clic-extremites-bief__725241d1.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/clic-extremites-bief_fichiers/
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/clic-extremites-bief_fichiers/clic-extremites-bief__725241d1.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/condition_initiale.html
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/conditions-initiales.html
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/conditions-initiales__31135ef5.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/conditions-initiales__393662f6.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/conditions-initiales__55d387cf.gif
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/conditions-initiales__58e9611a.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/conditions-initiales__5af87065.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/conditions-initiales__669bbcc6.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/conditions-initiales__m13ae671a.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/conditions-initiales__m21bc5878.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/conditions-initiales__m7d683294.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/conditions-initiales_fichiers/
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/conditions-initiales_fichiers/conditions-initiales__31135ef5.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/conditions-initiales_fichiers/conditions-initiales__393662f6.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/conditions-initiales_fichiers/conditions-initiales__55d387cf.gif
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/conditions-initiales_fichiers/conditions-initiales__58e9611a.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/conditions-initiales_fichiers/conditions-initiales__5af87065.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/conditions-initiales_fichiers/conditions-initiales__669bbcc6.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/conditions-initiales_fichiers/conditions-initiales__m13ae671a.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/conditions-initiales_fichiers/conditions-initiales__m186f7395.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/conditions-initiales_fichiers/conditions-initiales__m21bc5878.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/conditions-initiales_fichiers/conditions-initiales__m7d683294.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/confluents.html
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/confluents_html_198ef354.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/confluents_html_1d8e6b.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/confluents_html_58c7e366.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/confluents_html_7b870d3f.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/confluents_html_m1171e733.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/confluents_html_m7050af51.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/connexion au serveur.html
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/connexion au serveur_html_3dc55c8d.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/connexion au serveur_html_643b6057.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/cotes-initiales-cassiers.html
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/creation-des-profils.html
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/creation-des-profils__m7c83110e.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/creation-des-profils_fichiers/
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/creation-des-profils_fichiers/creation-des-profils__m7c83110e.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/creation-etude.html
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/creation-etude__72f85af5.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/creation-etude__7833935b.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/creation-etude__m247bda99.gif
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/creation-etude_fichiers/
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/creation-etude_fichiers/creation-etude__72f85af5.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/creation-etude_fichiers/creation-etude__7833935b.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/creation-etude_fichiers/creation-etude__m247bda99.gif
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/crues_callage.html
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/debit-apport.html
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/debit-apport__783bc144.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/debit-apport__m58e2c37e.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/debit-apport_fichiers/
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/debit-apport_fichiers/debit-apport__783bc144.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/debit-apport_fichiers/debit-apport__m58e2c37e.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/decrochage.html
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/decrochage__m3261e865.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/decrochage__m73020213.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/decrochage__mdc3b820.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/decrochage_fichiers/
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/decrochage_fichiers/decrochage__m3261e865.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/decrochage_fichiers/decrochage__m73020213.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/decrochage_fichiers/decrochage__mdc3b820.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel.html
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__11d9f4c2.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__13404eb4.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__13a3bb9c.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__1599317c.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__18734e63.gif
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__191b4b42.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__198ef354.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__19c0b53d.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__1b0103d3.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__1b3a0e9f.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__1cb07b01.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__1d8e6b.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__1ea95e86.gif
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__2098dbca.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__2588fe8.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__278285cb.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__27a0ab71.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__29c7076.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__2c1f5367.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__2caff009.gif
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__30d6987d.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__31135ef5.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__31b1e8a7.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__3316ed91.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__34bdcb23.gif
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__352e1965.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__36a95b5b.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__393662f6.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__3aca47f3.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__3cb1021f.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__3cc11cbc.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__3d9bd589.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__3f113852.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__40b03b28.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__415a5f1c.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__41bbb362.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__448e6620.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__45b032fe.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__47981122.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__47d29423.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__484624f4.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__4a487cc2.gif
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__4b4c5b51.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__4e3e4e62.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__54b34cb6.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__5505f83b.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__55d387cf.gif
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__55f0292.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__56ac44d.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__5754f021.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__58c7e366.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__58e9611a.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__59f60e90.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__5a917cc6.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__5af87065.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__5c566742.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__5d6775ed.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__5fdea2b4.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__6203ccb3.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__62bf8d5a.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__62edfdb1.gif
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__669bbcc6.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__66ca6b44.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__67602db3.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__67de6b45.gif
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__6ac52ecc.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__6b2b5eec.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__6c90fe1e.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__6d60084.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__6e5ab3fc.gif
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__6f31bc2c.gif
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__6faa338d.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__6fdb25ac.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__701a0d6b.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__724fb50f.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__725241d1.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__728ca3b8.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__72f85af5.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__732b4a6.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__7833935b.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__783bc144.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__7b441411.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__7b870d3f.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__7c8a096d.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__7caa2d8f.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__7e83d9af.gif
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__cf8a5f4.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__d30217c.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__f5c4df7.gif
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__m1171e733.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__m13ae671a.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__m13c5c4fd.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__m1516d614.gif
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__m15bdd4ce.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__m1610b99f.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__m17a212ed.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__m17fc0ab5.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__m186f7395.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__m19372bc7.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__m1fce783a.gif
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__m1ff7354b.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__m20f4c148.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__m21bc5878.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__m247bda99.gif
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__m284f9f99.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__m29f0aa93.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__m2c8adb14.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__m2cb5abc1.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__m2d6e7652.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__m2d98cd2e.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__m2da45f48.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__m31131107.gif
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__m3261e865.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__m34fc962c.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__m38601b78.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__m3a486bf0.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__m3bd12b89.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__m3c12627a.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__m4036e97e.gif
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__m40a5ff15.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__m417f6239.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__m43ea3c36.gif
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__m44319b7d.gif
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__m468d2267.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__m46b2feea.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__m4952c650.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__m4aefede0.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__m4c763b7a.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__m4d69a92d.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__m4ecf211f.gif
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__m4fec29a7.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__m503e61a.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__m50b73625.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__m536b463a.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__m53e0abe3.gif
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__m54e87686.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__m56cd4089.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__m58e2c37e.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__m5c5e03c8.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__m5d36291e.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__m5d48541c.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__m621d8e4d.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__m6346ef3a.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__m6605184c.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__m66e0ef5b.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__m675792eb.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__m677e8cd3.gif
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__m69d11ad4.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__m6bed2db0.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__m6d314c1e.gif
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__m6e003cb5.gif
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__m6f682d8f.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__m7050af51.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__m7059e3bc.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__m70d37491.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__m71030b70.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__m7205d23a.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__m72500914.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__m72befdd9.gif
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__m73020213.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__m73084129.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__m735ff7d1.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__m7410f98b.gif
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__m743cf864.gif
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__m7579f6dd.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__m768c603a.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__m787439a2.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__m7a5d755f.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__m7c83110e.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__m7d683294.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__m7d81675a.gif
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__m7f370901.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__m7f4326c7.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__m8801e27.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel__mdc3b820.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel_fichiers/
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel_fichiers/Thumbs.db
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel_fichiers/description-logiciel__11d9f4c2.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel_fichiers/description-logiciel__13404eb4.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel_fichiers/description-logiciel__13a3bb9c.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel_fichiers/description-logiciel__1599317c.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel_fichiers/description-logiciel__18734e63.gif
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel_fichiers/description-logiciel__191b4b42.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel_fichiers/description-logiciel__198ef354.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel_fichiers/description-logiciel__19c0b53d.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel_fichiers/description-logiciel__1b0103d3.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel_fichiers/description-logiciel__1b3a0e9f.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel_fichiers/description-logiciel__1cb07b01.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel_fichiers/description-logiciel__1d8e6b.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel_fichiers/description-logiciel__1ea95e86.gif
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel_fichiers/description-logiciel__2098dbca.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel_fichiers/description-logiciel__2588fe8.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel_fichiers/description-logiciel__278285cb.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel_fichiers/description-logiciel__27a0ab71.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel_fichiers/description-logiciel__29c7076.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel_fichiers/description-logiciel__2c1f5367.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel_fichiers/description-logiciel__2caff009.gif
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel_fichiers/description-logiciel__30d6987d.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel_fichiers/description-logiciel__31135ef5.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel_fichiers/description-logiciel__31b1e8a7.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel_fichiers/description-logiciel__3316ed91.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel_fichiers/description-logiciel__34bdcb23.gif
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel_fichiers/description-logiciel__352e1965.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel_fichiers/description-logiciel__36a95b5b.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel_fichiers/description-logiciel__393662f6.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel_fichiers/description-logiciel__3aca47f3.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel_fichiers/description-logiciel__3cb1021f.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel_fichiers/description-logiciel__3cc11cbc.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel_fichiers/description-logiciel__3d9bd589.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel_fichiers/description-logiciel__3f113852.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel_fichiers/description-logiciel__40b03b28.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel_fichiers/description-logiciel__415a5f1c.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel_fichiers/description-logiciel__41bbb362.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel_fichiers/description-logiciel__448e6620.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel_fichiers/description-logiciel__45b032fe.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel_fichiers/description-logiciel__47981122.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel_fichiers/description-logiciel__47d29423.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel_fichiers/description-logiciel__484624f4.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel_fichiers/description-logiciel__4a487cc2.gif
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel_fichiers/description-logiciel__4b4c5b51.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel_fichiers/description-logiciel__4e3e4e62.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel_fichiers/description-logiciel__54b34cb6.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel_fichiers/description-logiciel__5505f83b.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel_fichiers/description-logiciel__55d387cf.gif
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel_fichiers/description-logiciel__55f0292.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel_fichiers/description-logiciel__56ac44d.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel_fichiers/description-logiciel__5754f021.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel_fichiers/description-logiciel__58c7e366.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel_fichiers/description-logiciel__58e9611a.png
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel_fichiers/description-logiciel__59f60e90.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel_fichiers/description-logiciel__5a917cc6.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel_fichiers/description-logiciel__5af87065.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel_fichiers/description-logiciel__5c566742.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel_fichiers/description-logiciel__5d6775ed.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel_fichiers/description-logiciel__5fdea2b4.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel_fichiers/description-logiciel__6203ccb3.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel_fichiers/description-logiciel__62bf8d5a.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel_fichiers/description-logiciel__62edfdb1.gif
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel_fichiers/description-logiciel__669bbcc6.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel_fichiers/description-logiciel__66ca6b44.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel_fichiers/description-logiciel__67602db3.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel_fichiers/description-logiciel__67de6b45.gif
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel_fichiers/description-logiciel__6ac52ecc.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel_fichiers/description-logiciel__6b2b5eec.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel_fichiers/description-logiciel__6c90fe1e.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel_fichiers/description-logiciel__6d60084.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel_fichiers/description-logiciel__6e5ab3fc.gif
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel_fichiers/description-logiciel__6f31bc2c.gif
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel_fichiers/description-logiciel__6faa338d.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel_fichiers/description-logiciel__6fdb25ac.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/description-logiciel_fichiers/description-logiciel__701a0d6b.jpg
branches/Prepro-0.92-SNAPSHOT/aide/src/mascaret/descrip...
[truncated message content] |
|
From: <de...@us...> - 2009-01-14 05:01:02
|
Revision: 4354
http://fudaa.svn.sourceforge.net/fudaa/?rev=4354&view=rev
Author: deniger
Date: 2009-01-14 05:00:56 +0000 (Wed, 14 Jan 2009)
Log Message:
-----------
merge trunk
Property Changed:
----------------
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/actions/TrIsoLineAction.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/actions/TrPostCourbeAddPointsAction.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/actions/TrPostProfileAction.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/actions/TrPostVolumeAction.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataCreated.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataCreatedConstant.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataCreatedCstTime.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataCreatedCstTimeSaver.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataCreatedDefault.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataCreatedExpr.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataCreatedFroud.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataCreatedImport.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataCreatedMoins.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataCreatedNorm.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataCreatedNorme3D.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataCreatedPlus.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataCreatedRubarBathy.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataCreatedRubarVitesse.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataCreatedSaver.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataCreatedStatistic.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataCreatedStatisticSaver.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataCreationActions.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataCreationFille.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataCreationPanel.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataEditCommonPanel.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataEditCstPanel.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataEditExprPanel.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataEditStatisticPanel.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataInfoDoc.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataListener.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataMinMaxGlobalItem.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataUserVarModel.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataVecteur.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostExtremVisitor.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/dialogSpec/TrPostTrajectoireTaskModel.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/dialogSpec/TrPostWizardCourbeTemporelle.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/dialogSpec/TrPostWizardImportScope.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/dialogSpec/TrPostWizardProfilSpatial.java
Property changes on: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/actions/TrIsoLineAction.java
___________________________________________________________________
Modified: svn:mergeinfo
-
+ /trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/post/actions/TrIsoLineAction.java:1912-4350
Property changes on: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/actions/TrPostCourbeAddPointsAction.java
___________________________________________________________________
Modified: svn:mergeinfo
-
+ /trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/post/actions/TrPostCourbeAddPointsAction.java:1912-4350
Property changes on: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/actions/TrPostProfileAction.java
___________________________________________________________________
Modified: svn:mergeinfo
-
+ /trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/post/actions/TrPostProfileAction.java:1912-4350
Property changes on: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/actions/TrPostVolumeAction.java
___________________________________________________________________
Modified: svn:mergeinfo
-
+ /trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/post/actions/TrPostVolumeAction.java:1912-4350
Property changes on: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataCreated.java
___________________________________________________________________
Modified: svn:mergeinfo
-
+ /trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataCreated.java:1912-4350
Property changes on: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataCreatedConstant.java
___________________________________________________________________
Modified: svn:mergeinfo
-
+ /trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataCreatedConstant.java:1912-4350
Property changes on: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataCreatedCstTime.java
___________________________________________________________________
Modified: svn:mergeinfo
-
+ /trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataCreatedCstTime.java:1912-4350
Property changes on: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataCreatedCstTimeSaver.java
___________________________________________________________________
Modified: svn:mergeinfo
-
+ /trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataCreatedCstTimeSaver.java:1912-4350
Property changes on: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataCreatedDefault.java
___________________________________________________________________
Modified: svn:mergeinfo
-
+ /trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataCreatedDefault.java:1912-4350
Property changes on: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataCreatedExpr.java
___________________________________________________________________
Modified: svn:mergeinfo
-
+ /trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataCreatedExpr.java:1912-4350
Property changes on: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataCreatedFroud.java
___________________________________________________________________
Modified: svn:mergeinfo
-
+ /trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataCreatedFroud.java:1912-4350
Property changes on: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataCreatedImport.java
___________________________________________________________________
Modified: svn:mergeinfo
-
+ /trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataCreatedImport.java:1912-4350
Property changes on: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataCreatedMoins.java
___________________________________________________________________
Modified: svn:mergeinfo
-
+ /trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataCreatedMoins.java:1912-4350
Property changes on: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataCreatedNorm.java
___________________________________________________________________
Modified: svn:mergeinfo
-
+ /trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataCreatedNorm.java:1912-4350
Property changes on: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataCreatedNorme3D.java
___________________________________________________________________
Modified: svn:mergeinfo
-
+ /trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataCreatedNorme3D.java:1912-4350
Property changes on: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataCreatedPlus.java
___________________________________________________________________
Modified: svn:mergeinfo
-
+ /trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataCreatedPlus.java:1912-4350
Property changes on: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataCreatedRubarBathy.java
___________________________________________________________________
Modified: svn:mergeinfo
-
+ /trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataCreatedRubarBathy.java:1912-4350
Property changes on: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataCreatedRubarVitesse.java
___________________________________________________________________
Modified: svn:mergeinfo
-
+ /trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataCreatedRubarVitesse.java:1912-4350
Property changes on: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataCreatedSaver.java
___________________________________________________________________
Modified: svn:mergeinfo
-
+ /trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataCreatedSaver.java:1912-4350
Property changes on: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataCreatedStatistic.java
___________________________________________________________________
Modified: svn:mergeinfo
-
+ /trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataCreatedStatistic.java:1912-4350
Property changes on: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataCreatedStatisticSaver.java
___________________________________________________________________
Modified: svn:mergeinfo
-
+ /trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataCreatedStatisticSaver.java:1912-4350
Property changes on: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataCreationActions.java
___________________________________________________________________
Modified: svn:mergeinfo
-
+ /trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataCreationActions.java:1912-4350
Property changes on: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataCreationFille.java
___________________________________________________________________
Modified: svn:mergeinfo
-
+ /trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataCreationFille.java:1912-4350
Property changes on: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataCreationPanel.java
___________________________________________________________________
Modified: svn:mergeinfo
-
+ /trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataCreationPanel.java:1912-4350
Property changes on: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataEditCommonPanel.java
___________________________________________________________________
Modified: svn:mergeinfo
-
+ /trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataEditCommonPanel.java:1912-4350
Property changes on: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataEditCstPanel.java
___________________________________________________________________
Modified: svn:mergeinfo
-
+ /trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataEditCstPanel.java:1912-4350
Property changes on: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataEditExprPanel.java
___________________________________________________________________
Modified: svn:mergeinfo
-
+ /trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataEditExprPanel.java:1912-4350
Property changes on: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataEditStatisticPanel.java
___________________________________________________________________
Modified: svn:mergeinfo
-
+ /trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataEditStatisticPanel.java:1912-4350
Property changes on: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataInfoDoc.java
___________________________________________________________________
Modified: svn:mergeinfo
-
+ /trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataInfoDoc.java:1912-4350
Property changes on: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataListener.java
___________________________________________________________________
Modified: svn:mergeinfo
-
+ /trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataListener.java:1912-4350
Property changes on: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataMinMaxGlobalItem.java
___________________________________________________________________
Modified: svn:mergeinfo
-
+ /trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataMinMaxGlobalItem.java:1912-4350
Property changes on: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataUserVarModel.java
___________________________________________________________________
Modified: svn:mergeinfo
-
+ /trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataUserVarModel.java:1912-4350
Property changes on: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataVecteur.java
___________________________________________________________________
Modified: svn:mergeinfo
-
+ /trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataVecteur.java:1912-4350
Property changes on: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostExtremVisitor.java
___________________________________________________________________
Modified: svn:mergeinfo
-
+ /trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostExtremVisitor.java:1912-4350
Property changes on: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/dialogSpec/TrPostTrajectoireTaskModel.java
___________________________________________________________________
Modified: svn:mergeinfo
-
+ /trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/post/dialogSpec/TrPostTrajectoireTaskModel.java:1912-4350
Property changes on: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/dialogSpec/TrPostWizardCourbeTemporelle.java
___________________________________________________________________
Modified: svn:mergeinfo
-
+ /trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/post/dialogSpec/TrPostWizardCourbeTemporelle.java:1912-4350
Property changes on: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/dialogSpec/TrPostWizardImportScope.java
___________________________________________________________________
Modified: svn:mergeinfo
-
+ /trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/post/dialogSpec/TrPostWizardImportScope.java:1912-4350
Property changes on: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/dialogSpec/TrPostWizardProfilSpatial.java
___________________________________________________________________
Modified: svn:mergeinfo
-
+ /trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/post/dialogSpec/TrPostWizardProfilSpatial.java:1912-4350
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2009-01-14 02:23:56
|
Revision: 4353
http://fudaa.svn.sourceforge.net/fudaa/?rev=4353&view=rev
Author: deniger
Date: 2009-01-14 01:46:16 +0000 (Wed, 14 Jan 2009)
Log Message:
-----------
Modified Paths:
--------------
branches/Prepro-0.92-SNAPSHOT/ant-properties.xml
branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/albe/build.xml
branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/build.xml
branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/mascaret/izpack/izpack_fudaa_mascaret.xml
branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/oscar/build.xml
Added Paths:
-----------
branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/albe/albe.PNG
branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/albe/albe.bat
branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/albe/albe.ico
branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/albe/albe.jpg
branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/albe/izpack/
branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/albe/izpack/Unix_shortcutSpec.xml
branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/albe/izpack/izpack_fudaa_albe.xml
branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/albe/izpack/shortcutSpec.xml
branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/commun/standalone-compiler.jar
branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/modeleur/
branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/modeleur/build.xml
branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/modeleur/images/
branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/modeleur/images/gpl.png
branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/modeleur/images/mdl-logo.png
branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/modeleur/images/update.png
branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/modeleur/images/web.png
branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/modeleur/jars/
branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/modeleur/jars/.htaccess
branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/modeleur/jars/fudaa-mdl.jar.var
branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/modeleur/mdl.jnlp
branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/modeleur/mdl.properties
branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/oscar/Licence.txt
branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/oscar/izpack/
branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/oscar/izpack/Unix_shortcutSpec.xml
branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/oscar/izpack/izpack_fudaa_oscar.xml
branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/oscar/izpack/shortcutSpec.xml
branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/oscar/izpack/standalone-compiler.jar
branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/oscar/oscar.JPG
branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/oscar/oscar.PNG
branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/oscar/oscar.bat
branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/oscar/oscar.ico
branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/sinavi3/
branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/sinavi3/Licence.txt
branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/sinavi3/build.xml
branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/sinavi3/izpack/
branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/sinavi3/izpack/Unix_shortcutSpec.xml
branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/sinavi3/izpack/izpack_fudaa_sinavi3.xml
branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/sinavi3/izpack/shortcutSpec.xml
branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/sinavi3/izpack/standalone-compiler.jar
branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/sinavi3/sinavi3.PNG
branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/sinavi3/sinavi3.bat
branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/sinavi3/sinavi3.ico
branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/sinavi3/sinavi3.jpg
Removed Paths:
-------------
branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/albe/izpack/Unix_shortcutSpec.xml
branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/albe/izpack/izpack_fudaa_albe.xml
branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/albe/izpack/shortcutSpec.xml
branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/modeleur/build.xml
branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/modeleur/images/
branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/modeleur/images/gpl.png
branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/modeleur/images/mdl-logo.png
branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/modeleur/images/update.png
branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/modeleur/images/web.png
branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/modeleur/jars/
branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/modeleur/jars/.htaccess
branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/modeleur/jars/fudaa-mdl.jar.var
branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/modeleur/mdl.jnlp
branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/modeleur/mdl.properties
branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/oscar/izpack/Unix_shortcutSpec.xml
branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/oscar/izpack/izpack_fudaa_oscar.xml
branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/oscar/izpack/shortcutSpec.xml
branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/oscar/izpack/standalone-compiler.jar
branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/sinavi3/Licence.txt
branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/sinavi3/build.xml
branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/sinavi3/izpack/
branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/sinavi3/izpack/Unix_shortcutSpec.xml
branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/sinavi3/izpack/izpack_fudaa_sinavi3.xml
branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/sinavi3/izpack/shortcutSpec.xml
branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/sinavi3/izpack/standalone-compiler.jar
branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/sinavi3/sinavi3.PNG
branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/sinavi3/sinavi3.bat
branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/sinavi3/sinavi3.ico
branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/sinavi3/sinavi3.jpg
Modified: branches/Prepro-0.92-SNAPSHOT/ant-properties.xml
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ant-properties.xml 2009-01-14 01:43:21 UTC (rev 4352)
+++ branches/Prepro-0.92-SNAPSHOT/ant-properties.xml 2009-01-14 01:46:16 UTC (rev 4353)
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<!--
! @creation 2006-02-02
-! @modification $Date: 2006-09-28 10:03:45 $
+! @modification $Date: 2008-01-17 11:36:59 $
! @license GNU General Public License 2
! @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
-! @version $Id: ant-properties.xml,v 1.8 2006-09-28 10:03:45 deniger Exp $
+! @version $Id: ant-properties.xml,v 1.8.8.1 2008-01-17 11:36:59 bmarchan Exp $
! @author Fred deniger
!
! Ce fichier ant n'est pas \xE0 utiliser tel quel. Il faut utiliser le build de
@@ -88,9 +88,9 @@
<property name="build.compiler.deprecation" value="off" />
<property name="build.compiler.failonerror" value="false" />
- <property name="java.maxmemory" value="128M" />
+ <property name="java.maxmemory" value="1024M" />
<property name="javadoc.link" value="http://java.sun.com/j2se/1.4/docs/api/" />
- <property name="javadoc.maxmemory" value="128M" />
+ <property name="javadoc.maxmemory" value="1024M" />
<property name="javadoc.version" value="true" />
<property name="javadoc.use" value="true" />
<property name="javadoc.author" value="true" />
Copied: branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/albe/albe.PNG (from rev 4350, trunk/fudaa_devel/fudaa-distrib/albe/albe.PNG)
===================================================================
(Binary files differ)
Copied: branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/albe/albe.bat (from rev 4350, trunk/fudaa_devel/fudaa-distrib/albe/albe.bat)
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/albe/albe.bat (rev 0)
+++ branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/albe/albe.bat 2009-01-14 01:46:16 UTC (rev 4353)
@@ -0,0 +1,6 @@
+echo off
+cls
+echo Execution de Fudaa-Albe en cours...
+java.exe -Xmx256m -DFUDAA_SERVEUR=serveurs\albe -jar fudaa-albe.jar
+cls
+echo Fin d'execution de Fudaa-Albe
\ No newline at end of file
Copied: branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/albe/albe.ico (from rev 4350, trunk/fudaa_devel/fudaa-distrib/albe/albe.ico)
===================================================================
(Binary files differ)
Copied: branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/albe/albe.jpg (from rev 4350, trunk/fudaa_devel/fudaa-distrib/albe/albe.jpg)
===================================================================
(Binary files differ)
Modified: branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/albe/build.xml
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/albe/build.xml 2009-01-14 01:43:21 UTC (rev 4352)
+++ branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/albe/build.xml 2009-01-14 01:46:16 UTC (rev 4353)
@@ -1,16 +1,17 @@
<?xml version="1.0" encoding="ISO-8859-15"?>
<!--
! @creation 2006-9-28
-! @modification $Date: 2007-10-29 15:06:12 $
+! @modification $Date: 2008-11-28 12:00:00 $
! @license GNU General Public License 2
! @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
-! @version $Id: build.xml,v 1.1 2007-10-29 15:06:12 clavreul Exp $
+! @version $Id: build.xml,v 1.2 2008-11-28 12:00:00 fargeix Exp $
! @author Nicolas Clavreul
!
! build permettant de construire le jar
-->
<project name="albe" default="deploy" basedir=".">
<import file="../ant-deploy.xml" />
+ <taskdef name="izpack" classpath="../commun/standalone-compiler.jar" classname="com.izforge.izpack.ant.IzPackTask" />
<property name="this.main.class" value="Albe" />
<!--
@@ -87,4 +88,9 @@
</genjar>
</target>
-->
+
+ <taskdef resource="genjar.properties"/>
+ <target name="createInstaller" description="cree l'installeur Albe">
+ <izpack input="izpack/izpack_fudaa_albe.xml" output="../../../distrib/build/jar/albe/Fudaa_Albe_Install.jar" basedir="." />
+ </target>
</project>
Deleted: branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/albe/izpack/Unix_shortcutSpec.xml
===================================================================
--- trunk/fudaa_devel/fudaa-distrib/albe/izpack/Unix_shortcutSpec.xml 2009-01-13 20:42:41 UTC (rev 4350)
+++ branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/albe/izpack/Unix_shortcutSpec.xml 2009-01-14 01:46:16 UTC (rev 4353)
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<shortcuts>
- <programGroup defaultName="Fudaa Albe" location="applications"/>
- <shortcut
- name="Lancer Albe"
- programGroup="yes"
- desktop="yes"
- applications="no"
- startMenu="no"
- startup="no"
- target="$JAVA_HOME/bin/java"
- commandLine="-DINSTALLDIR=$INSTALL_PATH -DFUDAA_SERVEUR=$INSTALL_PATH/serveurs/albe -cp $INSTALL_PATH/fudaa-albe.jar org.fudaa.fudaa.albe.Albe"
- workingDirectory="$INSTALL_PATH"
- type="Application"
- iconFile="$INSTALL_PATH/albe.png"
- initialState="noShow"
- description="Lance le logiciel Albe">
- <createForPack name="Albe"/>
- </shortcut>
-
- <shortcut
- name="Supprimer Albe"
- programGroup="yes"
- desktop="yes"
- applications="no"
- startMenu="no"
- startup="no"
- target="$JAVA_HOME/bin/java"
- commandLine="-jar "$INSTALL_PATH/Uninstaller/uninstaller.jar""
- initialState="noShow"
- iconFile="trashcan_full"
- iconIndex="0"
- workingDirectory=""
- type="Application"
- encoding="UTF-8"
- description="Supprime le logiciel Albe">
- <createForPack name="Albe"/>
- </shortcut>
-
-</shortcuts>
\ No newline at end of file
Copied: branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/albe/izpack/Unix_shortcutSpec.xml (from rev 4350, trunk/fudaa_devel/fudaa-distrib/albe/izpack/Unix_shortcutSpec.xml)
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/albe/izpack/Unix_shortcutSpec.xml (rev 0)
+++ branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/albe/izpack/Unix_shortcutSpec.xml 2009-01-14 01:46:16 UTC (rev 4353)
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<shortcuts>
+ <programGroup defaultName="Fudaa Albe" location="applications"/>
+ <shortcut
+ name="Lancer Albe"
+ programGroup="yes"
+ desktop="yes"
+ applications="no"
+ startMenu="no"
+ startup="no"
+ target="$JAVA_HOME/bin/java"
+ commandLine="-DINSTALLDIR=$INSTALL_PATH -DFUDAA_SERVEUR=$INSTALL_PATH/serveurs/albe -cp $INSTALL_PATH/fudaa-albe.jar org.fudaa.fudaa.albe.Albe"
+ workingDirectory="$INSTALL_PATH"
+ type="Application"
+ iconFile="$INSTALL_PATH/albe.png"
+ initialState="noShow"
+ description="Lance le logiciel Albe">
+ <createForPack name="Albe"/>
+ </shortcut>
+
+ <shortcut
+ name="Supprimer Albe"
+ programGroup="yes"
+ desktop="yes"
+ applications="no"
+ startMenu="no"
+ startup="no"
+ target="$JAVA_HOME/bin/java"
+ commandLine="-jar "$INSTALL_PATH/Uninstaller/uninstaller.jar""
+ initialState="noShow"
+ iconFile="trashcan_full"
+ iconIndex="0"
+ workingDirectory=""
+ type="Application"
+ encoding="UTF-8"
+ description="Supprime le logiciel Albe">
+ <createForPack name="Albe"/>
+ </shortcut>
+
+</shortcuts>
\ No newline at end of file
Deleted: branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/albe/izpack/izpack_fudaa_albe.xml
===================================================================
--- trunk/fudaa_devel/fudaa-distrib/albe/izpack/izpack_fudaa_albe.xml 2009-01-13 20:42:41 UTC (rev 4350)
+++ branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/albe/izpack/izpack_fudaa_albe.xml 2009-01-14 01:46:16 UTC (rev 4353)
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="yes" ?>
-
-<!--
- A sample installation file.
- Use it as a base for your own installers :-)
-
- To compile it :
- - go in the bin directory where you installed IzPack
- - call "compile ../sample/install.xml -b ../sample"
--->
-
-<installation version="1.0">
-
- <!--
- The info section.
- The meaning of the tags should be natural ...
- -->
- <info>
- <appname>Albe</appname>
- <appversion>1.1.1</appversion>
- <authors>
- <author name="Sabrina DELATTRE" email="de...@fu..."/>
- </authors>
- <url>http://www.cetmef.developpement-durable.gouv.fr/</url>
- </info>
-
- <!--
- The gui preferences indication.
- Sets the installer window to 640x480. It will not be able to change the size.
- -->
- <guiprefs width="800" height="520" resizable="no"/>
-
- <variables>
- <variable name="$DesktopShortcutCheckboxEnabled" value="true"/>
- </variables>
-
- <!--
- The locale section.
- Asks here to include the English and French langpacks.
- -->
- <locale>
- <langpack iso3="fra"/>
- </locale>
-
- <!--
- The resources section.
- The ids must be these ones if you want to use the LicencePanel and/or the InfoPanel.
- -->
- <resources>
- <res id="LicencePanel.licence" src="../commun/licence.txt"/>
- <res id="shortcutSpec.xml" src="izpack/shortcutSpec.xml"/>
- <res id="Unix_shortcutSpec.xml" src="izpack/Unix_shortcutSpec.xml"/>
- <res src="albe.jpg" id="Installer.image.0"/>
- </resources>
-
- <!--
- The panels section.
- We indicate here which panels we want to use. The order will be respected.
- -->
- <panels>
- <panel classname="HelloPanel" id="hellopanel"/>
- <panel classname="LicencePanel" id="licensepanel"/>
- <panel classname="TargetPanel" id="targetpanel"/>
- <panel classname="PacksPanel" id="packspanel"/>
- <panel classname="InstallPanel" id="installpanel"/>
- <panel classname="ShortcutPanel" id="shortcutpanel"/>
- <panel classname="FinishPanel" id="finishpanel"/>
- </panels>
-
- <!--
- The packs section.
- We specify here our packs.
- -->
-
- <packs>
- <pack name="Albe" required="yes">
- <description>Installe tous les composants du logiciel Albe</description>
- <file src="../commun/licence.txt" targetdir="$INSTALL_PATH"/>
- <file src="albe.bat" targetdir="$INSTALL_PATH"/>
- <file src="albe.ico" targetdir="$INSTALL_PATH"/>
- <file src="albe.png" targetdir="$INSTALL_PATH"/>
- <file src="../../../distrib/build/jar/albe/fudaa-albe.jar" targetdir="$INSTALL_PATH"/>
- <file src="../../aide/src/albe" targetdir="$INSTALL_PATH/aide"/>
- <file src="../../fudaa/serveurs/albe" targetdir="$INSTALL_PATH/serveurs"/>
- <executable targetfile="$INSTALL_PATH/serveurs/albe/bin/linux/albe_linux.x" stage="never"/>
- </pack>
- </packs>
-
- <native type="izpack" name="ShellLink.dll"/>
-
-</installation>
Copied: branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/albe/izpack/izpack_fudaa_albe.xml (from rev 4350, trunk/fudaa_devel/fudaa-distrib/albe/izpack/izpack_fudaa_albe.xml)
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/albe/izpack/izpack_fudaa_albe.xml (rev 0)
+++ branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/albe/izpack/izpack_fudaa_albe.xml 2009-01-14 01:46:16 UTC (rev 4353)
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="iso-8859-1" standalone="yes" ?>
+
+<!--
+ A sample installation file.
+ Use it as a base for your own installers :-)
+
+ To compile it :
+ - go in the bin directory where you installed IzPack
+ - call "compile ../sample/install.xml -b ../sample"
+-->
+
+<installation version="1.0">
+
+ <!--
+ The info section.
+ The meaning of the tags should be natural ...
+ -->
+ <info>
+ <appname>Albe</appname>
+ <appversion>1.1.1</appversion>
+ <authors>
+ <author name="Sabrina DELATTRE" email="de...@fu..."/>
+ </authors>
+ <url>http://www.cetmef.developpement-durable.gouv.fr/</url>
+ </info>
+
+ <!--
+ The gui preferences indication.
+ Sets the installer window to 640x480. It will not be able to change the size.
+ -->
+ <guiprefs width="800" height="520" resizable="no"/>
+
+ <variables>
+ <variable name="$DesktopShortcutCheckboxEnabled" value="true"/>
+ </variables>
+
+ <!--
+ The locale section.
+ Asks here to include the English and French langpacks.
+ -->
+ <locale>
+ <langpack iso3="fra"/>
+ </locale>
+
+ <!--
+ The resources section.
+ The ids must be these ones if you want to use the LicencePanel and/or the InfoPanel.
+ -->
+ <resources>
+ <res id="LicencePanel.licence" src="../commun/licence.txt"/>
+ <res id="shortcutSpec.xml" src="izpack/shortcutSpec.xml"/>
+ <res id="Unix_shortcutSpec.xml" src="izpack/Unix_shortcutSpec.xml"/>
+ <res src="albe.jpg" id="Installer.image.0"/>
+ </resources>
+
+ <!--
+ The panels section.
+ We indicate here which panels we want to use. The order will be respected.
+ -->
+ <panels>
+ <panel classname="HelloPanel" id="hellopanel"/>
+ <panel classname="LicencePanel" id="licensepanel"/>
+ <panel classname="TargetPanel" id="targetpanel"/>
+ <panel classname="PacksPanel" id="packspanel"/>
+ <panel classname="InstallPanel" id="installpanel"/>
+ <panel classname="ShortcutPanel" id="shortcutpanel"/>
+ <panel classname="FinishPanel" id="finishpanel"/>
+ </panels>
+
+ <!--
+ The packs section.
+ We specify here our packs.
+ -->
+
+ <packs>
+ <pack name="Albe" required="yes">
+ <description>Installe tous les composants du logiciel Albe</description>
+ <file src="../commun/licence.txt" targetdir="$INSTALL_PATH"/>
+ <file src="albe.bat" targetdir="$INSTALL_PATH"/>
+ <file src="albe.ico" targetdir="$INSTALL_PATH"/>
+ <file src="albe.png" targetdir="$INSTALL_PATH"/>
+ <file src="../../../distrib/build/jar/albe/fudaa-albe.jar" targetdir="$INSTALL_PATH"/>
+ <file src="../../aide/src/albe" targetdir="$INSTALL_PATH/aide"/>
+ <file src="../../fudaa/serveurs/albe" targetdir="$INSTALL_PATH/serveurs"/>
+ <executable targetfile="$INSTALL_PATH/serveurs/albe/bin/linux/albe_linux.x" stage="never"/>
+ </pack>
+ </packs>
+
+ <native type="izpack" name="ShellLink.dll"/>
+
+</installation>
Deleted: branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/albe/izpack/shortcutSpec.xml
===================================================================
--- trunk/fudaa_devel/fudaa-distrib/albe/izpack/shortcutSpec.xml 2009-01-13 20:42:41 UTC (rev 4350)
+++ branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/albe/izpack/shortcutSpec.xml 2009-01-14 01:46:16 UTC (rev 4353)
@@ -1,36 +0,0 @@
-<shortcuts>
- <skipIfNotSupported/>
- <programGroup defaultName="Applications Fudaa\Albe" location="applications"/>
- <shortcut
- name="Lancer Albe"
- programGroup="yes"
- desktop="yes"
- applications="no"
- startMenu="no"
- startup="no"
- target="$INSTALL_PATH\albe.bat"
- commandLine=""
- workingDirectory="$INSTALL_PATH"
- iconFile="$INSTALL_PATH\albe.ico"
- initialState="noShow"
- description="Lance le logiciel Albe">
- <createForPack name="Albe"/>
- </shortcut>
-
- <shortcut
- name="Supprimer Albe"
- programGroup="yes"
- desktop="no"
- applications="no"
- startMenu="no"
- startup="no"
- target="$INSTALL_PATH\Uninstaller\uninstaller.jar"
- commandLine=""
- iconFile="%SystemRoot%\system32\SHELL32.dll"
- iconIndex="31"
- description="Supprime le logiciel Albe">
-
- <createForPack name="Albe"/>
- </shortcut>
-
-</shortcuts>
Copied: branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/albe/izpack/shortcutSpec.xml (from rev 4350, trunk/fudaa_devel/fudaa-distrib/albe/izpack/shortcutSpec.xml)
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/albe/izpack/shortcutSpec.xml (rev 0)
+++ branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/albe/izpack/shortcutSpec.xml 2009-01-14 01:46:16 UTC (rev 4353)
@@ -0,0 +1,36 @@
+<shortcuts>
+ <skipIfNotSupported/>
+ <programGroup defaultName="Applications Fudaa\Albe" location="applications"/>
+ <shortcut
+ name="Lancer Albe"
+ programGroup="yes"
+ desktop="yes"
+ applications="no"
+ startMenu="no"
+ startup="no"
+ target="$INSTALL_PATH\albe.bat"
+ commandLine=""
+ workingDirectory="$INSTALL_PATH"
+ iconFile="$INSTALL_PATH\albe.ico"
+ initialState="noShow"
+ description="Lance le logiciel Albe">
+ <createForPack name="Albe"/>
+ </shortcut>
+
+ <shortcut
+ name="Supprimer Albe"
+ programGroup="yes"
+ desktop="no"
+ applications="no"
+ startMenu="no"
+ startup="no"
+ target="$INSTALL_PATH\Uninstaller\uninstaller.jar"
+ commandLine=""
+ iconFile="%SystemRoot%\system32\SHELL32.dll"
+ iconIndex="31"
+ description="Supprime le logiciel Albe">
+
+ <createForPack name="Albe"/>
+ </shortcut>
+
+</shortcuts>
Modified: branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/build.xml
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/build.xml 2009-01-14 01:43:21 UTC (rev 4352)
+++ branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/build.xml 2009-01-14 01:46:16 UTC (rev 4353)
@@ -49,7 +49,7 @@
<mkdir dir="${fudaa.dist.classes.test.dir}" />
<echo message="debug=${build.compiler.debug}" />
<echo message="optimize=${build.compiler.optimize}" />
- <echo message="Vous devez utiliser java 1.4" />
+ <echo message="Vous devez utiliser java 1.5" />
<echo message="version utilisee: ${ant.java.version}" />
<ant dir="${ctulu.dir}" antfile="${ctulu.build.file}" target="build" inheritAll="false">
<property name="build.compiler" value="${build.compiler}" />
Copied: branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/commun/standalone-compiler.jar (from rev 4350, trunk/fudaa_devel/fudaa-distrib/commun/standalone-compiler.jar)
===================================================================
(Binary files differ)
Modified: branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/mascaret/izpack/izpack_fudaa_mascaret.xml
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/mascaret/izpack/izpack_fudaa_mascaret.xml 2009-01-14 01:43:21 UTC (rev 4352)
+++ branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/mascaret/izpack/izpack_fudaa_mascaret.xml 2009-01-14 01:46:16 UTC (rev 4353)
@@ -1,110 +1,111 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<!--
- A sample installation file.
- Use it as a base for your own installers :-)
-
- To compile it :
- - go in the bin directory where you installed IzPack
- - call "compile ../sample/install.xml -b ../sample"
-
- -->
-<installation version="1.0">
- <!--
- The info section.
- The meaning of the tags should be natural ...
-
- -->
-<info>
- <appname>Fudaa-Mascaret</appname>
- <appversion>3.1 alpha 1</appversion>
- <variable name="released-on" value="13/12/2007" />
- <authors>
- <author name="EDF Recherche et Développement" email="" />
- <author name="CETMEF" email="" />
- </authors>
- <url>http://rd.edf.com</url>
- </info>
-<native type="izpack" name="ShellLink.dll" />
- <!--
- The gui preferences indication.
- Sets the installer window to 800x420. It will be able to change the size.
-
- -->
- <guiprefs width="800" height="420" resizable="yes" />
- <!--
- The locale section.
- Asks here to include the French langpacks.
-
- -->
- <locale>
- <langpack iso3="fra" />
- </locale>
- <!--
- The resources section.
- The ids must be these ones if you want to use the LicencePanel and/or the InfoPanel.
-
- -->
- <resources>
- <res src="izpack/shortcutSpec.xml" id="shortcutSpec.xml" />
- <res src="Licence.txt" id="LicencePanel.licence"/>
- <res src="Readme.txt" id="InfoPanel.info" />
- <res src="fudaamascaret.jpg" id="Installer.image"/>
- <!-- res src="izpack/RegistrySpec.xml" id="RegistrySpec.xml"/ -->
- </resources>
-
- <!--
- The panels section.
- We indicate here which panels we want to use. The order will be respected.
-
- -->
- <panels>
- <panel classname="HelloPanel" />
- <panel classname="InfoPanel" />
- <panel classname="LicencePanel" />
- <panel classname="TargetPanel" />
- <panel classname="PacksPanel" />
- <panel classname="InstallPanel" />
- <panel classname="ShortcutPanel" />
- <panel classname="FinishPanel" />
- </panels>
- <!--
- The packs section.
- We specify here our packs.
- -->
- <packs>
- <pack name="Core" required="yes">
- <description>L'application de base intégrant l'interface graphique Fudaa-Mascaret et le code de calcul Mascaret</description>
- <file src="../../../distrib/build/jar/mascaret/fudaa-mascaret.jar" targetdir="$INSTALL_PATH" />
- <file src="../../fudaa/serveurs" targetdir="$INSTALL_PATH" />
- <file src="fudaa-mascaret.bat" targetdir="$INSTALL_PATH" />
- <file src="icons" targetdir="$INSTALL_PATH" />
- <parsable targetfile="$INSTALL_PATH/fudaa-mascaret.bat" /> <!-- The file will be parsed -->
- </pack>
- <pack name="Exemples" required="no">
- <description>Quelques exemples de fichiers d'entrée de Fudaa-Mascaret</description>
- <file src="exemples" targetdir="$INSTALL_PATH" /> <!-- Reccursive adding -->
- </pack>
- <pack name="Docs" required="no">
- <description>Le guide de prise en main de Fudaa-Mascaret</description>
- <file src="doc" targetdir="$INSTALL_PATH" /> <!-- Reccursive adding -->
- </pack>
- <pack name="Sources" required="no">
- <description>Le code source du projet Fudaa</description>
- <fileset dir="../.." targetdir="$INSTALL_PATH/src">
- <include name="ctulu/src/**/*.*" />
- <include name="dodico/idl/**/*.*" />
- <include name="dodico/src/**/*.*" />
- <include name="ebli/src/**/*.*" />
- <include name="fudaa/src/**/*.*" />
- </fileset>
- </pack>
- </packs>
-
- <!-- The native libraries to add -->
- <native type="izpack" name="ShellLink.dll" />
- <native type="3rdparty" name="COIOSHelper.dll" stage="both">
- <os family="windows"/>
- </native>
-
-
- </installation>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<!--
+ A sample installation file.
+ Use it as a base for your own installers :-)
+
+ To compile it :
+ - go in the bin directory where you installed IzPack
+ - call "compile ../sample/install.xml -b ../sample"
+
+ -->
+<installation version="1.0">
+ <!--
+ The info section.
+ The meaning of the tags should be natural ...
+
+ -->
+<info>
+ <appname>Fudaa-Mascaret</appname>
+ <appversion>3.1 alpha 1</appversion>
+ <variable name="released-on" value="13/12/2007" />
+ <authors>
+ <author name="EDF Recherche et Développement" email="" />
+ <author name="CETMEF" email="" />
+ </authors>
+ <url>http://rd.edf.com</url>
+ </info>
+<native type="izpack" name="ShellLink.dll" />
+ <!--
+ The gui preferences indication.
+ Sets the installer window to 800x420. It will be able to change the size.
+
+ -->
+ <guiprefs width="800" height="420" resizable="yes" />
+ <!--
+ The locale section.
+ Asks here to include the French langpacks.
+
+ -->
+ <locale>
+ <langpack iso3="fra" />
+ </locale>
+ <!--
+ The resources section.
+ The ids must be these ones if you want to use the LicencePanel and/or the InfoPanel.
+
+ -->
+ <resources>
+ <res src="izpack/shortcutSpec.xml" id="shortcutSpec.xml" />
+ <res src="Licence.txt" id="LicencePanel.licence"/>
+ <res src="Readme.txt" id="InfoPanel.info" />
+ <res src="fudaamascaret.jpg" id="Installer.image"/>
+ <!-- res src="izpack/RegistrySpec.xml" id="RegistrySpec.xml"/ -->
+ </resources>
+
+ <!--
+ The panels section.
+ We indicate here which panels we want to use. The order will be respected.
+
+ -->
+ <panels>
+ <panel classname="HelloPanel" />
+ <panel classname="InfoPanel" />
+ <panel classname="LicencePanel" />
+ <panel classname="TargetPanel" />
+ <panel classname="PacksPanel" />
+ <panel classname="InstallPanel" />
+ <panel classname="ShortcutPanel" />
+ <panel classname="FinishPanel" />
+ </panels>
+ <!--
+ The packs section.
+ We specify here our packs.
+ -->
+ <packs>
+ <pack name="Core" required="yes">
+ <description>L'application de base intégrant l'interface graphique Fudaa-Mascaret et le code de calcul Mascaret</description>
+ <file src="../../../distrib/build/jar/mascaret/fudaa-mascaret.jar" targetdir="$INSTALL_PATH" />
+ <file src="../../fudaa/serveurs" targetdir="$INSTALL_PATH" />
+ <file src="../../aide/src/mascaret" targetdir="$INSTALL_PATH/aide/src" />
+ <file src="fudaa-mascaret.bat" targetdir="$INSTALL_PATH" />
+ <file src="icons" targetdir="$INSTALL_PATH" />
+ <parsable targetfile="$INSTALL_PATH/fudaa-mascaret.bat" /> <!-- The file will be parsed -->
+ </pack>
+ <pack name="Exemples" required="no">
+ <description>Quelques exemples de fichiers d'entrée de Fudaa-Mascaret</description>
+ <file src="exemples" targetdir="$INSTALL_PATH" /> <!-- Reccursive adding -->
+ </pack>
+ <pack name="Docs" required="no">
+ <description>Le guide de prise en main de Fudaa-Mascaret</description>
+ <file src="doc" targetdir="$INSTALL_PATH" /> <!-- Reccursive adding -->
+ </pack>
+ <pack name="Sources" required="no">
+ <description>Le code source du projet Fudaa</description>
+ <fileset dir="../.." targetdir="$INSTALL_PATH/src">
+ <include name="ctulu/src/**/*.*" />
+ <include name="dodico/idl/**/*.*" />
+ <include name="dodico/src/**/*.*" />
+ <include name="ebli/src/**/*.*" />
+ <include name="fudaa/src/**/*.*" />
+ </fileset>
+ </pack>
+ </packs>
+
+ <!-- The native libraries to add -->
+ <native type="izpack" name="ShellLink.dll" />
+ <native type="3rdparty" name="COIOSHelper.dll" stage="both">
+ <os family="windows"/>
+ </native>
+
+
+ </installation>
Deleted: branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/modeleur/build.xml
===================================================================
--- trunk/fudaa_devel/fudaa-distrib/modeleur/build.xml 2009-01-13 20:42:41 UTC (rev 4350)
+++ branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/modeleur/build.xml 2009-01-14 01:46:16 UTC (rev 4353)
@@ -1,239 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
-! @file distribution.xml
-! @creation 2002-04-05
-! @modification $Date: 2008-02-14 17:07:35 $
-! @license GNU General Public License 2
-! @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
-! @version $Id: build.xml,v 1.1.2.1 2008-02-14 17:07:35 bmarchan Exp $
-! @author Fred deniger
-!
-! Voir les fichiers fudaa.default.properties et ANT_README.txt pour la liste
-! des taches et pour modifier des parametres.
-! Pour mettre \xE0 jour les sites distants, le fichier ant.properties doit \xEAtre correctement renseign\xE9.
-! Il se peut que eclipse d\xE9tecte une erreur dans ce script comme quoi la cible 'build' n'est pas trouv\xE9
-! mais il ne faut pas en tenir compte: elle est import\xE9e dans le fichier '../ant-deploy.xml'.
--->
-<project name="modeleur" default="deploy" basedir=".">
-
- <!--on importe les taches du fichier ant-deploy.xml-->
- <import file="../ant-deploy.xml" />
-
- <property name="this.main.class" value="Mdl" />
- <property name="this.dir" location="./" />
- <property name="jnlp.file.name" value="mdl.jnlp" />
- <property name="jnlp.file" location="${this.dir}/${jnlp.file.name}" />
- <property name="prop.file" location="${this.dir}/mdl.properties" />
- <property file="${prop.file}" />
- <property name="ssh.install.dir" value="/home/fudaa/www/install" />
- <property name="mdl.install.dir" value="${ssh.install.dir}/mdl" />
-
- <!--Construit les 2 fichiers jnlp \xE0 utiliser: un avec la 3D et l'autre sans.
- Le lien pour la 3D est r\xE9cup\xE9r\xE9 dans le fichier "java3D-link.txt"-->
- <target name="buildJnlp" depends=".testChemins" description="Construit le contenu des fichiers jnlp">
- <copy overwrite="true" file="${jnlp.file}" todir="${this.build.dir}" filtering="true">
- <filterset>
- <filter token="version" value="v${@version@}" />
- </filterset>
- </copy>
- </target>
-
- <target name="deployAndSend"
- depends="deploy,sendToFudaaFr"
- description="Construit les jars et met a jour les sites distants">
- </target>
-
-
- <!-- depends="rebuild"-->
- <target name="deploy"
- depends=" .testChemins"
- description="efface les classes, recompile le tout,cree et signe le jar.
- Les fichiers Jnlp sont \xE9galament cr\xE9\xE9s">
- <antcall target="createJar" />
- <antcall target="signJar" />
- <!--Le build Zip reconstruit deja les fichiers jnlp -->
- <antcall target="buildJnlp" />
- </target>
-
- <!--Envoie Tout ce qui est necessaire sauf l'aide:car elle ne bouge pas beaucoup! -->
- <target name="sendToFudaaFr"
- depends="setProxy,.testChemins"
- description="Met a jour les sites distants ( sauf le jar d'aide)">
- <scp file="${this.build.dir}/${jnlp.file.name}"
- todir="${ssh.username}:${ssh.password}@${ssh.host}:${mdl.install.dir}"
- trust="true" />
- <scp todir="${ssh.username}:${ssh.password}@${ssh.host}:${mdl.install.dir}/images" trust="true">
- <fileset dir="${basedir}/images" excludes="*.xcf" />
- </scp>
-
- <!--Pour que le tout marche il faut que le jar et le jar.pack.gz soient dans un dossier inf\xE9rieur-->
- <scp file="${this.jar.file}.pack.gz"
- todir="${ssh.username}:${ssh.password}@${ssh.host}:${mdl.install.dir}/jars/last"
- trust="true" />
- <scp file="${this.jar.file}"
- todir="${ssh.username}:${ssh.password}@${ssh.host}:${mdl.install.dir}/jars/last"
- trust="true" />
-
- <scp file="${basedir}/jars/fudaa-mdl.jar.var"
- todir="${ssh.username}:${ssh.password}@${ssh.host}:${mdl.install.dir}/jars"
- trust="true" />
- <scp file="${basedir}/jars/.htaccess"
- todir="${ssh.username}:${ssh.password}@${ssh.host}:${mdl.install.dir}/jars"
- trust="true" />
- </target>
-
-
-
- <target name="createJar" depends=".testCheminGenJar" description="cree fudaa_modeleur.jar">
- <!--On prepare le dossier de destination et on efface les anciens jars pour \xE9viter les conflits:
- des fois la tache genjar essaie de mettre \xE0 jour le jar ce qui prend du temps et peut \xEAtre source d'erreur
- subtile-->
- <mkdir dir="${this.jar.dir}" />
- <delete file="${this.jar.file}" />
- <genjar jarfile="${this.jar.file}">
- <classpath path="${fudaaDist.classpath}" />
- <manifest generateEntryAttributes="no">
- <attribute name="Main-Class" value="org.fudaa.fudaa.modeleur.Mdl" />
- </manifest>
- <class name="org.fudaa.fudaa.modeleur.Mdl" />
- <!--Cette classe GrData est ajout\xE9e \xE0 cause d'un bogue avec db4o qui ne retrouvait pas ces petits-->
- <class name="org.fudaa.ebli.geometrie.GrData" />
- <!--Pour ces librairies, tous les fichiers et toutes les ressources sont n\xE9cessaires-->
- <library jar="${ctulu.lib.dir}/db4o.jar" />
- <library jar="${ctulu.lib.dir}/fgis.jar" />
- <library jar="${ctulu.lib.dir}/looks.jar" />
- <library jar="${ctulu.lib.dir}/jep.jar" />
- <!--Pas de CORBA pour Fudaa-Modeleur-->
- <classfilter>
- <exclude name="org.fudaa.dodico.corba." />
- <exclude name="org.fudaa.dodico.usine." />
- </classfilter>
- <!--Les ressources utilis\xE9es-->
- <!--On utilise pas les icones de bu mais ceux de crystal, d'ou les excludes-->
- <resource>
- <fileset dir="${fudaa.dist.classes.dir}">
- <patternset refid="ressources.fic" />
- <include name="org/fudaa/dodico/commun/" />
- <include name="org/fudaa/ctulu/" />
- <include name="com/memoire/bu/" />
- <include name="com/hexidec/ekit/" />
- <include name="com/memoire/dja/" />
- <exclude name="com/memoire/dja/*_24.*" />
- <exclude name="com/memoire/dja/logo*.*" />
- <exclude name="com/memoire/dja/banner*.*" />
- <exclude name="com/memoire/bu/alma_*" />
- <exclude name="com/memoire/bu/*_16.*" />
- <exclude name="com/memoire/bu/*_20.*" />
- <exclude name="com/memoire/bu/*_22.*" />
- <exclude name="com/memoire/bu/*_24.*" />
- <exclude name="com/memoire/bu/*_26.*" />
- <exclude name="com/memoire/bu/*_32.*" />
- <exclude name="com/memoire/bu/*_48.*" />
- <exclude name="com/memoire/bu/*_64.*" />
- <exclude name="com/memoire/bu/crystal22_*" />
- <include name="com/memoire/dnd/" />
- <include name="com/memoire/bu/crystal*" />
- <include name="org/fudaa/dodico/h2d/" />
- <include name="org/fudaa/dodico/reflux/" />
- <include name="org/fudaa/ebli/ressource/" />
- <exclude name="org/fudaa/ebli/ressource/volume" />
- <exclude name="org/fudaa/ebli/ressource/echellez*" />
- <exclude name="org/fudaa/ebli/ressource/lumiere*" />
- <exclude name="org/fudaa/ebli/ressource/texture*" />
- <include name="org/fudaa/fudaa/ressource/" />
- <exclude name="org/fudaa/fudaa/ressource/connecter*" />
- <exclude name="org/fudaa/fudaa/ressource/astuces/" />
- <include name="org/fudaa/fudaa/sig/" />
- <include name="org/fudaa/fudaa/modeleur/" />
- <include name="ghm/followgui/" />
- </fileset>
- </resource>
- </genjar>
- <!--Important car utilis\xE9 par geotools pour ces factories-->
- <zip destfile="${this.jar.file}" update="true" compress="true">
- <zipgroupfileset file="${ctulu.lib.dir}/fgis.jar"
- includes="META-INF/services/**,META-INF/registry*" />
- </zip>
- </target>
-
-
- <!--Signe les jars cr\xE9es. Il faut utilise le sdk 1.5 pour cette tache a cause
- de l'exe pack-->
- <target name="signJar" depends=".testChemins">
- <property name="jarsigner" location="${java.home}/../bin/jarsigner">
- </property>
- <property file="${cert.dir}/fudaa-jar.txt" />
- <signjar jar="${this.jar.file}"
- alias="${fudaa.alias}"
- storepass="${fudaa.password}"
- keystore="${cert.dir}/fudaa.keystore" />
- <echo>RePack200 ${this.jar.name}</echo>
- <exec newenvironment="true"
- dir="${this.jar.dir}"
- executable="${java.home}/bin/pack200"
- failonerror="true"
- vmlauncher="false">
- <arg line="--repack ${this.jar.name}" />
- </exec>
- <echo>RePack200 ${this.jar.name} END</echo>
- <signjar jar="${this.jar.file}"
- alias="${fudaa.alias}"
- storepass="${fudaa.password}"
- keystore="${cert.dir}/fudaa.keystore" />
- <!--Je ne sais pas pourquoi il faut le faire 2 fois
- il semble qu'il y ait un bug dans les exe java
- -->
- <!--A retester avec les nouvelles versions de Java-->
- <echo>RePack200 ${this.jar.name} ENCORE ...</echo>
- <exec newenvironment="true"
- dir="${this.jar.dir}"
- executable="${java.home}/bin/pack200"
- failonerror="true"
- vmlauncher="false">
- <arg line="--repack ${this.jar.name}" />
- </exec>
- <echo>RePack200 ${this.jar.name} ENCORE END</echo>
- <signjar jar="${this.jar.file}"
- alias="${fudaa.alias}"
- storepass="${fudaa.password}"
- keystore="${cert.dir}/fudaa.keystore" />
- <echo>Test ${this.jar.name}</echo>
- <exec dir="${this.jar.dir}"
- executable="${jarsigner}"
- newenvironment="true"
- failonerror="true"
- vmlauncher="false">
- <arg line="-verify ${this.jar.name}" />
- </exec>
- <echo>Test ${this.jar.name} END</echo>
- <delete file="${this.jar.dir}/${this.jar.name}.pack.gz" />
- <echo>Pack200 ${this.jar.name}</echo>
- <exec newenvironment="true"
- dir="${this.jar.dir}"
- executable="${java.home}/bin/pack200"
- failonerror="true"
- vmlauncher="false">
- <arg line="${this.jar.name}.pack.gz ${this.jar.name}" />
- </exec>
- <echo>Pack200 ${this.jar.name} END</echo>
- <!--On teste la signature pour \xE9viter de balancer n'importe quoi sur le site-->
- <echo>Test ${this.jar.name}.pack.gz</echo>
- <exec newenvironment="true"
- dir="${this.jar.dir}"
- executable="${java.home}/bin/unpack200"
- failonerror="true"
- vmlauncher="false">
- <arg line="${this.jar.name}.pack.gz ${this.jar.name}.pack.gz.jar" />
- </exec>
- <exec dir="${this.jar.dir}"
- executable="${jarsigner}"
- newenvironment="true"
- failonerror="true"
- vmlauncher="false">
- <arg line="-verify ${this.jar.name}.pack.gz.jar" />
- </exec>
- <delete file="${this.jar.dir}/${this.jar.name}.pack.gz.jar" />
- <echo>Test ${this.jar.name}.pack.gz END</echo>
- </target>
-
-</project>
Copied: branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/modeleur/build.xml (from rev 4350, trunk/fudaa_devel/fudaa-distrib/modeleur/build.xml)
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/modeleur/build.xml (rev 0)
+++ branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/modeleur/build.xml 2009-01-14 01:46:16 UTC (rev 4353)
@@ -0,0 +1,239 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+! @file distribution.xml
+! @creation 2002-04-05
+! @modification $Date: 2008-02-14 17:07:35 $
+! @license GNU General Public License 2
+! @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
+! @version $Id: build.xml,v 1.1.2.1 2008-02-14 17:07:35 bmarchan Exp $
+! @author Fred deniger
+!
+! Voir les fichiers fudaa.default.properties et ANT_README.txt pour la liste
+! des taches et pour modifier des parametres.
+! Pour mettre \xE0 jour les sites distants, le fichier ant.properties doit \xEAtre correctement renseign\xE9.
+! Il se peut que eclipse d\xE9tecte une erreur dans ce script comme quoi la cible 'build' n'est pas trouv\xE9
+! mais il ne faut pas en tenir compte: elle est import\xE9e dans le fichier '../ant-deploy.xml'.
+-->
+<project name="modeleur" default="deploy" basedir=".">
+
+ <!--on importe les taches du fichier ant-deploy.xml-->
+ <import file="../ant-deploy.xml" />
+
+ <property name="this.main.class" value="Mdl" />
+ <property name="this.dir" location="./" />
+ <property name="jnlp.file.name" value="mdl.jnlp" />
+ <property name="jnlp.file" location="${this.dir}/${jnlp.file.name}" />
+ <property name="prop.file" location="${this.dir}/mdl.properties" />
+ <property file="${prop.file}" />
+ <property name="ssh.install.dir" value="/home/fudaa/www/install" />
+ <property name="mdl.install.dir" value="${ssh.install.dir}/mdl" />
+
+ <!--Construit les 2 fichiers jnlp \xE0 utiliser: un avec la 3D et l'autre sans.
+ Le lien pour la 3D est r\xE9cup\xE9r\xE9 dans le fichier "java3D-link.txt"-->
+ <target name="buildJnlp" depends=".testChemins" description="Construit le contenu des fichiers jnlp">
+ <copy overwrite="true" file="${jnlp.file}" todir="${this.build.dir}" filtering="true">
+ <filterset>
+ <filter token="version" value="v${@version@}" />
+ </filterset>
+ </copy>
+ </target>
+
+ <target name="deployAndSend"
+ depends="deploy,sendToFudaaFr"
+ description="Construit les jars et met a jour les sites distants">
+ </target>
+
+
+ <!-- depends="rebuild"-->
+ <target name="deploy"
+ depends=" .testChemins"
+ description="efface les classes, recompile le tout,cree et signe le jar.
+ Les fichiers Jnlp sont \xE9galament cr\xE9\xE9s">
+ <antcall target="createJar" />
+ <antcall target="signJar" />
+ <!--Le build Zip reconstruit deja les fichiers jnlp -->
+ <antcall target="buildJnlp" />
+ </target>
+
+ <!--Envoie Tout ce qui est necessaire sauf l'aide:car elle ne bouge pas beaucoup! -->
+ <target name="sendToFudaaFr"
+ depends="setProxy,.testChemins"
+ description="Met a jour les sites distants ( sauf le jar d'aide)">
+ <scp file="${this.build.dir}/${jnlp.file.name}"
+ todir="${ssh.username}:${ssh.password}@${ssh.host}:${mdl.install.dir}"
+ trust="true" />
+ <scp todir="${ssh.username}:${ssh.password}@${ssh.host}:${mdl.install.dir}/images" trust="true">
+ <fileset dir="${basedir}/images" excludes="*.xcf" />
+ </scp>
+
+ <!--Pour que le tout marche il faut que le jar et le jar.pack.gz soient dans un dossier inf\xE9rieur-->
+ <scp file="${this.jar.file}.pack.gz"
+ todir="${ssh.username}:${ssh.password}@${ssh.host}:${mdl.install.dir}/jars/last"
+ trust="true" />
+ <scp file="${this.jar.file}"
+ todir="${ssh.username}:${ssh.password}@${ssh.host}:${mdl.install.dir}/jars/last"
+ trust="true" />
+
+ <scp file="${basedir}/jars/fudaa-mdl.jar.var"
+ todir="${ssh.username}:${ssh.password}@${ssh.host}:${mdl.install.dir}/jars"
+ trust="true" />
+ <scp file="${basedir}/jars/.htaccess"
+ todir="${ssh.username}:${ssh.password}@${ssh.host}:${mdl.install.dir}/jars"
+ trust="true" />
+ </target>
+
+
+
+ <target name="createJar" depends=".testCheminGenJar" description="cree fudaa_modeleur.jar">
+ <!--On prepare le dossier de destination et on efface les anciens jars pour \xE9viter les conflits:
+ des fois la tache genjar essaie de mettre \xE0 jour le jar ce qui prend du temps et peut \xEAtre source d'erreur
+ subtile-->
+ <mkdir dir="${this.jar.dir}" />
+ <delete file="${this.jar.file}" />
+ <genjar jarfile="${this.jar.file}">
+ <classpath path="${fudaaDist.classpath}" />
+ <manifest generateEntryAttributes="no">
+ <attribute name="Main-Class" value="org.fudaa.fudaa.modeleur.Mdl" />
+ </manifest>
+ <class name="org.fudaa.fudaa.modeleur.Mdl" />
+ <!--Cette classe GrData est ajout\xE9e \xE0 cause d'un bogue avec db4o qui ne retrouvait pas ces petits-->
+ <class name="org.fudaa.ebli.geometrie.GrData" />
+ <!--Pour ces librairies, tous les fichiers et toutes les ressources sont n\xE9cessaires-->
+ <library jar="${ctulu.lib.dir}/db4o.jar" />
+ <library jar="${ctulu.lib.dir}/fgis.jar" />
+ <library jar="${ctulu.lib.dir}/looks.jar" />
+ <library jar="${ctulu.lib.dir}/jep.jar" />
+ <!--Pas de CORBA pour Fudaa-Modeleur-->
+ <classfilter>
+ <exclude name="org.fudaa.dodico.corba." />
+ <exclude name="org.fudaa.dodico.usine." />
+ </classfilter>
+ <!--Les ressources utilis\xE9es-->
+ <!--On utilise pas les icones de bu mais ceux de crystal, d'ou les excludes-->
+ <resource>
+ <fileset dir="${fudaa.dist.classes.dir}">
+ <patternset refid="ressources.fic" />
+ <include name="org/fudaa/dodico/commun/" />
+ <include name="org/fudaa/ctulu/" />
+ <include name="com/memoire/bu/" />
+ <include name="com/hexidec/ekit/" />
+ <include name="com/memoire/dja/" />
+ <exclude name="com/memoire/dja/*_24.*" />
+ <exclude name="com/memoire/dja/logo*.*" />
+ <exclude name="com/memoire/dja/banner*.*" />
+ <exclude name="com/memoire/bu/alma_*" />
+ <exclude name="com/memoire/bu/*_16.*" />
+ <exclude name="com/memoire/bu/*_20.*" />
+ <exclude name="com/memoire/bu/*_22.*" />
+ <exclude name="com/memoire/bu/*_24.*" />
+ <exclude name="com/memoire/bu/*_26.*" />
+ <exclude name="com/memoire/bu/*_32.*" />
+ <exclude name="com/memoire/bu/*_48.*" />
+ <exclude name="com/memoire/bu/*_64.*" />
+ <exclude name="com/memoire/bu/crystal22_*" />
+ <include name="com/memoire/dnd/" />
+ <include name="com/memoire/bu/crystal*" />
+ <include name="org/fudaa/dodico/h2d/" />
+ <include name="org/fudaa/dodico/reflux/" />
+ <include name="org/fudaa/ebli/ressource/" />
+ <exclude name="org/fudaa/ebli/ressource/volume" />
+ <exclude name="org/fudaa/ebli/ressource/echellez*" />
+ <exclude name="org/fudaa/ebli/ressource/lumiere*" />
+ <exclude name="org/fudaa/ebli/ressource/texture*" />
+ <include name="org/fudaa/fudaa/ressource/" />
+ <exclude name="org/fudaa/fudaa/ressource/connecter*" />
+ <exclude name="org/fudaa/fudaa/ressource/astuces/" />
+ <include name="org/fudaa/fudaa/sig/" />
+ <include name="org/fudaa/fudaa/modeleur/" />
+ <include name="ghm/followgui/" />
+ </fileset>
+ </resource>
+ </genjar>
+ <!--Important car utilis\xE9 par geotools pour ces factories-->
+ <zip destfile="${this.jar.file}" update="true" compress="true">
+ <zipgroupfileset file="${ctulu.lib.dir}/fgis.jar"
+ includes="META-INF/services/**,META-INF/registry*" />
+ </zip>
+ </target>
+
+
+ <!--Signe les jars cr\xE9es. Il faut utilise le sdk 1.5 pour cette tache a cause
+ de l'exe pack-->
+ <target name="signJar" depends=".testChemins">
+ <property name="jarsigner" location="${java.home}/../bin/jarsigner">
+ </property>
+ <property file="${cert.dir}/fudaa-jar.txt" />
+ <signjar jar="${this.jar.file}"
+ alias="${fudaa.alias}"
+ storepass="${fudaa.password}"
+ keystore="${cert.dir}/fudaa.keystore" />
+ <echo>RePack200 ${this.jar.name}</echo>
+ <exec newenvironment="true"
+ dir="${this.jar.dir}"
+ executable="${java.home}/bin/pack200"
+ failonerror="true"
+ vmlauncher="false">
+ <arg line="--repack ${this.jar.name}" />
+ </exec>
+ <echo>RePack200 ${this.jar.name} END</echo>
+ <signjar jar="${this.jar.file}"
+ alias="${fudaa.alias}"
+ storepass="${fudaa.password}"
+ keystore="${cert.dir}/fudaa.keystore" />
+ <!--Je ne sais pas pourquoi il faut le faire 2 fois
+ il semble qu'il y ait un bug dans les exe java
+ -->
+ <!--A retester avec les nouvelles versions de Java-->
+ <echo>RePack200 ${this.jar.name} ENCORE ...</echo>
+ <exec newenvironment="true"
+ dir="${this.jar.dir}"
+ executable="${java.home}/bin/pack200"
+ failonerror="true"
+ vmlauncher="false">
+ <arg line="--repack ${this.jar.name}" />
+ </exec>
+ <echo>RePack200 ${this.jar.name} ENCORE END</echo>
+ <signjar jar="${this.jar.file}"
+ alias="${fudaa.alias}"
+ storepass="${fudaa.password}"
+ keystore="${cert.dir}/fudaa.keystore" />
+ <echo>Test ${this.jar.name}</echo>
+ <exec dir="${this.jar.dir}"
+ executable="${jarsigner}"
+ newenvironment="true"
+ failonerror="true"
+ vmlauncher="false">
+ <arg line="-verify ${this.jar.name}" />
+ </exec>
+ <echo>Test ${this.jar.name} END</echo>
+ <delete file="${this.jar.dir}/${this.jar.name}.pack.gz" />
+ <echo>Pack200 ${this.jar.name}</echo>
+ <exec newenvironment="true"
+ dir="${this.jar.dir}"
+ executable="${java.home}/bin/pack200"
+ failonerror="true"
+ vmlauncher="false">
+ <arg line="${this.jar.name}.pack.gz ${this.jar.name}" />
+ </exec>
+ <echo>Pack200 ${this.jar.name} END</echo>
+ <!--On teste la signature pour \xE9viter de balancer n'importe quoi sur le site-->
+ <echo>Test ${this.jar.name}.pack.gz</echo>
+ <exec newenvironment="true"
+ dir="${this.jar.dir}"
+ executable="${java.home}/bin/unpack200"
+ failonerror="true"
+ vmlauncher="false">
+ <arg line="${this.jar.name}.pack.gz ${this.jar.name}.pack.gz.jar" />
+ </exec>
+ <exec dir="${this.jar.dir}"
+ executable="${jarsigner}"
+ newenvironment="true"
+ failonerror="true"
+ vmlauncher="false">
+ <arg line="-verify ${this.jar.name}.pack.gz.jar" />
+ </exec>
+ <delete file="${this.jar.dir}/${this.jar.name}.pack.gz.jar" />
+ <echo>Test ${this.jar.name}.pack.gz END</echo>
+ </target>
+
+</project>
Deleted: branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/modeleur/images/gpl.png
===================================================================
(Binary files differ)
Copied: branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/modeleur/images/gpl.png (from rev 4350, trunk/fudaa_devel/fudaa-distrib/modeleur/images/gpl.png)
===================================================================
(Binary files differ)
Deleted: branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/modeleur/images/mdl-logo.png
===================================================================
(Binary files differ)
Copied: branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/modeleur/images/mdl-logo.png (from rev 4350, trunk/fudaa_devel/fudaa-distrib/modeleur/images/mdl-logo.png)
===================================================================
(Binary files differ)
Deleted: branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/modeleur/images/update.png
===================================================================
(Binary files differ)
Copied: branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/modeleur/images/update.png (from rev 4350, trunk/fudaa_devel/fudaa-distrib/modeleur/images/update.png)
===================================================================
(Binary files differ)
Deleted: branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/modeleur/images/web.png
===================================================================
(Binary files differ)
Copied: branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/modeleur/images/web.png (from rev 4350, trunk/fudaa_devel/fudaa-distrib/modeleur/images/web.png)
===================================================================
(Binary files differ)
Deleted: branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/modeleur/jars/.htaccess
===================================================================
--- trunk/fudaa_devel/fudaa-distrib/modeleur/jars/.htaccess 2009-01-13 20:42:41 UTC (rev 4350)
+++ branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/modeleur/jars/.htaccess 2009-01-14 01:46:16 UTC (rev 4353)
@@ -1,14 +0,0 @@
-# Return the right mime type for JARs
-AddType application/x-java-archive .jar
-# Enable type maps
-AddHandler application/x-type-map .var
-Options +MultiViews
-
-<Files *.pack.gz>
- # Enable the Content-Encoding header for .jar.pack.gz files
- AddEncoding pack200-gzip .jar
- # Stop mod_gzip from messing with the Content-Encoding
- # response for these files
- RemoveEncoding .gz
-</Files>
-
Copied: branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/modeleur/jars/.htaccess (from rev 4350, trunk/fudaa_devel/fudaa-distrib/modeleur/jars/.htaccess)
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/modeleur/jars/.htaccess (rev 0)
+++ branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/modeleur/jars/.htaccess 2009-01-14 01:46:16 UTC (rev 4353)
@@ -0,0 +1,14 @@
+# Return the right mime type for JARs
+AddType application/x-java-archive .jar
+# Enable type maps
+AddHandler application/x-type-map .var
+Options +MultiViews
+
+<Files *.pack.gz>
+ # Enable the Content-Encoding header for .jar.pack.gz files
+ AddEncoding pack200-gzip .jar
+ # Stop mod_gzip from messing with the Content-Encoding
+ # response for these files
+ RemoveEncoding .gz
+</Files>
+
Deleted: branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/modeleur/jars/fudaa-mdl.jar.var
===================================================================
--- trunk/fudaa_devel/fudaa-distrib/modeleur/jars/fudaa-mdl.jar.var 2009-01-13 20:42:41 UTC (rev 4350)
+++ branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/modeleur/jars/fudaa-mdl.jar.var 2009-01-14 01:46:16 UTC (rev 4353)
@@ -1,9 +0,0 @@
-URI: fudaa-modeleur.jar
-
-URI: last/fudaa-modeleur.jar
-Content-Type: x-java-archive
-
-URI: last/fudaa-modeleur.jar.pack.gz
-Content-Type: x-java-archive
-Content-Encoding: pack200-gzip
-
Copied: branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/modeleur/jars/fudaa-mdl.jar.var (from rev 4350, trunk/fudaa_devel/fudaa-distrib/modeleur/jars/fudaa-mdl.jar.var)
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/modeleur/jars/fudaa-mdl.jar.var (rev 0)
+++ branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/modeleur/jars/fudaa-mdl.jar.var 2009-01-14 01:46:16 UTC (rev 4353)
@@ -0,0 +1,9 @@
+URI: fudaa-modeleur.jar
+
+URI: last/fudaa-modeleur.jar
+Content-Type: x-java-archive
+
+URI: last/fudaa-modeleur.jar.pack.gz
+Content-Type: x-java-archive
+Content-Encoding: pack200-gzip
+
Deleted: branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/modeleur/mdl.jnlp
===================================================================
--- trunk/fudaa_devel/fudaa-distrib/modeleur/mdl.jnlp 2009-01-13 20:42:41 UTC (rev 4350)
+++ branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/modeleur/mdl.jnlp 2009-01-14 01:46:16 UTC (rev 4353)
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<jnlp
- spec="1.0+"
- codebase="http://fudaa.fr/install/mdl"
- href="mdl.jnlp">
- <information>
- <title>Fudaa-Modeleur</title>
- <vendor>CETMEF DRIM</vendor>
- <homepage href="http://fudaa.fr"/>
- <description>Fudaa-Modeleur @version@</description>
- <description kind="tooltip">Fudaa-Modeleur </description>
- <description kind="short">Fudaa-Modeleur </description>
- <icon href="images/mdl-logo.png"/>
- <offline-allowed/>
- <shortcut online="false">
- <desktop/>
- <menu submenu="Fudaa-Modeleur "/>
- </shortcut>
- </information>
-<!--EN-->
- <information ...
[truncated message content] |
|
From: <de...@us...> - 2009-01-14 02:23:31
|
Revision: 4352
http://fudaa.svn.sourceforge.net/fudaa/?rev=4352&view=rev
Author: deniger
Date: 2009-01-14 01:43:21 +0000 (Wed, 14 Jan 2009)
Log Message:
-----------
Modified Paths:
--------------
branches/Prepro-0.92-SNAPSHOT/ctulu/src/com/memoire/bu/BuCheckBox3States.java
branches/Prepro-0.92-SNAPSHOT/ctulu/src/com/memoire/bu/BuLib.java
branches/Prepro-0.92-SNAPSHOT/ctulu/src/com/memoire/bu/BuMenu.java
branches/Prepro-0.92-SNAPSHOT/ctulu/src/com/memoire/bu/BuMenuBar.java
branches/Prepro-0.92-SNAPSHOT/ctulu/src/com/memoire/bu/BuMenuRecentFiles.java
branches/Prepro-0.92-SNAPSHOT/ctulu/src/org/fudaa/ctulu/CtuluArkLoader.java
branches/Prepro-0.92-SNAPSHOT/ctulu/src/org/fudaa/ctulu/CtuluArkSaver.java
branches/Prepro-0.92-SNAPSHOT/ctulu/src/org/fudaa/ctulu/CtuluLibGeometrie.java
branches/Prepro-0.92-SNAPSHOT/ctulu/src/org/fudaa/ctulu/CtuluListSelection.java
branches/Prepro-0.92-SNAPSHOT/ctulu/src/org/fudaa/ctulu/ProgressionUpdater.java
branches/Prepro-0.92-SNAPSHOT/ctulu/src/org/fudaa/ctulu/gis/GISAttribute.java
branches/Prepro-0.92-SNAPSHOT/ctulu/src/org/fudaa/ctulu/gis/GISAttributeConstants.java
branches/Prepro-0.92-SNAPSHOT/ctulu/src/org/fudaa/ctulu/gis/GISAttributeInterface.java
branches/Prepro-0.92-SNAPSHOT/ctulu/src/org/fudaa/ctulu/gis/GISAttributeModel.java
branches/Prepro-0.92-SNAPSHOT/ctulu/src/org/fudaa/ctulu/gis/GISAttributeString.java
branches/Prepro-0.92-SNAPSHOT/ctulu/src/org/fudaa/ctulu/gis/GISCollectionData.java
branches/Prepro-0.92-SNAPSHOT/ctulu/src/org/fudaa/ctulu/gis/GISDataModel.java
branches/Prepro-0.92-SNAPSHOT/ctulu/src/org/fudaa/ctulu/gis/GISDataModelAbstract.java
branches/Prepro-0.92-SNAPSHOT/ctulu/src/org/fudaa/ctulu/gis/GISDataModelFeatureAdapter.java
branches/Prepro-0.92-SNAPSHOT/ctulu/src/org/fudaa/ctulu/gis/GISDataModelFilterAdapter.java
branches/Prepro-0.92-SNAPSHOT/ctulu/src/org/fudaa/ctulu/gis/GISGeometry.java
branches/Prepro-0.92-SNAPSHOT/ctulu/src/org/fudaa/ctulu/gis/GISGeometryCollection.java
branches/Prepro-0.92-SNAPSHOT/ctulu/src/org/fudaa/ctulu/gis/GISGeometryFactory.java
branches/Prepro-0.92-SNAPSHOT/ctulu/src/org/fudaa/ctulu/gis/GISGuiBuilder.java
branches/Prepro-0.92-SNAPSHOT/ctulu/src/org/fudaa/ctulu/gis/GISLib.java
branches/Prepro-0.92-SNAPSHOT/ctulu/src/org/fudaa/ctulu/gis/GISLigneBrisee.java
branches/Prepro-0.92-SNAPSHOT/ctulu/src/org/fudaa/ctulu/gis/GISMultiPoint.java
branches/Prepro-0.92-SNAPSHOT/ctulu/src/org/fudaa/ctulu/gis/GISMultiPolygoneWithHole.java
branches/Prepro-0.92-SNAPSHOT/ctulu/src/org/fudaa/ctulu/gis/GISMultiPolyligne.java
branches/Prepro-0.92-SNAPSHOT/ctulu/src/org/fudaa/ctulu/gis/GISPoint.java
branches/Prepro-0.92-SNAPSHOT/ctulu/src/org/fudaa/ctulu/gis/GISPolygone.java
branches/Prepro-0.92-SNAPSHOT/ctulu/src/org/fudaa/ctulu/gis/GISPolygoneWithHole.java
branches/Prepro-0.92-SNAPSHOT/ctulu/src/org/fudaa/ctulu/gis/GISPolyligne.java
branches/Prepro-0.92-SNAPSHOT/ctulu/src/org/fudaa/ctulu/gis/GISRien.java
branches/Prepro-0.92-SNAPSHOT/ctulu/src/org/fudaa/ctulu/gis/GISVisitorChooser.java
branches/Prepro-0.92-SNAPSHOT/ctulu/src/org/fudaa/ctulu/gis/GISZone.java
branches/Prepro-0.92-SNAPSHOT/ctulu/src/org/fudaa/ctulu/gis/GISZoneAttributeFactory.java
branches/Prepro-0.92-SNAPSHOT/ctulu/src/org/fudaa/ctulu/gis/GISZoneCollection.java
branches/Prepro-0.92-SNAPSHOT/ctulu/src/org/fudaa/ctulu/gis/GISZoneCollectionLigneBrisee.java
branches/Prepro-0.92-SNAPSHOT/ctulu/src/org/fudaa/ctulu/gis/GISZoneCollectionPoint.java
branches/Prepro-0.92-SNAPSHOT/ctulu/src/org/fudaa/ctulu/gis/gml/GISGMLZoneExporter.java
branches/Prepro-0.92-SNAPSHOT/ctulu/src/org/fudaa/ctulu/gis/gml/GMLReader.java
branches/Prepro-0.92-SNAPSHOT/ctulu/src/org/fudaa/ctulu/gui/CtuluDialog.java
branches/Prepro-0.92-SNAPSHOT/ctulu/src/org/fudaa/ctulu/image/CtuluLibImage.java
branches/Prepro-0.92-SNAPSHOT/ctulu/src/org/fudaa/ctulu/interpolation/InterpolationSupportGISAdapter.java
branches/Prepro-0.92-SNAPSHOT/ctulu/src/org/fudaa/ctulu/interpolation/InterpolationSupportPoint.java
branches/Prepro-0.92-SNAPSHOT/ctulu/src/org/fudaa/ctulu/interpolation/Interpolator.java
branches/Prepro-0.92-SNAPSHOT/ctulu/src/org/fudaa/ctulu/interpolation/bilinear/InterpolationBilinearSupportSorted.java
branches/Prepro-0.92-SNAPSHOT/ctulu/src/org/fudaa/ctulu/interpolation/bilinear/InterpolatorBilinear.java
branches/Prepro-0.92-SNAPSHOT/ctulu/test/org/fudaa/ctulu/interpolation/TestJInterpolation.java
branches/Prepro-0.92-SNAPSHOT/dodico/idl/code/mascaret.idl
branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/albe/DResultatsAlbe.java
branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/dico/DicoAnalyzer.java
branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/ef/EfGridDataInterpolationValuesAdapter.java
branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/ef/interpolation/EfInterpolationGridSupportAdapter.java
branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/fortran/FileOpWriterCharSimpleAbstract.java
branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/mascaret/DCalculMascaret.java
branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/mascaret/DParametresMascaret.java
branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/mascaret/MascaretClient.java
branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/olb/OLBExec.java
branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/rubar/io/RubarStReader.java
branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/rubar/io/RubarStWriter.java
branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/sinavi3/DCalculSinavi3.java
branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/sinavi3/DParametresSinavi3.java
branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/sinavi3/DResultatsSinavi3.java
branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/telemac/dico/DicoArtemisv5p8.java
branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/telemac/dico/DicoEstel2dv5p8.java
branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/telemac/dico/DicoPostel3dv5p8.java
branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/telemac/dico/DicoSisyphev5p8.java
branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/telemac/dico/DicoSpartacus2dv5p8.java
branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/telemac/dico/DicoStbtelv5p8.java
branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/telemac/dico/DicoSubief2dv5p8.java
branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/telemac/dico/DicoSubief3dv5p8.java
branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/telemac/dico/DicoTelemac2dv5p8.java
branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/telemac/dico/DicoTelemac3dv5p8.java
branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/telemac/dico/DicoTomawacv5p8.java
branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/telemac/io/SinusxReader.java
branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/telemac/io/SinusxWriter.java
branches/Prepro-0.92-SNAPSHOT/dodico/test/org/fudaa/dodico/all/TestCParametresMascaret.java
branches/Prepro-0.92-SNAPSHOT/dodico/test/org/fudaa/dodico/all/TestMascaretCalage.java
branches/Prepro-0.92-SNAPSHOT/dodico/test/org/fudaa/dodico/h2d/TestJMaillage.java
branches/Prepro-0.92-SNAPSHOT/dodico/test/org/fudaa/dodico/reflux/TestJDunes.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/calque/BArbreCalque.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/calque/BArbreCalqueModel.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/calque/BCalque.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/calque/BCalqueImagePersistence.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/calque/BCalqueInteraction.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/calque/BCalquePersistenceGroupe.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/calque/BCalquePersistenceInterface.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/calque/BCalquePersistenceSingle.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/calque/BCalqueSaverInterface.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/calque/BCalqueVisitor.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/calque/BGroupeCalque.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/calque/ZCalqueAffichageDonnees.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/calque/ZCalqueAffichageDonneesAbstract.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/calque/ZCalqueAffichageDonneesInterface.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/calque/ZCalqueAffichageDonneesMultiSpecial.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/calque/ZCalqueAffichageInterface.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/calque/ZCalqueClickInteraction.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/calque/ZCalqueFleche.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/calque/ZCalqueGrille.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/calque/ZCalqueImageRaster.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/calque/ZCalqueLigneBrisee.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/calque/ZCalquePoint.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/calque/ZCalquePolygone.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/calque/ZCalquePolyligne.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/calque/ZCalqueSegment.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/calque/ZCalqueSelectionInteractionAbstract.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/calque/ZCalqueSelectionInteractionMulti.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/calque/ZCalqueSelectionInteractionSimple.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/calque/ZEbliCalquePanelController.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/calque/ZEbliCalquesPanel.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/calque/ZEbliFilleCalques.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/calque/ZModeleDonnees.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/calque/ZModeleGeom.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/calque/ZModeleLigneBrisee.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/calque/ZSelectionTrace.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/calque/action/CalqueActionInteraction.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/calque/action/CalqueGISEditionAction.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/calque/action/CalqueSelectionAction.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/calque/action/CalqueZoomOnSelectedAction.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/calque/dessin/DeForme.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/calque/edition/BPaletteEdition.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/calque/edition/EbliAtomicsEditorPanel.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/calque/edition/EbliSingleObjectEditorPanel.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/calque/edition/ZCalqueDeplacement.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/calque/edition/ZCalqueDeplacementPanel.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/calque/edition/ZCalqueDeplacementTargetInterface.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/calque/edition/ZCalqueEditable.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/calque/edition/ZCalqueEditionGroup.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/calque/edition/ZCalqueEditionInteraction.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/calque/edition/ZCalqueEditionInteractionTargetI.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/calque/edition/ZCalqueLigneBriseeEditable.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/calque/edition/ZCalquePointEditable.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/calque/edition/ZEditionAttibutesContainer.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/calque/edition/ZEditionAttributesCreatorInterface.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/calque/edition/ZEditorDefault.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/calque/edition/ZEditorInterface.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/calque/edition/ZEditorLigneBriseePanel.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/calque/edition/ZEditorPanelInterface.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/calque/edition/ZModeleLigneBriseeDefault.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/calque/edition/ZModeleLigneBriseeEditable.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/calque/edition/ZModelePointEditable.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/calque/edition/ZModelePointEditableInterface.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/calque/find/CalqueFindComponentPolygone.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/calque/find/CalqueFindCourbeTreeModel.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/commun/BPalettePanelInterface.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/commun/EbliActionAbstract.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/commun/EbliActionInterface.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/commun/EbliActionPaletteAbstract.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/commun/EbliActionPaletteSpecAbstract.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/commun/EbliActionPaletteTreeModel.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/commun/EbliListeSelectionMulti.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/commun/EbliListeSelectionMultiInterface.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/controle/BConfigurableInterface.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/controle/BConfigurableSectionInterface.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/courbe/EGGrapheModelListener.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/palette/PaletteEditAction.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/ressource/draw-add-pt.png
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/ressource/node-add.png
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/trace/TraceIcon.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/trace/TracePoint.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/trace/TraceSurface.java
branches/Prepro-0.92-SNAPSHOT/ebli/test/org/fudaa/ebli/all/TestZCalquePoint.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/albe/AlbeDeplacementReactionResultats.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/albe/AlbeFilleNoteDeCalculs.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/albe/AlbeFilleResultatsCombinaison.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/albe/AlbeImplementation.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/albe/AlbeLancementCalculsFrame.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/albe/AlbeLib.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/albe/AlbeMobilisationDefenseResultats.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/albe/AlbeRecapitulatifResultats.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/albe/AlbeRes.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/albe/AlbeResistancePieuResultats.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/albe/AlbeResultatsRecapitulatifsBrowserFrame.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/albe/WHtmlContent.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/albe/astuces.txt
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/commun/FudaaProjectInterface.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/commun/impl/FudaaCommonImplementation.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/commun/save/FilleVisuSaver.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/commun/save/FudaaFilleVisuPersistence.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/commun/save/FudaaSavable.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/commun/save/FudaaSaveLib.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/commun/save/FudaaSaveProject.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/commun/save/FudaaSaveZipLoader.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/commun/save/FudaaSaveZipLoaderAdapter.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/commun/save/FudaaSaveZipWriter.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/commun/undo/FudaaUndoCmdMngListener.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/Hydraulique1dBaseImplementation.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/Hydraulique1dExport.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/Hydraulique1dImport.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/Hydraulique1dPoint.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/Hydraulique1dProfilModel.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/Hydraulique1dProjet.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/conv/CConversionHydraulique1d.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/conv/ConvH1D_Masc.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/conv/ConvMasc_H1D.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/conv/ConvUnite.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dApportEditor.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dBiefEditor.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dBornesGrapheEditor.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dConcentrationsInitialesEditor.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dConditionsInitialesEditor.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dCrueCalagePanel.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dCruesCalageEditor.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dCustomizer.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dCustomizerImprimable.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dDeversoirEditor.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dExtremLibreEditor.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dFiltrageProfilEditor.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dGraphesResultatsEditor.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dInsererProfilEditor.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dLaissesEditor.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dLigneInitialeEditor.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dLissageProfilEditor.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dListeLoiCombo.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dListingsCalageEditor.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dLoiHydrauliqueCellEditor.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dLoiHydrauliqueEditor2.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dLoiHydrauliqueLibraryEditor.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dLoiSeuilEditor2.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dMaillageEditor.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dMeteoEditor.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dModeleQEauEditor.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dNoeudFluvEditor.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dNoeudTransEditor.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dNoeudTransParamEditor.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dNoyauEditor.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dParametresCalageEditor.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dParametresGenerauxAvancesEditor.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dParametresGenerauxEditor.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dParametresRepriseEditor.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dParametresResultatsEditor.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dParametresResultatsQualiteDEauEditor.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dParametresTemporelsEditor.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dParamsGenerauxQualiteDEauEditor.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dParamsPhysiqueQEEditor.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dPerteChargeEditor.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dPlanimetrageEditor.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dResultatsGenerauxEditor.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dSectionsSeriesEditor.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dSeuilAvecLoiEditor.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dSeuilChooser.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dSeuilLoiEditor.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dSeuilVanneEditor.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dSitesEditor.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dSourceEditor.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dTableauZoneEditor.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dTableauxEditor.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dTranslaterProfilEditor.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dVariablesResultatsEditor.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dVisuInitialeEditor.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dZoneFrottementCalageEditor.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dZoneFrottementEditor.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dZoneSecheEditor.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/PanneauGraphesResultats.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/casier/Hydraulique1dCasierApportDebitPanel.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/casier/Hydraulique1dCasierCaracLiaisonPanel.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/casier/Hydraulique1dCasierEditor.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/casier/Hydraulique1dCasierGeometriePanel.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/casier/Hydraulique1dCasierLiaisonEditor.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/casier/Hydraulique1dCasierNumeriqueEditor.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/casier/Hydraulique1dCasierPlanimEditor.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/casier/Hydraulique1dCasierSemiPointsEditor.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/casier/Hydraulique1dCasierTableauPlanimPanel.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/casier/Hydraulique1dCasierTableauXYZPanel.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/casier/tableau/Hydraulique1dCasierTabPlanimModel.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/casier/tableau/Hydraulique1dCasierTabXYZ.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/casier/tableau/Hydraulique1dCasierTabXYZModel.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/profil/Hydraulique1dProfilEditor.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/profil/Hydraulique1dProfilSimpleEditor.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/profil/Hydraulique1dProfilTableauPanel.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/graphe/Hydraulique1dGrapheProfilDataset.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHMRepository.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_Apport2.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_Base.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_Bief.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_Casier.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_CasierLiaison.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_CasierNumerique.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_CasierPlanim.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_CasierSemiPoints.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_ConcentrationsInitiales.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_ConditionsInitiales.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_CruesCalage.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_Deversoir.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_ExtremiteLibre.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_GraphesResultats.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_Laisse.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_LibraryLoiHydraulique.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_LigneInitiale.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_ListingsCalage.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_LoiHydraulique2.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_Maillage2.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_Meteo.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_ModeleQEau.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_Noyau.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_ParamCalage.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_ParamGeneraux.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_ParamReprise.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_ParamResultat.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_ParamResultatQualiteDEau.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_ParamTemporel.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_ParamsGenerauxQualiteDEau.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_ParamsPhysiqueQE.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_Planimetrage2.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_Profil.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_ProfilResultats.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_ResultatsGeneraux.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_SectionsParSections.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_SectionsParSerie2.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_SeuilAvecLoi.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_SeuilLoi.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_SeuilVanne.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_SitesStockage.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_Source.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_Tableaux.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_VariableResultat.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_VisuInitiale.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_ZonesFrottement.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_ZonesFrottementACaler.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_ZonesFrottementCalees.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_ZonesSeches.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/reseau/Hydraulique1dReseauApport.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/reseau/Hydraulique1dReseauBarragePrincipal.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/reseau/Hydraulique1dReseauBiefCourbe.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/reseau/Hydraulique1dReseauBiefDroit.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/reseau/Hydraulique1dReseauCasier.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/reseau/Hydraulique1dReseauDeversoir.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/reseau/Hydraulique1dReseauExtremLibre.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/reseau/Hydraulique1dReseauFrame.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/reseau/Hydraulique1dReseauGridAdapter.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/reseau/Hydraulique1dReseauLiaisonCasier.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/reseau/Hydraulique1dReseauMouseAdapter.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/reseau/Hydraulique1dReseauNoeud.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/reseau/Hydraulique1dReseauPerteCharge.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/reseau/Hydraulique1dReseauSeuil.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/reseau/Hydraulique1dReseauSingularite.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/reseau/Hydraulique1dReseauSource.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/reseau/Hydraulique1dReseauVerificateur.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/tableau/Hydraulique1dLigneConcentrationsInitialesTableau.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/tableau/Hydraulique1dLigneLaisseTableau.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/tableau/Hydraulique1dLigneLigneDEauTableau.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/tableau/Hydraulique1dLigneOptionsTraceurTableau.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/tableau/Hydraulique1dLigneParamsPhysiqueQETableau.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/tableau/Hydraulique1dLigneProfilTableau.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/tableau/Hydraulique1dLigneSiteTableau.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/tableau/Hydraulique1dLigneZoneFrottementTableau.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/tableau/Hydraulique1dLigneZoneTableau.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/tableau/Hydraulique1dLigneZoneTailleTableau.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/tableau/Hydraulique1dTableauConcInitsModel.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/tableau/Hydraulique1dTableauLaisseModel.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/tableau/Hydraulique1dTableauLigneEauModel.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/tableau/Hydraulique1dTableauOptionsTraceurModel.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/tableau/Hydraulique1dTableauParamsPhysQEModel.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/tableau/Hydraulique1dTableauProfilsModel.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/tableau/Hydraulique1dTableauSiteModel.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/tableau/Hydraulique1dTableauZoneFrottementCalageModel.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/tableau/Hydraulique1dTableauZoneFrottementModel.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/tableau/Hydraulique1dTableauZoneModel.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/tableau/Hydraulique1dTableauZoneSecheModel.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/hydraulique1d/tableau/Hydraulique1dTableauZoneTailleModel.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/mascaret/MascaretImplementation.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/meshviewer/export/MvExportFactory.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/meshviewer/impl/MvActLoadDefault.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/meshviewer/layer/MvEdgeNumberLayer.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/meshviewer/layer/MvElementLayer.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/meshviewer/layer/MvElementNumberLayer.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/meshviewer/layer/MvFrontierLayerAbstract.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/meshviewer/layer/MvIsoPaintersLayer.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/meshviewer/layer/MvNodeNumberLayer.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/meshviewer/layer/MvVisuPanel.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/meshviewer/package.html
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/meshviewer/profile/MvLineChooser.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/meshviewer/profile/MvProfileLayerModelForCourbe.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/oscar/OscarDeformeeResultatsBruts.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/oscar/OscarDiagrammePressionsResultatsBruts.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/oscar/OscarEffortsParametresEffortsEnTeteDeRideau.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/oscar/OscarEffortsTranchantsResultatsBruts.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/oscar/OscarFilleNoteDeCalculs.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/oscar/OscarImplementation.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/oscar/OscarLib.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/oscar/OscarMomentsFlechissantsResultatsBruts.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/oscar/OscarOuvrageParametres.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/oscar/OscarPredimensionnementResultatsBruts.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/oscar/WHtmlContent.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/sig/FSigGeomSrcData.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/sig/FSigGeomSrcDataUtils.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/sig/FSigLib.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/sig/FSigLineSingleModel.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/sig/FSigResource.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/sig/layer/FSigEditor.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/sig/layer/FSigImageImportAction.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/sig/layer/FSigLayerAction.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/sig/layer/FSigLayerExporter.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/sig/layer/FSigLayerFilter.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/sig/layer/FSigLayerGroup.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/sig/layer/FSigVisuPanel.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/sig/persistence/FSigLayerPointPersistence.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/sig/wizard/FSigDataModelSinusxAdapter.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/sig/wizard/FSigFileLoadResult.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/sig/wizard/FSigFileLoaderI.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/sig/wizard/FSigFileLoaderRubarSt.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/sig/wizard/FSigFileLoaderSinusX.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/sig/wizard/FSigImageWizardPanelController.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/sig/wizard/FSigImageWizardStepCalage.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/sig/wizard/FSigImageWizardStepImage.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/sig/wizard/FSigImageWizardTask.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/sig/wizard/FSigWizardDefaultPanel.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/sig/wizard/FSigWizardFileMng.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/sig/wizard/FSigWizardImport.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/sig/wizard/FSigWizardImportHelper.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/sig/wizard/FSigWizardStepInterface.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/sig/wizard/FSigWizardVariableModifier.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/sinavi2/Sinavi2FilleAffBiefs.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/sinavi2/Sinavi2FilleAffEcluses.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/sinavi2/Sinavi2ResAttentesBateaux.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/sinavi2/Sinavi2ResAttentesElements.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/sinavi3/GenarrFrameAffichage.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/sinavi3/GenarrListeNavires.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/sinavi3/GenarrModeleTable.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/sinavi3/GenarrNavire.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/sinavi3/LoiDeterministeTableModel.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3AlgorithmeAttentesGenerales.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3AlgorithmeDureesParcours.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3AlgorithmeTOUTESDureesParcours.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3DataSimulation.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3DessinerPort.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3DessinerPortFrame.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3DonneesGeneralesParametres.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3Ecluse.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3FrameGenerationRappelDonnees.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3FrameSaisieDonneesGenerales.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3FrameSaisieHoraires.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3FrameSaisieHorairesComplet.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3FrameSaisieHorairesCompletSemaine.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3FrameSaisieLoiDeterministe.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3FrameSaisieLoiJournaliere.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3GenereNoteHtml.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3Implementation.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3ModeleDurManeuvreEclEntrant.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3ModeleDurManeuvreEclSortant.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3ModeleExcel.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3ModeleVitesseBiefAvalant.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3ModeleVitesseBiefMontant.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3Modeletrajets.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3PanelAffichageEcluse.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3PanelGestionTrajetsBateaux.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3PanelReglesCroisementBief.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3PanelReglestrematageBief.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3PanelSaisieBateaux.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3PanelSaisieBief.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3PanelSaisieEcluse.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3PanelSaisieGare.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3PreferencesPanel.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3ResultatComparaisonAttenteElement.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3ResultatComparaisonAttentetrajet.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3ResultatComparaisonDureeParcours.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3ResultatComparaisonGenerationBateaux.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3ResultatGenerationBateaux.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3ResultatHistorique.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3ResultatsAttenteGeneraleCategories.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3ResultatsAttenteGeneraleElement.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3ResultatsAttenteTrajet.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3ResultatsCroisementsBief.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3ResultatsDureesParcours.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3ResultatsTrematagesBief.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3TraduitHoraires.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3VisualiserBateaux.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3VisualiserGares.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/sipor/GenarrModeleTable.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/sipor/SiporDataSimulation.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/sipor/SiporDessinerPort.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/sipor/SiporDonneesGeneralesParametres.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/sipor/SiporFrameGenerationRappelDonnees.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/sipor/SiporFrameSaisieHoraires.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/sipor/SiporFrameSaisieHorairesComplet.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/sipor/SiporFrameSaisieHorairesCompletSemaine.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/sipor/SiporGenereNoteHtml.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/sipor/SiporModeleDureeParcoursCercles.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/sipor/SiporModeleDureeParcoursChenaux.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/sipor/SiporModeleExcel.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/common/TrCommonImplementation.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/common/TrFileFormatManager.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/data/TrBcLayerGroup.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/data/TrGisProjectEditor.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/data/TrRefluxBcBoundaryMiddleLayer.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/data/TrSiPlanEditorPanel.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/data/TrSiProfilLayer.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/data/TrSiProfilModel.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/data/TrVisuPanel.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrIsoLayerDefault.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostTrajectoireLineLayer.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/rubar/TrRubarDonneesBrutesLayer.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/rubar/TrRubarOuvrageLayer.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/telemac/TrTelemacBcBoundaryBlockLayer.java
Added Paths:
-----------
branches/Prepro-0.92-SNAPSHOT/ctulu/src/com/memoire/bu/crystal_couperligne.png
branches/Prepro-0.92-SNAPSHOT/ctulu/src/org/fudaa/ctulu/gis/GISCoordinateSequenceContainerInterface.java
branches/Prepro-0.92-SNAPSHOT/ctulu/src/org/fudaa/ctulu/gis/GISDataModelPointMultiPointAdapter.java
branches/Prepro-0.92-SNAPSHOT/ctulu/src/org/fudaa/ctulu/gis/GISSequencesCoordinateSequence.java
branches/Prepro-0.92-SNAPSHOT/ctulu/src/org/fudaa/ctulu/gis/GISVisitorGeometryCollector.java
branches/Prepro-0.92-SNAPSHOT/ctulu/src/org/fudaa/ctulu/gis/GISZoneCollectionGeometry.java
branches/Prepro-0.92-SNAPSHOT/ctulu/src/org/fudaa/ctulu/gis/GISZoneCollectionMultiPoint.java
branches/Prepro-0.92-SNAPSHOT/ctulu/src/org/fudaa/ctulu/interpolation/InterpolationTargetGISAdapter.java
branches/Prepro-0.92-SNAPSHOT/ctulu/src/org/fudaa/ctulu/interpolation/SupportCoordinate.java
branches/Prepro-0.92-SNAPSHOT/ctulu/src/org/fudaa/ctulu/interpolation/SupportLocationI.java
branches/Prepro-0.92-SNAPSHOT/ctulu/src/org/fudaa/ctulu/interpolation/SupportLocationXYComparator.java
branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/hydraulique1d/metier/
branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/hydraulique1d/metier/DeserializerHandlerVersion04.java
branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/hydraulique1d/metier/DeserializerHandlerVersion05.java
branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/hydraulique1d/metier/EnumMetierCondLimiteImposee.java
branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/hydraulique1d/metier/EnumMetierCritereArret.java
branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/hydraulique1d/metier/EnumMetierFormatFichier.java
branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/hydraulique1d/metier/EnumMetierLimiteCalcule.java
branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/hydraulique1d/metier/EnumMetierMethodeMaillage.java
branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/hydraulique1d/metier/EnumMetierOptionStockage.java
branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/hydraulique1d/metier/EnumMetierRegime.java
branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/hydraulique1d/metier/EnumMetierSensDebitLiaison.java
branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/hydraulique1d/metier/EnumMetierTypeCompositionLits.java
branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/hydraulique1d/metier/EnumMetierTypeFrottement.java
branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/hydraulique1d/metier/EnumMetierTypeNombre.java
branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/hydraulique1d/metier/EnumMetierUnite.java
branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/hydraulique1d/metier/Identifieur.java
branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/hydraulique1d/metier/MetierBarragePrincipal.java
branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/hydraulique1d/metier/MetierBief.java
branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/hydraulique1d/metier/MetierCalculHydraulique1d.java
branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/hydraulique1d/metier/MetierCasier.java
branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/hydraulique1d/metier/MetierConditionsInitiales.java
branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/hydraulique1d/metier/MetierDefinitionSections.java
branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/hydraulique1d/metier/MetierDefinitionSectionsParSections.java
branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/hydraulique1d/metier/MetierDefinitionSectionsParSeries.java
branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/hydraulique1d/metier/MetierDefinitionSectionsParSeriesUnitaire.java
branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/hydraulique1d/metier/MetierDescriptionVariable.java
branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/hydraulique1d/metier/MetierDonneesHydrauliques.java
branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/hydraulique1d/metier/MetierEtude1d.java
branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/hydraulique1d/metier/MetierExtremite.java
branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/hydraulique1d/metier/MetierHydraulique1d.java
branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/hydraulique1d/metier/MetierInformationTemps.java
branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/hydraulique1d/metier/MetierLaisse.java
branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/hydraulique1d/metier/MetierLiaison.java
branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/hydraulique1d/metier/MetierLigneEauInitiale.java
branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/hydraulique1d/metier/MetierLigneEauPoint.java
branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/hydraulique1d/metier/MetierLimite.java
branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/hydraulique1d/metier/MetierLoiHydraulique.java
branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/hydraulique1d/metier/MetierMaillage.java
branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/hydraulique1d/metier/MetierNoeud.java
branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/hydraulique1d/metier/MetierOptionsListing.java
branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/hydraulique1d/metier/MetierOptionsListingTracer.java
branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/hydraulique1d/metier/MetierParametresGeneraux.java
branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/hydraulique1d/metier/MetierParametresGenerauxCasier.java
branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/hydraulique1d/metier/MetierParametresReprise.java
branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/hydraulique1d/metier/MetierParametresResultats.java
branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/hydraulique1d/metier/MetierParametresStockage.java
branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/hydraulique1d/metier/MetierParametresTailleMaxFichier.java
branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/hydraulique1d/metier/MetierParametresTemporels.java
branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/hydraulique1d/metier/MetierProfil.java
branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/hydraulique1d/metier/MetierReseau.java
branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/hydraulique1d/metier/MetierResultatsBief.java
branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/hydraulique1d/metier/MetierResultatsBiefPasTemps.java
branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/hydraulique1d/metier/MetierResultatsGeneraux.java
branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/hydraulique1d/metier/MetierResultatsTemporelSpatial.java
branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/hydraulique1d/metier/MetierResultatsTemporelSpatialBief.java
branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/hydraulique1d/metier/MetierSectionCalculee.java
branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/hydraulique1d/metier/MetierSectionCalculeePasTemps.java
branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/hydraulique1d/metier/MetierSingularite.java
branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/hydraulique1d/metier/MetierSite.java
branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/hydraulique1d/metier/MetierZone.java
branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/hydraulique1d/metier/MetierZoneFrottement.java
branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/hydraulique1d/metier/MetierZonePlanimetrage.java
branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/hydraulique1d/metier/SMetierIdentifieur.java
branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/hydraulique1d/metier/SMetierIndiceZoneStockage.java
branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/hydraulique1d/metier/calageauto/
branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/hydraulique1d/metier/calageauto/EnumMetierMethodeOpt.java
branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/hydraulique1d/metier/calageauto/EnumMetierTypeLit.java
branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/hydraulique1d/metier/calageauto/MetierApportCrueCalageAuto.java
branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/hydraulique1d/metier/calageauto/MetierCalageAuto.java
branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/hydraulique1d/metier/calageauto/MetierCrueCalageAuto.java
branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/hydraulique1d/metier/calageauto/MetierMesureCrueCalageAuto.java
branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/hydraulique1d/metier/calageauto/MetierParametresCalageAuto.java
branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fuda...
[truncated message content] |
|
From: <de...@us...> - 2009-01-14 01:13:32
|
Revision: 4351
http://fudaa.svn.sourceforge.net/fudaa/?rev=4351&view=rev
Author: deniger
Date: 2009-01-14 01:13:24 +0000 (Wed, 14 Jan 2009)
Log Message:
-----------
Modified Paths:
--------------
branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/dunes/io/DunesAdapter.java
Added Paths:
-----------
branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/dunes/io/DunesGEOFileFormat.java
branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/dunes/io/DunesGEOWriter.java
branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/dunes/io/DunesMAIFileFormat.java
branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/dunes/io/DunesMAIReader.java
branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/dunes/io/DunesMAIWriter.java
Modified: branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/dunes/io/DunesAdapter.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/dunes/io/DunesAdapter.java 2009-01-13 20:42:41 UTC (rev 4350)
+++ branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/dunes/io/DunesAdapter.java 2009-01-14 01:13:24 UTC (rev 4351)
@@ -47,7 +47,7 @@
}
public FileFormat getFileFormat() {
- return DunesFileFormat.getInstance();
+ return DunesMAIFileFormat.getInstance();
}
}
Copied: branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/dunes/io/DunesGEOFileFormat.java (from rev 4350, trunk/fudaa_devel/dodico/src/org/fudaa/dodico/dunes/io/DunesGEOFileFormat.java)
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/dunes/io/DunesGEOFileFormat.java (rev 0)
+++ branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/dunes/io/DunesGEOFileFormat.java 2009-01-14 01:13:24 UTC (rev 4351)
@@ -0,0 +1,61 @@
+/**
+ * @creation 11 f\xE9vr. 2004
+ * @modification $Date: 2007/05/04 13:47:27 $
+ * @license GNU General Public License 2
+ * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
+ * @mail de...@fu...
+ */
+package org.fudaa.dodico.dunes.io;
+
+import java.io.File;
+
+import org.fudaa.ctulu.CtuluIOOperationSynthese;
+import org.fudaa.ctulu.ProgressionInterface;
+import org.fudaa.ctulu.fileformat.FileFormatUnique;
+import org.fudaa.ctulu.fileformat.FileReadOperationAbstract;
+import org.fudaa.ctulu.fileformat.FileWriteOperationAbstract;
+
+import org.fudaa.dodico.commun.DodicoLib;
+import org.fudaa.dodico.fichiers.FileFormatSoftware;
+import org.fudaa.dodico.h2d.type.H2dFileFormatType;
+
+/**
+ * Un format pour les fichiers de modelisation geometriques Dunes.
+ * @author Bertrand Marchand
+ * @version $Id: SinusxFileFormat.java,v 1.15 2007/05/04 13:47:27 deniger Exp $
+ */
+public final class DunesGEOFileFormat extends FileFormatUnique {
+
+ static final DunesGEOFileFormat INSTANCE = new DunesGEOFileFormat();
+
+ /**
+ * @return singleton
+ */
+ public static DunesGEOFileFormat getInstance() {
+ return INSTANCE;
+ }
+
+ private DunesGEOFileFormat() {
+ super(1);
+ extensions_ = new String[] { "geo" };
+ id_ = "DUNESGEO";
+ nom_ = "Dunes g\xE9ometrie";
+ description_ = DodicoLib.getS("Comporte les d\xE9finitions de points, polylignes et polygones");
+ software_ = FileFormatSoftware.REFLUX_IS;
+// type_ = : Geometrique => Autre
+ }
+
+ public FileReadOperationAbstract createReader() {
+ return null;
+// return new DunesGEOReader(this);
+ }
+
+ public CtuluIOOperationSynthese write(final File _f, final Object _source, final ProgressionInterface _prog) {
+ return super.write(_f, _source, _prog);
+ }
+
+ public FileWriteOperationAbstract createWriter() {
+ return new DunesGEOWriter(this);
+ }
+
+}
\ No newline at end of file
Copied: branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/dunes/io/DunesGEOWriter.java (from rev 4350, trunk/fudaa_devel/dodico/src/org/fudaa/dodico/dunes/io/DunesGEOWriter.java)
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/dunes/io/DunesGEOWriter.java (rev 0)
+++ branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/dunes/io/DunesGEOWriter.java 2009-01-14 01:13:24 UTC (rev 4351)
@@ -0,0 +1,268 @@
+/*
+ * @creation 2002-11-21
+ * @modification $Date: 2007/05/04 13:47:27 $
+ * @license GNU General Public License 2
+ * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
+ * @mail de...@fu...
+ */
+package org.fudaa.dodico.dunes.io;
+
+import java.io.IOException;
+import java.util.ArrayList;
+
+import org.fudaa.ctulu.CtuluActivity;
+import org.fudaa.ctulu.ProgressionUpdater;
+import org.fudaa.ctulu.fileformat.FileFormatVersionInterface;
+import org.fudaa.ctulu.gis.GISDataModel;
+import org.fudaa.ctulu.gis.GISDataModelPointMultiPointAdapter;
+import org.fudaa.ctulu.gis.GISMultiPoint;
+import org.fudaa.dodico.fortran.FileOpWriterCharSimpleAbstract;
+import org.fudaa.dodico.fortran.FortranWriter;
+import org.fudaa.dodico.h2d.resource.H2dResource;
+
+import com.vividsolutions.jts.geom.Coordinate;
+import com.vividsolutions.jts.geom.CoordinateSequence;
+import com.vividsolutions.jts.geom.Geometry;
+import com.vividsolutions.jts.geom.LineString;
+import com.vividsolutions.jts.geom.Point;
+
+/**
+ * Une classe pour ecrire des fichiers Dunes de mod\xE9lisation (.geo)
+ * @version $Id: SinusxWriter.java,v 1.24 2007/05/04 13:47:27 deniger Exp $
+ * @author Bertrand Marchand
+ */
+public class DunesGEOWriter extends FileOpWriterCharSimpleAbstract implements CtuluActivity {
+
+ final FileFormatVersionInterface v_;
+ boolean stop_;
+
+ public void stop() {
+ stop_ = true;
+ }
+
+ /**
+ * @param _v la version utilisee.
+ */
+ public DunesGEOWriter(final FileFormatVersionInterface _v) {
+ v_ = _v;
+ }
+
+ /**
+ * Ecriture des g\xE9om\xE9tries contenues dans les mod\xE8les. Les g\xE9om\xE9tries peuvent \xEAtre
+ * des points, des polylignes/polygones ou des multipoints. Chaque modele est cens\xE9 contenir
+ * le m\xEAme type de g\xE9om\xE9tries.<p>
+ *
+ * Les doublons de coordonn\xE9es (si X et Y sont equivalents) sont supprim\xE9s.
+ * @param _geometries Les mod\xE8les de g\xE9om\xE9tries
+ */
+ protected void internalWrite(final Object _o) {
+ if (!(_o instanceof GISDataModel[])) {
+ donneesInvalides(_o);
+ return;
+ }
+
+ GISDataModel[] mdls=(GISDataModel[])_o;
+ if (mdls == null) {
+ analyze_.addFatalError(H2dResource.getS("Les donn\xE9es sont nulles"));
+ return;
+ }
+
+ final ProgressionUpdater up = new ProgressionUpdater(progress_);
+ if (progress_ != null) {
+ progress_.setProgression(0);
+ }
+ up.majProgessionStateOnly();
+
+ Coordinate[] coords=null;
+
+ // Les coordonn\xE9es, d'abord la totalit\xE9, puis sans les doublons.
+ ArrayList<Coordinate> vcoords=new ArrayList<Coordinate>();
+ int nblig=0;
+
+ // Recuperation des coordonn\xE9es : d'abord les lignes...
+ GISDataModel[] mdlligs=filtreModels(mdls,1);
+ if (mdlligs.length==0) {
+ analyze_.addFatalError(H2dResource.getS("Aucune ligne trouv\xE9e"));
+ return;
+ }
+
+ for (int i=0; i<mdlligs.length; i++) {
+ GISDataModel mdl=mdlligs[i];
+ int nbgeo=mdl.getNumGeometries();
+ for (int j=0; j<nbgeo; j++) {
+ LineString g=(LineString)mdl.getGeometry(j);
+ int nbpt=g.getNumPoints();
+ nblig+=nbpt-1;
+ CoordinateSequence seq=g.getCoordinateSequence();
+ for (int k=0; k<nbpt; k++) {
+ vcoords.add(seq.getCoordinate(k));
+ }
+ }
+ }
+ if (stop_) return;
+ up.setValue(1,1,10,10);
+ up.majProgessionStateOnly();
+
+ // ...Ensuite les points
+ GISDataModel[] mdlpts=filtreModels(mdls,0);
+
+ for (int i=0; i<mdlpts.length; i++) {
+ GISDataModel mdl=mdlpts[i];
+ int nbgeo=mdl.getNumGeometries();
+ for (int j=0; j<nbgeo; j++) {
+ GISMultiPoint g=(GISMultiPoint)mdl.getGeometry(j);
+ int nbpt=g.getNumPoints();
+ CoordinateSequence seq=g.getCoordinateSequence();
+ for (int k=0; k<nbpt; k++) {
+ vcoords.add(seq.getCoordinate(k));
+ }
+ }
+ }
+ if (stop_) return;
+
+ coords=vcoords.toArray(new Coordinate[0]);
+ // Les indexs de coordonn\xE9es pour les lignes.
+ int[] idxs=new int[coords.length];
+ for (int i=0; i<idxs.length; i++) idxs[i]=i;
+
+ // Suppression des doublons (pas optimal, mais fonctionnel).
+ // Il serait plus efficace d'utiliser un tri suivant X pour supprimer les doublons.
+ // La difficult\xE9 une fois le tri fait est de retrouver l'indice des points pour les lignes.
+ up.setValue(100,coords.length,10,70);
+ int nbsup=0;
+ for (int i=0; i<coords.length; i++) {
+ up.majAvancement();
+ if (stop_) return;
+
+ if (coords[i]==null) {
+ nbsup++;
+ continue;
+ }
+ // Reindexation au fur et a mesure des suppressions.
+ idxs[i]-=nbsup;
+
+ for (int j=i+1; j<coords.length; j++) {
+ if (coords[j]==null) continue;
+ if (coords[i].distance(coords[j])<1.e-6) {
+ idxs[j]=idxs[i];
+ coords[j]=null;
+ }
+ }
+ }
+
+ int nbtrous=0;
+ int nbreg=0;
+ up.setValue(20, coords.length-nbsup+nblig+nbtrous+nbreg, 80, 20);
+
+ // Ecriture des infos. Repris de DParametresDunes.
+ final FortranWriter fout = new FortranWriter(out_);
+ try {
+ int[] fmt;
+
+ /** Ecriture des coordonnees des points * */
+ fmt = new int[] { 8, 8 };
+ fout.intField(1, 1);
+ fout.intField(0, coords.length-nbsup);
+ fout.writeFields(fmt);
+ fmt = new int[] { 8, 24, 24, 24 };
+ for (int i = 0; i < coords.length; i++) {
+ if (stop_) return;
+ if (coords[i]==null) continue;
+ fout.doubleField(3, coords[i].z);
+ fout.intField(0, idxs[i]+1);
+ fout.doubleField(1, coords[i].x);
+ fout.doubleField(2, coords[i].y);
+ fout.writeFields(fmt);
+ up.majAvancement();
+ }
+
+ /** Ecriture des polylignes * */
+ fmt = new int[] { 8, 8 };
+ fout.intField(1, 0);
+ fout.intField(0, nblig);
+ fout.writeFields(fmt);
+ fmt = new int[] { 8, 8, 8 };
+ int ilig=0;
+ for (int i=0; i<mdlligs.length; i++) {
+ if (stop_) return;
+ GISDataModel mdl=mdlligs[i];
+ int nbgeo=mdl.getNumGeometries();
+ for (int j=0; j<nbgeo; j++) {
+ LineString g=(LineString)mdl.getGeometry(j);
+ int nbpt=g.getNumPoints();
+ for (int k=1; k<nbpt; k++) {
+ int index1=idxs[ilig]+1;
+ int index2=idxs[ilig+1]+1;
+ fout.intField(2, index2);
+ fout.intField(0, ilig+1);
+ fout.intField(1, index1);
+ fout.writeFields(fmt);
+ ilig++;
+ up.majAvancement();
+ }
+ }
+ }
+
+ /** Ecriture des positions des trous * */
+ fmt = new int[] { 8 };
+ fout.intField(0, nbtrous);
+ fout.writeFields(fmt);
+ fmt = new int[] { 8, 24, 24 };
+ for (int i = 0; i < nbtrous; i++) {
+ if (stop_) return;
+ double x=0;
+ double y=0;
+ fout.intField(0, i + 1);
+ fout.doubleField(1, x);
+ fout.doubleField(2, y);
+ fout.writeFields(fmt);
+ up.majAvancement();
+ }
+
+ /** Ecriture des positions des regions * */
+ fmt = new int[] { 8 };
+ fout.intField(0, nbreg);
+ fout.writeFields(fmt);
+ fmt = new int[] { 8, 24, 24, 24, 24 };
+ for (int i = 0; i < nbreg; i++) {
+ if (stop_) return;
+ double x=0;
+ double y=0;
+ double z=0;
+ final double aireMax = 0;
+ fout.intField(0, i + 1);
+ fout.doubleField(1, x);
+ fout.doubleField(2, y);
+ fout.doubleField(3, z);
+ fout.doubleField(4, aireMax);
+ fout.writeFields(fmt);
+ up.majAvancement();
+ }
+ } catch (final IOException ex) {
+ analyze_.manageException(ex);
+ }
+ }
+
+ /**
+ * R\xE9cup\xE8re les modeles d'un type particulier.
+ * @param _mdls Les models
+ * @param _type 0 : Points et multipoints. 1 : Lignes, polygones.
+ * @return Les modeles, une fois filtr\xE9s.
+ */
+ GISDataModel[] filtreModels(GISDataModel[] _mdls, int _type) {
+ ArrayList<GISDataModel> mdls=new ArrayList<GISDataModel>();
+ for (int i=0; i<_mdls.length; i++) {
+ if (_mdls[i].getNumGeometries()==0) continue;
+
+ Geometry g=_mdls[i].getGeometry(0);
+ if (_type==0 && g instanceof GISMultiPoint)
+ mdls.add(_mdls[i]);
+ else if (_type==0 && g instanceof Point)
+ mdls.add(new GISDataModelPointMultiPointAdapter(_mdls[i]));
+ else if (_type==1 && g instanceof LineString)
+ mdls.add(_mdls[i]);
+ }
+
+ return mdls.toArray(new GISDataModel[0]);
+ }
+}
\ No newline at end of file
Copied: branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/dunes/io/DunesMAIFileFormat.java (from rev 4350, trunk/fudaa_devel/dodico/src/org/fudaa/dodico/dunes/io/DunesMAIFileFormat.java)
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/dunes/io/DunesMAIFileFormat.java (rev 0)
+++ branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/dunes/io/DunesMAIFileFormat.java 2009-01-14 01:13:24 UTC (rev 4351)
@@ -0,0 +1,136 @@
+/*
+ * @creation 13 mars 2003
+ * @modification $Date: 2006-11-15 09:22:54 $
+ * @license GNU General Public License 2
+ * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
+ */
+package org.fudaa.dodico.dunes.io;
+
+import java.io.File;
+
+import org.fudaa.ctulu.CtuluIOOperationSynthese;
+import org.fudaa.ctulu.ProgressionInterface;
+import org.fudaa.ctulu.fileformat.FileFormatUnique;
+import org.fudaa.ctulu.fileformat.FileReadOperationAbstract;
+import org.fudaa.ctulu.fileformat.FileWriteOperationAbstract;
+
+import org.fudaa.dodico.ef.EfGridInterface;
+import org.fudaa.dodico.ef.EfGridSource;
+import org.fudaa.dodico.ef.FileFormatGridVersion;
+import org.fudaa.dodico.fichiers.FileFormatSoftware;
+import org.fudaa.dodico.h2d.resource.H2dResource;
+import org.fudaa.dodico.h2d.type.H2dFileFormatType;
+
+/**
+ * @author deniger
+ * @version $Id: DunesFileFormat.java,v 1.25 2006-11-15 09:22:54 deniger Exp $
+ */
+public final class DunesMAIFileFormat extends FileFormatUnique implements DunesVersionInterface, FileFormatGridVersion {
+
+ public static final DunesMAIFileFormat INSTANCE = new DunesMAIFileFormat();
+
+ /**
+ * @return le singleton
+ */
+ public static DunesMAIFileFormat getInstance() {
+ return INSTANCE;
+ }
+
+ private DunesMAIFileFormat() {
+ super(1);
+ extensions_ = new String[] { "mail", "dunes" };
+ id_ = "DUNES";
+ nom_ = "Dunes maillage";
+ description_ = H2dResource.getS("utilis\xE9 par le mailleur Dunes");
+ software_ = FileFormatSoftware.REFLUX_IS;
+ type_ = H2dFileFormatType.MAILLAGE;
+ }
+
+ public boolean containsGrid() {
+ return true;
+ }
+
+ /**
+ * Returns the aDAPTATIF.
+ *
+ * @return int
+ */
+ public int getAdaptatifCode() {
+ return 2;
+ }
+
+ /**
+ * Returns the eLEMENT_ID.
+ *
+ * @return String
+ */
+ public String getElementCode() {
+ return "ELEMENT";
+ }
+
+ /**
+ * Returns the nOEUD_ID.
+ *
+ * @return String
+ */
+ public String getNoeudCode() {
+ return "NOEUD";
+ }
+
+ /**
+ * Returns the nON_ADAPTATIF.
+ *
+ * @return int
+ */
+ public int getNonAdaptatifCode() {
+ return 1;
+ }
+
+ public FileReadOperationAbstract createReader() {
+ return new DunesMAIReader(this);
+ }
+
+ public FileWriteOperationAbstract createWriter() {
+ return new DunesMAIWriter(this);
+ }
+
+ /**
+ * @param _f le fichier cible a ecrire
+ * @param _inter le source des donnees
+ * @param _prog la barre de progression
+ * @return la synthese de l'operation
+ */
+ public CtuluIOOperationSynthese write(final File _f, final DunesInterface _inter, final ProgressionInterface _prog) {
+ final DunesMAIWriter w = new DunesMAIWriter(this);
+ w.setFile(_f);
+ w.setProgressReceiver(_prog);
+ return w.write(_inter);
+ }
+
+ /**
+ * @param _f le fichier cible
+ * @param _m le maillage a ecrire
+ * @param _prog la barre de progression
+ * @return la synthese
+ */
+ public CtuluIOOperationSynthese writeGrid(final File _f, final EfGridInterface _m, final ProgressionInterface _prog) {
+ final DunesAdapter inter = new DunesAdapter();
+ inter.setMaillage(_m);
+ return write(_f, inter, _prog);
+ }
+
+ public CtuluIOOperationSynthese writeGrid(final File _f, final EfGridSource _m, final ProgressionInterface _prog) {
+ return writeGrid(_f, _m.getGrid(), _prog);
+ }
+
+ public CtuluIOOperationSynthese readGrid(final File _f, final ProgressionInterface _prog) {
+ return read(_f, _prog);
+ }
+
+ public CtuluIOOperationSynthese readListPoint(final File _f, final ProgressionInterface _prog) {
+ final CtuluIOOperationSynthese s = readGrid(_f, _prog);
+ s.setSource(((EfGridSource) s.getSource()).getGrid());
+ return s;
+ }
+
+}
\ No newline at end of file
Copied: branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/dunes/io/DunesMAIReader.java (from rev 4350, trunk/fudaa_devel/dodico/src/org/fudaa/dodico/dunes/io/DunesMAIReader.java)
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/dunes/io/DunesMAIReader.java (rev 0)
+++ branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/dunes/io/DunesMAIReader.java 2009-01-14 01:13:24 UTC (rev 4351)
@@ -0,0 +1,240 @@
+/*
+ * @creation 19 f\xE9vr. 2003
+ * @modification $Date: 2007-01-19 13:07:22 $
+ * @license GNU General Public License 2
+ * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
+ * @mail de...@fu...
+ */
+package org.fudaa.dodico.dunes.io;
+
+import java.io.EOFException;
+import java.io.IOException;
+
+import org.fudaa.ctulu.CtuluLibMessage;
+import org.fudaa.ctulu.CtuluLibString;
+import org.fudaa.ctulu.ProgressionUpdater;
+import org.fudaa.ctulu.fileformat.FileFormat;
+import org.fudaa.ctulu.fileformat.FileFormatVersionInterface;
+
+import org.fudaa.dodico.ef.EfElement;
+import org.fudaa.dodico.ef.EfLib;
+import org.fudaa.dodico.ef.EfNode;
+import org.fudaa.dodico.ef.impl.EfGrid;
+import org.fudaa.dodico.fortran.FileOpReadCharSimpleAbstract;
+import org.fudaa.dodico.h2d.resource.H2dResource;
+
+/**
+ * Lecteur de fichiers dunes (.mail).
+ *
+ * @author deniger
+ * @version $Id: DunesReader.java,v 1.28 2007-01-19 13:07:22 deniger Exp $
+ */
+public class DunesMAIReader extends FileOpReadCharSimpleAbstract {
+
+ DunesVersionInterface version_;
+
+ /**
+ * Utilise la derniere version de DunesFileFormat.
+ */
+ public DunesMAIReader() {
+ this(DunesMAIFileFormat.getInstance());
+ }
+
+ /**
+ * @param _f le format a utiliser
+ */
+ public DunesMAIReader(final DunesVersionInterface _f) {
+ version_ = _f;
+ }
+
+ protected Object internalRead() {
+ return readDunes();
+ }
+
+ private EfElement[] readElement(final ProgressionUpdater _up) throws IOException {
+ final int nbElem = in_.intField(0);
+ // Les donnees utiles pour l'etat d'avancement
+ _up.setValue(2, nbElem, 50, 50);
+ _up.majProgessionStateOnly();
+ int[] index;
+
+ final EfElement[] elems = new EfElement[nbElem];
+ for (int i = 0; i < nbElem; i++) {
+ in_.readFields();
+ if (in_.getNumberOfFields() < 2) {
+ analyze_.addInfo(H2dResource.getS("Format attendu") + "NUM_ELEMENT NB_POINT P[1] ...P[NB_POINT]", in_
+ .getLineNumber());
+ analyze_.addError(H2dResource.getS("La d\xE9finition de l'\xE9l\xE9ment {0} n'est pas valide"), in_.getLineNumber());
+ return null;
+ }
+ // le numero d'element
+ int temp = in_.intField(0);
+ if (temp != (i + 1)) {
+ analyze_
+ .addInfo(H2dResource.getS("L'index de l'\xE9l\xE9ment ne correspond pas \xE0 l'index r\xE9el"), in_.getLineNumber());
+ }
+ temp = in_.intField(1);
+ if (temp <= 0) {
+ analyze_.addError(H2dResource.getS("Le nombre de points est n\xE9gatif ou nul pour l'\xE9l\xE9ment d'indice {0}",
+ CtuluLibString.getString(i + 1)), in_.getLineNumber());
+ return null;
+ }
+ if (in_.getNumberOfFields() != (temp + 2)) {
+ analyze_.addInfo(H2dResource.getS("Nombre indiqu\xE9") + ": " + temp + CtuluLibString.DOT + H2dResource.getS("Nombre lu") + ": "
+ + (in_.getNumberOfFields() - 2), in_.getLineNumber());
+ analyze_.addFatalError(H2dResource.getS("Le nombre d'\xE9l\xE9ments est incorrect"), in_.getLineNumber());
+ return null;
+ }
+ index = new int[temp];
+ for (int j = 0; j < temp; j++) {
+ // on stocke les indexs en commencant a 0.
+ index[j] = in_.intField(2 + j) - 1;
+ }
+ elems[i] = new EfElement(index);
+ _up.majAvancement();
+ }
+ return elems;
+ }
+
+ private EfNode[] readNodes(final int _nbNoeuds, final ProgressionUpdater _up, final double[] _adaptatifs) throws IOException {
+ final EfNode[] points = new EfNode[_nbNoeuds];
+ _up.setValue(2, _nbNoeuds, 0, 50);
+ _up.majProgessionStateOnly();
+ int temp;
+ // lecture des noeuds
+ for (int i = 0; i < _nbNoeuds; i++) {
+ in_.readFields();
+ if (in_.getNumberOfFields() != 4) {
+ analyze_.addInfo(H2dResource.getS("Format attendu") + ": NUM_POINT X Y Z", in_.getLineNumber());
+ analyze_.addError(H2dResource.getS("La d\xE9finition du noeud {0} n'est pas valide", CtuluLibString
+ .getString(i + 1)), in_.getLineNumber());
+ return null;
+ }
+ temp = in_.intField(0);
+ if (temp != (i + 1)) {
+ analyze_.addInfo(H2dResource.getS("Le num\xE9ro du point ne correspond pas au num\xE9ro r\xE9el"), in_.getLineNumber());
+ }
+ points[i] = new EfNode(in_.doubleField(1), in_.doubleField(2), in_.doubleField(3));
+ if (_adaptatifs != null) {
+ in_.readFields();
+ if (in_.getNumberOfFields() != 1) {
+ analyze_.addWarn(H2dResource.getS("La ligne du coefficient adaptatif ne doit contenir qu'un champ"), in_
+ .getLineNumber());
+ }
+ _adaptatifs[i] = in_.doubleField(0);
+ }
+ _up.majAvancement();
+ }
+ return points;
+
+ }
+
+ private DunesInterface readDunes() {
+ DunesAdapter source = null;
+ EfNode[] points = null;
+ EfElement[] elems = null;
+ double[] adaptatifs = null;
+ in_.setJumpBlankLine(true);
+ try {
+ // lit jusqu'a la premiere ligne non vide.
+ // Lecture de l'identifiant NOEUD
+ in_.readFields();
+ if ((in_.getNumberOfFields() != 1) || (!version_.getNoeudCode().equals(in_.stringField(0)))) {
+ analyze_.addError(H2dResource.getS("L'identifiant {0} est attendu", version_.getNoeudCode()), in_
+ .getLineNumber());
+ return null;
+
+ }
+ in_.readFields();
+ // Lecture du nombre de noeud et format du maillage (apaptatif ou non)
+ // NOMBRE_DE_NOEUD TYPE_DE_MAILLAGE
+
+ // verification que l'on a bien 2 champs
+ if (in_.getNumberOfFields() != 2) {
+ analyze_.addFatalError(H2dResource.getS("Nombre de noeuds non trouv\xE9"), in_.getLineNumber());
+ return null;
+ }
+ // le nombre de noeud
+ final int nbNoeuds = in_.intField(0);
+ // le type de maillage.
+ // Si 2, des infos sur le maillage adaptatif seront presentes
+ final int typeMaillage = in_.intField(1);
+ // Si adaptatif, on initialise le tableau stockant les valeurs.
+ if (typeMaillage == version_.getAdaptatifCode()) {
+ adaptatifs = new double[nbNoeuds];
+ // on affecte a source le tableau.
+ }
+ final ProgressionUpdater up = new ProgressionUpdater(progress_);
+ points = readNodes(nbNoeuds, up, adaptatifs);
+ if (points == null) {
+ return null;
+ }
+ // Lecture du mot cle ELEMENT
+ in_.readFields();
+ if ((in_.getNumberOfFields() != 1) && (!version_.getElementCode().equals(in_.stringField(0)))) {
+ analyze_.addError(H2dResource.getS("L'identifiant {0} est attendu", version_.getElementCode()), in_
+ .getLineNumber());
+ return null;
+ }
+ // Lecture du nombre d'elements.
+ in_.readFields();
+ // Un seul champ attendu
+ if (in_.getNumberOfFields() != 1) {
+ analyze_.addFatalError(H2dResource.getS("Cette ligne est invalide"), in_.getLineNumber());
+ return null;
+ }
+ elems = readElement(up);
+ if (elems == null) {
+ return null;
+ }
+ in_.readFields();
+ if (!"0 0 0 0".equals(in_.getLine().trim())) {
+ if (in_.getLine().trim().length() > 0) {
+ analyze_.addWarn(H2dResource
+ .getS("Cette ligne et les suivantes sont ignor\xE9es"), in_.getLineNumber());
+ }
+ }
+ in_.readFields();
+ if (in_.getLine().trim().length() > 0) {
+ analyze_.addWarn(H2dResource
+ .getS("Cette ligne et les suivantes sont ignor\xE9es"), in_.getLineNumber());
+ }
+ } catch (final EOFException e) {
+ if (CtuluLibMessage.DEBUG) {
+ CtuluLibMessage.debug("Dunes Read end");
+ }
+ } catch (final NumberFormatException fe) {
+ analyze_.manageException(fe, in_.getLineNumber());
+ } catch (final IOException _e) {
+ analyze_.manageException(_e);
+ }
+ // Le mot clef noeud est trouve, on peut creer le maillage.
+ final EfGrid maillage = new EfGrid(points, elems);
+ EfLib.orienteGrid(maillage, progress_, true, analyze_);
+ source = new DunesAdapter();
+ source.setMaillage(maillage);
+ source.setAdaptatif(adaptatifs);
+ return source;
+ }
+
+ /**
+ * @return le format
+ */
+ public FileFormat getFileFormat() {
+ return getDunesFileFormat();
+ }
+
+ /**
+ * @return le format utilise
+ */
+ public DunesMAIFileFormat getDunesFileFormat() {
+ return (DunesMAIFileFormat) version_.getFileFormat();
+ }
+
+ /**
+ * @return la version utilisee
+ */
+ public FileFormatVersionInterface getVersion() {
+ return version_;
+ }
+}
\ No newline at end of file
Copied: branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/dunes/io/DunesMAIWriter.java (from rev 4350, trunk/fudaa_devel/dodico/src/org/fudaa/dodico/dunes/io/DunesMAIWriter.java)
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/dunes/io/DunesMAIWriter.java (rev 0)
+++ branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/dunes/io/DunesMAIWriter.java 2009-01-14 01:13:24 UTC (rev 4351)
@@ -0,0 +1,197 @@
+/*
+ * @creation 2003-02-20
+ * @modification $Date: 2006-10-16 07:55:47 $
+ * @license GNU General Public License 2
+ * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
+ * @mail de...@fu...
+ */
+package org.fudaa.dodico.dunes.io;
+
+import java.io.IOException;
+
+import org.fudaa.ctulu.CtuluIOOperationSynthese;
+import org.fudaa.ctulu.ProgressionUpdater;
+import org.fudaa.ctulu.fileformat.FileFormat;
+import org.fudaa.ctulu.fileformat.FileFormatVersionInterface;
+
+import org.fudaa.dodico.commun.DodicoLib;
+import org.fudaa.dodico.ef.EfElement;
+import org.fudaa.dodico.ef.EfGridInterface;
+import org.fudaa.dodico.fortran.FileOpWriterCharSimpleAbstract;
+import org.fudaa.dodico.h2d.resource.H2dResource;
+
+/**
+ * @author deniger
+ * @version $Id: DunesWriter.java,v 1.27 2006-10-16 07:55:47 deniger Exp $
+ */
+public class DunesMAIWriter extends FileOpWriterCharSimpleAbstract {
+
+ DunesVersionInterface version_;
+
+ /**
+ * Construit avec une version par defaut.
+ */
+ public DunesMAIWriter() {
+ this(DunesMAIFileFormat.getInstance());
+ }
+
+ /**
+ * @param _f la version a utiliser
+ */
+ public DunesMAIWriter(final DunesVersionInterface _f) {
+ version_ = _f;
+ }
+
+ /**
+ * @return le format utilise
+ */
+ public FileFormat getFileFormat() {
+ return version_.getFileFormat();
+ }
+
+ /**
+ * Ecrire les donnees de l'interface <code>DunesInterface</code> sur la sortie <code>Writer</code>. L'ecriture
+ * n'est effectu\xE9e que si les points et elements du maillage sont non nuls. La m\xE9thode se termine par un flush mais ne
+ * ferme pas le flux.
+ */
+ protected void writeDunes(final DunesInterface _d) {
+ final DunesInterface dunes = _d;
+ // Test sur les objets a ecrire
+ if (dunes == null) {
+ analyze_.addFatalError(H2dResource.getS("Les donn\xE9es sont nulles"));
+ return;
+ }
+ if (out_ == null) {
+ analyze_.addFatalError(DodicoLib.getS("Le flux de sortie est nul"));
+ return;
+ }
+ final EfGridInterface maillage = dunes.getGrid();
+ if (maillage == null) {
+ analyze_.addFatalError("Le maillage est nul");
+ return;
+ }
+ final int nPts = maillage.getPtsNb();
+ if (nPts == 0) {
+ analyze_.addFatalError(H2dResource.getS("Le maillage ne contient pas de points"));
+ return;
+ }
+ // H2dElement[] elems= maillage.getElts();
+ // if (elems == null)
+ // {
+ // analyze_.addFatalError("Le maillage ne contient pas d'\xE9l\xE9ments !");
+ // return;
+ // }
+ final int nElems = maillage.getEltNb();
+ if (nElems == 0) {
+ analyze_.addFatalError(H2dResource.getS("Le maillage ne contient pas d'\xE9l\xE9ments"));
+ return;
+ }
+ try {
+ StringBuffer b = new StringBuffer(600);
+ b.append(version_.getNoeudCode());
+ b.append(' ');
+ b.append(lineSep_);
+ b.append(nPts);
+ boolean printAdaptatifV = false;
+ final double[] adValeur = dunes.getAdaptatifValeur();
+ b.append(' ');
+ if (adValeur == null) {
+ b.append(version_.getNonAdaptatifCode());
+ } else {
+ b.append(version_.getAdaptatifCode());
+ printAdaptatifV = true;
+ }
+ writelnToOut(b.toString());
+ // Gestion de l'etat d'avancement
+ // le pas pour afficher l'etat d'avancement
+ final int pourc = 0;
+ final boolean afficheAvance = (progress_ == null ? false : true);
+ if (afficheAvance) {
+ progress_.setProgression(pourc);
+ progress_.setDesc(H2dResource.getS("Ecriture fichier") + " dunes");
+ }
+ final ProgressionUpdater up = new ProgressionUpdater(progress_);
+ up.setValue(2, nPts);
+
+ for (int i = 0; i < nPts; i++) {
+ b = new StringBuffer();
+ b.append((i + 1));
+ b.append(' ');
+ b.append(maillage.getPtX(i));
+ b.append(' ');
+ b.append(maillage.getPtY(i));
+ b.append(' ');
+ b.append(maillage.getPtZ(i));
+ b.append(lineSep_);
+ if (printAdaptatifV&&adValeur!=null) {
+ b.append(adValeur[i]);
+ b.append(lineSep_);
+ }
+ writeToOut(b.toString());
+ up.majAvancement();
+ }
+ b = new StringBuffer();
+ // Cette ligne blanche est-elle utile ?
+ b.append(lineSep_);
+ // L'identifiant element
+ b.append(version_.getElementCode());
+ b.append(lineSep_);
+ // le nb d'\xE9l\xE9ments
+ b.append(nElems);
+ writelnToOut(b.toString());
+ // pour afficher l'etat d'avancement
+ up.setValue(2, nElems, 50, 50);
+ up.majAvancement();
+ // les points par elements
+ EfElement ppel;
+ // le nombre de points par elements.
+ int nppel;
+ for (int i = 0; i < nElems; i++) {
+ b = new StringBuffer();
+ ppel = maillage.getElement(i);
+ nppel = ppel.getPtNb();
+ // le num d'elements
+ b.append((i + 1));
+ b.append(' ');
+ // le nombre de point pour l'\xE9l\xE9ment i
+ b.append(nppel);
+ // les indices des points pour l'element i
+ for (int j = 0; j < nppel; j++) {
+ b.append(' ');
+ // Les indices sont stock\xE9s a partir de 0.
+ b.append(ppel.getPtIndex(j) + 1);
+ }
+ writelnToOut(b.toString());
+ // mis a jour de l'etat d'avancement au cas ou.
+ up.majAvancement();
+ }
+ out_.flush();
+ } catch (final IOException _ex) {
+ analyze_.manageException(_ex);
+ }
+ }
+
+ protected void internalWrite(final Object _o) {
+ if (_o instanceof DunesInterface) {
+ writeDunes((DunesInterface) _o);
+ } else {
+ analyze_.addFatalError(DodicoLib.getS("Donn\xE9es invalides"));
+ }
+ }
+
+ /**
+ * @param _o la source a ecrire
+ * @return la synthese de l'operation
+ */
+ public final CtuluIOOperationSynthese write(final DunesInterface _o) {
+ writeDunes(_o);
+ return closeOperation(_o);
+ }
+
+ /**
+ * @return la version utilisee
+ */
+ public FileFormatVersionInterface getVersion() {
+ return version_;
+ }
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2009-01-13 20:42:51
|
Revision: 4350
http://fudaa.svn.sourceforge.net/fudaa/?rev=4350&view=rev
Author: deniger
Date: 2009-01-13 20:42:41 +0000 (Tue, 13 Jan 2009)
Log Message:
-----------
correction oubli de commit
@override est mal utilise
Modified Paths:
--------------
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/commun/EbliEditorArrow.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/courbe/EGCourbeModelDefault.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/courbe/EGModel.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetArrowEditor.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/commun/courbe/FudaaCourbeDefautModel.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/commun/courbe/FudaaCourbeTimeModel.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/meshviewer/profile/MVProfileCourbeModel.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/meshviewer/profile/MvProfileCoordinatesModel.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/telemac/TrTelemacBoundaryCourbeModel.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/telemac/TrTelemacWeirCourbeModel.java
Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/commun/EbliEditorArrow.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/commun/EbliEditorArrow.java 2009-01-13 19:16:54 UTC (rev 4349)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/commun/EbliEditorArrow.java 2009-01-13 20:42:41 UTC (rev 4350)
@@ -264,13 +264,10 @@
return i;
}
- @Override
public Dimension getDefaultImageDimension() {
- // TODO Auto-generated method stub
return getSize();
}
- @Override
public BufferedImage produceImage(Map _params) {
final BufferedImage i = CtuluLibImage.createImage(getWidth(), getHeight(), _params);
final Graphics2D g2d = i.createGraphics();
@@ -379,15 +376,11 @@
repaint();
}
- @Override
public void mouseEntered(MouseEvent e) {
- // TODO Auto-generated method stub
}
- @Override
public void mouseExited(MouseEvent e) {
- // TODO Auto-generated method stub
}
/**
@@ -400,7 +393,6 @@
* marqueur qui s'active dans le cas du drag and drop et qui marque le point initial ainsi que le point destination jusqu'au lacher.
*/
boolean marqueurDeplacement_=false;
- @Override
public void mousePressed(MouseEvent e) {
// TODO Auto-generated method stub
if(!ajout()){
@@ -415,7 +407,6 @@
}
- @Override
public void mouseReleased(MouseEvent e) {
// TODO Auto-generated method stub
if(!ajout() && positionPointToMove_!=-1){
@@ -428,8 +419,7 @@
}
}
- Point positionDeplacement_=null;
- @Override
+ Point positionDeplacement_;
public void mouseDragged(MouseEvent e) {
//System.out.println("Souris dragged: "+positionPointToMove_);
if(marqueurDeplacement_){
@@ -438,9 +428,7 @@
}
}
- @Override
public void mouseMoved(MouseEvent e) {
- // TODO Auto-generated method stub
System.out.println("Souris MOVED: "+positionPointToMove_);
}
Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/courbe/EGCourbeModelDefault.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/courbe/EGCourbeModelDefault.java 2009-01-13 19:16:54 UTC (rev 4349)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/courbe/EGCourbeModelDefault.java 2009-01-13 20:42:41 UTC (rev 4350)
@@ -7,6 +7,8 @@
*/
package org.fudaa.ebli.courbe;
+import java.util.Map;
+
import org.fudaa.ctulu.CtuluCommandContainer;
import org.fudaa.ctulu.CtuluLibArray;
import org.fudaa.ctulu.CtuluListSelectionInterface;
@@ -219,6 +221,12 @@
return duplic;
}
+ public Object getPersistSpecificDatas() {
+ return null;
+ }
+
+ public void setPersistSpecificDatas(Object _data, Map _infos) {}
+
//@Override
//public String getUnite() {
// // TODO Auto-generated method stub
Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/courbe/EGModel.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/courbe/EGModel.java 2009-01-13 19:16:54 UTC (rev 4349)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/courbe/EGModel.java 2009-01-13 20:42:41 UTC (rev 4350)
@@ -7,6 +7,8 @@
*/
package org.fudaa.ebli.courbe;
+import java.util.Map;
+
import org.fudaa.ctulu.CtuluCommandContainer;
import org.fudaa.ctulu.CtuluListSelectionInterface;
import org.fudaa.ctulu.collection.CourbeInterface;
@@ -188,7 +190,14 @@
* @return
*/
EGModel duplicate();
+
+ /**
+ * @return
+ */
+ Object getPersistSpecificDatas();
+ void setPersistSpecificDatas(Object data, Map infos);
+
//String getUnite();
}
Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetArrowEditor.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetArrowEditor.java 2009-01-13 19:16:54 UTC (rev 4349)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetArrowEditor.java 2009-01-13 20:42:41 UTC (rev 4350)
@@ -17,109 +17,94 @@
import com.memoire.fu.FuLog;
-
-
/**
* Classe editeur de Fleche
+ *
* @author Adrien Hadoux
- *
*/
-public class EbliWidgetArrowEditor extends EbliWidget implements InplaceEditorProvider<EbliEditorArrow>{
+public class EbliWidgetArrowEditor extends EbliWidget implements InplaceEditorProvider<EbliEditorArrow> {
- public EbliEditorArrow editor_;
- BufferedImage imageFleche;
-
-
- public EbliWidgetArrowEditor(EbliScene scene,EbliEditorArrow editor) {
- super(scene, false);
- // TODO Auto-generated constructor stub
- editor_=editor;
- editor_.model_=getTraceLigneModel();
- editor_.foreground_=getColorContour();
- // -- creation de l action pour editor --//
- //final WidgetAction editorAction = ActionFactory.createInplaceEditorAction(this);
+ public EbliEditorArrow editor_;
+ BufferedImage imageFleche;
- // -- ajout de l action au widget correspondant --//
- // this.getActions().addAction(editorAction);
+ public EbliWidgetArrowEditor(EbliScene scene, EbliEditorArrow editor) {
+ super(scene, false);
+ // TODO Auto-generated constructor stub
+ editor_ = editor;
+ editor_.model_ = getTraceLigneModel();
+ editor_.foreground_ = getColorContour();
+ // -- creation de l action pour editor --//
+ // final WidgetAction editorAction = ActionFactory.createInplaceEditorAction(this);
- final EbliWidgetControllerFlecheEditor controller = new EbliWidgetControllerFlecheEditor(this);
- controller.setEditable(true);
- setController(controller);
-
- }
+ // -- ajout de l action au widget correspondant --//
+ // this.getActions().addAction(editorAction);
+ final EbliWidgetControllerFlecheEditor controller = new EbliWidgetControllerFlecheEditor(this);
+ controller.setEditable(true);
+ setController(controller);
- protected void paintWidget() {
- final Rectangle rec = getClientArea();
- final Graphics2D g = getGraphics();
- // g.translate(rec.x, rec.y);
- if (rec.width > 0 && rec.height > 0) {
+ }
+ protected void paintWidget() {
+ final Rectangle rec = getClientArea();
+ final Graphics2D g = getGraphics();
+ // g.translate(rec.x, rec.y);
+ if (rec.width > 0 && rec.height > 0) {
- // mode edition
- //if (imageFleche == null || imageFleche.getWidth() != (rec.width-1) || imageFleche.getHeight() != (rec.height-1)) {
- FuLog.debug("EWI: recreate image");
- final Map params = new HashMap();
- CtuluLibImage.setCompatibleImageAsked(params);
- editor_.model_=getTraceLigneModel();
- editor_.foreground_=getColorContour();
- imageFleche = editor_.produceImage(rec.width - 1, rec.height - 1, params);
+ // mode edition
+ // if (imageFleche == null || imageFleche.getWidth() != (rec.width-1) || imageFleche.getHeight() !=
+ // (rec.height-1)) {
+ FuLog.debug("EWI: recreate image");
+ final Map params = new HashMap();
+ CtuluLibImage.setCompatibleImageAsked(params);
+ editor_.model_ = getTraceLigneModel();
+ editor_.foreground_ = getColorContour();
+ imageFleche = editor_.produceImage(rec.width - 1, rec.height - 1, params);
- //}
- g.drawImage(imageFleche, rec.x, rec.y, rec.width - 1, rec.height - 1, null);
- }
- }
-
-
- @Override
- public EbliEditorArrow createEditorComponent(
- org.netbeans.api.visual.action.InplaceEditorProvider.EditorController controller,
- Widget widget) {
- //-- on met a jour le traceligne model --//
- editor_.model_=getTraceLigneModel();
- editor_.foreground_=getColorContour();
- final Rectangle rec = getClientArea();
- editor_.setSize(new Dimension(rec.width,rec.height));
- editor_.setPreferredSize(new Dimension(rec.width,rec.height));
-
- return editor_;
- }
+ // }
+ g.drawImage(imageFleche, rec.x, rec.y, rec.width - 1, rec.height - 1, null);
+ }
+ }
- @Override
- public EnumSet<org.netbeans.api.visual.action.InplaceEditorProvider.ExpansionDirection> getExpansionDirections(
- org.netbeans.api.visual.action.InplaceEditorProvider.EditorController controller,
- Widget widget, EbliEditorArrow editor) {
- // TODO Auto-generated method stub
- return null;
- }
+ public EbliEditorArrow createEditorComponent(
+ org.netbeans.api.visual.action.InplaceEditorProvider.EditorController controller, Widget widget) {
+ // -- on met a jour le traceligne model --//
+ editor_.model_ = getTraceLigneModel();
+ editor_.foreground_ = getColorContour();
+ final Rectangle rec = getClientArea();
+ editor_.setSize(new Dimension(rec.width, rec.height));
+ editor_.setPreferredSize(new Dimension(rec.width, rec.height));
- @Override
- public Rectangle getInitialEditorComponentBounds(
- org.netbeans.api.visual.action.InplaceEditorProvider.EditorController controller,
- Widget widget, EbliEditorArrow editor, Rectangle viewBounds) {
- // TODO Auto-generated method stub
- final Rectangle rec = convertLocalToScene(getClientArea());
- rec.width -= 1;
- rec.height -= 1;
- return rec;
- }
+ return editor_;
+ }
- @Override
- public void notifyClosing(
- org.netbeans.api.visual.action.InplaceEditorProvider.EditorController controller,
- Widget widget, EbliEditorArrow editor, boolean commit) {
- // TODO Auto-generated method stub
- imageFleche =null;
- repaint();
- editingStop();
- }
+ public EnumSet<org.netbeans.api.visual.action.InplaceEditorProvider.ExpansionDirection> getExpansionDirections(
+ org.netbeans.api.visual.action.InplaceEditorProvider.EditorController controller, Widget widget,
+ EbliEditorArrow editor) {
+ // TODO Auto-generated method stub
+ return null;
+ }
- @Override
- public void notifyOpened(
- org.netbeans.api.visual.action.InplaceEditorProvider.EditorController controller,
- Widget widget, EbliEditorArrow editor) {
- // TODO Auto-generated method stub
- editingStart();
- }
+ public Rectangle getInitialEditorComponentBounds(
+ org.netbeans.api.visual.action.InplaceEditorProvider.EditorController controller, Widget widget,
+ EbliEditorArrow editor, Rectangle viewBounds) {
+ // TODO Auto-generated method stub
+ final Rectangle rec = convertLocalToScene(getClientArea());
+ rec.width -= 1;
+ rec.height -= 1;
+ return rec;
+ }
+ public void notifyClosing(org.netbeans.api.visual.action.InplaceEditorProvider.EditorController controller,
+ Widget widget, EbliEditorArrow editor, boolean commit) {
+ imageFleche = null;
+ repaint();
+ editingStop();
+ }
+
+ public void notifyOpened(org.netbeans.api.visual.action.InplaceEditorProvider.EditorController controller,
+ Widget widget, EbliEditorArrow editor) {
+ editingStart();
+ }
+
}
Modified: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/commun/courbe/FudaaCourbeDefautModel.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/commun/courbe/FudaaCourbeDefautModel.java 2009-01-13 19:16:54 UTC (rev 4349)
+++ branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/commun/courbe/FudaaCourbeDefautModel.java 2009-01-13 20:42:41 UTC (rev 4350)
@@ -46,7 +46,8 @@
return false;
}
- public static void defaultFill(EvolutionReguliereInterface _e, InfoData _table, CtuluListSelectionInterface _selectedPt) {
+ public static void defaultFill(EvolutionReguliereInterface _e, InfoData _table,
+ CtuluListSelectionInterface _selectedPt) {
if (_e.isUsed()) {
_table.put(FudaaLib.getS("Courbe utilis\xE9e"), CtuluLibString.getString(_e.getUsed()) + CtuluLibString.ESPACE
+ CtuluLib.getS("fois"));
@@ -162,15 +163,11 @@
return new FudaaCourbeDefautModel(this.e_.getCopy(this.e_.getListener()));
}
-@Override
-public Object getPersistSpecificDatas() {
- // TODO Auto-generated method stub
- return null;
-}
+ public Object getPersistSpecificDatas() {
+ return null;
+ }
-@Override
-public void setPersistSpecificDatas(Object data, Map infos) {
- // TODO Auto-generated method stub
-
-}
+ public void setPersistSpecificDatas(Object data, Map infos) {
+
+ }
}
\ No newline at end of file
Modified: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/commun/courbe/FudaaCourbeTimeModel.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/commun/courbe/FudaaCourbeTimeModel.java 2009-01-13 19:16:54 UTC (rev 4349)
+++ branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/commun/courbe/FudaaCourbeTimeModel.java 2009-01-13 20:42:41 UTC (rev 4350)
@@ -42,10 +42,10 @@
/**
* ACHTUNG!!!; constructeur utilis\xE9 uniquement pour la persistance des donnees!!!
*/
- public FudaaCourbeTimeModel(){
-
+ public FudaaCourbeTimeModel() {
+
}
-
+
public void fillWithInfo(InfoData _table, CtuluListSelectionInterface _selectedPt) {}
protected void clearCache() {
@@ -92,9 +92,7 @@
}
public int getNbValues() {
- if (y_ == null) {
- return 0;
- }
+ if (y_ == null) { return 0; }
return time_.length;
}
@@ -207,29 +205,19 @@
public EGModel duplicate() {
FudaaCourbeTimeModel duplic = new FudaaCourbeTimeModel(this.time_);
- if (this.yRange_ != null)
- duplic.yRange_ = new CtuluRange(this.yRange_);
- if(this.nom_!=null)
- duplic.nom_ = nom_;
- if (this.y_ != null)
- duplic.y_ = CtuluLibArray.copy(y_);
-
-
+ if (this.yRange_ != null) duplic.yRange_ = new CtuluRange(this.yRange_);
+ if (this.nom_ != null) duplic.nom_ = nom_;
+ if (this.y_ != null) duplic.y_ = CtuluLibArray.copy(y_);
+
return duplic;
}
-@Override
-public Object getPersistSpecificDatas() {
- // TODO Auto-generated method stub
- return null;
-}
+ public Object getPersistSpecificDatas() {
+ return null;
+ }
-@Override
-public void setPersistSpecificDatas(Object data, Map infos) {
- // TODO Auto-generated method stub
-
-}
+ public void setPersistSpecificDatas(Object data, Map infos) {
+ }
-
}
\ No newline at end of file
Modified: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/meshviewer/profile/MVProfileCourbeModel.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/meshviewer/profile/MVProfileCourbeModel.java 2009-01-13 19:16:54 UTC (rev 4349)
+++ branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/meshviewer/profile/MVProfileCourbeModel.java 2009-01-13 20:42:41 UTC (rev 4350)
@@ -62,8 +62,7 @@
title_ = _variable.toString();
time_ = _timeStep;
builder_ = _builder;
- if(builder_!=null)
- res_ = builder_.createResults(_timeStep, _prog);
+ if (builder_ != null) res_ = builder_.createResults(_timeStep, _prog);
y_ = new TDoubleArrayList(res_.getNbIntersect());
computeY(_prog);
}
@@ -242,16 +241,12 @@
}
}
-@Override
-public Object getPersistSpecificDatas() {
- // TODO Auto-generated method stub
- return null;
-}
+ public Object getPersistSpecificDatas() {
+ return null;
+ }
-@Override
-public void setPersistSpecificDatas(Object data, Map infos) {
- // TODO Auto-generated method stub
-
-}
+ public void setPersistSpecificDatas(Object data, Map infos) {
+ }
+
}
Modified: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/meshviewer/profile/MvProfileCoordinatesModel.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/meshviewer/profile/MvProfileCoordinatesModel.java 2009-01-13 19:16:54 UTC (rev 4349)
+++ branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/meshviewer/profile/MvProfileCoordinatesModel.java 2009-01-13 20:42:41 UTC (rev 4350)
@@ -190,16 +190,12 @@
return duplic;
}
-@Override
-public Object getPersistSpecificDatas() {
- // TODO Auto-generated method stub
- return null;
-}
+ public Object getPersistSpecificDatas() {
+ return null;
+ }
-@Override
-public void setPersistSpecificDatas(Object data, Map infos) {
- // TODO Auto-generated method stub
-
-}
+ public void setPersistSpecificDatas(Object data, Map infos) {
+ }
+
}
Modified: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/telemac/TrTelemacBoundaryCourbeModel.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/telemac/TrTelemacBoundaryCourbeModel.java 2009-01-13 19:16:54 UTC (rev 4349)
+++ branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/telemac/TrTelemacBoundaryCourbeModel.java 2009-01-13 20:42:41 UTC (rev 4350)
@@ -246,16 +246,12 @@
}
-@Override
-public Object getPersistSpecificDatas() {
- // TODO Auto-generated method stub
- return null;
-}
+ public Object getPersistSpecificDatas() {
+ return null;
+ }
-@Override
-public void setPersistSpecificDatas(Object data, Map infos) {
- // TODO Auto-generated method stub
-
-}
+ public void setPersistSpecificDatas(Object data, Map infos) {
+ }
+
}
\ No newline at end of file
Modified: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/telemac/TrTelemacWeirCourbeModel.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/telemac/TrTelemacWeirCourbeModel.java 2009-01-13 19:16:54 UTC (rev 4349)
+++ branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/telemac/TrTelemacWeirCourbeModel.java 2009-01-13 20:42:41 UTC (rev 4350)
@@ -168,15 +168,11 @@
return new TrTelemacWeirCourbeModel(this.i_, this.mng_, this.cote_, CtuluLibArray.copy(this.x_));
}
-@Override
-public Object getPersistSpecificDatas() {
- // TODO Auto-generated method stub
- return null;
-}
+ public Object getPersistSpecificDatas() {
+ return null;
+ }
-@Override
-public void setPersistSpecificDatas(Object data, Map infos) {
- // TODO Auto-generated method stub
-
-}
+ public void setPersistSpecificDatas(Object data, Map infos) {
+
+ }
}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <had...@us...> - 2009-01-13 19:17:03
|
Revision: 4349
http://fudaa.svn.sourceforge.net/fudaa/?rev=4349&view=rev
Author: hadouxad
Date: 2009-01-13 19:16:54 +0000 (Tue, 13 Jan 2009)
Log Message:
-----------
fleches + persistance des donnees des courbes
Modified Paths:
--------------
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/commun/courbe/FudaaCourbeDefautModel.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/commun/courbe/FudaaCourbeTimeModel.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/meshviewer/profile/MVProfileCourbeModel.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/meshviewer/profile/MvProfileCoordinatesModel.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostCourbeModel.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostCourbeTreeModel.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostLayoutFille.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostLayoutPanelController.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostProjet.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/telemac/TrTelemacBoundaryCourbeModel.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/telemac/TrTelemacWeirCourbeModel.java
Modified: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/commun/courbe/FudaaCourbeDefautModel.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/commun/courbe/FudaaCourbeDefautModel.java 2009-01-13 19:15:33 UTC (rev 4348)
+++ branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/commun/courbe/FudaaCourbeDefautModel.java 2009-01-13 19:16:54 UTC (rev 4349)
@@ -7,6 +7,8 @@
*/
package org.fudaa.fudaa.commun.courbe;
+import java.util.Map;
+
import org.fudaa.ctulu.CtuluCommandContainer;
import org.fudaa.ctulu.CtuluLib;
import org.fudaa.ctulu.CtuluLibString;
@@ -159,4 +161,16 @@
public EGModel duplicate() {
return new FudaaCourbeDefautModel(this.e_.getCopy(this.e_.getListener()));
}
+
+@Override
+public Object getPersistSpecificDatas() {
+ // TODO Auto-generated method stub
+ return null;
+}
+
+@Override
+public void setPersistSpecificDatas(Object data, Map infos) {
+ // TODO Auto-generated method stub
+
+}
}
\ No newline at end of file
Modified: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/commun/courbe/FudaaCourbeTimeModel.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/commun/courbe/FudaaCourbeTimeModel.java 2009-01-13 19:15:33 UTC (rev 4348)
+++ branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/commun/courbe/FudaaCourbeTimeModel.java 2009-01-13 19:16:54 UTC (rev 4349)
@@ -7,6 +7,8 @@
*/
package org.fudaa.fudaa.commun.courbe;
+import java.util.Map;
+
import org.fudaa.ctulu.CtuluCommandContainer;
import org.fudaa.ctulu.CtuluLibArray;
import org.fudaa.ctulu.CtuluListSelectionInterface;
@@ -37,6 +39,13 @@
time_ = _timeIdx;
}
+ /**
+ * ACHTUNG!!!; constructeur utilis\xE9 uniquement pour la persistance des donnees!!!
+ */
+ public FudaaCourbeTimeModel(){
+
+ }
+
public void fillWithInfo(InfoData _table, CtuluListSelectionInterface _selectedPt) {}
protected void clearCache() {
@@ -209,4 +218,18 @@
return duplic;
}
+@Override
+public Object getPersistSpecificDatas() {
+ // TODO Auto-generated method stub
+ return null;
+}
+
+@Override
+public void setPersistSpecificDatas(Object data, Map infos) {
+ // TODO Auto-generated method stub
+
+}
+
+
+
}
\ No newline at end of file
Modified: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/meshviewer/profile/MVProfileCourbeModel.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/meshviewer/profile/MVProfileCourbeModel.java 2009-01-13 19:15:33 UTC (rev 4348)
+++ branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/meshviewer/profile/MVProfileCourbeModel.java 2009-01-13 19:16:54 UTC (rev 4349)
@@ -7,6 +7,8 @@
*/
package org.fudaa.fudaa.meshviewer.profile;
+import java.util.Map;
+
import gnu.trove.TDoubleArrayList;
import org.fudaa.ctulu.CtuluCommandContainer;
@@ -240,4 +242,16 @@
}
}
+@Override
+public Object getPersistSpecificDatas() {
+ // TODO Auto-generated method stub
+ return null;
}
+
+@Override
+public void setPersistSpecificDatas(Object data, Map infos) {
+ // TODO Auto-generated method stub
+
+}
+
+}
Modified: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/meshviewer/profile/MvProfileCoordinatesModel.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/meshviewer/profile/MvProfileCoordinatesModel.java 2009-01-13 19:15:33 UTC (rev 4348)
+++ branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/meshviewer/profile/MvProfileCoordinatesModel.java 2009-01-13 19:16:54 UTC (rev 4349)
@@ -7,6 +7,8 @@
*/
package org.fudaa.fudaa.meshviewer.profile;
+import java.util.Map;
+
import org.fudaa.ctulu.CtuluCommandContainer;
import org.fudaa.ctulu.CtuluListSelectionInterface;
import org.fudaa.ctulu.ProgressionInterface;
@@ -188,4 +190,16 @@
return duplic;
}
+@Override
+public Object getPersistSpecificDatas() {
+ // TODO Auto-generated method stub
+ return null;
}
+
+@Override
+public void setPersistSpecificDatas(Object data, Map infos) {
+ // TODO Auto-generated method stub
+
+}
+
+}
Modified: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostCourbeModel.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostCourbeModel.java 2009-01-13 19:15:33 UTC (rev 4348)
+++ branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostCourbeModel.java 2009-01-13 19:16:54 UTC (rev 4349)
@@ -8,6 +8,8 @@
package org.fudaa.fudaa.tr.post;
import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Map;
import java.util.Set;
import org.fudaa.ctulu.CtuluCommandContainer;
@@ -28,221 +30,321 @@
*/
public abstract class TrPostCourbeModel extends FudaaCourbeTimeModel {
- /**
- * @return the source
- */
- public TrPostSource getSource() {
- return source_;
- }
+ /**
+ * @return the source
+ */
+ public TrPostSource getSource() {
+ return source_;
+ }
- /**
- * source utilisee par la courbe
- */
- public TrPostSource source_;
+ /**
+ * source utilisee par la courbe
+ */
+ public TrPostSource source_;
- public final static class Interpolated extends TrPostCourbeModel {
+ public final static class Interpolated extends TrPostCourbeModel {
- final TrPostInterpolatePoint ptIdx_;
+ TrPostInterpolatePoint ptIdx_;
- /**
- * @param _ptIdx
- * @param _varIdx
- * @param _timeIdx
- */
- public Interpolated(final TrPostSource _src, final TrPostInterpolatePoint _ptIdx, final H2dVariableType _varIdx) {
- super(_src, _varIdx, _src.getTime().getTimeListModel().getTimesInSec());
- ptIdx_ = _ptIdx;
- }
+
+ /**
+ * ACHTUNG: constructeur utilis\xE9 uniquement pour la persistance des donn\xE9es!!!
+ */
+ public Interpolated(){
+ super();
+ }
+
+
+ /**
+ * @param _ptIdx
+ * @param _varIdx
+ * @param _timeIdx
+ */
+ public Interpolated(final TrPostSource _src, final TrPostInterpolatePoint _ptIdx, final H2dVariableType _varIdx) {
+ super(_src, _varIdx, _src.getTime().getTimeListModel().getTimesInSec());
+ ptIdx_ = _ptIdx;
+ }
- @Override
- public double getPtX() {
- return ptIdx_.getX();
- }
+ @Override
+ public double getPtX() {
+ return ptIdx_.getX();
+ }
- @Override
- public double getPtY() {
- return ptIdx_.getY();
- }
+ @Override
+ public double getPtY() {
+ return ptIdx_.getY();
+ }
- @Override
- protected void updateY() {
- createY();
- for (int i = 0; i < y_.length; i++) {
- final EfData data = source_.getData(var_, i);
- if (data == null) {
- FuLog.warning("TRP: data is null for " + var_);
- super.y_[i] = ptIdx_.getInterpolateValue(getVar(), data, i, source_);
- }
- }
- }
+ @Override
+ protected void updateY() {
+ createY();
+ for (int i = 0; i < y_.length; i++) {
+ final EfData data = source_.getData(var_, i);
+ if (data == null) {
+ FuLog.warning("TRP: data is null for " + var_);
+ super.y_[i] = ptIdx_.getInterpolateValue(getVar(), data, i, source_);
+ }
+ }
+ }
- public TrPostInterpolatePoint getInterpolatePt() {
- return ptIdx_;
- }
+ public TrPostInterpolatePoint getInterpolatePt() {
+ return ptIdx_;
+ }
- @Override
- public boolean isCourbeForInterpolation(final TrPostInterpolatePoint _int) {
- return ptIdx_.equals(_int);
- }
+ @Override
+ public boolean isCourbeForInterpolation(final TrPostInterpolatePoint _int) {
+ return ptIdx_.equals(_int);
+ }
- @Override
- public boolean isCourbeForObject(final int _idxObj) {
- return false;
- }
+ @Override
+ public boolean isCourbeForObject(final int _idxObj) {
+ return false;
+ }
- }
+ @Override
+ public Object getSelectionPoint() {
+ // TODO Auto-generated method stub
+ return ptIdx_;
+ }
- public final static class Node extends TrPostCourbeModel {
+ @Override
+ public void setSelectionPoint(Object point) {
+ // TODO Auto-generated method stub
+ if(point!=null && (point instanceof TrPostInterpolatePoint))
+ ptIdx_=(TrPostInterpolatePoint) point;
+ }
- final int ptIdx_;
+ }
- /**
- * @param _ptIdx
- * @param _varIdx
- * @param _timeIdx
- */
- public Node(final TrPostSource _src, final int _ptIdx, final H2dVariableType _varIdx, final double[] _timeIdx) {
- super(_src, _varIdx, _timeIdx);
- ptIdx_ = _ptIdx;
- }
+ public final static class Node extends TrPostCourbeModel {
- @Override
- protected void updateY() {
- createY();
- for (int i = 0; i < y_.length; i++) {
- // final EfData data = source_.getData(var_, i);
- // if (data == null) {
- // FuLog.warning("TRP: data is null for " + var_);
- try {
- super.y_[i] = source_.getData(var_, i, ptIdx_);
- } catch (final IOException e) {
- FuLog.error(e);
- }
- // }
- }
- // final EfData data = source_.getData(_var, _timeIdx);
- // if (data == null) {
- // FuLog.warning("TRP: data is null for " + _var);
- // }
- // super.y_[_timeIdx] = data.getValue(ptIdx_);
+ int ptIdx_;
- }
+ /**
+ * @param _ptIdx
+ * @param _varIdx
+ * @param _timeIdx
+ */
+ public Node(final TrPostSource _src, final int _ptIdx, final H2dVariableType _varIdx, final double[] _timeIdx) {
+ super(_src, _varIdx, _timeIdx);
+ ptIdx_ = _ptIdx;
+ }
- @Override
- public double getPtX() {
- // FIXME RUBAR
- return source_.isElementVar(getVar()) ? source_.getGrid().getCentreXElement(ptIdx_) : source_.getGrid().getPtX(
- ptIdx_);
- }
+
+ /**
+ * ACHTUNG: constructeur utilis\xE9 uniquement pour la persistance des donn\xE9es!!!
+ */
+ public Node(){
+ super();
+ }
+
+ @Override
+ protected void updateY() {
+ createY();
+ for (int i = 0; i < y_.length; i++) {
+ // final EfData data = source_.getData(var_, i);
+ // if (data == null) {
+ // FuLog.warning("TRP: data is null for " + var_);
+ try {
+ super.y_[i] = source_.getData(var_, i, ptIdx_);
+ } catch (final IOException e) {
+ FuLog.error(e);
+ }
+ // }
+ }
+ // final EfData data = source_.getData(_var, _timeIdx);
+ // if (data == null) {
+ // FuLog.warning("TRP: data is null for " + _var);
+ // }
+ // super.y_[_timeIdx] = data.getValue(ptIdx_);
- @Override
- public double getPtY() {
- return source_.isElementVar(getVar()) ? source_.getGrid().getCentreYElement(ptIdx_) : source_.getGrid().getPtY(
- ptIdx_);
- }
+ }
- public int getPtIdx() {
- return ptIdx_;
- }
+ @Override
+ public double getPtX() {
+ // FIXME RUBAR
+ return source_.isElementVar(getVar()) ? source_.getGrid().getCentreXElement(ptIdx_) : source_.getGrid().getPtX(
+ ptIdx_);
+ }
- @Override
- public boolean isCourbeForInterpolation(final TrPostInterpolatePoint _int) {
- return false;
- }
+ @Override
+ public double getPtY() {
+ return source_.isElementVar(getVar()) ? source_.getGrid().getCentreYElement(ptIdx_) : source_.getGrid().getPtY(
+ ptIdx_);
+ }
- @Override
- public boolean isCourbeForObject(final int _idxObj) {
- return _idxObj == ptIdx_;
- }
+ public int getPtIdx() {
+ return ptIdx_;
+ }
- }
+ @Override
+ public boolean isCourbeForInterpolation(final TrPostInterpolatePoint _int) {
+ return false;
+ }
- public static EGCourbeChild buildCourbeModel(final H2dVariableType _var, final int _idxPt, final EGGroup _group,
- final TrPostSource _src) {
- final TrPostCourbeModel model = new TrPostCourbeModel.Node(_src, _idxPt, _var, _src.getTime().getTimeListModel()
- .getTimesInSec());
- final EGCourbeChild courbe = new FudaaCourbeTime(_group, model, _src.getNewTimeListModel());
- _group.addEGComponent(courbe);
- String title=courbe.getModel().getTitle()+ CtuluLibString.ESPACE ;
- if(_var.getCommonUnitString()!=null)
- title+="("+_var.getCommonUnitString()+")"+CtuluLibString.ESPACE;
- Coordinate coor=_src.getGrid().getCoor(_idxPt);
- title+= _idxPt + ":" + " (" + _src.getPrecisionModel().round(coor.x) + ", "
- + _src.getPrecisionModel().round(coor.y) + ")";
- courbe.getModel().setTitle(title);
- return courbe;
- }
+ @Override
+ public boolean isCourbeForObject(final int _idxObj) {
+ return _idxObj == ptIdx_;
+ }
- public static EGCourbeChild buildCourbeModel(final H2dVariableType _var, final TrPostInterpolatePoint _idxPt,
- final EGGroup _group, final TrPostSource _src) {
- final TrPostCourbeModel model = new TrPostCourbeModel.Interpolated(_src, _idxPt, _var);
- final EGCourbeChild courbe = new FudaaCourbeTime(_group, model, _src.getNewTimeListModel());
- _group.addEGComponent(courbe);
- courbe.getModel().setTitle(
- courbe.getModel().getTitle()+"("+_var.getCommonUnitString()+")" + " (" + _src.getPrecisionModel().round(_idxPt.getX()) + ", "
- + _src.getPrecisionModel().round(_idxPt.getY()) + ')');
- return courbe;
- }
+ @Override
+ public Object getSelectionPoint() {
+ // TODO Auto-generated method stub
+ return new Integer(ptIdx_);
+ }
- H2dVariableType var_;
+ @Override
+ public void setSelectionPoint(Object point) {
+ // TODO Auto-generated method stub
+ if(point!=null && (point instanceof Integer))
+ ptIdx_=((Integer)point).intValue();
+ }
- public TrPostCourbeModel(final TrPostSource _src, final H2dVariableType _varIdx, final double[] _timeIdx) {
- super(_timeIdx);
- source_ = _src;
- var_ = _varIdx;
- }
+ }
- protected final void setVar(final H2dVariableType _t) {
- var_ = _t;
- }
+ public static EGCourbeChild buildCourbeModel(final H2dVariableType _var, final int _idxPt, final EGGroup _group,
+ final TrPostSource _src) {
+ final TrPostCourbeModel model = new TrPostCourbeModel.Node(_src, _idxPt, _var, _src.getTime().getTimeListModel()
+ .getTimesInSec());
+ final EGCourbeChild courbe = new FudaaCourbeTime(_group, model, _src.getNewTimeListModel());
+ _group.addEGComponent(courbe);
+ String title=courbe.getModel().getTitle()+ CtuluLibString.ESPACE ;
+ if(_var.getCommonUnitString()!=null)
+ title+="("+_var.getCommonUnitString()+")"+CtuluLibString.ESPACE;
+ Coordinate coor=_src.getGrid().getCoor(_idxPt);
+ title+= _idxPt + ":" + " (" + _src.getPrecisionModel().round(coor.x) + ", "
+ + _src.getPrecisionModel().round(coor.y) + ")";
+ courbe.getModel().setTitle(title);
+ return courbe;
+ }
- public boolean clearCache(final H2dVariableType _varChanged, final Set _varUsingModifiedVar) {
- if (var_ == _varChanged || (_varUsingModifiedVar != null) && _varUsingModifiedVar.contains(var_)) {
- clearCache();
- return true;
- }
- return false;
- }
+ public static EGCourbeChild buildCourbeModel(final H2dVariableType _var, final TrPostInterpolatePoint _idxPt,
+ final EGGroup _group, final TrPostSource _src) {
+ final TrPostCourbeModel model = new TrPostCourbeModel.Interpolated(_src, _idxPt, _var);
+ final EGCourbeChild courbe = new FudaaCourbeTime(_group, model, _src.getNewTimeListModel());
+ _group.addEGComponent(courbe);
+ courbe.getModel().setTitle(
+ courbe.getModel().getTitle()+"("+_var.getCommonUnitString()+")" + " (" + _src.getPrecisionModel().round(_idxPt.getX()) + ", "
+ + _src.getPrecisionModel().round(_idxPt.getY()) + ')');
+ return courbe;
+ }
- @Override
- public boolean deplace(final int[] _selectIdx, final double _deltaX, final double _deltaY,
- final CtuluCommandContainer _cmd) {
- return false;
- }
+ H2dVariableType var_;
- protected abstract void updateY();
+ public TrPostCourbeModel(final TrPostSource _src, final H2dVariableType _varIdx, final double[] _timeIdx) {
+ super(_timeIdx);
+ source_ = _src;
+ var_ = _varIdx;
+ }
+
+ /**
+ * ACTHUNG: constructeur utilis\xE9 uniquement pour la persistance des donn\xE9es!!!
+ */
+ public TrPostCourbeModel(){
+ super();
+ }
- @Override
- public String getTitle() {
- return nom_ == null ? var_.getName() : nom_;
- }
+ protected final void setVar(final H2dVariableType _t) {
+ var_ = _t;
+ }
- public final H2dVariableType getVar() {
- return var_;
- }
+ public boolean clearCache(final H2dVariableType _varChanged, final Set _varUsingModifiedVar) {
+ if (var_ == _varChanged || (_varUsingModifiedVar != null) && _varUsingModifiedVar.contains(var_)) {
+ clearCache();
+ return true;
+ }
+ return false;
+ }
- public abstract double getPtX();
+ @Override
+ public boolean deplace(final int[] _selectIdx, final double _deltaX, final double _deltaY,
+ final CtuluCommandContainer _cmd) {
+ return false;
+ }
- public abstract double getPtY();
+ protected abstract void updateY();
- public abstract boolean isCourbeForInterpolation(TrPostInterpolatePoint _int);
+ @Override
+ public String getTitle() {
+ return nom_ == null ? var_.getName() : nom_;
+ }
- public abstract boolean isCourbeForObject(int _idxObj);
+ public final H2dVariableType getVar() {
+ return var_;
+ }
- @Override
- public boolean isRemovable() {
- return true;
- }
+ public abstract double getPtX();
- @Override
- public boolean isDuplicatable() {
- return true;
- }
+ public abstract double getPtY();
- protected void createY() {
- if (y_ == null || y_.length != this.source_.getNbTimeStep()) {
- y_ = new double[source_.getNbTimeStep()];
- }
- }
+ public abstract boolean isCourbeForInterpolation(TrPostInterpolatePoint _int);
+ public abstract boolean isCourbeForObject(int _idxObj);
+
+ @Override
+ public boolean isRemovable() {
+ return true;
+ }
+
+ @Override
+ public boolean isDuplicatable() {
+ return true;
+ }
+
+ protected void createY() {
+ if (y_ == null || y_.length != this.source_.getNbTimeStep()) {
+ y_ = new double[source_.getNbTimeStep()];
+ }
+ }
+
+ @Override
+ public Object getPersistSpecificDatas() {
+
+ //-- retourne le quatuor point, pdt,variable et fichier source
+ ArrayList<Object> listeData=new ArrayList<Object>();
+ listeData.add(this.source_.getId());
+ listeData.add(this.getTime());
+ listeData.add(this.var_);
+ //-- recupere le noeud ou point interpol\xE9 --//
+ listeData.add(getSelectionPoint());
+ return listeData;
+ }
+
+ public abstract Object getSelectionPoint();
+ public abstract void setSelectionPoint(Object point);
+
+ @Override
+ public void setPersistSpecificDatas(Object data, Map infos) {
+
+ if(data ==null || !(data instanceof ArrayList))return;
+
+ ArrayList<Object> liste=(ArrayList<Object>)data;
+
+
+ String idSource=(String) liste.get(0);
+ TrPostProjet projet = (TrPostProjet) infos.get("TrPostProjet");
+
+ if (projet != null){
+ // -- etape 1: recherche du source qui contient le path donn\xE9 --//
+ TrPostSource src = projet.findSourceById(idSource);
+ if(src!=null)
+ this.source_=src;
+
+ }
+ // -- etape 2:times --//
+ double[] times=(double[]) liste.get(1);
+ if(times!=null)
+ this.setTime(times);
+
+ // -- etape 3:variable --//
+ H2dVariableType var=(H2dVariableType) liste.get(2);
+ if(var!=null)
+ this.var_=var;
+
+ Object point=liste.get(3);
+ if(point!=null)
+ setSelectionPoint(point);
+
+ }
+
}
\ No newline at end of file
Modified: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostCourbeTreeModel.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostCourbeTreeModel.java 2009-01-13 19:15:33 UTC (rev 4348)
+++ branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostCourbeTreeModel.java 2009-01-13 19:16:54 UTC (rev 4349)
@@ -39,6 +39,7 @@
import org.fudaa.ebli.courbe.EGGrapheModel;
import org.fudaa.ebli.courbe.EGGrapheTreeModel;
import org.fudaa.ebli.courbe.EGGroup;
+import org.fudaa.ebli.courbe.EGModel;
import org.fudaa.ebli.geometrie.GrPoint;
import org.fudaa.fudaa.commun.courbe.FudaaCourbeModel;
import org.fudaa.fudaa.commun.courbe.FudaaCourbeImporter.Target;
@@ -945,6 +946,26 @@
return duplic;
}
+
+ /**
+ * Methode qui affiche les infos principales de la courbe choisie
+ * @return
+ */
+ public String getSelectedSpecificCourbeInfos(){
+
+ if(this.getSelectedObject() instanceof EGCourbe){
+
+ EGModel model=((EGCourbe)this.getSelectedObject() ).getModel();
+
+ //-- on utilise les fillWithInfo pour preciser les infos de courbe entre les 2 tableaux des courbes.
+ //model.fillWithInfo(_table, _selectedPt);
+ return model.getPersistSpecificDatas().toString();
+
+ }
+ else return null;
+ }
+
+
@Override
public Object getSpecificPersitDatas(Map Params) {
// TODO Auto-generated method stub
@@ -956,7 +977,7 @@
}
@Override
- public void setSpecificPersitDatas(final Object specPersitData, Map params) {
+ public void setSpecificPersitDatas(final Object specPersitData, Map infos) {
// TODO Auto-generated method stub
TrPostCourbeTreeModelPersist data = (TrPostCourbeTreeModelPersist) specPersitData;
@@ -964,7 +985,7 @@
data.fillModelWith(this);
// -- recuperation du trpostprojet specifique au chargement --//
- TrPostProjet projet = (TrPostProjet) params.get("TrPostProjet");
+ TrPostProjet projet = (TrPostProjet) infos.get("TrPostProjet");
this.projet_ = projet;
this.impl_ = projet.impl_;
Modified: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostLayoutFille.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostLayoutFille.java 2009-01-13 19:15:33 UTC (rev 4348)
+++ branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostLayoutFille.java 2009-01-13 19:16:54 UTC (rev 4349)
@@ -44,6 +44,7 @@
import org.fudaa.ebli.visuallibrary.calque.CalqueLegendeWidgetAdapter;
import org.fudaa.ebli.visuallibrary.calque.EbliWidgetCreatorLegende;
import org.fudaa.ebli.visuallibrary.calque.EbliWidgetCreatorVueCalque;
+import org.fudaa.ebli.visuallibrary.creator.EbliWidgetCreatorArrowEditor;
import org.fudaa.ebli.visuallibrary.creator.EbliWidgetCreatorTextEditor;
import org.fudaa.ebli.visuallibrary.graphe.EbliWidgetCreatorGraphe;
import org.fudaa.fudaa.commun.courbe.FudaaCourbeImporter;
@@ -498,7 +499,19 @@
setTitle(previousTitleFrame);
}
+ //-- cas des fleches
+ else if (node.getCreator() instanceof EbliWidgetCreatorArrowEditor) {
+ FuLog.debug("arrow editor");
+
+ // -- etape 1: on fout eventuellement le tree des layouts --//
+ changeTree(getScene());
+ // -- etape 2: rechargement de la toolbar specifique dans this --//
+ changeToolbar(node.getWidget().getController());
+ setTitle(previousTitleFrame);
+ }
+
+
else {
// -- etape 1: on fout eventuellement le tree des layouts --//
changeTree(getScene());
Modified: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostLayoutPanelController.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostLayoutPanelController.java 2009-01-13 19:15:33 UTC (rev 4348)
+++ branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostLayoutPanelController.java 2009-01-13 19:16:54 UTC (rev 4349)
@@ -28,12 +28,14 @@
import org.fudaa.ebli.commun.EbliActionPaletteAbstract;
import org.fudaa.ebli.commun.EbliActionSimple;
import org.fudaa.ebli.commun.EbliComponentFactory;
+import org.fudaa.ebli.commun.EbliEditorArrow;
import org.fudaa.ebli.commun.EbliLib;
import org.fudaa.ebli.ressource.EbliResource;
import org.fudaa.ebli.visuallibrary.EbliNode;
import org.fudaa.ebli.visuallibrary.EbliNodeDefault;
import org.fudaa.ebli.visuallibrary.EbliScene;
import org.fudaa.ebli.visuallibrary.EbliWidget;
+import org.fudaa.ebli.visuallibrary.EbliWidgetArrowEditor;
import org.fudaa.ebli.visuallibrary.EbliWidgetBordureSingle;
import org.fudaa.ebli.visuallibrary.actions.CommandUndoRedoCreation;
import org.fudaa.ebli.visuallibrary.actions.EbliWidgetActionAlign;
@@ -52,6 +54,7 @@
import org.fudaa.ebli.visuallibrary.calque.CalqueLegendeWidgetAdapter;
import org.fudaa.ebli.visuallibrary.calque.EbliWidgetCreatorLegende;
import org.fudaa.ebli.visuallibrary.calque.EbliWidgetCreatorVueCalque;
+import org.fudaa.ebli.visuallibrary.creator.EbliWidgetCreatorArrowEditor;
import org.fudaa.ebli.visuallibrary.creator.EbliWidgetCreatorShape;
import org.fudaa.ebli.visuallibrary.creator.EbliWidgetCreatorTextLabel;
import org.fudaa.ebli.visuallibrary.creator.ShapeCreatorCircle;
@@ -331,13 +334,19 @@
// -- ajout du rectangle --//
final EbliNodeDefault nodeFleche = new EbliNodeDefault();
nodeFleche.setTitle("Fleche simple");
- nodeFleche.setCreator(new EbliWidgetCreatorShape(new ShapeCreatorFlecheSimple()));
- nodeFleche.setPreferedSize(new Dimension(100, 50));
+ //nodeFleche.setCreator(new EbliWidgetCreatorShape(new ShapeCreatorFlecheSimple()));
+
+ nodeFleche.setCreator(new EbliWidgetCreatorArrowEditor(new EbliEditorArrow()));
+
+ nodeFleche.setPreferedSize(new Dimension(200, 150));
nodeFleche.setPreferedLocation(new Point(350, 125));
// ajout du node au layout
addNode(nodeFleche);
+ //nodeFleche.getWidget().repaint();
+ //((EbliWidgetArrowEditor)nodeFleche.getWidget()).editor_.creationFlecheClassique();
+
return nodeFleche;
}
@@ -429,7 +438,7 @@
});
// -- palette fleche simple--//
- _l.add(new EbliActionSimple(EbliResource.EBLI.getString("Fleche"),
+ _l.add(new EbliActionSimple(EbliResource.EBLI.getString("Editeur Fleche"),
EbliResource.EBLI.getToolIcon("crystal_bu_link"), "WIDGETFLECHESIMPLE") {
@Override
public void actionPerformed(final ActionEvent _evt) {
Modified: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostProjet.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostProjet.java 2009-01-13 19:15:33 UTC (rev 4348)
+++ branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostProjet.java 2009-01-13 19:16:54 UTC (rev 4349)
@@ -103,6 +103,9 @@
*/
public class TrPostProjet implements ActionListener {
+
+ public final static boolean AMELIO_LOT_VISIBLE=true;
+
/**
* Manager de sauvegarder/charghement des donn\xE9es
*/
Modified: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/telemac/TrTelemacBoundaryCourbeModel.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/telemac/TrTelemacBoundaryCourbeModel.java 2009-01-13 19:15:33 UTC (rev 4348)
+++ branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/telemac/TrTelemacBoundaryCourbeModel.java 2009-01-13 19:16:54 UTC (rev 4349)
@@ -7,6 +7,8 @@
*/
package org.fudaa.fudaa.tr.telemac;
+import java.util.Map;
+
import org.fudaa.ctulu.CtuluCommandContainer;
import org.fudaa.ctulu.CtuluLibArray;
import org.fudaa.ctulu.CtuluListSelectionInterface;
@@ -244,4 +246,16 @@
}
+@Override
+public Object getPersistSpecificDatas() {
+ // TODO Auto-generated method stub
+ return null;
+}
+
+@Override
+public void setPersistSpecificDatas(Object data, Map infos) {
+ // TODO Auto-generated method stub
+
+}
+
}
\ No newline at end of file
Modified: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/telemac/TrTelemacWeirCourbeModel.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/telemac/TrTelemacWeirCourbeModel.java 2009-01-13 19:15:33 UTC (rev 4348)
+++ branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/telemac/TrTelemacWeirCourbeModel.java 2009-01-13 19:16:54 UTC (rev 4349)
@@ -7,6 +7,8 @@
*/
package org.fudaa.fudaa.tr.telemac;
+import java.util.Map;
+
import org.fudaa.ctulu.CtuluCommandContainer;
import org.fudaa.ctulu.CtuluLibArray;
import org.fudaa.ctulu.CtuluListSelectionInterface;
@@ -165,4 +167,16 @@
public EGModel duplicate() {
return new TrTelemacWeirCourbeModel(this.i_, this.mng_, this.cote_, CtuluLibArray.copy(this.x_));
}
+
+@Override
+public Object getPersistSpecificDatas() {
+ // TODO Auto-generated method stub
+ return null;
+}
+
+@Override
+public void setPersistSpecificDatas(Object data, Map infos) {
+ // TODO Auto-generated method stub
+
+}
}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <had...@us...> - 2009-01-13 19:15:37
|
Revision: 4348
http://fudaa.svn.sourceforge.net/fudaa/?rev=4348&view=rev
Author: hadouxad
Date: 2009-01-13 19:15:33 +0000 (Tue, 13 Jan 2009)
Log Message:
-----------
fleches + persistance des donnees des courbes
Added Paths:
-----------
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/commun/EbliEditorArrow.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetArrowEditor.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetControllerFlecheEditor.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/creator/EbliWidgetCreatorArrowEditor.java
Added: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/commun/EbliEditorArrow.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/commun/EbliEditorArrow.java (rev 0)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/commun/EbliEditorArrow.java 2009-01-13 19:15:33 UTC (rev 4348)
@@ -0,0 +1,528 @@
+package org.fudaa.ebli.commun;
+
+import java.awt.Color;
+import java.awt.Cursor;
+import java.awt.Dimension;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+import java.awt.Image;
+import java.awt.Point;
+import java.awt.event.ActionEvent;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
+import java.awt.event.MouseMotionListener;
+import java.awt.image.BufferedImage;
+import java.awt.image.ImageProducer;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.swing.JMenu;
+import javax.swing.JMenuBar;
+import javax.swing.JToolBar;
+
+import org.fudaa.ctulu.image.CtuluImageProducer;
+import org.fudaa.ctulu.image.CtuluLibImage;
+import org.fudaa.ebli.ressource.EbliResource;
+import org.fudaa.ebli.trace.TraceLigne;
+import org.fudaa.ebli.trace.TraceLigneModel;
+
+
+
+import com.memoire.bu.BuPanel;
+
+
+/**
+ * Editeur de fleche.
+ * Gere 4 points (2 pour le segment) et 2 pour les extr\xE9mit\xE9s
+ * Gere 2 type: plein ou vide
+ *
+ * Permet \xE0 l'utilisateur de modifier sa fleche en cliquant dessus
+ *
+ * @author Adrien Hadoux
+ *
+ */
+public class EbliEditorArrow extends BuPanel implements CtuluImageProducer, MouseListener, MouseMotionListener {
+
+ public final static int ExtremiteTete=0;
+ public final static int ExtremiteQueue=1;
+ public final static int ExtremiteGauche=2;
+ public final static int ExtremiteDroite=3;
+
+
+ public EbliEditorArrow(){
+ this(new Point[ExtremiteDroite+1]);
+ //-- on initialise --//
+
+ creationFlecheClassique();
+ repaint();
+ }
+
+ /**
+ * Constructeur appel\xE9 pour une cr\xE9ation de base.
+ * @param points
+ */
+ public EbliEditorArrow(Point[] points){
+ points_=points;
+ setSize(200, 150);
+ this.addMouseListener(this);
+ this.addMouseMotionListener(this);
+ this.setCursor(Cursor.getPredefinedCursor(Cursor.CROSSHAIR_CURSOR));
+ repaint();
+ }
+
+
+ private Point[] points_;
+
+
+
+
+ /**
+ * Model traceligne appel\xE9 a chaque edition de la fleche pour mettre a jour le trac\xE9.
+ */
+ public TraceLigneModel model_;
+ public Color background_=Color.white;
+ public Color foreground_=Color.black;
+
+ public Point getExtremiteTete(){
+ return points_[ExtremiteTete];
+ }
+
+ public Point getExtremiteQueue(){
+ return points_[ExtremiteQueue];
+ }
+
+
+ public Point getExtremiteGauche(){
+ return points_[ExtremiteGauche];
+ }
+
+ public Point getExtremiteDroite(){
+ return points_[ExtremiteDroite];
+ }
+
+ public Point[] getPoints_() {
+ return points_;
+ }
+
+ public void setPoints_(Point[] points_) {
+ this.points_ = points_;
+ }
+
+ public void modifieExtremite(Point newPoint, int position){
+ if(position>ExtremiteDroite || points_==null)return;
+ points_[position]=newPoint;
+ repaint();
+ }
+
+ public void clearArrow(){
+ points_=new Point[ExtremiteDroite+1];
+ repaint();
+ }
+
+
+
+ int previousWidth_=0;
+ int previousHeight_=0;
+
+
+ public void recalculatePosition(int w,int h){
+ if(points_==null)return;
+ if(previousWidth_==0)previousWidth_=getWidth();
+ if(previousHeight_==0)previousHeight_=getHeight();
+ if(previousWidth_==0)return;
+ if(previousHeight_==0)return;
+
+ double ratioW=1.0*w/previousWidth_;
+ double ratioH=1.0*h/previousHeight_;
+
+
+ for(int i=0;i<points_.length;i++){
+ if(points_[i]!=null){
+ points_[i].x=(int)(points_[i].x*ratioW);
+ points_[i].y=(int)(points_[i].y*ratioH);
+ }
+ }
+ previousWidth_=w;
+ previousHeight_=h;
+ }
+
+ /**
+ * Methode qui dessine la fleche.
+ */
+ public void print(Graphics _g,int w,int h) {
+
+
+ //recalculatePosition(w,h);
+
+ final BufferedImage image = CtuluLibImage.createImage(w, h, new HashMap());
+ final Graphics2D g2d = image.createGraphics();
+ image.flush();
+
+
+
+
+ if(points_==null)return;
+
+ if(existeAucunPoint()){
+ g2d.setColor(Color.black);
+ g2d.drawString("Veuillez cliquer sur les 4 points pour cr\xE9er la fl\xE8che", 10, 10);
+ g2d.drawString("Modifier: faire des glisser-d\xE9pos\xE9 pr\xE8s des extr\xE9mit\xE9s", 10, 20);
+
+ }
+
+ // -- creation du traceligne --//
+ final TraceLigne traceligne = new TraceLigne(model_);
+ traceligne.setCouleur(foreground_);
+
+ //-- on trace le segment initial --//
+ if(getExtremiteTete()!=null && getExtremiteQueue()!=null){
+ traceligne.dessineTrait(g2d, getExtremiteTete().x, getExtremiteTete().y, getExtremiteQueue().x,getExtremiteQueue().y);
+ }else{
+ // pas de segment complet, on trace juste les points existants
+ if(getExtremiteTete()!=null)
+ traceligne.dessineRectangle(g2d,getExtremiteTete().x-traceligne.getEpaisseur()/2,getExtremiteTete().y-traceligne.getEpaisseur()/2,traceligne.getEpaisseur(), traceligne.getEpaisseur());
+ if(getExtremiteQueue()!=null)
+ traceligne.dessineRectangle(g2d,getExtremiteQueue().x-traceligne.getEpaisseur()/2,getExtremiteQueue().y-traceligne.getEpaisseur()/2,traceligne.getEpaisseur(), traceligne.getEpaisseur());
+
+ }
+ //-- on trace le segment tete/gauche --//
+ if(getExtremiteTete()!=null && getExtremiteGauche()!=null){
+ traceligne.dessineTrait(g2d, getExtremiteTete().x, getExtremiteTete().y, getExtremiteGauche().x,getExtremiteGauche().y);
+ }else{
+ // pas de segment complet, on trace juste les points existants
+ if(getExtremiteGauche()!=null)
+ traceligne.dessineRectangle(g2d,getExtremiteGauche().x-traceligne.getEpaisseur()/2,getExtremiteGauche().y-traceligne.getEpaisseur()/2,traceligne.getEpaisseur(), traceligne.getEpaisseur());
+
+ }
+ //-- on trace le segment tete/droite --//
+ if(getExtremiteTete()!=null && getExtremiteDroite()!=null){
+ traceligne.dessineTrait(g2d, getExtremiteTete().x, getExtremiteTete().y, getExtremiteDroite().x,getExtremiteDroite().y);
+ }else{
+ // pas de segment complet, on trace juste les points existants
+ if(getExtremiteDroite()!=null)
+ traceligne.dessineRectangle(g2d,getExtremiteDroite().x-traceligne.getEpaisseur()/2,getExtremiteDroite().y-traceligne.getEpaisseur()/2,traceligne.getEpaisseur(), traceligne.getEpaisseur());
+
+ }
+
+ //-- on dessine l'image --//
+ _g.drawImage(image, 0,0, null);
+
+ }
+
+ @Override
+ public void paintComponent(Graphics _g) {
+
+ //-- empecher de voir d'autres dessins par dessus --//
+ _g.setColor(background_);
+ _g.fillRect(0, 0, getWidth(), getHeight());
+ _g.setColor(foreground_);
+ print(_g,getWidth(),getHeight() );
+
+ //-- on affiche les marqueurs drag and drop --//
+ if(marqueurDeplacement_ && positionPointToMove_!=-1){
+ _g.setColor(Color.RED);
+ //-- position initiale --//
+ _g.fillRect(points_[positionPointToMove_].x-3,points_[positionPointToMove_].y-3,6,6);
+
+ //-- position deplacement --//
+ if(positionDeplacement_!=null){
+ _g.setColor(Color.GREEN);
+
+ _g.fillRect(positionDeplacement_.x-3,positionDeplacement_.y-3,6,6);
+ }
+
+
+ }
+
+ }
+
+ public BufferedImage produceImage(final int _w, final int _h, final Map _params) {
+
+ recalculatePosition(_w,_h);
+
+ final BufferedImage i = CtuluLibImage.createImage(_w, _h, _params);
+ final Graphics2D g2d = i.createGraphics();
+ CtuluLibImage.setBestQuality(g2d);
+ if (CtuluLibImage.mustFillBackground(_params)) {
+ g2d.setColor(Color.WHITE);
+ g2d.fillRect(0, 0, _w, _h);
+ }
+
+ if (getWidth() != _w || getHeight() != _h) {
+
+ // this.setPreferredSize(new Dimension(_w, _h));
+
+ g2d.scale(CtuluLibImage.getRatio(_w, getWidth()), CtuluLibImage.getRatio(_h, getHeight()));
+ setSize(_w, _h);
+ }
+
+ print(g2d,_w,_h);
+ g2d.dispose();
+ i.flush();
+ return i;
+ }
+
+ @Override
+ public Dimension getDefaultImageDimension() {
+ // TODO Auto-generated method stub
+ return getSize();
+ }
+
+ @Override
+ public BufferedImage produceImage(Map _params) {
+ final BufferedImage i = CtuluLibImage.createImage(getWidth(), getHeight(), _params);
+ final Graphics2D g2d = i.createGraphics();
+ CtuluLibImage.setBestQuality(g2d);
+ if (CtuluLibImage.mustFillBackground(_params)) {
+ g2d.setColor(Color.WHITE);
+ g2d.fillRect(0, 0, getWidth(), getHeight());
+ }
+
+
+ print(g2d);
+ g2d.dispose();
+ i.flush();
+ return i;
+ }
+
+ /**
+ * Methode qui est appel\xE9e apr\xE8s un clic et qui d\xE9termine le point manquant \xE0 ajouter:
+ * @param p
+ */
+ public void determinePointAajouter(Point p){
+ if(p==null)return;
+
+ if(getExtremiteTete()==null)
+ modifieExtremite(p, ExtremiteTete);
+ else
+ if(getExtremiteQueue()==null)
+ modifieExtremite(p, ExtremiteQueue);
+ else
+ if(getExtremiteGauche()==null)
+ modifieExtremite(p, ExtremiteGauche);
+ else
+ if(getExtremiteDroite()==null)
+ modifieExtremite(p, ExtremiteDroite);
+ else return;
+ }
+
+
+ /**
+ * Retourne true si le point est a ajouter ou false si il s'agit d'un d\xE9placement
+ * @return
+ */
+ public boolean ajout(){
+ if(getExtremiteTete()==null)
+ return true;
+ if(getExtremiteQueue()==null)
+ return true;
+ if(getExtremiteDroite()==null)
+ return true;
+ if(getExtremiteGauche()==null)
+ return true;
+ return false;
+ }
+
+ public boolean existeAucunPoint(){
+ if(getExtremiteTete()!=null)
+ return false;
+ if(getExtremiteQueue()!=null)
+ return false;
+ if(getExtremiteDroite()!=null)
+ return false;
+ if(getExtremiteGauche()!=null)
+ return false;
+ return true;
+ }
+
+ /**
+ * Methode qui determine le point a modifier de la fleche, c'est a dire le point qui se trouve le plus proche du clic utilisateur au point p.
+ * @param p
+ * @return
+ */
+ public int determinePointAmodifier(Point p){
+
+ double distanceMin=p.distance(getExtremiteTete());
+ int position=ExtremiteTete;
+
+ if(distanceMin>p.distance(getExtremiteQueue())){
+ distanceMin=p.distance(getExtremiteQueue());
+ position=ExtremiteQueue;
+ }
+
+ if(distanceMin>p.distance(getExtremiteDroite())){
+ distanceMin=p.distance(getExtremiteDroite());
+ position=ExtremiteDroite;
+ }
+
+ if(distanceMin>p.distance(getExtremiteGauche())){
+ distanceMin=p.distance(getExtremiteGauche());
+ position=ExtremiteGauche;
+ }
+
+ return position;
+ }
+
+
+ public void mouseClicked(MouseEvent e) {
+
+ if(ajout())
+ determinePointAajouter(new Point(e.getX(),e.getY()));
+ else{
+
+ //-- mode modification du point --//
+ // modifieExtremite(new Point(e.getX(),e.getY()), determinePointAmodifier(new Point(e.getX(),e.getY())));
+ //RIEN FAIRE
+ }
+ repaint();
+ }
+
+ @Override
+ public void mouseEntered(MouseEvent e) {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void mouseExited(MouseEvent e) {
+ // TODO Auto-generated method stub
+
+ }
+ /**
+ * lors d'un drag and drop, on retient la position du point qu'on veut deplacer
+ * et lors du relachement souris ou remplace les infos
+ */
+ int positionPointToMove_=-1;
+
+ /**
+ * marqueur qui s'active dans le cas du drag and drop et qui marque le point initial ainsi que le point destination jusqu'au lacher.
+ */
+ boolean marqueurDeplacement_=false;
+ @Override
+ public void mousePressed(MouseEvent e) {
+ // TODO Auto-generated method stub
+ if(!ajout()){
+ positionPointToMove_=determinePointAmodifier(new Point(e.getX(),e.getY()));
+ marqueurDeplacement_=true;
+ System.out.println("Souris pressed: positionToMove:"+positionPointToMove_);
+ repaint();
+ }
+ else
+ positionPointToMove_=-1;
+
+
+ }
+
+ @Override
+ public void mouseReleased(MouseEvent e) {
+ // TODO Auto-generated method stub
+ if(!ajout() && positionPointToMove_!=-1){
+ modifieExtremite(new Point(e.getX(),e.getY()), positionPointToMove_);
+ positionPointToMove_=-1;
+ System.out.println("Souris released: positionToMove:"+positionPointToMove_);
+ marqueurDeplacement_=false;
+ positionDeplacement_=null;
+ repaint();
+ }
+ }
+
+ Point positionDeplacement_=null;
+ @Override
+ public void mouseDragged(MouseEvent e) {
+ //System.out.println("Souris dragged: "+positionPointToMove_);
+ if(marqueurDeplacement_){
+ positionDeplacement_=new Point(e.getX(),e.getY());
+ repaint();
+ }
+ }
+
+ @Override
+ public void mouseMoved(MouseEvent e) {
+ // TODO Auto-generated method stub
+ System.out.println("Souris MOVED: "+positionPointToMove_);
+ }
+
+
+ public EbliEditorArrow duplicate(){
+ EbliEditorArrow duplic=new EbliEditorArrow(points_.clone());
+ duplic.model_=new TraceLigneModel(model_);
+ return duplic;
+ }
+
+
+ public void creationFlecheClassique(){
+ clearArrow();
+ if(model_==null)
+ model_=new TraceLigneModel();
+ modifieExtremite(new Point((int)(getWidth()-model_.getEpaisseur()),(int)(getHeight()/2.0-model_.getEpaisseur()/2.0)), ExtremiteTete);
+ modifieExtremite(new Point((int)(0+model_.getEpaisseur()),(int)(getHeight()/2.0-model_.getEpaisseur()/2.0)), ExtremiteQueue);
+ modifieExtremite(new Point((int)(2.0/3.0*getWidth()),(int)(model_.getEpaisseur())), ExtremiteDroite);
+ modifieExtremite(new Point((int)(2.0/3.0*getWidth()),(int)(getHeight()-model_.getEpaisseur())), ExtremiteGauche);
+ repaint();
+ }
+
+ public void creationDoubleFlecheClassique(){
+ clearArrow();
+ if(model_==null)
+ model_=new TraceLigneModel();
+ modifieExtremite(new Point((int)(getWidth()-model_.getEpaisseur()),(int)(getHeight()/2.0-model_.getEpaisseur()/2.0)), ExtremiteTete);
+ modifieExtremite(new Point((int)(0+model_.getEpaisseur()),(int)(getHeight()/2.0-model_.getEpaisseur()/2.0)), ExtremiteQueue);
+ modifieExtremite(new Point((int)(2.0/3.0*getWidth()),(int)(model_.getEpaisseur())), ExtremiteDroite);
+ modifieExtremite(new Point((int)(2.0/3.0*getWidth()),(int)(getHeight()-model_.getEpaisseur())), ExtremiteGauche);
+ repaint();
+ }
+
+ JToolBar toolbar_;
+ JMenuBar menuBar_;
+ public JToolBar getToolBar( ) {
+ if(toolbar_==null){
+ toolbar_=new JToolBar();
+ for(EbliActionSimple action:getActions())
+ toolbar_.add(action);
+ }
+ return toolbar_;
+ }
+
+ public JMenuBar getMenuBar( ) {
+ if(menuBar_==null){
+ menuBar_=new JMenuBar();
+ JMenu principal=new JMenu("Menu");
+ for(EbliActionSimple action:getActions())
+ principal.add(action);
+ menuBar_.add(principal);
+ }
+ return menuBar_;
+ }
+
+
+ List<EbliActionSimple> getActions(){
+ List<EbliActionSimple> liste=new ArrayList<EbliActionSimple>();
+
+ EbliActionSimple action=new EbliActionSimple(EbliResource.EBLI.getString("Initialiser"),EbliResource.EBLI
+ .getIcon("restore"),"Restaurer"){
+ public void actionPerformed(final ActionEvent _evt) {
+ clearArrow();
+ }
+ };
+ liste.add(action);
+ action=new EbliActionSimple(EbliResource.EBLI.getString("Fl\xE8che"),EbliResource.EBLI.getToolIcon("crystal_bu_link"),"Fl\xE8che"){
+ public void actionPerformed(final ActionEvent _evt) {
+ creationFlecheClassique();
+ }
+ };
+ liste.add(action);
+// action=new EbliActionSimple(EbliResource.EBLI.getString("Double Fl\xE8che"),EbliResource.EBLI.getToolIcon("crystal_bu_scrollpane_corner"),"Double Fl\xE8che"){
+// public void actionPerformed(final ActionEvent _evt) {
+// creationDoubleFlecheClassique();
+// }
+// };
+// liste.add(action);
+ return liste;
+ }
+
+
+
+
+}
Added: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetArrowEditor.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetArrowEditor.java (rev 0)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetArrowEditor.java 2009-01-13 19:15:33 UTC (rev 4348)
@@ -0,0 +1,125 @@
+package org.fudaa.ebli.visuallibrary;
+
+import java.awt.Dimension;
+import java.awt.Graphics2D;
+import java.awt.Rectangle;
+import java.awt.image.BufferedImage;
+import java.util.EnumSet;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.fudaa.ctulu.image.CtuluLibImage;
+import org.fudaa.ebli.commun.EbliEditorArrow;
+import org.netbeans.api.visual.action.ActionFactory;
+import org.netbeans.api.visual.action.InplaceEditorProvider;
+import org.netbeans.api.visual.action.WidgetAction;
+import org.netbeans.api.visual.widget.Widget;
+
+import com.memoire.fu.FuLog;
+
+
+
+/**
+ * Classe editeur de Fleche
+ * @author Adrien Hadoux
+ *
+ */
+public class EbliWidgetArrowEditor extends EbliWidget implements InplaceEditorProvider<EbliEditorArrow>{
+
+ public EbliEditorArrow editor_;
+ BufferedImage imageFleche;
+
+
+ public EbliWidgetArrowEditor(EbliScene scene,EbliEditorArrow editor) {
+ super(scene, false);
+ // TODO Auto-generated constructor stub
+ editor_=editor;
+ editor_.model_=getTraceLigneModel();
+ editor_.foreground_=getColorContour();
+ // -- creation de l action pour editor --//
+ //final WidgetAction editorAction = ActionFactory.createInplaceEditorAction(this);
+
+ // -- ajout de l action au widget correspondant --//
+ // this.getActions().addAction(editorAction);
+
+ final EbliWidgetControllerFlecheEditor controller = new EbliWidgetControllerFlecheEditor(this);
+ controller.setEditable(true);
+ setController(controller);
+
+ }
+
+
+ protected void paintWidget() {
+ final Rectangle rec = getClientArea();
+ final Graphics2D g = getGraphics();
+ // g.translate(rec.x, rec.y);
+ if (rec.width > 0 && rec.height > 0) {
+
+
+ // mode edition
+ //if (imageFleche == null || imageFleche.getWidth() != (rec.width-1) || imageFleche.getHeight() != (rec.height-1)) {
+ FuLog.debug("EWI: recreate image");
+ final Map params = new HashMap();
+ CtuluLibImage.setCompatibleImageAsked(params);
+ editor_.model_=getTraceLigneModel();
+ editor_.foreground_=getColorContour();
+ imageFleche = editor_.produceImage(rec.width - 1, rec.height - 1, params);
+
+ //}
+ g.drawImage(imageFleche, rec.x, rec.y, rec.width - 1, rec.height - 1, null);
+ }
+ }
+
+
+ @Override
+ public EbliEditorArrow createEditorComponent(
+ org.netbeans.api.visual.action.InplaceEditorProvider.EditorController controller,
+ Widget widget) {
+ //-- on met a jour le traceligne model --//
+ editor_.model_=getTraceLigneModel();
+ editor_.foreground_=getColorContour();
+ final Rectangle rec = getClientArea();
+ editor_.setSize(new Dimension(rec.width,rec.height));
+ editor_.setPreferredSize(new Dimension(rec.width,rec.height));
+
+ return editor_;
+ }
+
+ @Override
+ public EnumSet<org.netbeans.api.visual.action.InplaceEditorProvider.ExpansionDirection> getExpansionDirections(
+ org.netbeans.api.visual.action.InplaceEditorProvider.EditorController controller,
+ Widget widget, EbliEditorArrow editor) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public Rectangle getInitialEditorComponentBounds(
+ org.netbeans.api.visual.action.InplaceEditorProvider.EditorController controller,
+ Widget widget, EbliEditorArrow editor, Rectangle viewBounds) {
+ // TODO Auto-generated method stub
+ final Rectangle rec = convertLocalToScene(getClientArea());
+ rec.width -= 1;
+ rec.height -= 1;
+ return rec;
+ }
+
+ @Override
+ public void notifyClosing(
+ org.netbeans.api.visual.action.InplaceEditorProvider.EditorController controller,
+ Widget widget, EbliEditorArrow editor, boolean commit) {
+ // TODO Auto-generated method stub
+ imageFleche =null;
+ repaint();
+ editingStop();
+ }
+
+ @Override
+ public void notifyOpened(
+ org.netbeans.api.visual.action.InplaceEditorProvider.EditorController controller,
+ Widget widget, EbliEditorArrow editor) {
+ // TODO Auto-generated method stub
+ editingStart();
+ }
+
+}
Added: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetControllerFlecheEditor.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetControllerFlecheEditor.java (rev 0)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetControllerFlecheEditor.java 2009-01-13 19:15:33 UTC (rev 4348)
@@ -0,0 +1,92 @@
+package org.fudaa.ebli.visuallibrary;
+
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+import javax.swing.JMenuBar;
+import javax.swing.JMenuItem;
+import javax.swing.JPopupMenu;
+import javax.swing.JToolBar;
+
+import org.fudaa.ctulu.CtuluResource;
+import org.fudaa.ctulu.gui.CtuluHtmlEditorPanel;
+import org.fudaa.ebli.commun.EbliEditorArrow;
+import org.fudaa.ebli.ressource.EbliResource;
+import org.fudaa.ebli.visuallibrary.actions.EbliActionEditorOneClick;
+import org.netbeans.api.visual.action.InplaceEditorProvider;
+
+import com.memoire.bu.BuMenuBar;
+import com.memoire.bu.BuPanel;
+
+/**
+ * Controller de l'editeur de fleches.
+ * @author Adrien Hadoux
+ *
+ */
+public class EbliWidgetControllerFlecheEditor extends EbliWidgetController {
+
+ EbliActionEditorOneClick<EbliEditorArrow> editorAction_;
+ EbliEditorArrow editor_;
+
+ public EbliWidgetControllerFlecheEditor(EbliWidgetArrowEditor _widget) {
+ super(_widget);
+ editor_ = _widget.editor_;
+ addActionSpecifiques();
+
+ }
+
+
+ public void MenuEditer() {
+ // -- executer l action d edition --//
+ editorAction_.openEditor(getWidget());
+
+ }
+
+ public void addActionSpecifiques() {
+
+ editorAction_ = new EbliActionEditorOneClick<EbliEditorArrow>((InplaceEditorProvider) widget_);
+ // -- ajout de l action au widget correspondant --//
+ widget_.getActions().addAction(editorAction_);
+
+ }
+
+ @Override
+ protected void buildPopupMenu(final JPopupMenu _menu) {
+ constructPopupMenuSpecifique(_menu);
+ // -- creation du menu commun a tous les widgets
+ constructPopupMenuBase(_menu);
+ }
+
+
+ private void constructPopupMenuSpecifique(final JPopupMenu _popup) {
+ JMenuItem menuItem = new JMenuItem(EbliResource.EBLI.getString("Editer la fl\xE8che"));
+ _popup.add(menuItem, 0);
+ menuItem.setIcon(CtuluResource.CTULU.getIcon("crystal_editer"));
+ menuItem.addActionListener(new ActionListener() {
+ public void actionPerformed(final ActionEvent e) {
+ MenuEditer();
+ }
+ });
+ }
+
+
+ public JToolBar getToolbarComponent() {
+ if (editor_ != null)
+ return editor_.getToolBar();
+ else
+ return new JToolBar();
+ }
+
+ JMenuBar menuBar_;
+
+ public JMenuBar getMenubarComponent() {
+ if (editor_ == null)
+ return new BuMenuBar();
+
+ if (menuBar_ == null)
+ menuBar_ = editor_.getMenuBar();
+ return menuBar_;
+
+ }
+
+ }
Added: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/creator/EbliWidgetCreatorArrowEditor.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/creator/EbliWidgetCreatorArrowEditor.java (rev 0)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/creator/EbliWidgetCreatorArrowEditor.java 2009-01-13 19:15:33 UTC (rev 4348)
@@ -0,0 +1,81 @@
+package org.fudaa.ebli.visuallibrary.creator;
+
+import java.awt.Point;
+import java.util.Map;
+
+import org.fudaa.ebli.commun.EbliEditorArrow;
+import org.fudaa.ebli.visuallibrary.EbliNode;
+import org.fudaa.ebli.visuallibrary.EbliNodeDefault;
+import org.fudaa.ebli.visuallibrary.EbliScene;
+import org.fudaa.ebli.visuallibrary.EbliWidget;
+import org.fudaa.ebli.visuallibrary.EbliWidgetArrowEditor;
+import org.fudaa.ebli.visuallibrary.EbliWidgetBordureSingle;
+
+import org.fudaa.ebli.visuallibrary.EbliWidgetWithBordure;
+
+public class EbliWidgetCreatorArrowEditor implements EbliWidgetCreator {
+
+ EbliWidgetArrowEditor res;
+ //EbliWidgetWithBordure res;
+ /**
+ * Le type de l objet a creer.
+ */
+ EbliEditorArrow editor_;
+
+
+
+
+
+ public EbliWidgetCreatorArrowEditor(final EbliEditorArrow _typeObject) {
+ super();
+
+ editor_ = _typeObject;
+ }
+
+ public EbliWidgetCreatorArrowEditor() {
+
+ }
+
+ public EbliWidget create(final EbliScene _scene) {
+ // res = new EbliWidgetBordureSingle(new EbliWidgetArrowEditor(_scene, editor_));
+ res=new EbliWidgetArrowEditor(_scene, editor_);
+ return res;
+ }
+
+ public EbliWidget getWidget() {
+ return res;
+ }
+
+ public EbliNode duplicate(final EbliNode _nodeAdupliquer) {
+
+ final EbliNode duplique = new EbliNodeDefault();
+
+ duplique.setCreator(new EbliWidgetCreatorArrowEditor(editor_.duplicate()));
+
+ duplique.setTitle(_nodeAdupliquer.getTitle());
+ // recopie des tailles
+ duplique.setPreferedSize(_nodeAdupliquer.getPreferedSize());
+ // -- calcul nouvelle position
+ final Point nouvellePosition = new Point(getWidget().getLocation().x, (getWidget().getLocation().y + getWidget()
+ .getClientArea().height));
+ duplique.setPreferedLocation(nouvellePosition);
+
+ return duplique;
+ }
+
+ public EbliWidgetWithBordure getBordure() {
+ return null;
+ }
+
+ public Object getPersistData(final Map parameters) {
+ return editor_.getPoints_();
+ }
+
+ public void setPersistData(final Object data, final Map parameters) {
+ if (data == null) editor_ = new EbliEditorArrow();
+ else {
+ editor_ = new EbliEditorArrow((Point[])data);
+ }
+ }
+
+ }
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2009-01-12 20:08:55
|
Revision: 4347
http://fudaa.svn.sourceforge.net/fudaa/?rev=4347&view=rev
Author: deniger
Date: 2009-01-12 20:08:48 +0000 (Mon, 12 Jan 2009)
Log Message:
-----------
Modified Paths:
--------------
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/calque/EbliWidgetFusionCalques.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/calque/EbliWidgetVueCalque.java
Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/calque/EbliWidgetFusionCalques.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/calque/EbliWidgetFusionCalques.java 2009-01-12 19:51:23 UTC (rev 4346)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/calque/EbliWidgetFusionCalques.java 2009-01-12 20:08:48 UTC (rev 4347)
@@ -24,47 +24,45 @@
*/
public final class EbliWidgetFusionCalques extends EbliWidgetGroup implements PropertyChangeListener {
- public final ArrayList<EbliWidgetVueCalque> listeWidgetCalque_ = new ArrayList<EbliWidgetVueCalque>();
+ public final ArrayList<EbliWidgetVueCalque> listeWidgetCalque_ = new ArrayList<EbliWidgetVueCalque>();
- public EbliWidgetFusionCalques(final EbliScene _scene) {
- super(_scene);
- // calquePanel_.getVueCalque().getAbstractCalque().addPropertyChangeListener(
- // "versReel", listener);
+ public EbliWidgetFusionCalques(final EbliScene _scene) {
+ super(_scene);
+ // calquePanel_.getVueCalque().getAbstractCalque().addPropertyChangeListener(
+ // "versReel", listener);
- }
+ }
- public void addChildCalque(final EbliWidget child) {
+ public void addChildCalque(final EbliWidget child) {
- addChild(child);
+ addChild(child);
- final EbliWidgetVueCalque widgetCalque = (EbliWidgetVueCalque) child.getIntern();
- listeWidgetCalque_.add(widgetCalque);
+ final EbliWidgetVueCalque widgetCalque = (EbliWidgetVueCalque) child.getIntern();
+ listeWidgetCalque_.add(widgetCalque);
+ // widgetCalque.calquePanel_.getVueCalque().getAbstractCalque().
+ // addPropertyChangeListener("versReel", this);
+ }
+ boolean noCyclePropertieChange = true;
- // widgetCalque.calquePanel_.getVueCalque().getAbstractCalque().
- // addPropertyChangeListener("versReel", this);
+ /**
+ * Methode a appelee a la fin des ajout de widget pour synchroniser les zooms de tous les calques du groupe. Il faut
+ * le faire dans l'ordre inverse afin de pr\xE9server le zoom de la widget initiale.
+ */
+ public void synchronyseZoom() {
- }
- boolean noCyclePropertieChange = true;
-
- /**
- * Methode a appelee a la fin des ajout de widget pour synchroniser les zooms de tous les calques du groupe.
- * Il faut le faire dans l'ordre inverse afin de pr\xE9server le zoom de la widget initiale.
- */
- public void synchronyseZoom(){
-
- // -- on met a jour le modele de zoom pour toutes les filles en prenant le
+ // -- on met a jour le modele de zoom pour toutes les filles en prenant le
// dernier widget (= la widget temoin)
GrBoite boite = null;
- ZEbliCalquesPanel pn = null;
+ ZEbliCalquesPanel pn = null;
for (int i = listeWidgetCalque_.size() - 1; i >= 0; i--) {
EbliWidgetVueCalque vue = listeWidgetCalque_.get(i);
- if (boite == null) {
+ if (boite == null) {
boite = vue.getViewBoite();
-
- pn = vue.calquePanel_;
+
+ pn = vue.calquePanel_;
}
// } else if (vue.getViewBoite() != null) {
// boite.ajuste(vue.getViewBoite());
@@ -74,120 +72,113 @@
// vue.image = null;
// vue.repaint();
// }
-// vue.calquePanel_.getVueCalque().addPropertyChangeListener("repere", this);
+ // vue.calquePanel_.getVueCalque().addPropertyChangeListener("repere", this);
vue.calquePanel_.getVueCalque().addPropertyChangeListener("repereEvt", this);
vue.image = null;
vue.repaint();
-
+
}
- if (boite != null) {
- // -- on force le redimensionnement de la widget calque initiale avec le
+ if (boite != null) {
+ // -- on force le redimensionnement de la widget calque initiale avec le
// meme zoom
// -- le fait de faire appel a ceci mettra a jour les zooms de toutes les
// autres widgets
pn.getVueCalque().changeRepere(pn, boite, 0, 0);
}
- getEbliScene().refresh();
+ getEbliScene().refresh();
- }
+ }
-
+ public void propertyChange(final PropertyChangeEvent _evt) {
- public void propertyChange(final PropertyChangeEvent _evt) {
+ if (!noCyclePropertieChange) return;
+ noCyclePropertieChange = false;
+ // listeWidgetCalque_.get(0).calquePanel_.getVueCalque().changeViewBoite(
+ // _source, _boite, _rapide)
+ System.err.println("on recommence le tout");
+ final BVueCalque vueCalque = (BVueCalque) _evt.getSource();
+ RepereEvent newRepere = (RepereEvent) _evt.getNewValue();
+ for (final Iterator<Widget> it = getChildren().iterator(); it.hasNext();) {
+ final EbliWidgetVueCalque widget = (EbliWidgetVueCalque) ((EbliWidget) it.next()).getIntern();
+ if (widget.calquePanel_.getVueCalque() != vueCalque) {
+ widget.repereModifie(newRepere);
+ }
- if (!noCyclePropertieChange) return;
- noCyclePropertieChange = false;
- // listeWidgetCalque_.get(0).calquePanel_.getVueCalque().changeViewBoite(
- // _source, _boite, _rapide)
- final BVueCalque vueCalque = (BVueCalque) _evt.getSource();
- final GrBoite boite = vueCalque.getViewBoite();
- RepereEvent newRepere=(RepereEvent) _evt.getNewValue();
- for (final Iterator<Widget> it = getChildren().iterator(); it.hasNext();) {
- final EbliWidgetVueCalque widget = (EbliWidgetVueCalque) ((EbliWidget) it.next()).getIntern();
- if (widget.calquePanel_.getVueCalque() != vueCalque) {
-// widget.calquePanel_.getVueCalque().changeRepere(widget.calquePanel_, boite, 0, 0);
- widget.calquePanel_.getVueCalque().repereModifie(newRepere);
- }
- widget.image = null;
- widget.repaint();
- }
- noCyclePropertieChange = true;
- getEbliScene().refresh();
- }
+ }
+ noCyclePropertieChange = true;
+ getEbliScene().refresh();
+ }
- /**
- * Surcharge de la methode de ebli, utilisse pour virer les property change listener
- */
- @Override
- public void removePropertyChangeListenerFormWidget(final EbliWidget child) {
- EbliWidgetVueCalque widgetCalque;
- if (child instanceof EbliWidgetVueCalque) widgetCalque = (EbliWidgetVueCalque) child;
- else widgetCalque = (EbliWidgetVueCalque) ((EbliWidget) child.getChildren().get(0)).getIntern();
- widgetCalque.calquePanel_.getVueCalque().getAbstractCalque().removePropertyChangeListener("repere", this);
+ /**
+ * Surcharge de la methode de ebli, utilisse pour virer les property change listener
+ */
+ @Override
+ public void removePropertyChangeListenerFormWidget(final EbliWidget child) {
+ EbliWidgetVueCalque widgetCalque;
+ if (child instanceof EbliWidgetVueCalque) widgetCalque = (EbliWidgetVueCalque) child;
+ else widgetCalque = (EbliWidgetVueCalque) ((EbliWidget) child.getChildren().get(0)).getIntern();
+ widgetCalque.calquePanel_.getVueCalque().getAbstractCalque().removePropertyChangeListener("repereEvt", this);
- }
+ }
- ZCalqueSondeSynchroniserFusion managerSondesFusion_;
+ ZCalqueSondeSynchroniserFusion managerSondesFusion_;
- /**
- * Methode a appeler a la fin de la creation de la sonde fusion pour ajouter l action sonde fusion dans chaque
- * calques.
- */
- public void synchroniseSondeFusion() {
+ /**
+ * Methode a appeler a la fin de la creation de la sonde fusion pour ajouter l action sonde fusion dans chaque
+ * calques.
+ */
+ public void synchroniseSondeFusion() {
- // -- creation du manager de sonde fusion qui synchronise toute ses sondes
- // --//
- managerSondesFusion_ = new ZCalqueSondeSynchroniserFusion();
+ // -- creation du manager de sonde fusion qui synchronise toute ses sondes
+ // --//
+ managerSondesFusion_ = new ZCalqueSondeSynchroniserFusion();
- for (final EbliWidgetVueCalque widget : listeWidgetCalque_) {
- final ZEbliCalquesPanel panel = widget.calquePanel_;
+ for (final EbliWidgetVueCalque widget : listeWidgetCalque_) {
+ final ZEbliCalquesPanel panel = widget.calquePanel_;
- // -- il faut initialiser les actions specifiques si pas deja fait pour
- // activer les interactions--//
- panel.getController().initSpecificActions();
+ // -- il faut initialiser les actions specifiques si pas deja fait pour
+ // activer les interactions--//
+ panel.getController().initSpecificActions();
- // --recuperation de la sonde du calque --//
- final ZCalqueSondeInteraction sonde = panel.getController().getCalqueSondeInteraction();
+ // --recuperation de la sonde du calque --//
+ final ZCalqueSondeInteraction sonde = panel.getController().getCalqueSondeInteraction();
- // -- ajout de la sonde dans le manager
- managerSondesFusion_.addZCalqueSondeInteraction(sonde, widget);
- }
- // -- ajout dans les toolbars de tous les calques de la meme action --//
- // for (EbliWidgetVueCalque widget : listeWidgetCalque_) {
- //
- // ((EbliWidgetControllerCalque)
- // widget.getController()).getToolbarComponent().add(
- // new CalqueActionSonde(sondeFusion));
- //
- // }
- }
+ // -- ajout de la sonde dans le manager
+ managerSondesFusion_.addZCalqueSondeInteraction(sonde, widget);
+ }
+ // -- ajout dans les toolbars de tous les calques de la meme action --//
+ // for (EbliWidgetVueCalque widget : listeWidgetCalque_) {
+ //
+ // ((EbliWidgetControllerCalque)
+ // widget.getController()).getToolbarComponent().add(
+ // new CalqueActionSonde(sondeFusion));
+ //
+ // }
+ }
- /**
- * Methode a appeler au ungroup ou undo sur la fusion. Desynchronise les sondes des calques.
- */
- public void desynchroniseSondeFusion() {
- managerSondesFusion_.removeAllListenningSonde();
- }
+ /**
+ * Methode a appeler au ungroup ou undo sur la fusion. Desynchronise les sondes des calques.
+ */
+ public void desynchroniseSondeFusion() {
+ managerSondesFusion_.removeAllListenningSonde();
+ }
-
- public boolean hasSattelite() {
-
- return true;
-
- }
+ public boolean hasSattelite() {
- public List<EbliWidget> getSattelite() {
-
- List<EbliWidget> liste = new ArrayList<EbliWidget>();
+ return true;
- for (int i = listeWidgetCalque_.size() - 1; i >= 0; i--) {
- EbliWidgetVueCalque vue = listeWidgetCalque_.get(i);
- if(vue.hasSattelite())
- liste.addAll(vue.getSattelite());
- }
- return liste;
+ }
- }
-
-
+ public List<EbliWidget> getSattelite() {
+
+ List<EbliWidget> liste = new ArrayList<EbliWidget>();
+
+ for (int i = listeWidgetCalque_.size() - 1; i >= 0; i--) {
+ EbliWidgetVueCalque vue = listeWidgetCalque_.get(i);
+ if (vue.hasSattelite()) liste.addAll(vue.getSattelite());
+ }
+ return liste;
+
+ }
+
}
Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/calque/EbliWidgetVueCalque.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/calque/EbliWidgetVueCalque.java 2009-01-12 19:51:23 UTC (rev 4346)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/calque/EbliWidgetVueCalque.java 2009-01-12 20:08:48 UTC (rev 4347)
@@ -22,6 +22,7 @@
import org.fudaa.ebli.calque.BCalque;
import org.fudaa.ebli.calque.ZEbliCalquesPanel;
import org.fudaa.ebli.geometrie.GrBoite;
+import org.fudaa.ebli.repere.RepereEvent;
import org.fudaa.ebli.visuallibrary.EbliNode;
import org.fudaa.ebli.visuallibrary.EbliNodeDefault;
import org.fudaa.ebli.visuallibrary.EbliScene;
@@ -49,7 +50,7 @@
BufferedImage image;
- public GrBoite initZoom_;
+// public GrBoite initZoom_;
BuPanel conteneurEditor;
@@ -70,7 +71,8 @@
public EbliWidgetVueCalque(final EbliScene _scene, final ZEbliCalquesPanel _vue, final GrBoite _initZoom) {
super(_scene);
calquePanel_ = _vue;
- initZoom_ = _initZoom;
+// initZoom_ = _initZoom;
+ zoom_ = _initZoom;
calquePanel_.setBorder(null);
setPreferredSize(new Dimension(500, 400));
@@ -143,7 +145,7 @@
return (EbliWidgetControllerCalque) getController();
}
- boolean first_ = true;
+// boolean first_ = true;
@Override
protected void paintWidget() {
@@ -157,28 +159,31 @@
final Graphics2D g = getGraphics();
initSize(rec);
- if (first_) {
- first_ = false;
- if (initZoom_ != null && initZoom_.getDeltaX() > 0 && initZoom_.getDeltaY() > 0) {
- calquePanel_.getVueCalque().changeRepere(this, initZoom_);
-
- //-- tres important!!: le zoom doit prendre la valeur initial du zoom pour conserver le bon angle si on fais le cas suivant:
- //-- lros du chargement d un calque avec zoom specifique, suivi d'un agrandissement ou reduction: il faut que le zoom!=null pour ne pas reinitialiser le repere (cf boucle suivante)
- zoom_=initZoom_;
- initZoom_ = null;
- } else calquePanel_.restaurer();
+// if (first_) {
+// first_ = false;
+// if (initZoom_ != null && initZoom_.getDeltaX() > 0 && initZoom_.getDeltaY() > 0) {
+// calquePanel_.getVueCalque().changeRepere(this, initZoom_);
+//
+// // -- tres important!!: le zoom doit prendre la valeur initial du zoom pour conserver le bon angle si on fais
+// // le cas suivant:
+// // -- lros du chargement d un calque avec zoom specifique, suivi d'un agrandissement ou reduction: il faut que
+// // le zoom!=null pour ne pas reinitialiser le repere (cf boucle suivante)
+// zoom_ = initZoom_;
+// initZoom_ = null;
+// } else calquePanel_.restaurer();
+//
+// // -- ACHTUNG!!! si on enleve la creation de l'image ici, elle se fera dans l'autre if et ecrasera le zoom
+// // init!! --//
+// final Map params = new HashMap();
+// CtuluLibImage.setCompatibleImageAsked(params);
+// image = calquePanel_.produceImage(rec.width, rec.height, params);
+//
+// }
- //-- ACHTUNG!!! si on enleve la creation de l'image ici, elle se fera dans l'autre if et ecrasera le zoom init!! --//
- final Map params = new HashMap();
- CtuluLibImage.setCompatibleImageAsked(params);
- image = calquePanel_.produceImage(rec.width, rec.height, params);
-
- }
-
// mode edition
if (image == null || image.getWidth() != rec.width || image.getHeight() != rec.height) {
FuLog.debug("EWI: recreate image");
- if (zoom_ != null) {
+ if (zoom_ != null && zoom_.getDeltaX() > 0 && zoom_.getDeltaY() > 0) {
calquePanel_.getVueCalque().changeRepere(this, zoom_);
} else calquePanel_.restaurer();
@@ -219,7 +224,7 @@
public void notifyOpened(final org.netbeans.api.visual.action.InplaceEditorProvider.EditorController controller,
final Widget widget, final BuPanel editor) {
editingStart();
-// calquePanel_.setBorder(BorderFactory.createLineBorder(Color.GRAY, 1));
+ // calquePanel_.setBorder(BorderFactory.createLineBorder(Color.GRAY, 1));
}
// public void setColorFond(Color newColor) {
@@ -308,12 +313,20 @@
this.image = image;
}
-public GrBoite getZoom_() {
- return zoom_;
-}
+ protected GrBoite getZoom() {
+ return zoom_;
+ }
-public void setZoom_(GrBoite zoom_) {
- this.zoom_ = zoom_;
-}
+ protected void setZoom(GrBoite zoom_) {
+ this.zoom_ = zoom_;
+ }
+ protected void repereModifie(RepereEvent _newRepere) {
+ image = null;
+ calquePanel_.getVueCalque().repereModifie(_newRepere);
+
+ zoom_ = calquePanel_.getVueCalque().getViewBoite();
+ repaint();
+ }
+
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <had...@us...> - 2009-01-12 19:51:33
|
Revision: 4346
http://fudaa.svn.sourceforge.net/fudaa/?rev=4346&view=rev
Author: hadouxad
Date: 2009-01-12 19:51:23 +0000 (Mon, 12 Jan 2009)
Log Message:
-----------
Corrections Compte rendu des 2 lots + fiches de recettes LNHE
Modified Paths:
--------------
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/commun/courbe/FudaaCourbeWizardImportScope.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/meshviewer/profile/MvProfileBuilder.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostCourbeModel.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostProjet.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostSourceComparatorBuilder.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/actions/TrPostActionChooseAndCreateCalque.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/dialogSpec/TrPostWizardCourbeTemporelle.java
Modified: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/commun/courbe/FudaaCourbeWizardImportScope.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/commun/courbe/FudaaCourbeWizardImportScope.java 2009-01-12 19:48:55 UTC (rev 4345)
+++ branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/commun/courbe/FudaaCourbeWizardImportScope.java 2009-01-12 19:51:23 UTC (rev 4346)
@@ -688,7 +688,7 @@
impl_.setMainProgression(30);
impl_.setMainMessage(CtuluLib.getS("Cr\xE9ation du graphe"));
//on cree les evol reguliere SPECIFIQUES pour ces courbes.
- FudaaCourbeImporterScope.createGraphe(target_, dataG().returnEvolRegulierePourTemporelles(), null, prog,false);
+ FudaaCourbeImporterScope.createGraphe(target_, dataG().returnEvolRegulierePourTemporelles(xchoosen), null, prog,false);
}else{
//correlation
Modified: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/meshviewer/profile/MvProfileBuilder.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/meshviewer/profile/MvProfileBuilder.java 2009-01-12 19:48:55 UTC (rev 4345)
+++ branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/meshviewer/profile/MvProfileBuilder.java 2009-01-12 19:51:23 UTC (rev 4346)
@@ -8,6 +8,8 @@
package org.fudaa.fudaa.meshviewer.profile;
import java.awt.Color;
+import java.text.DecimalFormat;
+import java.text.NumberFormat;
import java.util.HashMap;
import java.util.Map;
@@ -215,7 +217,15 @@
_prog), _prog);
EGCourbeChild child;
if (isTime) {
- model.setTitle(var.toString() + CtuluLibString.ESPACE + timeModel_.getElementAt(time[t]));
+ String title=var.toString() + CtuluLibString.ESPACE ;
+ if(var.getCommonUnit()!=null)
+ title+="("+var.getCommonUnit()+")"+ CtuluLibString.ESPACE ;
+ title+=timeModel_.getElementAt(time[t]);
+ //-- on ajoute les extremites du segment choisi --//
+ title+=", P1("+format(this.selectedLine_.getCoordinateN(0).x,2)+";"+format(this.selectedLine_.getCoordinateN(0).y,2)+")"+sep+"P"+this.selectedLine_.getNumPoints()+"("+format(this.selectedLine_.getCoordinateN(this.selectedLine_.getNumPoints()-1).x,2)+";"+format(this.selectedLine_.getCoordinateN(this.selectedLine_.getNumPoints()-1).y,2)+")";
+
+
+ model.setTitle(title);
child = new MvProfileCourbeTime(gri, model, timeModel_);
} else {
child = new MvProfileCourbe(gri, model);
@@ -233,6 +243,23 @@
}
+
+ public String format(double value,int nbChiffresSignificatifs){
+
+ double val=0;
+
+ String forme="#.";
+
+ for(int i=0;i<nbChiffresSignificatifs;i++)
+ forme+="0";
+
+ DecimalFormat df = new DecimalFormat(forme);
+
+
+
+ return df.format(value);
+ }
+
/**
* Methode qui permet d ajouter une courbe spatiale poru un grapeh deja existant.
*
Modified: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostCourbeModel.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostCourbeModel.java 2009-01-12 19:48:55 UTC (rev 4345)
+++ branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostCourbeModel.java 2009-01-12 19:51:23 UTC (rev 4346)
@@ -20,6 +20,7 @@
import org.fudaa.fudaa.commun.courbe.FudaaCourbeTimeModel;
import com.memoire.fu.FuLog;
+import com.vividsolutions.jts.geom.Coordinate;
/**
* @author Fred Deniger
@@ -160,10 +161,15 @@
final TrPostSource _src) {
final TrPostCourbeModel model = new TrPostCourbeModel.Node(_src, _idxPt, _var, _src.getTime().getTimeListModel()
.getTimesInSec());
-
final EGCourbeChild courbe = new FudaaCourbeTime(_group, model, _src.getNewTimeListModel());
_group.addEGComponent(courbe);
- courbe.getModel().setTitle(courbe.getModel().getTitle() + CtuluLibString.ESPACE + (_idxPt + 1));
+ String title=courbe.getModel().getTitle()+ CtuluLibString.ESPACE ;
+ if(_var.getCommonUnitString()!=null)
+ title+="("+_var.getCommonUnitString()+")"+CtuluLibString.ESPACE;
+ Coordinate coor=_src.getGrid().getCoor(_idxPt);
+ title+= _idxPt + ":" + " (" + _src.getPrecisionModel().round(coor.x) + ", "
+ + _src.getPrecisionModel().round(coor.y) + ")";
+ courbe.getModel().setTitle(title);
return courbe;
}
@@ -173,7 +179,7 @@
final EGCourbeChild courbe = new FudaaCourbeTime(_group, model, _src.getNewTimeListModel());
_group.addEGComponent(courbe);
courbe.getModel().setTitle(
- courbe.getModel().getTitle() + " (" + _src.getPrecisionModel().round(_idxPt.getX()) + ", "
+ courbe.getModel().getTitle()+"("+_var.getCommonUnitString()+")" + " (" + _src.getPrecisionModel().round(_idxPt.getX()) + ", "
+ _src.getPrecisionModel().round(_idxPt.getY()) + ')');
return courbe;
}
Modified: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostProjet.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostProjet.java 2009-01-12 19:48:55 UTC (rev 4345)
+++ branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostProjet.java 2009-01-12 19:51:23 UTC (rev 4346)
@@ -59,7 +59,9 @@
import org.fudaa.ebli.visuallibrary.EbliNode;
import org.fudaa.ebli.visuallibrary.EbliNodeDefault;
import org.fudaa.ebli.visuallibrary.calque.CalqueLegendeWidgetAdapter;
+import org.fudaa.ebli.visuallibrary.graphe.EbliWidgetControllerGraphe;
import org.fudaa.ebli.visuallibrary.graphe.EbliWidgetCreatorGraphe;
+import org.fudaa.ebli.visuallibrary.graphe.EbliWidgetGrapheController;
import org.fudaa.fudaa.commun.courbe.FudaaGrapheTimeAnimatedVisuPanel;
import org.fudaa.fudaa.fdico.FDicoLib;
import org.fudaa.fudaa.meshviewer.MvResource;
@@ -915,6 +917,7 @@
final TrPostVisuPanel calque) {
final EGGraphe graphe = new EGGraphe(_model);
graphe.setXAxe(EGAxeHorizontal.buildDefautTimeAxe(calque.getSource().getTimeFormatter()));
+ graphe.getModel().getAxeX().setUnite("s");
graphe.setCmd(new CtuluCommandManager());
addEbliNode(new FudaaGrapheTimeAnimatedVisuPanel(graphe), calque);
}
@@ -950,11 +953,19 @@
_pn.getGraphe().restore();
if (_desc != null) nodeG.getWidget().getController().setDescription(_desc);
currentLayoutFilleOrFirst.getScene().setSelectedObjects(Collections.emptySet());
+
+ //-- ajout syst\xE9matique de la legende associee --//
+ EbliWidgetControllerGraphe controller=(EbliWidgetControllerGraphe)nodeG.getWidget().getIntern().getController();
+ controller.ajoutLegende();
}
});
- getImpl().getCurrentLayoutFilleOrFirst().getScene().refresh();
+ //getImpl().getCurrentLayoutFilleOrFirst().getScene().refresh();
+
+
+
+
}
protected void buildTimeUpdater() {
@@ -1132,7 +1143,7 @@
final Point location = pnVisu.getLocation();
location.x += 10;
location.y += 10;
- filleLayout.addCalque("Calque", location, pnVisu.getPreferredSize(), pnVisu, legendeCalque);
+ filleLayout.addCalque("Calque "+(filleLayout.getScene().getAllVue2d().size()+1), location, pnVisu.getPreferredSize(), pnVisu, legendeCalque);
// -- decoration de la fille layout --//
filleLayout.setFrameIcon(EbliResource.EBLI.getToolIcon("lissage"));
Modified: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostSourceComparatorBuilder.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostSourceComparatorBuilder.java 2009-01-12 19:48:55 UTC (rev 4345)
+++ branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostSourceComparatorBuilder.java 2009-01-12 19:51:23 UTC (rev 4346)
@@ -224,7 +224,7 @@
final Point location = pnVisu.getLocation();
location.x += 10;
location.y += 10;
- impl.getCurrentLayoutFille().addCalque(TrPostSourceComparatorBuilder.getComparaisonTitle(), location,
+ impl.getCurrentLayoutFille().addCalque(TrPostSourceComparatorBuilder.getComparaisonTitle()+" "+impl.getCurrentLayoutFille().getScene().getAllVue2d().size()+1, location,
pnVisu.getPreferredSize(), pnVisu, legendeCalque);
pnVisu.restaurer();
Modified: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/actions/TrPostActionChooseAndCreateCalque.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/actions/TrPostActionChooseAndCreateCalque.java 2009-01-12 19:48:55 UTC (rev 4345)
+++ branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/actions/TrPostActionChooseAndCreateCalque.java 2009-01-12 19:51:23 UTC (rev 4346)
@@ -52,7 +52,7 @@
final CalqueLegendeWidgetAdapter legendeCalque = new CalqueLegendeWidgetAdapter(getScene(), null);
final TrPostVisuPanel pnVisu = new TrPostVisuPanel(projet_.getImpl(), projet_, legendeCalque, srcChoisie);
- final EbliNode node = controller_.addCalque(TrResource.getS("Calque"), pnVisu.getLocation(), pnVisu
+ final EbliNode node = controller_.addCalque(TrResource.getS("Calque")+(controller_.getSceneCourante().getAllVue2d().size()+1), pnVisu.getLocation(), pnVisu
.getPreferredSize(), pnVisu, legendeCalque);
// -- ajout de l INFO de la source utilis\xE9e --//
node.getWidget().getController().setDescription("Source: " + projet_.formatInfoSource(srcChoisie));
Modified: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/dialogSpec/TrPostWizardCourbeTemporelle.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/dialogSpec/TrPostWizardCourbeTemporelle.java 2009-01-12 19:48:55 UTC (rev 4345)
+++ branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/dialogSpec/TrPostWizardCourbeTemporelle.java 2009-01-12 19:51:23 UTC (rev 4346)
@@ -414,6 +414,9 @@
modelTotal.mergeWithAnotherTreeModel(modelPointsInt);
} else if (modelPointsInt != null) modelTotal = modelPointsInt;
+
+ modelTotal.getAxeX().setUnite("s");
+
// -- creation du widget avec model total --//
return modelTotal;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <had...@us...> - 2009-01-12 19:49:04
|
Revision: 4345
http://fudaa.svn.sourceforge.net/fudaa/?rev=4345&view=rev
Author: hadouxad
Date: 2009-01-12 19:48:55 +0000 (Mon, 12 Jan 2009)
Log Message:
-----------
Corrections Compte rendu des 2 lots + fiches de recettes LNHE
Modified Paths:
--------------
branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/telemac/io/ScopeStructure.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/courbe/EGCourbeModelDefault.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/courbe/EGModel.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliScene.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetShape.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/actions/EbliWidgetActionAlign.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/actions/EbliWidgetActionDuplicateLayout.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/calque/CalqueLegendeWidgetAdapter.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/calque/EbliWidgetControllerCalque.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/graphe/EbliWidgetControllerGraphe.java
Modified: branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/telemac/io/ScopeStructure.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/telemac/io/ScopeStructure.java 2009-01-12 11:28:25 UTC (rev 4344)
+++ branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/telemac/io/ScopeStructure.java 2009-01-12 19:48:55 UTC (rev 4345)
@@ -520,7 +520,7 @@
}
evolReg[i] = new EvolutionReguliere(tabX, tabY, false);
- evolReg[i].setNom("courbe de " + nomVar);
+ evolReg[i].setNom("courbe de " + nomVar.replace(" ", ""));
evolReg[i].setUnite(nomVar);
}
@@ -529,11 +529,39 @@
}
/**
+ * Methode qui essaie d'extraire le nombre de la chaine de separator (utilis\xE9 pour les evol temporelles).
+ * Si n'y arrive pas, retourne l'indice du separateur.
+ * Normalement les separateurs sont de la forme suivante:
+ * VAR = VALUE c'est value qui nous interesse.
+ * @param indiceSeparator
+ * @return
+ */
+ public double getValueExtractOfSeparator(int indiceSeparator){
+
+ String separator=getSeparator(indiceSeparator);
+
+ if(separator.lastIndexOf(' ')!=-1){
+ String sub=separator.substring(separator.lastIndexOf(' '), separator.length());
+
+ try{
+ double value=Double.parseDouble(sub);
+
+ return value;
+
+ }catch(NumberFormatException e){
+ return indiceSeparator;
+ }
+
+ }
+ return indiceSeparator;
+ }
+
+ /**
* A utiliser poru transformer scopgen en evol temporelles.
* On cree une courbe par variables, et on prend les points de tous les separaor pou les former.
* @return
*/
- public EvolutionReguliere[] returnEvolRegulierePourTemporelles() {
+ public EvolutionReguliere[] returnEvolRegulierePourTemporelles(double xVoulu) {
EvolutionReguliere[] evolReg = new EvolutionReguliere[getNbVariables()-1];
@@ -549,12 +577,29 @@
//on recupere les x de ce separator
List<Double> listX=getListValueForVariableForSeparator(getSeparator(k), 0);
- //on recupere les y de la variable de la courbe
+ //on recupere tous les y de la variable de la courbe
List<Double> listY=getListValueForVariableForSeparator(getSeparator(k), i+1);
+
+ //-- le x correspond \xE0 la valeur du caractere de separation--//
+ double x=getValueExtractOfSeparator(k);
+
+ //-- il faut recuperer le y le plus proche du x voulu en regardant les indices --//
+
+ //-- recuperation de l'indice du x le plus proche --//
+ int indiceXproche=0;
+ double min=Math.abs(xVoulu- listX.get(0));
+ for(int g=0;g<listX.size();g++)
+ if(min>Math.abs(xVoulu- listX.get(g))){
+ min=Math.abs(xVoulu- listX.get(g));
+ indiceXproche=g;
+ }
+
+ double y=listY.get(indiceXproche);
+
//on ajoute tout cela au x et y totaux
- listeTOTALX.addAll(listX);
- listeTOTALY.addAll(listY);
+ listeTOTALX.add(x);
+ listeTOTALY.add(y);
}
@@ -567,7 +612,7 @@
tabY[j] = listeTOTALY.get(j);
}
evolReg[i] = new EvolutionReguliere(tabX, tabY, false);
- evolReg[i].setNom("courbe de " + nomVar);
+ evolReg[i].setNom(nomVar.replace(" ", "")+" sur ["+getSeparator(0).replace(" ", "")+";"+getSeparator(getNbSeparator()-1).replace(" ", "")+"] pour X choisi="+xVoulu);
evolReg[i].setUnite(nomVar);
}
@@ -597,7 +642,7 @@
}
evolReg[0] = new EvolutionReguliere(tabX, tabY, false);
- evolReg[0].setNom("cor\xE9lation:(X="+getVariable(varX+1)+"//Y="+getVariable(varY+1)+")");
+ evolReg[0].setNom("cor\xE9lation:(X="+getVariable(varX+1).replace(" ", "")+"//Y="+getVariable(varY+1).replace(" ", "")+")");
evolReg[0].setUnite(getVariable(varX+1));
return evolReg;
@@ -622,7 +667,7 @@
restreindreStructure(listVariables);
//on interpole pour le x choisi
- restreindreStructure(xchoosen);
+ //restreindreStructure(xchoosen);
printResults();
}
Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/courbe/EGCourbeModelDefault.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/courbe/EGCourbeModelDefault.java 2009-01-12 11:28:25 UTC (rev 4344)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/courbe/EGCourbeModelDefault.java 2009-01-12 19:48:55 UTC (rev 4345)
@@ -218,4 +218,10 @@
return duplic;
}
+
+//@Override
+//public String getUnite() {
+// // TODO Auto-generated method stub
+// return null;
+//}
}
\ No newline at end of file
Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/courbe/EGModel.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/courbe/EGModel.java 2009-01-12 11:28:25 UTC (rev 4344)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/courbe/EGModel.java 2009-01-12 19:48:55 UTC (rev 4345)
@@ -188,5 +188,7 @@
* @return
*/
EGModel duplicate();
+
+ //String getUnite();
}
Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliScene.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliScene.java 2009-01-12 11:28:25 UTC (rev 4344)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliScene.java 2009-01-12 19:48:55 UTC (rev 4345)
@@ -6,6 +6,7 @@
import java.awt.image.BufferedImage;
import java.beans.PropertyChangeListener;
import java.beans.PropertyChangeSupport;
+import java.util.ArrayList;
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
@@ -17,6 +18,7 @@
import org.fudaa.ctulu.CtuluUI;
import org.fudaa.ctulu.image.CtuluImageProducer;
import org.fudaa.ctulu.image.CtuluLibImage;
+import org.fudaa.ebli.visuallibrary.calque.EbliWidgetVueCalque;
import org.fudaa.ebli.visuallibrary.tree.EbliWidgetJXTreeTableModel;
import org.netbeans.api.visual.action.InplaceEditorProvider;
import org.netbeans.api.visual.action.WidgetAction;
@@ -352,6 +354,26 @@
}
+
+ public List<EbliWidget> getAllVue2d(){
+
+ List<EbliWidget> liste=new ArrayList<EbliWidget>();
+
+ for (final Object objet : this.getObjects()) {
+ if (objet instanceof EbliNode) {
+ final EbliNode cible = (EbliNode) objet;
+
+ if(cible.getWidget().getIntern() instanceof EbliWidgetVueCalque)
+ liste.add(cible.getWidget().getIntern() );
+
+
+ }
+ }
+ return liste;
+
+
+ }
+
/**
* Methode qui redimensionne proportionellement les widget \xE0 la scene
*
Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetShape.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetShape.java 2009-01-12 11:28:25 UTC (rev 4344)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetShape.java 2009-01-12 19:48:55 UTC (rev 4345)
@@ -113,9 +113,16 @@
g.setPaint(fg_);
// --couleur de fond --//
- g.setColor(getColorFond());
- g.fill(shape);
-
+ //g.setColor(getColorFond());
+ //g.fill(shape);
+ // // --test on autorise que si son widget fils le permet --//
+ if (!this.getTransparent()) {
+ g.setColor(getColorFond());
+ g.fill(shape);
+ }
+
+
+
g.setPaint(old);
}
tl.dessineShape(g, shape);
Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/actions/EbliWidgetActionAlign.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/actions/EbliWidgetActionAlign.java 2009-01-12 11:28:25 UTC (rev 4344)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/actions/EbliWidgetActionAlign.java 2009-01-12 19:48:55 UTC (rev 4345)
@@ -66,7 +66,7 @@
public static class Center extends EbliWidgetActionAlign {
public Center(final EbliScene _scene) {
- super(EbliResource.EBLI.getString("Centrer verticalement"), EbliResource.EBLI.getToolIcon("aocenterv"),
+ super(EbliResource.EBLI.getString("Centrer horizontalement"), EbliResource.EBLI.getToolIcon("aocenterv"),
"CENTERV", _scene);
}
@@ -147,7 +147,7 @@
public static class Middle extends EbliWidgetActionAlign {
public Middle(final EbliScene _scene) {
- super(EbliResource.EBLI.getString("Centrer horizontalement"), EbliResource.EBLI.getToolIcon("aocenterh"),
+ super(EbliResource.EBLI.getString("Centrer verticalement"), EbliResource.EBLI.getToolIcon("aocenterh"),
"CENTERH", _scene);
}
Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/actions/EbliWidgetActionDuplicateLayout.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/actions/EbliWidgetActionDuplicateLayout.java 2009-01-12 11:28:25 UTC (rev 4344)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/actions/EbliWidgetActionDuplicateLayout.java 2009-01-12 19:48:55 UTC (rev 4345)
@@ -37,10 +37,10 @@
final CtuluCommandContainer cmd_;
public EbliWidgetActionDuplicateLayout(final EbliScene _scene) {
- super(_scene, EbliResource.EBLI.getString("Dupliquer la sc\xE8ne"), CtuluResource.CTULU
+ super(_scene, EbliResource.EBLI.getString("Dupliquer le layout"), CtuluResource.CTULU
.getIcon("crystal_cascade.png"), "DUPLICATE");
- putValue(NAME, EbliResource.EBLI.getString("Dupliquer la sc\xE8ne"));
+ putValue(NAME, EbliResource.EBLI.getString("Dupliquer le layout"));
cmd_ = _scene.getCmdMng();
}
Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/calque/CalqueLegendeWidgetAdapter.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/calque/CalqueLegendeWidgetAdapter.java 2009-01-12 11:28:25 UTC (rev 4344)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/calque/CalqueLegendeWidgetAdapter.java 2009-01-12 19:48:55 UTC (rev 4345)
@@ -17,6 +17,7 @@
import org.fudaa.ebli.calque.BCalqueLegendePanel;
import org.fudaa.ebli.palette.BPalettePlageInterface;
import org.fudaa.ebli.palette.BPalettePlageLegende;
+import org.fudaa.ebli.ressource.EbliResource;
import org.fudaa.ebli.trace.BPlageInterface;
import org.fudaa.ebli.visuallibrary.EbliNode;
import org.fudaa.ebli.visuallibrary.EbliNodeDefault;
@@ -62,7 +63,7 @@
for (int i = 0; i < listeC.length; i++) {
final Component c = listeC[i];
- if (c instanceof JLabel) {
+ if (c instanceof JLabel && !((JLabel)c).getText().equals(EbliResource.EBLI.getString("R\xE9sultats"))) {
final LabelWidget titre = new LabelWidget(_scene);
titre.setAlignment(Alignment.CENTER);
Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/calque/EbliWidgetControllerCalque.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/calque/EbliWidgetControllerCalque.java 2009-01-12 11:28:25 UTC (rev 4344)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/calque/EbliWidgetControllerCalque.java 2009-01-12 19:48:55 UTC (rev 4345)
@@ -178,6 +178,8 @@
// duplication du node en question
final EbliNode duplique = n.duplicate(null);
+ duplique.setTitle("Calque "+(sceneDestination.getAllVue2d().size()+1));
+
// -- redimensionnement du duplicata --//
((EbliWidgetCreatorVueCalque) duplique.getCreator()).initSize(getVisuPanel().getVueCalque().getCalque().getSize());
Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/graphe/EbliWidgetControllerGraphe.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/graphe/EbliWidgetControllerGraphe.java 2009-01-12 11:28:25 UTC (rev 4344)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/graphe/EbliWidgetControllerGraphe.java 2009-01-12 19:48:55 UTC (rev 4345)
@@ -5,7 +5,9 @@
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.Iterator;
+import java.util.List;
import javax.swing.JComponent;
import javax.swing.JLabel;
@@ -23,9 +25,12 @@
import org.fudaa.ebli.commun.EbliActionInterface;
import org.fudaa.ebli.commun.EbliActionSimple;
import org.fudaa.ebli.commun.EbliComponentFactory;
+import org.fudaa.ebli.courbe.EGCourbe;
import org.fudaa.ebli.courbe.EGFillePanel;
import org.fudaa.ebli.courbe.EGGraphe;
+import org.fudaa.ebli.courbe.EGGrapheModel;
import org.fudaa.ebli.courbe.EGGrapheTreeModel;
+import org.fudaa.ebli.courbe.EGModel;
import org.fudaa.ebli.courbe.EGSpecificActions;
import org.fudaa.ebli.courbe.EGTableGraphePanel;
import org.fudaa.ebli.courbe.EGTree;
@@ -70,6 +75,12 @@
EbliWidgetGraphe widgetGraphe_;
EbliActionEditorOneClick<BuPanel> editorAction_;
+
+ /**
+ * Liste qui contient les parametres d'origines des titres,
+ * doit etre relanc\xE9 dans le cas ou l'on ajoute de nouveau une legende.
+ */
+ HashMap<EGCourbe,String> listeTitlesOrigins_=new HashMap<EGCourbe,String>();
public EbliWidgetControllerGraphe(final EbliWidgetGraphe widget_, final EbliNodeDefault nodeLegende) {
super(widget_);
@@ -82,6 +93,9 @@
addActionSpecifiques();
setProportional(true);
+
+ initTitlesOrigins(widgetGraphe_.panelGraphe_.getGraphe().getModel());
+
}
@@ -310,6 +324,25 @@
});
}
+ /**
+ * Initialise les titres d origines du graphe.
+ * @param model
+ */
+ public void initTitlesOrigins(EGGrapheModel model){
+ EGCourbe[] listeCourbes=model.getCourbes();
+ for(int i=0;i<listeCourbes.length;i++)
+ listeTitlesOrigins_.put(listeCourbes[i], listeCourbes[i].getTitle());
+
+ }
+ public void reinitTitlesOrigins(EGGrapheModel model){
+ EGCourbe[] listeCourbes=model.getCourbes();
+ for(int i=0;i<listeCourbes.length;i++)
+ if(listeTitlesOrigins_.get(listeCourbes[i])!=null)
+ listeCourbes[i].setTitle(listeTitlesOrigins_.get(listeCourbes[i]));
+
+ }
+
+
public void ajoutLegende() {
// -- creation de la l\xE9gende --//
if (widget_.getEbliScene() != null) {
@@ -340,6 +373,10 @@
widgetGraphe_.getNodeLegende().setPreferedSize(widgetGraphe_.getNodeLegende().getWidget().getPreferredSize());
widget_.getEbliScene().refresh();
+
+
+ //-- reinitialisation des titres de la legendes --//
+ reinitTitlesOrigins(widgetGraphe_.panelGraphe_.getGraphe().getModel());
} else if (widgetGraphe_.getNodeLegende().hasWidget()) {
// -- cas ou la legende est masquee --//
widgetGraphe_.getNodeLegende().getWidget().setVisible(true);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bma...@us...> - 2009-01-12 11:28:40
|
Revision: 4344
http://fudaa.svn.sourceforge.net/fudaa/?rev=4344&view=rev
Author: bmarchan
Date: 2009-01-12 11:28:25 +0000 (Mon, 12 Jan 2009)
Log Message:
-----------
Created tag FudaaModeleur_0_10.
Added Paths:
-----------
tags/FudaaModeleur_0_10/
tags/FudaaModeleur_0_10/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueAffichageDonneesInterface.java
tags/FudaaModeleur_0_10/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlImplementation.java
Removed Paths:
-------------
tags/FudaaModeleur_0_10/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueAffichageDonneesInterface.java
tags/FudaaModeleur_0_10/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlImplementation.java
Property changes on: tags/FudaaModeleur_0_10
___________________________________________________________________
Added: svn:ignore
+ eclipse_projects
Added: svn:mergeinfo
+ /branches/Br_FudaaModeleur_TF:3445-3850
/branches/FudaaModeleur_TC1:3861-3891
Deleted: tags/FudaaModeleur_0_10/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueAffichageDonneesInterface.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueAffichageDonneesInterface.java 2009-01-09 15:13:24 UTC (rev 4342)
+++ tags/FudaaModeleur_0_10/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueAffichageDonneesInterface.java 2009-01-12 11:28:25 UTC (rev 4344)
@@ -1,231 +0,0 @@
-/**
- * @file ZCalqueAffichageDonneesInterface.java
- * @creation 24 oct. 2003
- * @modification $Date$
- * @license GNU General Public License 2
- * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
- * @mail de...@fu...
- */
-package org.fudaa.ebli.calque;
-
-import java.awt.Graphics2D;
-import java.beans.PropertyChangeListener;
-
-import com.vividsolutions.jts.geom.LineString;
-import com.vividsolutions.jts.geom.LinearRing;
-
-import org.fudaa.ctulu.CtuluListSelectionInterface;
-
-import org.fudaa.ebli.commun.EbliListeSelectionMultiInterface;
-import org.fudaa.ebli.commun.EbliTableInfoTarget;
-import org.fudaa.ebli.find.EbliFindableItem;
-import org.fudaa.ebli.geometrie.GrBoite;
-import org.fudaa.ebli.geometrie.GrMorphisme;
-import org.fudaa.ebli.geometrie.GrPoint;
-import org.fudaa.ebli.palette.BPalettePlageTarget;
-import org.fudaa.ebli.trace.TraceIconModel;
-import org.fudaa.ebli.trace.TraceLigneModel;
-
-/**
- * Une interface pour un calque d'affichage contenant des donn\xE9es, supportant la recherche et
- * pouvant etre une cible d'une palette de couleurs.
- *
- * @author deniger
- * @version $Id$
- */
-public interface ZCalqueAffichageDonneesInterface extends EbliFindableItem, BPalettePlageTarget, EbliTableInfoTarget,
- ZCalqueAffichageInterface {
-
- void fillWithInfo(BCalquePaletteInfo.InfoData _d);
-
- /**
- * Efface la selection du calque.
- */
- void clearSelection();
-
- /**
- * Tout selectionner.
- */
- void selectAll();
-
- /**
- * Selectionne les objets d'indices donn\xE9es.
- * @param _idx Les indices.
- */
- boolean setSelection(int[] _idx);
-
- /**
- * Selectionne l'objet suivant de l'objet en cours.
- * @return true si la selection a \xE9t\xE9 modifi\xE9e.
- */
- public boolean selectNext();
-
-
- /**
- * Selectionne l'objet suivant de l'objet en cours.
- * @return true si la selection a \xE9t\xE9 modifi\xE9e.
- */
- public boolean selectPrevious();
-
- /**
- * Inverser la selection.
- */
- void inverseSelection();
-
- boolean isEditable();
-
- /**
- * Definit si les objets du calque sont ou non selectionnables.
- * @return true : Les objets sont selectionnables.
- */
- boolean isSelectable();
-
- /**
- * Definit si l'utilisateur peut changer le caract\xE8re s\xE9lectionnable/non depuis l'action "Selectionnable".
- * @return true : Si le calque peut \xEAtre rendu selectionnable
- */
- public boolean canSetSelectable();
-
- /**
- * @return la boite zoomant sur la selection. Cette boite est la boite englobante
- * augment\xE9e d'une marge.
- */
- GrBoite getZoomOnSelected();
-
- /**
- * La boite englobante des objets s\xE9lectionn\xE9s.
- * @return La boite
- */
- GrBoite getDomaineOnSelected();
-
- /**
- * @return true si seulement un objet selectionne.
- */
- boolean isOnlyOneObjectSelected();
-
- /**
- * Permet de modifier la selection du calque \xE0 partir d'un selection ponctuelle.
- *
- * @param _pointReel le point de selection en coordonnees reelles
- * @param _tolerancePixel la tolerance utilisee pour determiner si un objet est selectionne
- * @param _action voir les action de ZCalqueSelectionInteraction
- * @return true si la selection a ete modifiee
- * @see ZCalqueSelectionInteractionAbstract
- */
- boolean changeSelection(GrPoint _pointReel, int _tolerancePixel, int _action);
-
- /**
- * Permet de modifier la selection du calque \xE0 partir d'un poly de selection.
- *
- * @param _p le polygone englobant en COORDONNEES REELS
- * @param _action l'action sur la selection (voir les action de ZCalqueSelectionInteraction)
- * @param _mode TODO
- * @return true si selection modifiee
- * @see ZCalqueSelectionInteractionAbstract
- */
- boolean changeSelection(LinearRing _p, int _action, int _mode);
-
- boolean changeSelection(LinearRing[] _p, int _action, int _mode);
-
- /**
- * @return la ligne repr\xE9sentant la s\xE9lection courant. null si s\xE9lection non adequate
- */
- LineString getSelectedLine();
-
- /**
- * @return true si la selection est vide
- */
- boolean isSelectionEmpty();
-
- /**
- * @return le modele utilise
- */
- ZModeleDonnees modeleDonnees();
-
- /**
- * @param _l un listener pour la selection
- */
- void addSelectionListener(ZSelectionListener _l);
-
- /**
- * @param _l le listener a enlever
- */
- void removeSelectionListener(ZSelectionListener _l);
-
- /**
- * @return l'id du calque
- */
- String getName();
-
- /**
- * @return true si la selection sur une selection entre 2 points est possible.
- */
- boolean isSpecialSelectionAllowed();
-
- /**
- * @param _l le listener a ajouter
- */
- void addPropertyChangeListener(PropertyChangeListener _l);
-
- /**
- * @param _l le listener a enlever
- */
- void removePropertyChangeListener(PropertyChangeListener _l);
-
- /**
- * Edition de la selection.
- *
- * @return chaine d'erreur
- */
- String editSelected();
-
- /**
- * Permet au calque selection interaction de dessiner la s\xE9lection en dernier et donc par-dessus tous les autres
- * calques.
- *
- * @param _g le grphics a modifier
- * @param _trace le conteneur des tracer de selection
- */
- void paintSelection(Graphics2D _g, ZSelectionTrace _trace, GrMorphisme _versEcran, GrBoite _clipReel);
-
- /**
- * Redessiner le calque.
- */
- void repaint();
-
- /**
- * @return la selection multi. Peut etre null.
- */
- EbliListeSelectionMultiInterface getLayerSelectionMulti();
-
- /**
- * @return la selection simple. Peut etre null.
- */
- CtuluListSelectionInterface getLayerSelection();
-
- /**
- * Un calque peut dispose de plusieurs jeux d'icone.
- *
- * @param _idx l'indice de l'icone.
- * @param _model
- * @return
- */
- boolean setIconModel(int _idx, final TraceIconModel _model);
-
- TraceIconModel getIconModel(int _idx);
-
- /**
- * @param _idx l'indice du jeu d'icone/ligne.
- * @return le titre du jeu
- */
- String getSetTitle(int _idx);
-
- /**
- * @return le nomnbre de jeu d'icone/ligne
- */
- int getNbSet();
-
- boolean setLineModel(int _idx, final TraceLigneModel _model);
-
- TraceLigneModel getLineModel(int _idx);
-}
Copied: tags/FudaaModeleur_0_10/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueAffichageDonneesInterface.java (from rev 4343, branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueAffichageDonneesInterface.java)
===================================================================
--- tags/FudaaModeleur_0_10/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueAffichageDonneesInterface.java (rev 0)
+++ tags/FudaaModeleur_0_10/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueAffichageDonneesInterface.java 2009-01-12 11:28:25 UTC (rev 4344)
@@ -0,0 +1,232 @@
+/**
+ * @file ZCalqueAffichageDonneesInterface.java
+ * @creation 24 oct. 2003
+ * @modification $Date$
+ * @license GNU General Public License 2
+ * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
+ * @mail de...@fu...
+ */
+package org.fudaa.ebli.calque;
+
+import java.awt.Graphics2D;
+import java.beans.PropertyChangeListener;
+
+import com.vividsolutions.jts.geom.LineString;
+import com.vividsolutions.jts.geom.LinearRing;
+
+import org.fudaa.ctulu.CtuluListSelectionInterface;
+
+import org.fudaa.ebli.commun.EbliListeSelectionMultiInterface;
+import org.fudaa.ebli.commun.EbliTableInfoTarget;
+import org.fudaa.ebli.find.EbliFindableItem;
+import org.fudaa.ebli.geometrie.GrBoite;
+import org.fudaa.ebli.geometrie.GrMorphisme;
+import org.fudaa.ebli.geometrie.GrPoint;
+import org.fudaa.ebli.palette.BPalettePlageTarget;
+import org.fudaa.ebli.trace.TraceIconModel;
+import org.fudaa.ebli.trace.TraceLigneModel;
+
+/**
+ * Une interface pour un calque d'affichage contenant des donn\xE9es, supportant la recherche et
+ * pouvant etre une cible d'une palette de couleurs.
+ *
+ * @author deniger
+ * @version $Id$
+ */
+public interface ZCalqueAffichageDonneesInterface extends EbliFindableItem, BPalettePlageTarget, EbliTableInfoTarget,
+ ZCalqueAffichageInterface {
+
+ void fillWithInfo(BCalquePaletteInfo.InfoData _d);
+
+ /**
+ * Efface la selection du calque.
+ */
+ void clearSelection();
+
+ /**
+ * Tout selectionner.
+ */
+ void selectAll();
+
+ /**
+ * Selectionne les objets d'indices donn\xE9es.
+ * @param _idx Les indices.
+ */
+ boolean setSelection(int[] _idx);
+
+ /**
+ * Selectionne l'objet suivant de l'objet en cours.
+ * @return true si la selection a \xE9t\xE9 modifi\xE9e.
+ */
+ public boolean selectNext();
+
+
+ /**
+ * Selectionne l'objet suivant de l'objet en cours.
+ * @return true si la selection a \xE9t\xE9 modifi\xE9e.
+ */
+ public boolean selectPrevious();
+
+ /**
+ * Inverser la selection.
+ */
+ void inverseSelection();
+
+ boolean isEditable();
+
+ /**
+ * Definit si les objets du calque sont ou non selectionnables. Si la valeur retourn\xE9e est false, les
+ * m\xE9thodes de s\xE9lection de l'interface n'ont aucun effet.
+ * @return true : Les objets sont selectionnables.
+ */
+ boolean isSelectable();
+
+ /**
+ * Definit si l'utilisateur peut changer le caract\xE8re s\xE9lectionnable/non depuis l'action "Selectionnable".
+ * @return true : Si le calque peut \xEAtre rendu selectionnable
+ */
+ public boolean canSetSelectable();
+
+ /**
+ * @return la boite zoomant sur la selection. Cette boite est la boite englobante
+ * augment\xE9e d'une marge.
+ */
+ GrBoite getZoomOnSelected();
+
+ /**
+ * La boite englobante des objets s\xE9lectionn\xE9s.
+ * @return La boite
+ */
+ GrBoite getDomaineOnSelected();
+
+ /**
+ * @return true si seulement un objet selectionne.
+ */
+ boolean isOnlyOneObjectSelected();
+
+ /**
+ * Permet de modifier la selection du calque \xE0 partir d'un selection ponctuelle.
+ *
+ * @param _pointReel le point de selection en coordonnees reelles
+ * @param _tolerancePixel la tolerance utilisee pour determiner si un objet est selectionne
+ * @param _action voir les action de ZCalqueSelectionInteraction
+ * @return true si la selection a ete modifiee
+ * @see ZCalqueSelectionInteractionAbstract
+ */
+ boolean changeSelection(GrPoint _pointReel, int _tolerancePixel, int _action);
+
+ /**
+ * Permet de modifier la selection du calque \xE0 partir d'un poly de selection.
+ *
+ * @param _p le polygone englobant en COORDONNEES REELS
+ * @param _action l'action sur la selection (voir les action de ZCalqueSelectionInteraction)
+ * @param _mode TODO
+ * @return true si selection modifiee
+ * @see ZCalqueSelectionInteractionAbstract
+ */
+ boolean changeSelection(LinearRing _p, int _action, int _mode);
+
+ boolean changeSelection(LinearRing[] _p, int _action, int _mode);
+
+ /**
+ * @return la ligne repr\xE9sentant la s\xE9lection courant. null si s\xE9lection non adequate
+ */
+ LineString getSelectedLine();
+
+ /**
+ * @return true si la selection est vide
+ */
+ boolean isSelectionEmpty();
+
+ /**
+ * @return le modele utilise
+ */
+ ZModeleDonnees modeleDonnees();
+
+ /**
+ * @param _l un listener pour la selection
+ */
+ void addSelectionListener(ZSelectionListener _l);
+
+ /**
+ * @param _l le listener a enlever
+ */
+ void removeSelectionListener(ZSelectionListener _l);
+
+ /**
+ * @return l'id du calque
+ */
+ String getName();
+
+ /**
+ * @return true si la selection sur une selection entre 2 points est possible.
+ */
+ boolean isSpecialSelectionAllowed();
+
+ /**
+ * @param _l le listener a ajouter
+ */
+ void addPropertyChangeListener(PropertyChangeListener _l);
+
+ /**
+ * @param _l le listener a enlever
+ */
+ void removePropertyChangeListener(PropertyChangeListener _l);
+
+ /**
+ * Edition de la selection.
+ *
+ * @return chaine d'erreur
+ */
+ String editSelected();
+
+ /**
+ * Permet au calque selection interaction de dessiner la s\xE9lection en dernier et donc par-dessus tous les autres
+ * calques.
+ *
+ * @param _g le grphics a modifier
+ * @param _trace le conteneur des tracer de selection
+ */
+ void paintSelection(Graphics2D _g, ZSelectionTrace _trace, GrMorphisme _versEcran, GrBoite _clipReel);
+
+ /**
+ * Redessiner le calque.
+ */
+ void repaint();
+
+ /**
+ * @return la selection multi. Peut etre null.
+ */
+ EbliListeSelectionMultiInterface getLayerSelectionMulti();
+
+ /**
+ * @return la selection simple. Peut etre null.
+ */
+ CtuluListSelectionInterface getLayerSelection();
+
+ /**
+ * Un calque peut dispose de plusieurs jeux d'icone.
+ *
+ * @param _idx l'indice de l'icone.
+ * @param _model
+ * @return
+ */
+ boolean setIconModel(int _idx, final TraceIconModel _model);
+
+ TraceIconModel getIconModel(int _idx);
+
+ /**
+ * @param _idx l'indice du jeu d'icone/ligne.
+ * @return le titre du jeu
+ */
+ String getSetTitle(int _idx);
+
+ /**
+ * @return le nomnbre de jeu d'icone/ligne
+ */
+ int getNbSet();
+
+ boolean setLineModel(int _idx, final TraceLigneModel _model);
+
+ TraceLigneModel getLineModel(int _idx);
+}
Deleted: tags/FudaaModeleur_0_10/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlImplementation.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlImplementation.java 2009-01-09 15:13:24 UTC (rev 4342)
+++ tags/FudaaModeleur_0_10/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlImplementation.java 2009-01-12 11:28:25 UTC (rev 4344)
@@ -1,809 +0,0 @@
-/*
- * @creation 7 juin 07
- * @license GNU General Public License 2
- * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
- * @mail de...@fu...
- */
-package org.fudaa.fudaa.modeleur;
-
-import java.awt.Dimension;
-import java.awt.Point;
-import java.awt.event.ActionEvent;
-import java.beans.PropertyVetoException;
-import java.io.File;
-import java.io.IOException;
-import java.util.List;
-
-import javax.swing.JComponent;
-import javax.swing.JInternalFrame;
-import javax.swing.JOptionPane;
-import javax.swing.filechooser.FileFilter;
-
-import org.fudaa.ctulu.CtuluArkLoader;
-import org.fudaa.ctulu.CtuluExportDataInterface;
-import org.fudaa.ctulu.CtuluLibFile;
-import org.fudaa.ctulu.CtuluLibString;
-import org.fudaa.ctulu.CtuluRunnable;
-import org.fudaa.ctulu.CtuluTaskDelegate;
-import org.fudaa.ctulu.ProgressionInterface;
-import org.fudaa.ctulu.gui.CtuluDialogPanel;
-import org.fudaa.ctulu.gui.CtuluFileChooserTestWritable;
-import org.fudaa.ctulu.gui.CtuluLibDialog;
-import org.fudaa.ebli.impression.EbliMiseEnPagePreferencesPanel;
-import org.fudaa.ebli.ressource.EbliResource;
-import org.fudaa.fudaa.commun.FudaaLib;
-import org.fudaa.fudaa.commun.FudaaProjectStateListener;
-import org.fudaa.fudaa.commun.FudaaProjetStateInterface;
-import org.fudaa.fudaa.commun.impl.FudaaCommonImplementation;
-import org.fudaa.fudaa.commun.impl.FudaaGuiLib;
-import org.fudaa.fudaa.commun.impl.FudaaLookPreferencesPanel;
-import org.fudaa.fudaa.commun.impl.FudaaStartupExitPreferencesPanel;
-import org.fudaa.fudaa.commun.save.FudaaSaveLib;
-import org.fudaa.fudaa.commun.save.FudaaSaveProject;
-import org.fudaa.fudaa.commun.save.FudaaSaveZipLoader;
-import org.fudaa.fudaa.modeleur.action.MdlShow1DFrameAction;
-import org.fudaa.fudaa.modeleur.action.MdlShow2DFrameAction;
-import org.fudaa.fudaa.modeleur.modeleur1d.MdlFille1d;
-import org.fudaa.fudaa.ressource.FudaaResource;
-import org.fudaa.fudaa.sig.FSigProjectPersistence;
-import org.fudaa.fudaa.sig.FSigResource;
-import org.fudaa.fudaa.tr.common.TrResource;
-
-import com.memoire.bu.BuAbstractPreferencesPanel;
-import com.memoire.bu.BuBrowserPreferencesPanel;
-import com.memoire.bu.BuColumn;
-import com.memoire.bu.BuDesktopPreferencesPanel;
-import com.memoire.bu.BuInformationsSoftware;
-import com.memoire.bu.BuLanguagePreferencesPanel;
-import com.memoire.bu.BuLib;
-import com.memoire.bu.BuMainPanel;
-import com.memoire.bu.BuMenu;
-import com.memoire.bu.BuMenuBar;
-import com.memoire.bu.BuMenuItem;
-import com.memoire.bu.BuMenuRecentFiles;
-import com.memoire.bu.BuPreferences;
-import com.memoire.bu.BuRegistry;
-import com.memoire.bu.BuResource;
-import com.memoire.bu.BuScrollPane;
-import com.memoire.bu.BuTaskView;
-import com.memoire.bu.BuUserPreferencesPanel;
-import com.memoire.fu.FuLog;
-
-/**
- * La classe principale de mise en place de l'application, de gestion des
- * actions, des \xE9tats de l'interface, etc.
- *
- * @author Bertrand Marchand
- * @version $Id$
- */
-public class MdlImplementation extends FudaaCommonImplementation implements FudaaProjectStateListener {
-
- protected static BuInformationsSoftware isMdl_ = new BuInformationsSoftware();
- static {
- isMdl_.name = "Modeleur";
- isMdl_.version = "0.09";
- isMdl_.date = "2008-12-22";
- isMdl_.rights = "Tous droits r\xE9serv\xE9s. CETMEF (c)1999-2008";
- isMdl_.license = "GPL2";
- isMdl_.languages = "fr,en";
- isMdl_.authors=new String[]{"F.Deniger, B.Marchand"};
- isMdl_.contact="nic...@eq...";
- isMdl_.http="http://www.fudaa.fr/mdl/";
-
- isMdl_.logo = EbliResource.EBLI.getIcon("draw-palette");
- isMdl_.banner = BuResource.BU.getIcon("aproposde_32");
- }
-
- public static File getDestFile(File _init) {
- return CtuluLibFile.appendExtensionIfNeeded(_init, getExtension());
- }
-
- public static String getExtension() {
- return "mod.zip";
- }
-
- public static class MdlFileFilter extends FileFilter {
- final String extension_ = '.' + getExtension();
-
- public boolean accept(File _f) {
- return _f != null && (_f.isDirectory() || _f.getName().endsWith(extension_));
- }
-
- public String getDescription() {
- return FSigResource.FSIG.getString("Fudaa Modeleur (*.mod.zip)");
- }
-
- }
-
- public static BuInformationsSoftware informationsSoftware() {
- return isMdl_;
- }
-
- public final static FileFilter FILTER = new MdlFileFilter();
-
- /** Fenetre interne pour le modeleur 2D. */
- MdlFille2d mdl2dFrame_;
- /** Fenetre interne pour le modeleur 1D */
- MdlFille1d mdl1dFrame_=null;
- /** Projet modeleur. */
- MdlProjet project_;
-
- public MdlImplementation() {
- super();
- useNewHelp_ = false;
- }
-
- /**
- * Retourne le fichier s\xE9lectionn\xE9 par boite de dialogue.
- * @param _saveDialog true : Save dialog, test si fichier existant avant ecriture.
- * @return LE fichier, ou null si op\xE9ration abort\xE9e.
- */
- private File chooseNewFile(boolean _saveDialog) {
- return getDestFile(chooseFile(_saveDialog));
- }
-
- private File chooseFile(boolean _saveDialog) {
- return FudaaGuiLib.ouvrirFileChooser(FSigResource.FSIG.getString("Fichier modeleur"), FILTER, this.getFrame(),
- _saveDialog, _saveDialog ? new CtuluFileChooserTestWritable(this) : null);
- }
-
- protected void setFileIfNeeded() {
- if (project_.getParamsFile() == null) {
- project_.setParamFile(chooseNewFile(true));
- }
- }
-
- public void projectStateChanged(FudaaProjetStateInterface _proj) {
- updateActionsState();
- }
-
- /**
- * Mise \xE0 jour de l'\xE9tat des boutons.
- */
- void updateActionsState() {
- boolean bprjOpen=project_!=null;
- boolean bprjModPar=bprjOpen && project_.getProjectState().isParamsModified();
- boolean buiMod=bprjOpen && project_.getProjectState().isUIModified();
-
- setEnabledForAction("ENREGISTRER", bprjModPar | buiMod);
- setEnabledForAction("ENREGISTRERSOUS", bprjOpen);
- setEnabledForAction("FERMER", bprjOpen);
- setEnabledForAction("IMPORT_PROJECT", bprjOpen);
- setEnabledForAction(CtuluExportDataInterface.EXPORT_CMD, bprjOpen);
- }
-
- /**
- * Creation de la vue 2D, et ajout.
- */
- void createNew2dFrame() {
- mdl2dFrame_ = new MdlFille2d(this);
- addInternalFrame(mdl2dFrame_);
- }
-
- /**
- * Creation de la vue 1D. Ajout a la demande.
- */
- void createNew1dFrame() {
- if (mdl1dFrame_==null) {
- mdl1dFrame_=new MdlFille1d(this);
- }
- }
-
- /**
- * @return La vue 1D, ou null si inexistante.
- */
- public MdlFille1d get1dFrame() {
- return mdl1dFrame_;
- }
-
- /**
- * @return La vue 2D, ou null si inexistante.
- */
- public MdlFille2d get2dFrame() {
- return mdl2dFrame_;
- }
-
- /**
- * Installe la vue 1d sur le desktop, et la rend active.
- */
- public void install1dFrame() {
- boolean alreadyInstalled=false;
- for (JInternalFrame f: getAllInternalFrames()) {
- if (f.equals(mdl1dFrame_)) {
- alreadyInstalled=true;
- break;
- }
- }
- if (!alreadyInstalled)
- addInternalFrame(mdl1dFrame_);
- else
- activateInternalFrame(mdl1dFrame_);
- }
-
- protected boolean buildExportDataToolIcon() {
- return true;
- }
-
- protected boolean buildFudaaReportTool() {
- return true;
- }
-
- protected boolean buildImageToolIcon() {
- return true;
- }
-
- /**
- * Ferme le projet, ferme les fenetres associ\xE9s, sans demande d'enregistrement en cas
- * de modif (ce controle a \xE9t\xE9 effectu\xE9 en amont).
- */
- protected void closeProject() {
- if (project_==null) return;
- project_.close();
- try {
- mdl2dFrame_.setClosed(true);
- mdl1dFrame_.setClosed(true);
- } catch (PropertyVetoException _evt) {
- FuLog.error(_evt);
-
- }
- removeInternalFrames(getAllInternalFrames());
- getMainMenuBar().getMenu("mnPROJECT").setVisible(false);
- project_ = null;
- }
-
- /**
- * Cr\xE9e un nouveau projet, la fenetre 2D si necessaire.
- * @param _add true : Recr\xE9e la fenetre.
- */
- protected void createProject(final boolean _add) {
- project_ = new MdlProjet();
- project_.setOpening(true);
- if (_add) createNew2dFrame();
- else ((MdlVisuPanel)mdl2dFrame_.getVisuPanel()).initCalques(false);
- createNew1dFrame();
- project_.install(this);
- BuLib.invokeLater(new Runnable() {
-
- public void run() {
- project_.setOpening(false);
-// changeSaveActions(false);
- updateActionsState();
- project_.setSaved();
- getMainMenuBar().getMenu("mnPROJECT").setVisible(true);
- }
- });
- }
-
- protected boolean useScrollInBuDesktop() {
- return true;
- }
-
- public void actionPerformed(ActionEvent _evt) {
- final String action = _evt.getActionCommand();
- if (action == null) {
- return;
- }
- if ("OUVRIR".equals(action)) {
- ouvrir(null);
- } else if ("ENREGISTRER".equals(action)) {
- save();
- } else if ("ENREGISTRERSOUS".equals(action)) {
- saveAs();
- } else if ("FERMER".equals(action)) {
- close();
- } else if ("CREER".equals(action)) {
- create();
- } else if ("IMPORT_PROJECT".equals(action)) {
- importProject();
- } else if ("AIDE_INDEX".equals(action)) {
- displayHelp(getAideIndexUrl());
- } else if (action.startsWith("TOGGLE")) {
- final BuColumn c = getMainPanel().getRightColumn();
- final JComponent comp = c.getToggleComponent(action);
- if (comp != null) {
- comp.setVisible(!comp.isVisible());
- c.revalidate();
- }
- } else if (action.startsWith("REOUVRIR")) {
- FuLog.trace(action.substring(9,action.length()-1));
- ouvrir(new File(action.substring(9,action.length()-1)));
- } else
- super.actionPerformed(_evt);
- }
-
- /**
- * Met a jour les fichiers recents chaque fois que necessaire.
- */
- private void updateRecentFiles(File _fichier) {
- getMainMenuBar().addRecentFile(_fichier.getPath(),null);
- MdlPreferences.MDL.writeIniFile();
- }
-
- /**
- * Surcharge de la m\xE9thode pour pouvoir sauvegarder les pr\xE9f\xE9rences.
- */
- public void exit() {
- confirmExit();
- }
-
- /**
- * Confirmation de la sortie avec ou sans sauvegarde.
- */
- public boolean confirmExit() {
- if (!FudaaStartupExitPreferencesPanel.isExitConfirmed() ||
- question(BuResource.BU.getString("Quitter"), BuResource.BU
- .getString("Voulez-vous vraiment quitter ce logiciel ?"))) {
- return saveAndCloseProjet(new Runnable() {
- // Lanc\xE9 apr\xE8s la sauvegarde, si op\xE9ration de sauvegarde concluante ou si pas de sauvegarde demand\xE9e.
- public void run() {
- savePreferencesAndTerminate();
- }
- });
- }
- return true;
- }
-
- /**
- * Action "Creer" un nouveau projet.
- */
- public void create() {
- saveAndCloseProjet(new Runnable() {
- public void run() {
- createProject(true);
- }
- });
- }
-
- /**
- * Action "Fermer" le projet en cours.
- */
- public void close() {
- saveAndCloseProjet(null);
- updateActionsState();
- }
-
- protected String getAideIndexUrl() {
- return getHelpDir() + "modeleur/index.html";
- }
-
- public BuPreferences getApplicationPreferences() {
- return null;
- }
-
- public BuInformationsSoftware getInformationsSoftware() {
- return informationsSoftware();
- }
-
- /**
- * Action "Ouvrir" un nouveau projet. Peut demander la sauvegarde du projet pr\xE9c\xE9demment ouvert si
- * existant.
- * @param _f Le fichier projet \xE0 ouvrir. null, si le fichier doit etre choisi par l'utilisateur.
- */
- public void ouvrir(final File _f) {
- if (isProjectModified()) {
- saveAndCloseProjet(new Runnable() {
-
- public void run() {
- ouvrir(_f);
- }
- });
- return;
- }
-
- closeProject();
-
- final File f = CtuluLibFile.exists(_f) ? _f : chooseFile(false);
- if (f==null) return; // Abandon utilisateur.
-
- createProject(false);
- setGlassPaneStop();
- new CtuluRunnable(BuResource.BU.getString("Ouvrir"), MdlImplementation.this) {
-
- public boolean run(ProgressionInterface _proj) {
- project_.setOpening(true);
- Runnable r = null;
- try {
- try {
- FudaaSaveZipLoader loader=new FudaaSaveZipLoader(f);
- // Recup des infos pour utilisateur.
- BuInformationsSoftware is=FudaaSaveProject.getSoftwareInfos(loader);
- FuLog.warning("File version : "+(is.version==null ? "Undefined":is.version));
-
- r= FudaaSaveLib.restoreFille(MdlImplementation.this, mdl2dFrame_, _proj,loader);
- } catch (final IOException _evt) {
- FuLog.error(_evt);
-
- }
-
- project_.setParamFile(f);
-
- } finally {
-
- final Runnable swingRun = r;
- BuLib.invokeLater(new Runnable() {
-
- public void run() {
- try {
- addInternalFrame(mdl2dFrame_);
-
- if (swingRun != null) swingRun.run();
-
- // Met a jour la fenetre 1d
- FudaaSaveZipLoader loader=null;
- try {
- loader=new FudaaSaveZipLoader(f);
- mdl1dFrame_.restoreFrom(loader, null);
- }
- catch (IOException _exc) {}
- finally {
- if (loader!=null) {
- try { loader.close(); } catch (IOException _exc) {}
- }
- }
-
- // le projet a ete install\xE9: on enl\xE8ve les flag de modification
- project_.setOpening(false);
- project_.setSaved();
- if (swingRun == null) {
- MdlImplementation.this.warn(BuResource.BU.getString("Ouvrir"), FSigResource.FSIG
- .getString("Le projet n'a pas \xE9t\xE9 ouvert!"));
- }
- else {
- updateRecentFiles(project_.getParamsFile());
- }
- } finally {
- unsetGlassPaneStop();
-
- }
- }
-
- });
-
- }
- return r != null;
- }
- }.run();
- }
-
- /**
- * Action "Enregistrer" le projet.
- */
- public void save() {
- if (project_.getParamsFile() != null) {
- CtuluRunnable act = new CtuluRunnable(FudaaSaveLib.getActionSaveTitle(), this) {
-
- public boolean run(ProgressionInterface _proj) {
- if (FSigProjectPersistence.saveProject(MdlImplementation.this, project_, project_.getParamsFile(), _proj)) {
- updateRecentFiles(project_.getParamsFile());
- return true;
- }
- return false;
- }
- };
- act.setAfterRunnable(getSaveSwingRunnable(project_.getParamsFile()), true);
- act.run();
- } else
- saveAs();
- }
-
- /**
- * Action "Enregistrer sous" le projet.
- */
- public void saveAs() {
- final File f = chooseNewFile(true);
- if (f == null) return;
-
- CtuluRunnable act = new CtuluRunnable(FudaaSaveLib.getActionSaveTitle(), this) {
-
- public boolean run(ProgressionInterface _proj) {
- if (FSigProjectPersistence.saveProject(MdlImplementation.this, project_, f, _proj)) {
- updateRecentFiles(f);
- return true;
- }
- return false;
- }
- };
- act.setAfterRunnable(getSaveSwingRunnable(f), true);
- act.run();
- }
-
- protected boolean isProjectModified() {
- return project_ != null
- && (project_.getProjectState().isParamsModified() || project_.getProjectState().isUIModified());
- }
-
- public void importProject() {
- MdlProjectImportPanel pn=new MdlProjectImportPanel();
- if (CtuluDialogPanel.isOkResponse(pn.afficheModale(getFrame(), "Import d'un projet"))) {
- File f=pn.getFile();
- try {
- FudaaSaveZipLoader loader = new FudaaSaveZipLoader(f);
- String[] ignoredLayers=pn.getIgnoredLayers();
- for (String s : ignoredLayers) {
- loader.setOption(CtuluArkLoader.OPTION_LAYER_IGNORE+s,CtuluLibString.toString(true));
- }
-
- final CtuluTaskDelegate createTask = createTask("Import d'un projet");
-// FIXME BM: Suppression de la tache dans un thread diff\xE9rent, car l'appli se bloque
-// Probable pb de deadlock.
-// createTask.start(new Runnable() {
-// public void run() {
- FudaaSaveLib.restoreAndLaunch(MdlImplementation.this, mdl2dFrame_, createTask.getStateReceiver(), loader);
-// }
-// });
-
- // Liberation du fichier.
- loader.close();
- } catch (final IOException _evt) {
- FuLog.error(_evt);
-
- }
- }
- }
-
- /**
- * Dans le thread swing....
- *
- * @param _relaunch l'exe a lancer apr\xE8s: si l'utilisateur a accept\xE9 la fermeture du projet
- */
- public boolean saveAndCloseProjet(final Runnable _relaunch) {
- final Runnable r = new Runnable() {
-
- public void run() {
- closeProject();
- if (_relaunch != null) _relaunch.run();
- }
- };
- boolean save = false;
- if (isProjectModified()) {
- final int i = CtuluLibDialog.confirmExitIfProjectisModified(getFrame());
- // l'utilisateur veut annuler l'op\xE9ration
- if (i == JOptionPane.CANCEL_OPTION) {
- FuLog.debug("FSI: close operation cancelled by user");
- return false;
- }
- save = (i == JOptionPane.OK_OPTION);
- }
-
- FuLog.debug("FSI: close operation accepted and save option= " + save);
- // pas de sauvegarde: on lance l'op\xE9ration suivante:
- if (!save) {
- r.run();
- } else {
- // on initilialise le fichier de dest si n\xE9cessaire
- setFileIfNeeded();
- if (project_.getParamsFile()==null) return false;
- CtuluRunnable act = new CtuluRunnable(FudaaSaveLib.getActionSaveTitle(), this) {
-
- public boolean run(ProgressionInterface _prog) {
- // le fichier peut etre null si l'utilisateur a refuse de pr\xE9ciser un fichier
- // dans ce cas, on ne sauvegarde pas.
- if (project_.getParamsFile() != null) {
- setGlassPaneStop();
- FSigProjectPersistence.saveProject(MdlImplementation.this, project_,
- project_.getParamsFile(), _prog);
- updateRecentFiles(project_.getParamsFile());
-
- unsetGlassPaneStop();
- return true;
- }
- else return false;
- }
- };
- // le r sera lance apres et dans le thread swing
- act.setAfterRunnable(r, true);
- act.run();
- return false;
- }
- return true;
- }
-
- protected Runnable getSaveSwingRunnable(final File _paramFile) {
- return new Runnable() {
-
- public void run() {
- if (_paramFile != null) project_.setParamFile(_paramFile);
- project_.setSaved();
-
- }
- };
- }
-
- /**
- * Construit le menu projet.
- * @return Le menu projet.
- */
- protected BuMenu buildProjectMenu() {
- BuMenu mn=new BuMenu(FudaaResource.FUDAA.getString("Projet"),"mnPROJECT");
- mn.add(new MdlShow2DFrameAction(this));
- mn.add(new MdlShow1DFrameAction(this));
-
- mn.setVisible(false);
- return mn;
- }
-
- /**
- * Methode surcharg\xE9e pour les panneau de pr\xE9f\xE9rence.
- */
- protected void buildPreferences(final List<BuAbstractPreferencesPanel> _frAddTab) {
- _frAddTab.add(new BuUserPreferencesPanel(this));
- _frAddTab.add(new BuLanguagePreferencesPanel(this));
- _frAddTab.add(new BuDesktopPreferencesPanel(this));
- _frAddTab.add(new FudaaStartupExitPreferencesPanel(true));
- _frAddTab.add(new FudaaLookPreferencesPanel(this));
- _frAddTab.add(new BuBrowserPreferencesPanel(this));
- _frAddTab.add(new EbliMiseEnPagePreferencesPanel());
- }
-
- /**
- * Cr\xE9ation du panneau des taches, dans la colonne de droite.
- */
- protected void buildTaskView() {
- final BuMainPanel mp = getMainPanel();
- final BuColumn lc = mp.getLeftColumn();
- lc.setFocusable(false);
- final BuColumn rc = mp.getRightColumn();
- rc.setFocusable(false);
- lc.setBorder(null);
- // rc.setBorder(new EmptyBorder(0,2,0,2));
- BuTaskView taches = new BuTaskView();
- taches.setToolTipText(TrResource.getS("Les t\xE2ches en cours"));
- final BuScrollPane sp = new BuScrollPane(taches);
- sp.setPreferredSize(new Dimension(150, 80));
- sp.setToolTipText(TrResource.getS("Les t\xE2ches en cours"));
- rc.addToggledComponent(BuResource.BU.getString("T\xE2ches"), "TOGGLE_TACHE", BuResource.BU.getToolIcon("tache"), sp,
- true, this).setToolTipText(TrResource.getS("Cacher/Afficher les t\xE2ches"));
- mp.setTaskView(taches);
- }
-
- /**
- * Sauvegarde des pr\xE9f\xE9rences de l'appli \xE0 la sortie.
- *
- * Remarque importante : Certaines infos sauv\xE9es par cette m\xE9thode sont relues
- * par d'autres applications Fudaa, qui risquent alors de s'afficher de facon
- * inattendue.
- */
- protected void savePreferencesAndTerminate() {
- final Point p = getFrame().getLocation();
- final Dimension d = getFrame().getSize();
- BuPreferences.BU.putIntegerProperty("window.x", p.x);
- BuPreferences.BU.putIntegerProperty("window.y", p.y);
- BuPreferences.BU.putIntegerProperty("window.w", d.width);
- BuPreferences.BU.putIntegerProperty("window.h", d.height);
- BuPreferences.BU.writeIniFile();
-
- BuRegistry.unregister(this.getFrame());
- }
-
- /**
- * Mise en place de l'application ava,nt affichage.
- */
- public void init() {
- super.init();
- // Pour forcer l'activation du command listener.
- getUndoCmdListener();
-
- removeUnusedActions();
- final BuMenuBar mb = getMainMenuBar();
- // on enleve le menu des look and feel : moche car tout n'est pas mis a jour
-/* Issu de Fudaa-Prepro
- final BuMenu mAide = (BuMenu) b.getMenu("MENU_AIDE");
-
- mAide.add(TrLib.buildAideContextItem(this), 0);
- TrLib.addJavawsForJnlp(mAide);
- TrLib.addJava3DJMFTest(mAide);*/
-
- setEnabledForAction("QUITTER", true);
- setEnabledForAction("PREFERENCE", true);
- setEnabledForAction("CREER", true);
- setEnabledForAction("OUVRIR", true);
- setEnabledForAction("IMPORTER", true);
- setEnabledForAction("EXPORTER", true);
-
- BuMenuRecentFiles mr= (BuMenuRecentFiles)mb.getMenu("REOUVRIR");
- if (mr != null) {
- mr.setPreferences(MdlPreferences.MDL);
- mr.setResource(MdlResource.MDL);
- mr.setEnabled(true);
- }
-
-/* setEnabledForAction("MAJ", true);
- setEnabledForAction("SEND_COMMENT", true);
- setEnabledForAction("LAUNCH_JAVAWS", true);
- final BuMenu mFichier = (BuMenu) b.getMenu("MENU_FICHIER");
- mFichier.addMenuItem(TrResource.getS("Fermer toutes les applications"), "CLOSE_ALL", BuResource.BU
- .getIcon("fermer"), true, 0);
- final BuToolBar tb = getMainToolBar();
- if (!isSupervisor()) {
-
- tb.addToolButton(TrResource.getSupervisorName(), TrResource.getS("ouvrir le superviseur"), "SUPERVISEUR",
- TrResource.getSupervisorIcon(), true).setVisible(true);
-
- }*/
- // les menus exporter et importer sont construit dynamiquement
-// b.getMenu(getExporterCmd()).addItemListener(this);
- BuMenu mmImport = (BuMenu) mb.getMenu("IMPORTER");
- BuMenu mnExport = (BuMenu) mb.getMenu("EXPORTER");
-
-// menu.addMenuItem(FSigImageImportAction.getCommonTitle(), "IMPORT_IMAGE", FSigImageImportAction.getCommonImage(),
-// this).setEnabled(false);
- mmImport.addMenuItem(FudaaLib.getS("Importer un projet"), "IMPORT_PROJECT", BuResource.BU.getMenuIcon("importer"), this)
- .setEnabled(false);
-// menu.addItemListener(this);
- setEnabledForAction("IMPORT_PROJECT", true);
- mmImport.setEnabled(true);
-
- BuMenuItem itExportData = new BuMenuItem();
- super.initExportDataButton(itExportData);
- mnExport.add(itExportData);
-
- BuMenu mnProject=buildProjectMenu();
- mb.addMenu(mnProject);
-
-/* setEnabledForAction("RANGERICONES", true);
- if (!isSupervisor()) {
- final JComponent cp = getMainPanel().getMiddleComponent();
- if (cp instanceof JScrollPane) {
- ScrollPaneSelector.installScrollPaneSelector((JScrollPane) cp);
- }
- }*/
- buildTaskView();
- }
-
- /**
- * Suppression des commandes par d\xE9faut dans Fudaa.
- */
- protected void removeUnusedActions() {
-/* Issu de Fudaa-Prepro
- final BuMenu r = (BuMenu) getMainMenuBar().getMenu("MENU_EDITION");
- if (r != null) {
- r.removeAll();
- r.addMenuItem(BuResource.BU.getString("D\xE9faire"), "DEFAIRE", false, KeyEvent.VK_Z);
- r.addMenuItem(BuResource.BU.getString("Refaire"), "REFAIRE", false).setAccelerator(
- KeyStroke.getKeyStroke(KeyEvent.VK_Z, InputEvent.CTRL_MASK | InputEvent.SHIFT_MASK));
- // normalement Ctrl-Y
- // r.addSeparator();
- //
- r.addMenuItem(BuResource.BU.getString("Copier"), "COPIER", false, KeyEvent.VK_C);
- r.addMenuItem(BuResource.BU.getString("Couper"), "COUPER", false, KeyEvent.VK_X);
- r.addMenuItem(BuResource.BU.getString("Coller"), "COLLER", false, KeyEvent.VK_V);
- // r.addMenuItem(BuResource.BU.getString("Dupliquer" ),"DUPLIQUER" ,false)
- // .setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_V,KeyEvent.CTRL_MASK|KeyEvent.SHIFT_MASK));
- r.addSeparator();
- FSigLib.addSelectionAction(r, null);
- // r.addMenuItem(BuResource.BU.getString("Remplacer..." ),"REMPLACER"
- // ,false,KeyEvent.VK_R);
- r.addSeparator();
- r.addMenuItem(BuResource.BU.getString("Pr\xE9f\xE9rences"), "PREFERENCE", false, KeyEvent.VK_F2);
- addConsoleMenu(r);
- final BuToolBar tb = getMainToolBar();
- BuActionRemover.removeAction(tb, "COUPER");
- BuActionRemover.removeAction(tb, "COLLER");
- BuActionRemover.removeAction(tb, "COPIER");
- BuActionRemover.removeAction(tb, "DUPLIQUER");
- BuActionRemover.removeAction(tb, "RANGERICONES");
- // BuActionRemover.removeAction(tb, "TOUTSELECTIONNER");
- BuActionRemover.removeAction(tb, "REMPLACER");
-
- }*/
- /*
- * removeAction("COUPER"); removeAction("COLLER"); removeAction("COPIER"); removeAction("DUPLIQUER");
- * removeAction("TOUTSELECTIONNER"); removeAction("REMPLACER");
- */
- removeAction("ASSISTANT");
-// removeAction("ASTUCE");
- removeAction("POINTEURAIDE");
- removeAction("INDEX_THEMA");
- removeAction("INDEX_ALPHA");
- removeAction("PROPRIETE");
- removeAction("PLEINECRAN");
- removeAction("VISIBLE_LEFTCOLUMN");
- }
-
- public void start() {
- super.start();
- super.addFrameListLeft();
- createProject(true);
- }
-
-}
Copied: tags/FudaaModeleur_0_10/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlImplementation.java (from rev 4343, branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlImplementation.java)
===================================================================
--- tags/FudaaModeleur_0_10/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlImplementation.java (rev 0)
+++ tags/FudaaModeleur_0_10/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlImplementation.java 2009-01-12 11:28:25 UTC (rev 4344)
@@ -0,0 +1,809 @@
+/*
+ * @creation 7 juin 07
+ * @license GNU General Public License 2
+ * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
+ * @mail de...@fu...
+ */
+package org.fudaa.fudaa.modeleur;
+
+import java.awt.Dimension;
+import java.awt.Point;
+import java.awt.event.ActionEvent;
+import java.beans.PropertyVetoException;
+import java.io.File;
+import java.io.IOException;
+import java.util.List;
+
+import javax.swing.JComponent;
+import javax.swing.JInternalFrame;
+import javax.swing.JOptionPane;
+import javax.swing.filechooser.FileFilter;
+
+import org.fudaa.ctulu.CtuluArkLoader;
+import org.fudaa.ctulu.CtuluExportDataInterface;
+import org.fudaa.ctulu.CtuluLibFile;
+import org.fudaa.ctulu.CtuluLibString;
+import org.fudaa.ctulu.CtuluRunnable;
+import org.fudaa.ctulu.CtuluTaskDelegate;
+import org.fudaa.ctulu.ProgressionInterface;
+import org.fudaa.ctulu.gui.CtuluDialogPanel;
+import org.fudaa.ctulu.gui.CtuluFileChooserTestWritable;
+import org.fudaa.ctulu.gui.CtuluLibDialog;
+import org.fudaa.ebli.impression.EbliMiseEnPagePreferencesPanel;
+import org.fudaa.ebli.ressource.EbliResource;
+import org.fudaa.fudaa.commun.FudaaLib;
+import org.fudaa.fudaa.commun.FudaaProjectStateListener;
+import org.fudaa.fudaa.commun.FudaaProjetStateInterface;
+import org.fudaa.fudaa.commun.impl.FudaaCommonImplementation;
+import org.fudaa.fudaa.commun.impl.FudaaGuiLib;
+import org.fudaa.fudaa.commun.impl.FudaaLookPreferencesPanel;
+import org.fudaa.fudaa.commun.impl.FudaaStartupExitPreferencesPanel;
+import org.fudaa.fudaa.commun.save.FudaaSaveLib;
+import org.fudaa.fudaa.commun.save.FudaaSaveProject;
+import org.fudaa.fudaa.commun.save.FudaaSaveZipLoader;
+import org.fudaa.fudaa.modeleur.action.MdlShow1DFrameAction;
+import org.fudaa.fudaa.modeleur.action.MdlShow2DFrameAction;
+import org.fudaa.fudaa.modeleur.modeleur1d.MdlFille1d;
+import org.fudaa.fudaa.ressource.FudaaResource;
+import org.fudaa.fudaa.sig.FSigProjectPersistence;
+import org.fudaa.fudaa.sig.FSigResource;
+import org.fudaa.fudaa.tr.common.TrResource;
+
+import com.memoire.bu.BuAbstractPreferencesPanel;
+import com.memoire.bu.BuBrowserPreferencesPanel;
+import com.memoire.bu.BuColumn;
+import com.memoire.bu.BuDesktopPreferencesPanel;
+import com.memoire.bu.BuInformationsSoftware;
+import com.memoire.bu.BuLanguagePreferencesPanel;
+import com.memoire.bu.BuLib;
+import com.memoire.bu.BuMainPanel;
+import com.memoire.bu.BuMenu;
+import com.memoire.bu.BuMenuBar;
+import com.memoire.bu.BuMenuItem;
+import com.memoire.bu.BuMenuRecentFiles;
+import com.memoire.bu.BuPreferences;
+import com.memoire.bu.BuRegistry;
+import com.memoire.bu.BuResource;
+import com.memoire.bu.BuScrollPane;
+import com.memoire.bu.BuTaskView;
+import com.memoire.bu.BuUserPreferencesPanel;
+import com.memoire.fu.FuLog;
+
+/**
+ * La classe principale de mise en place de l'application, de gestion des
+ * actions, des \xE9tats de l'interface, etc.
+ *
+ * @author Bertrand Marchand
+ * @version $Id$
+ */
+public class MdlImplementation extends FudaaCommonImplementation implements FudaaProjectStateListener {
+
+ protected static BuInformationsSoftware isMdl_ = new BuInformationsSoftware();
+ static {
+ isMdl_.name = "Modeleur";
+ isMdl_.version = "0.10";
+ isMdl_.date = "2009-01-12";
+ isMdl_.rights = "Tous droits r\xE9serv\xE9s. CETMEF (c)1999-2009";
+ isMdl_.license = "GPL2";
+ isMdl_.languages = "fr,en";
+ isMdl_.authors=new String[]{"F.Deniger, B.Marchand"};
+ isMdl_.contact="nic...@eq...";
+ isMdl_.http="http://www.fudaa.fr/mdl/";
+
+ isMdl_.logo = EbliResource.EBLI.getIcon("draw-palette");
+ isMdl_.banner = BuResource.BU.getIcon("aproposde_32");
+ }
+
+ public static File getDestFile(File _init) {
+ return CtuluLibFile.appendExtensionIfNeeded(_init, getExtension());
+ }
+
+ public static String getExtension() {
+ return "mod.zip";
+ }
+
+ public static class MdlFileFilter extends FileFilter {
+ final String extension_ = '.' + getExtension();
+
+ public boolean accept(File _f) {
+ return _f != null && (_f.isDirectory() || _f.getName().endsWith(extension_));
+ }
+
+ public String getDescription() {
+ return FSigResource.FSIG.getString("Fudaa Modeleur (*.mod.zip)");
+ }
+
+ }
+
+ public static BuInformationsSoftware informationsSoftware() {
+ return isMdl_;
+ }
+
+ public final static FileFilter FILTER = new MdlFileFilter();
+
+ /** Fenetre interne pour le modeleur 2D. */
+ MdlFille2d mdl2dFrame_;
+ /** Fenetre interne pour le modeleur 1D */
+ MdlFille1d mdl1dFrame_=null;
+ /** Projet modeleur. */
+ MdlProjet project_;
+
+ public MdlImplementation() {
+ super();
+ useNewHelp_ = false;
+ }
+
+ /**
+ * Retourne le fichier s\xE9lectionn\xE9 par boite de dialogue.
+ * @param _saveDialog true : Save dialog, test si fichier existant avant ecriture.
+ * @return LE fichier, ou null si op\xE9ration abort\xE9e.
+ */
+ private File chooseNewFile(boolean _saveDialog) {
+ return getDestFile(chooseFile(_saveDialog));
+ }
+
+ private File chooseFile(boolean _saveDialog) {
+ return FudaaGuiLib.ouvrirFileChooser(FSigResource.FSIG.getString("Fichier modeleur"), FILTER, this.getFrame(),
+ _saveDialog, _saveDialog ? new CtuluFileChooserTestWritable(this) : null);
+ }
+
+ protected void setFileIfNeeded() {
+ if (project_.getParamsFile() == null) {
+ project_.setParamFile(chooseNewFile(true));
+ }
+ }
+
+ public void projectStateChanged(FudaaProjetStateInterface _proj) {
+ updateActionsState();
+ }
+
+ /**
+ * Mise \xE0 jour de l'\xE9tat des boutons.
+ */
+ void updateActionsState() {
+ boolean bprjOpen=project_!=null;
+ boolean bprjModPar=bprjOpen && project_.getProjectState().isParamsModified();
+ boolean buiMod=bprjOpen && project_.getProjectState().isUIModified();
+
+ setEnabledForAction("ENREGISTRER", bprjModPar | buiMod);
+ setEnabledForAction("ENREGISTRERSOUS", bprjOpen);
+ setEnabledForAction("FERMER", bprjOpen);
+ setEnabledForAction("IMPORT_PROJECT", bprjOpen);
+ setEnabledForAction(CtuluExportDataInterface.EXPORT_CMD, bprjOpen);
+ }
+
+ /**
+ * Creation de la vue 2D, et ajout.
+ */
+ void createNew2dFrame() {
+ mdl2dFrame_ = new MdlFille2d(this);
+ addInternalFrame(mdl2dFrame_);
+ }
+
+ /**
+ * Creation de la vue 1D. Ajout a la demande.
+ */
+ void createNew1dFrame() {
+ if (mdl1dFrame_==null) {
+ mdl1dFrame_=new MdlFille1d(this);
+ }
+ }
+
+ /**
+ * @return La vue 1D, ou null si inexistante.
+ */
+ public MdlFille1d get1dFrame() {
+ return mdl1dFrame_;
+ }
+
+ /**
+ * @return La vue 2D, ou null si inexistante.
+ */
+ public MdlFille2d get2dFrame() {
+ return mdl2dFrame_;
+ }
+
+ /**
+ * Installe la vue 1d sur le desktop, et la rend active.
+ */
+ public void install1dFrame() {
+ boolean alreadyInstalled=false;
+ for (JInternalFrame f: getAllInternalFrames()) {
+ if (f.equals(mdl1dFrame_)) {
+ alreadyInstalled=true;
+ break;
+ }
+ }
+ if (!alreadyInstalled)
+ addInternalFrame(mdl1dFrame_);
+ else
+ activateInternalFrame(mdl1dFrame_);
+ }
+
+ protected boolean buildExportDataToolIcon() {
+ return true;
+ }
+
+ protected boolean buildFudaaReportTool() {
+ return true;
+ }
+
+ protected boolean buildImageToolIcon() {
+ return true;
+ }
+
+ /**
+ * Ferme le projet, ferme les fenetres associ\xE9s, sans demande d'enregistrement en cas
+ * de modif (ce controle a \xE9t\xE9 effectu\xE9 en amont).
+ */
+ protected void closeProject() {
+ if (project_==null) return;
+ project_.close();
+ try {
+ mdl2dFrame_.setClosed(true);
+ mdl1dFrame_.setClosed(true);
+ } catch (PropertyVetoException _evt) {
+ FuLog.error(_evt);
+
+ }
+ removeInternalFrames(getAllInternalFrames());
+ getMainMenuBar().getMenu("mnPROJECT").setVisible(false);
+ project_ = null;
+ }
+
+ /**
+ * Cr\xE9e un nouveau projet, la fenetre 2D si necessaire.
+ * @param _add true : Recr\xE9e la fenetre.
+ */
+ protected void createProject(final boolean _add) {
+ project_ = new MdlProjet();
+ project_.setOpening(true);
+ if (_add) createNew2dFrame();
+ else ((MdlVisuPanel)mdl2dFrame_.getVisuPanel()).initCalques(false);
+ createNew1dFrame();
+ project_.install(this);
+ BuLib.invokeLater(new Runnable() {
+
+ public void run() {
+ project_.setOpening(false);
+// changeSaveActions(false);
+ updateActionsState();
+ project_.setSaved();
+ getMainMenuBar().getMenu("mnPROJECT").setVisible(true);
+ }
+ });
+ }
+
+ protected boolean useScrollInBuDesktop() {
+ return true;
+ }
+
+ public void actionPerformed(ActionEvent _evt) {
+ final String action = _evt.getActionCommand();
+ if (action == null) {
+ return;
+ }
+ if ("OUVRIR".equals(action)) {
+ ouvrir(null);
+ } else if ("ENREGISTRER".equals(action)) {
+ save();
+ } else if ("ENREGISTRERSOUS".equals(action)) {
+ saveAs();
+ } else if ("FERMER".equals(action)) {
+ close();
+ } else if ("CREER".equals(action)) {
+ create();
+ } else if ("IMPORT_PROJECT".equals(action)) {
+ importProject();
+ } else if ("AIDE_INDEX".equals(action)) {
+ displayHelp(getAideIndexUrl());
+ } else if (action.startsWith("TOGGLE")) {
+ final BuColumn c = getMainPanel().getRightColumn();
+ final JComponent comp = c.getToggleComponent(action);
+ if (comp != null) {
+ comp.setVisible(!comp.isVisible());
+ c.revalidate();
+ }
+ } else if (action.startsWith("REOUVRIR")) {
+ FuLog.trace(action.substring(9,action.length()-1));
+ ouvrir(new File(action.substring(9,action.length()-1)));
+ } else
+ super.actionPerformed(_evt);
+ }
+
+ /**
+ * Met a jour les fichiers recents chaque fois que necessaire.
+ */
+ private void updateRecentFiles(File _fichier) {
+ getMainMenuBar().addRecentFile(_fichier.getPath(),null);
+ MdlPreferences.MDL.writeIniFile();
+ }
+
+ /**
+ * Surcharge de la m\xE9thode pour pouvoir sauvegarder les pr\xE9f\xE9rences.
+ */
+ public void exit() {
+ confirmExit();
+ }
+
+ /**
+ * Confirmation de la sortie avec ou sans sauvegarde.
+ */
+ public boolean confirmExit() {
+ if (!FudaaStartupExitPreferencesPanel.isExitConfirmed() ||
+ question(BuResource.BU.getString("Quitter"), BuResource.BU
+ .getString("Voulez-vous vraiment quitter ce logiciel ?"))) {
+ return saveAndCloseProjet(new Runnable() {
+ // Lanc\xE9 apr\xE8s la sauvegarde, si op\xE9ration de sauvegarde concluante ou si pas de sauvegarde demand\xE9e.
+ public void run() {
+ savePreferencesAndTerminate();
+ }
+ });
+ }
+ return true;
+ }
+
+ /**
+ * Action "Creer" un nouveau projet.
+ */
+ public void create() {
+ saveAndCloseProjet(new Runnable() {
+ public void run() {
+ createProject(true);
+ }
+ });
+ }
+
+ /**
+ * Action "Fermer" le projet en cours.
+ */
+ public void close() {
+ saveAndCloseProjet(null);
+ updateActionsState();
+ }
+
+ protected String getAideIndexUrl() {
+ return getHelpDir() + "modeleur/index.html";
+ }
+
+ public BuPreferences getApplicationPreferences() {
+ return null;
+ }
+
+ public BuInformationsSoftware getInformationsSoftware() {
+ return informationsSoftware();
+ }
+
+ /**
+ * Action "Ouvrir" un nouveau projet. Peut demander la sauvegarde du projet pr\xE9c\xE9demment ouvert si
+ * existant.
+ * @param _f Le fichier projet \xE0 ouvrir. null, si le fichier doit etre choisi par l'utilisateur.
+ */
+ public void ouvrir(final File _f) {
+ if (isProjectModified()) {
+ saveAndCloseProjet(new Runnable() {
+
+ public void run() {
+ ouvrir(_f);
+ }
+ });
+ return;
+ }
+
+ closeProject();
+
+ final File f = CtuluLibFile.exists(_f) ? _f : chooseFile(false);
+ if (f==null) return; // Abandon utilisateur.
+
+ createProject(false);
+ setGlassPaneStop();
+ new CtuluRunnable(BuResource.BU.getString("Ouvrir"), MdlImplementation.this) {
+
+ public boolean run(ProgressionInterface _proj) {
+ project_.setOpening(true);
+ Runnable r = null;
+ try {
+ try {
+ FudaaSaveZipLoader loader=new FudaaSaveZipLoader(f);
+ // Recup des infos pour utilisateur.
+ BuInformationsSoftware is=FudaaSaveProject.getSoftwareInfos(loader);
+ FuLog.warning("File version : "+(is.version==null ? "Undefined":is.version));
+
+ r= FudaaSaveLib.restoreFille(MdlImplementation.this, mdl2dFrame_, _proj,loader);
+ } catch (final IOException _evt) {
+ FuLog.error(_evt);
+
+ }
+
+ project_.setParamFile(f);
+
+ } finally {
+
+ final Runnable swingRun = r;
+ BuLib.invokeLater(new Runnable() {
+
+ public void run() {
+ try {
+ addInternalFrame(mdl2dFrame_);
+
+ if (swingRun != null) swingRun.run();
+
+ // Met a jour la fenetre 1d
+ FudaaSaveZipLoader loader=null;
+ try {
+ loader=new FudaaSaveZipLoader(f);
+ mdl1dFrame_.restoreFrom(loader, null);
+ }
+ catch (IOException _exc) {}
+ finally {
+ if (loader!=null) {
+ try { loader.close(); } catch (IOException _exc) {}
+ }
+ }
+
+ // le projet a ete install\xE9: on enl\xE8ve les flag de modification
+ project_.setOpening(false);
+ project_.setSaved();
+ if (swingRun == null) {
+ MdlImplementation.this.warn(BuResource.BU.getString("Ouvrir"), FSigResource.FSIG
+ .getString("Le projet n'a pas \xE9t\xE9 ouvert!"));
+ }
+ else {
+ updateRecentFiles(project_.getParamsFile());
+ }
+ } finally {
+ unsetGlassPaneStop();
+
+ }
+ }
+
+ });
+
+ }
+ return r != null;
+ }
+ }.run();
+ }
+
+ /**
+ * Action "Enregistrer" le projet.
+ */
+ public void save() {
+ if (project_.getParamsFile() != null) {
+ CtuluRunnable act = new CtuluRunnable(FudaaSaveLib.getActionSaveTitle(), this) {
+
+ public boolean run(ProgressionInterface _proj) {
+ if (FSigProjectPersistence.saveProject(MdlImplementation.this, project_, project_.getParamsFile(), _proj)) {
+ updateRecentFiles(project_.getParamsFile());
+ return true;
+ }
+ return false;
+ }
+ };
+ act.setAfterRunnable(getSaveSwingRunnable(project_.getParamsFile()), true);
+ act.run();
+ } else
+ saveAs();
+ }
+
+ /**
+ * Action "Enregistrer sous" le projet.
+ */
+ public void saveAs() {
+ final File f = chooseNewFile(true);
+ if (f == null) return;
+
+ CtuluRunnable act = new CtuluRunnable(FudaaSaveLib.getActionSaveTitle(), this) {
+
+ public boolean run(ProgressionInterface _proj) {
+ if (FSigProjectPersistence.saveProject(MdlImplementation.this, project_, f, _proj)) {
+ updateRecentFiles(f);
+ return true;
+ }
+ return false;
+ }
+ };
+ act.setAfterRunnable(getSaveSwingRunnable(f), true);
+ act.run();
+ }
+
+ protected boolean isProjectModified() {
+ return project_ != null
+ && (project_.getProjectState().isParamsModified() || project_.getProjectState().isUIModified());
+ }
+
+ public void importProject() {
+ MdlProjectImportPanel pn=new MdlProjectImportPanel();
+ if (CtuluDialogPanel.isOkResponse(pn.afficheModale(getFrame(), "Import d'un projet"))) {
+ File f=pn.getFile();
+ try {
+ FudaaSaveZipLoader loader = new FudaaSaveZipLoader(f);
+ String[] ignoredLayers=pn.getIgnoredLayers();
+ for (String s : ignoredLayers) {
+ loader.setOption(CtuluArkLoader.OPTION_LAYER_IGNORE+s,CtuluLibString.toString(true));
+ }
+
+ final CtuluTaskDelegate createTask = createTask("Import d'un projet");
+// FIXME BM: Suppression de la tache dans un thread diff\xE9rent, car l'appli se bloque
+// Probable pb de deadlock.
+// createTask.start(new Runnable() {
+// public void run() {
+ FudaaSaveLib.restoreAndLaunch(MdlImplementation.this, mdl2dFrame_, createTask.getStateReceiver(), loader);
+// }
+// });
+
+ // Liberation du fichier.
+ loader.close();
+ } catch (final IOException _evt) {
+ FuLog.error(_evt);
+
+ }
+ }
+ }
+
+ /**
+ * Dans le thread swing....
+ *
+ * @param _relaunch l'exe a lancer apr\xE8s: si l'utilisateur a accept\xE9 la fermeture du projet
+ */
+ public boolean saveAndCloseProjet(final Runnable _relaunch) {
+ final Runnable r = new Runnable() {
+
+ public void run() {
+ closeProject();
+ if (_relaunch != null) _relaunch.run();
+ }
+ };
+ boolean save = false;
+ if (isProjectModified()) {
+ final int i = CtuluLibDialog.confirmExitIfProjectisModified(getFrame());
+ // l'utilisateur veut annuler l'op\xE9ration
+ if (i == JOptionPane.CANCEL_OPTION) {
+ FuLog.debug("FSI: close operation cancelled by user");
+ return false;
+ }
+ save = (i == JOptionPane.OK_OPTION);
+ }
+
+ FuLog.debug("FSI: close operation accepted and save option= " + save);
+ // pas de sauvegarde: on lance l'op\xE9ration suivante:
+ if (!save) {
+ r.run();
+ } else {
+ // on initilialise le fichier de...
[truncated message content] |
|
From: <bma...@us...> - 2009-01-12 11:25:38
|
Revision: 4343
http://fudaa.svn.sourceforge.net/fudaa/?rev=4343&view=rev
Author: bmarchan
Date: 2009-01-12 11:25:30 +0000 (Mon, 12 Jan 2009)
Log Message:
-----------
Chgt de version 0.09 => 0.10
Modified Paths:
--------------
branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueAffichageDonneesInterface.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlImplementation.java
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueAffichageDonneesInterface.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueAffichageDonneesInterface.java 2009-01-09 15:13:24 UTC (rev 4342)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueAffichageDonneesInterface.java 2009-01-12 11:25:30 UTC (rev 4343)
@@ -75,7 +75,8 @@
boolean isEditable();
/**
- * Definit si les objets du calque sont ou non selectionnables.
+ * Definit si les objets du calque sont ou non selectionnables. Si la valeur retourn\xE9e est false, les
+ * m\xE9thodes de s\xE9lection de l'interface n'ont aucun effet.
* @return true : Les objets sont selectionnables.
*/
boolean isSelectable();
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlImplementation.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlImplementation.java 2009-01-09 15:13:24 UTC (rev 4342)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlImplementation.java 2009-01-12 11:25:30 UTC (rev 4343)
@@ -81,9 +81,9 @@
protected static BuInformationsSoftware isMdl_ = new BuInformationsSoftware();
static {
isMdl_.name = "Modeleur";
- isMdl_.version = "0.09";
- isMdl_.date = "2008-12-22";
- isMdl_.rights = "Tous droits r\xE9serv\xE9s. CETMEF (c)1999-2008";
+ isMdl_.version = "0.10";
+ isMdl_.date = "2009-01-12";
+ isMdl_.rights = "Tous droits r\xE9serv\xE9s. CETMEF (c)1999-2009";
isMdl_.license = "GPL2";
isMdl_.languages = "fr,en";
isMdl_.authors=new String[]{"F.Deniger, B.Marchand"};
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <emm...@us...> - 2009-01-09 15:13:39
|
Revision: 4342
http://fudaa.svn.sourceforge.net/fudaa/?rev=4342&view=rev
Author: emmanuel_martin
Date: 2009-01-09 15:13:24 +0000 (Fri, 09 Jan 2009)
Log Message:
-----------
Correction d'une erreur lors de l'inversion automatique des profils.
Modified Paths:
--------------
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/model/Bief.java
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/model/Bief.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/model/Bief.java 2009-01-09 14:54:08 UTC (rev 4341)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/model/Bief.java 2009-01-09 15:13:24 UTC (rev 4342)
@@ -183,13 +183,7 @@
// Inversion du sens du profil si besoin
double produitVectorielCoordZ=vAxeH.x*vProfilH.y-vAxeH.y*vProfilH.x;
if (produitVectorielCoordZ>0) {
- Coordinate[] coords=((Geometry)profil).getCoordinates();
- for (int l=0; l<coords.length/2; l++) {
- Coordinate tmp=coords[l];
- coords[l]=coords[coords.length-1-l];
- coords[coords.length-1-l]=tmp;
- }
- zone.setCoordinateSequence(k, new GISCoordinateSequenceFactory().create(coords), null);
+ inverseProfil(k);
profil=(Geometry)profils_.getGeomData().getGeometry(k);
seqProfil=((GISCoordinateSequenceContainerInterface)profil).getCoordinateSequence();
}
@@ -222,6 +216,29 @@
}
/**
+ * Inverse le sens du profil dont l'index est pass\xE9 en param\xE8tre.
+ */
+ private void inverseProfil(int _idxProfil) {
+ GISZoneCollection zone=profils_.getGeomData();
+ Coordinate[] coords=((Geometry)zone.getGeometry(_idxProfil)).getCoordinates();
+ for (int l=0; l<coords.length/2; l++) {
+ // Inversion des coordonn\xE9es
+ Coordinate tmp=coords[l];
+ coords[l]=coords[coords.length-1-l];
+ coords[coords.length-1-l]=tmp;
+ // Inversion des attributs atomiques
+ for(int i=0;i<zone.getNbAttributes();i++)
+ if(zone.getAttribute(i).isAtomicValue()) {
+ GISAttributeModel model=((GISAttributeModel)zone.getDataModel(i));
+ Object valueTmp=model.getObjectValueAt(l);
+ model.setObject(l, model.getObjectValueAt(coords.length-1-l), null);
+ model.setObject(l, valueTmp, null);
+ }
+ }
+ zone.setCoordinateSequence(_idxProfil, new GISCoordinateSequenceFactory().create(coords), null);
+ }
+
+ /**
* Valuation des attributs *gauche et *droite des profils.
*
* @param _idxProfil l'index du profil concern\xE9.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <emm...@us...> - 2009-01-09 14:54:17
|
Revision: 4341
http://fudaa.svn.sourceforge.net/fudaa/?rev=4341&view=rev
Author: emmanuel_martin
Date: 2009-01-09 14:54:08 +0000 (Fri, 09 Jan 2009)
Log Message:
-----------
Correction d'un bug de listener dans ctulu
Modified Paths:
--------------
branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/collection/CtuluCollectionIntegerAbstract.java
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/collection/CtuluCollectionIntegerAbstract.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/collection/CtuluCollectionIntegerAbstract.java 2009-01-09 11:18:00 UTC (rev 4340)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/collection/CtuluCollectionIntegerAbstract.java 2009-01-09 14:54:08 UTC (rev 4341)
@@ -230,7 +230,7 @@
}
final int old = getValue(_i);
internalSet(_i, _newV);
- fireDataChanged();
+ fireObjectChanged(_i, _newV);
if (_c != null) {
_c.addCmd(new CommandSet(_newV, old, _i));
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <emm...@us...> - 2009-01-09 11:18:06
|
Revision: 4340
http://fudaa.svn.sourceforge.net/fudaa/?rev=4340&view=rev
Author: emmanuel_martin
Date: 2009-01-09 11:18:00 +0000 (Fri, 09 Jan 2009)
Log Message:
-----------
correction de la modification des index des labels.
Modified Paths:
--------------
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/model/ProfilContainerAdapter.java
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/model/ProfilContainerAdapter.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/model/ProfilContainerAdapter.java 2009-01-09 10:59:45 UTC (rev 4339)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/model/ProfilContainerAdapter.java 2009-01-09 11:18:00 UTC (rev 4340)
@@ -383,7 +383,7 @@
public void setLimiteGauche(int _idx, CtuluCommandContainer _cmd) {
int idxRiveGauche=getValueOf(GISAttributeConstants.INTERSECTION_RIVE_GAUCHE);
- if(_idx>=idxRiveGauche)
+ if(_idx<=idxRiveGauche)
setIndexIn(GISAttributeConstants.INTERSECTION_LIMITE_STOCKAGE_GAUCHE, _idx, _cmd);
else
throw new IllegalArgumentException(FudaaLib.getS("La limite gauche doit rester \xE0 gauche de la rive gauche."));
@@ -391,7 +391,7 @@
public void setLimiteDroite(int _idx, CtuluCommandContainer _cmd) {
int idxRiveDroite=getValueOf(GISAttributeConstants.INTERSECTION_RIVE_DROITE);
- if(-_idx<=idxRiveDroite)
+ if(_idx>=idxRiveDroite)
setIndexIn(GISAttributeConstants.INTERSECTION_LIMITE_STOCKAGE_DROITE, _idx, _cmd);
else
throw new IllegalArgumentException(FudaaLib.getS("La limite droite doit rester \xE0 droite de la rive droite."));
@@ -400,7 +400,7 @@
public void setRiveGauche(int _idx, CtuluCommandContainer _cmd) {
int idxLimiteGauche=getValueOf(GISAttributeConstants.INTERSECTION_LIMITE_STOCKAGE_GAUCHE);
int idxRiveDroite=getValueOf(GISAttributeConstants.INTERSECTION_RIVE_DROITE);
- if(_idx<=idxLimiteGauche&&_idx>idxRiveDroite)
+ if(_idx>=idxLimiteGauche&&_idx<idxRiveDroite)
setIndexIn(GISAttributeConstants.INTERSECTION_RIVE_GAUCHE, _idx, _cmd);
else
throw new IllegalArgumentException(FudaaLib.getS("La rive gauche doit rester entre la limite gauche et la rive droite."));
@@ -409,7 +409,7 @@
public void setRiveDroite(int _idx, CtuluCommandContainer _cmd) {
int idxLimiteDroite=getValueOf(GISAttributeConstants.INTERSECTION_LIMITE_STOCKAGE_DROITE);
int idxRiveGauche=getValueOf(GISAttributeConstants.INTERSECTION_RIVE_GAUCHE);
- if(_idx>=idxLimiteDroite&&_idx<idxRiveGauche)
+ if(_idx<=idxLimiteDroite&&_idx>idxRiveGauche)
setIndexIn(GISAttributeConstants.INTERSECTION_RIVE_DROITE, _idx, _cmd);
else
throw new IllegalArgumentException(FudaaLib.getS("La rive droite doit rester entre la limite droite et la rive gauche."));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bma...@us...> - 2009-01-09 10:59:51
|
Revision: 4339
http://fudaa.svn.sourceforge.net/fudaa/?rev=4339&view=rev
Author: bmarchan
Date: 2009-01-09 10:59:45 +0000 (Fri, 09 Jan 2009)
Log Message:
-----------
Task#141 : Possibilit?\195?\169 de rendre selectionnable/non des calques.
Modified Paths:
--------------
branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/BArbreCalque.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/BArbreCalqueModel.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueAffichageDonnees.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueAffichageDonneesAbstract.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueAffichageDonneesInterface.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueGeometry.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueLigneBrisee.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayer2dLine.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayer2dMultiPoint.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/view/VueBief.java
Added Paths:
-----------
branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/ressource/non-selectionnable.png
Property Changed:
----------------
branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueAffichageDonneesAbstract.java
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/BArbreCalque.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/BArbreCalque.java 2009-01-09 10:31:50 UTC (rev 4338)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/BArbreCalque.java 2009-01-09 10:59:45 UTC (rev 4339)
@@ -53,6 +53,11 @@
import org.fudaa.ebli.commun.EbliPopupListener;
import org.fudaa.ebli.ressource.EbliResource;
+/**
+ * Un menu pour le composant de cartographie utilisant des calques non bas\xE9s sur des mod\xE8le.
+ * @see EbliFilleCalques
+ * @deprecated
+ */
class BArbreNormalMenu extends BuMenu {
/**
@@ -321,10 +326,6 @@
}
}
- public BArbreNormalMenu buildNormalMenu() {
- return new BArbreNormalMenu(getArbreModel());
- }
-
public JPopupMenu buildPopupMenu(final BCalque _calque) {
final CtuluPopupMenu r = new CtuluPopupMenu();
getArbreModel().fillPopupMenu(r);
@@ -584,6 +585,13 @@
if (calque instanceof ZCalqueAffichageDonneesAbstract) {
final ZCalqueAffichageDonneesAbstract cq = (ZCalqueAffichageDonneesAbstract) calque;
lbSelect_.setVisible(!cq.isSelectionEmpty());
+
+ if (!cq.isSelectable()) {
+ if (s.length() > 0) {
+ s.append(CtuluLibString.ESPACE);
+ }
+ s.append(EbliResource.EBLI.getString("nonsel."));
+ }
}
else {
lbSelect_.setVisible(false);
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/BArbreCalqueModel.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/BArbreCalqueModel.java 2009-01-09 10:31:50 UTC (rev 4338)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/BArbreCalqueModel.java 2009-01-09 10:59:45 UTC (rev 4339)
@@ -30,6 +30,7 @@
import javax.swing.tree.TreeSelectionModel;
import com.memoire.bu.BuBorders;
+import com.memoire.bu.BuCheckBoxMenuItem;
import com.memoire.bu.BuGridLayout;
import com.memoire.bu.BuLabel;
import com.memoire.bu.BuMenu;
@@ -201,6 +202,10 @@
actDown(c);
} else if (action.equals(getActLast())) {
actLast(c);
+ } else if (action.equals("SET_SELECTABLE")) {
+ actSetSelectable(c,true);
+ } else if (action.equals("UNSET_SELECTABLE")) {
+ actSetSelectable(c,false);
} else {
int i = action.indexOf('_');
if (i >= 0) {
@@ -223,6 +228,8 @@
quickRefresh();
} else if ("VISIBLE".equals(action)) {
calque.setVisible(!calque.isVisible());
+ } else if ("SELECTABLE".equals(action) && (calque instanceof ZCalqueAffichageDonneesAbstract)) {
+ ((ZCalqueAffichageDonneesAbstract) calque).setSelectable(!((ZCalqueAffichageDonneesAbstract) calque).isSelectable());
// refreshSelect = true;
} else if ("RENAME".equals(action)) {
renameLayer(calque);
@@ -256,6 +263,20 @@
}
}
+ /**
+ * Rend les calques s\xE9lectionnables ou non, en controlaant qu'ils puissent l'etre.
+ * @param _c Les calques.
+ * @param _b True : Selectionnables.
+ */
+ private void actSetSelectable(final BCalque[] _c, boolean _b) {
+ for (int i = 0; i < _c.length; i++) {
+ if (_c[i] instanceof ZCalqueAffichageDonneesAbstract) {
+ ZCalqueAffichageDonneesAbstract cq=(ZCalqueAffichageDonneesAbstract)_c[i];
+ if (cq.canSetSelectable()) cq.setSelectable(_b);
+ }
+ }
+ }
+
protected void renameLayer(final BCalque _calque) {
final String title = _calque.getTitle();
final BuTextField ft = new BuTextField(title);
@@ -374,6 +395,9 @@
_m.addMenuItem(EbliResource.EBLI.getString("Visible"), "VISIBLE_OUI", null, true, 0, this);
_m.addMenuItem(EbliResource.EBLI.getString("Cach\xE9"), "VISIBLE_NON", BuResource.BU.getIcon("cacher"), true, 0, this);
_m.addSeparator();
+ _m.addMenuItem(EbliResource.EBLI.getString("S\xE9lectionnable"), "SET_SELECTABLE", EbliResource.EBLI.getIcon("fleche"), true, 0, this);
+ _m.addMenuItem(EbliResource.EBLI.getString("Non s\xE9lectionnable"), "UNSET_SELECTABLE", EbliResource.EBLI.getIcon("non-selectionnable"), true, 0, this);
+ _m.addSeparator();
_m.addMenuItem(EbliResource.EBLI.getString("Att\xE9nu\xE9"), "ATTENUE_OUI", null, true, 0, this);
_m.addMenuItem(EbliResource.EBLI.getString(getActNormal()), "ATTENUE_NON", null, true, 0, this);
_m.addSeparator();
@@ -404,6 +428,9 @@
final JMenuItem it = _m.addMenuItem(EbliResource.EBLI.getString("Cach\xE9"), "VISIBLE_NON", null, true, this);
it.setIcon(BuResource.BU.getIcon("cacher"));
_m.addSeparator();
+ _m.addMenuItem(EbliResource.EBLI.getString("S\xE9lectionnable"), "SET_SELECTABLE", EbliResource.EBLI.getIcon("fleche"), true, this);
+ _m.addMenuItem(EbliResource.EBLI.getString("Non s\xE9lectionnable"), "UNSET_SELECTABLE", EbliResource.EBLI.getIcon("non-selectionnable"), true, this);
+ _m.addSeparator();
_m.addMenuItem(EbliResource.EBLI.getString("Att\xE9nu\xE9"), "ATTENUE_OUI", null, true, this);
_m.addMenuItem(EbliResource.EBLI.getString(getActNormal()), "ATTENUE_NON", null, true, this);
_m.addSeparator();
@@ -447,6 +474,14 @@
_m.addCheckBox(EbliResource.EBLI.getString("Gel\xE9"), "GELE", true, ci.isGele(), this);
}
_m.addCheckBox(EbliResource.EBLI.getString("Visible"), "VISIBLE", true, _c.isVisible(), this);
+ if (_c instanceof ZCalqueAffichageDonneesAbstract) {
+ ZCalqueAffichageDonneesAbstract cq=(ZCalqueAffichageDonneesAbstract)_c;
+ if (cq.canSetSelectable()) {
+ BuCheckBoxMenuItem mi=
+ _m.addCheckBox(EbliResource.EBLI.getString("S\xE9lectionnable"), "SELECTABLE", EbliResource.EBLI.getIcon("fleche"), true, cq.isSelectable());
+ mi.addActionListener(this);
+ }
+ }
_m.addSeparator();
_m.addMenuItem(EbliResource.EBLI.getString("En premier"), getActPrem(), EbliResource.EBLI.getIcon("enpremier"),
true, this);
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueAffichageDonnees.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueAffichageDonnees.java 2009-01-09 10:31:50 UTC (rev 4338)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueAffichageDonnees.java 2009-01-09 10:59:45 UTC (rev 4339)
@@ -116,6 +116,8 @@
* @return true si un objet de ce calque est selection par le point.
*/
public boolean changeSelection(final GrPoint _pt, final int _tolerancePixel, final int _action) {
+ if (!isSelectable()) return false;
+
final CtuluListSelection l = selection(_pt, _tolerancePixel);
changeSelection(l, _action);
if ((l == null) || (l.isEmpty())) {
@@ -134,6 +136,8 @@
* @return true si des objets ont ete selectionnes par le polygone
*/
public boolean changeSelection(final LinearRing _poly, final int _action, final int _mode) {
+ if (!isSelectable()) return false;
+
final CtuluListSelection l = selection(_poly, _mode);
changeSelection(l, _action);
if ((l == null) || (l.isEmpty())) {
@@ -143,6 +147,8 @@
}
public boolean changeSelection(final LinearRing[] _p, final int _action, final int _mode) {
+ if (!isSelectable()) return false;
+
if (_p == null) {
return false;
}
@@ -159,6 +165,8 @@
}
public void clearSelection() {
+ if (!isSelectable()) return;
+
if ((selection_ != null) && (!selection_.isEmpty())) {
selection_.clear();
fireSelectionEvent();
@@ -181,6 +189,8 @@
}
public void inverseSelection() {
+ if (!isSelectable()) return;
+
if (isSelectionEmpty()) {
return;
}
@@ -208,7 +218,7 @@
}
public void selectAll() {
- if (!isVisible()) return;
+ if (!isVisible() || !isSelectable()) return;
initSelection();
selection_.addInterval(0, modeleDonnees().getNombre() - 1);
fireSelectionEvent();
@@ -239,6 +249,8 @@
* @return true si une selection a \xE9t\xE9 effectu\xE9e.
*/
public boolean setSelection(final int[] _idx) {
+ if (!isSelectable()) return false;
+
if (_idx == null) {
return false;
}
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueAffichageDonneesAbstract.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueAffichageDonneesAbstract.java 2009-01-09 10:31:50 UTC (rev 4338)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueAffichageDonneesAbstract.java 2009-01-09 10:59:45 UTC (rev 4339)
@@ -24,6 +24,7 @@
import org.fudaa.ebli.controle.BConfigurableComposite;
import org.fudaa.ebli.controle.BConfigurableInterface;
import org.fudaa.ebli.controle.BSelecteurAlpha;
+import org.fudaa.ebli.controle.BSelecteurCheckBox;
import org.fudaa.ebli.controle.BSelecteurIconModel;
import org.fudaa.ebli.controle.BSelecteurLineModel;
import org.fudaa.ebli.geometrie.GrBoite;
@@ -40,7 +41,7 @@
/**
* @author deniger
- * @version $Id: ZCalqueAffichageDonneesAbstract.java,v 1.47.6.2 2008-05-13 12:10:36 bmarchan Exp $
+ * @version $Id$
*/
public abstract class ZCalqueAffichageDonneesAbstract extends BCalqueAffichage implements
ZCalqueAffichageDonneesInterface {
@@ -98,6 +99,9 @@
*/
protected boolean isPaletteCouleurUsed_;
protected boolean painted_ = true;
+
+ /** Les objets du calques sont-ils selectionnables */
+ protected boolean isSelectable_=true;
protected BPalettePlageAbstract paletteCouleur_;
@@ -111,6 +115,25 @@
public boolean isEditable() {
return modeleDonnees() != null && modeleDonnees().getNombre() > 0;
}
+
+ public boolean isSelectable() {
+ return isSelectable_;
+ }
+
+ /**
+ * Definit si les objets du calque sont selectionnables.
+ */
+ public void setSelectable(boolean _b) {
+ if (isSelectable() != _b) {
+ if (!_b) clearSelection();
+ isSelectable_= _b;
+ firePropertyChange("selectable", !_b, _b);
+ }
+ }
+
+ public boolean canSetSelectable() {
+ return false;
+ }
public void paintAllInImage(final Graphics2D _g, final GrMorphisme _versEcran, final GrMorphisme _versReel,
final GrBoite _clipReel) {
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueAffichageDonneesAbstract.java
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueAffichageDonneesInterface.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueAffichageDonneesInterface.java 2009-01-09 10:31:50 UTC (rev 4338)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueAffichageDonneesInterface.java 2009-01-09 10:59:45 UTC (rev 4339)
@@ -75,6 +75,18 @@
boolean isEditable();
/**
+ * Definit si les objets du calque sont ou non selectionnables.
+ * @return true : Les objets sont selectionnables.
+ */
+ boolean isSelectable();
+
+ /**
+ * Definit si l'utilisateur peut changer le caract\xE8re s\xE9lectionnable/non depuis l'action "Selectionnable".
+ * @return true : Si le calque peut \xEAtre rendu selectionnable
+ */
+ public boolean canSetSelectable();
+
+ /**
* @return la boite zoomant sur la selection. Cette boite est la boite englobante
* augment\xE9e d'une marge.
*/
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueGeometry.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueGeometry.java 2009-01-09 10:31:50 UTC (rev 4338)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueGeometry.java 2009-01-09 10:59:45 UTC (rev 4339)
@@ -195,6 +195,8 @@
}
public boolean changeSelection(final GrPoint _pt, final int _tolerancePixel, final int _action) {
+ if (!isSelectable()) return false;
+
if (isAtomicMode_) {
final EbliListeSelectionMulti l = selectionMulti(_pt, _tolerancePixel);
changeSelectionMulti(l, _action);
@@ -207,6 +209,8 @@
}
public boolean changeSelection(final LinearRing _poly, final int _action, final int _mode) {
+ if (!isSelectable()) return false;
+
if (isAtomicMode_) {
final EbliListeSelectionMulti l = selectionMulti(_poly);
changeSelectionMulti(l, _action);
@@ -248,6 +252,8 @@
}
public void clearSelection() {
+ if (!isSelectable()) return;
+
// dans le mode edition de noeuds
if (isAtomicMode_) {
if (selectionMulti_ != null && !selectionMulti_.isEmpty()) {
@@ -367,6 +373,8 @@
}
public void inverseSelection() {
+ if (!isSelectable()) return;
+
if (isSelectionEmpty()) {
return;
}
@@ -656,7 +664,7 @@
}
public void selectAll() {
- if (!isVisible()) return;
+ if (!isVisible() || !isSelectable()) return;
if (!isAtomicMode_) {
initSelection();
@@ -877,6 +885,8 @@
}
public boolean setSelection(final int[] _idx) {
+ if (!isSelectable()) return false;
+
// Aucun controle n'est fait sur la visibilit\xE9 ou non des objets d'indices pass\xE9s.
if (!isAtomicMode_) {
return super.setSelection(_idx);
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueLigneBrisee.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueLigneBrisee.java 2009-01-09 10:31:50 UTC (rev 4338)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueLigneBrisee.java 2009-01-09 10:59:45 UTC (rev 4339)
@@ -223,6 +223,8 @@
}
public boolean changeSelection(final GrPoint _pt, final int _tolerancePixel, final int _action) {
+ if (!isSelectable()) return false;
+
if (isAtomicMode_) {
final EbliListeSelectionMulti l = selectionMulti(_pt, _tolerancePixel);
changeSelectionMulti(l, _action);
@@ -235,6 +237,8 @@
}
public boolean changeSelection(final LinearRing _poly, final int _action, final int _mode) {
+ if (!isSelectable()) return false;
+
if (isAtomicMode_) {
final EbliListeSelectionMulti l = selectionMulti(_poly);
changeSelectionMulti(l, _action);
@@ -276,6 +280,8 @@
}
public void clearSelection() {
+ if (!isSelectable()) return;
+
// dans le mode edition de noeuds
if (isAtomicMode_) {
if (selectionMulti_ != null && !selectionMulti_.isEmpty()) {
@@ -436,28 +442,9 @@
}
}
- public void inverseSelectedSelection() {
- if (!isAtomicMode_) {
- super.inverseSelection();
- return;
- }
- if (isSelectionEmpty()) {
- return;
- }
- for (int i = modele_.getNombre() - 1; i >= 0; i--) {
- CtuluListSelection s = selectionMulti_.get(i);
- if (s == null) {
- s = new CtuluListSelection();
- s.setSelectionInterval(0, modele_.getNbPointForGeometry(i) - 1);
- selectionMulti_.set(i, s);
- } else {
- s.inverse(modele_.getNbPointForGeometry(i));
- }
- }
- fireSelectionEvent();
- }
-
public void inverseSelection() {
+ if (!isSelectable()) return;
+
if (!isAtomicMode_) {
// super.inverseSelection();
if (isSelectionEmpty()) {
@@ -750,7 +737,7 @@
}
public void selectAll() {
- if (!isVisible()) return;
+ if (!isVisible() || !isSelectable()) return;
if (!isAtomicMode_) {
// super.selectAll();
@@ -995,6 +982,8 @@
}
public boolean setSelection(final int[] _idx) {
+ if (!isSelectable()) return false;
+
// Aucun controle n'est fait sur la visibilit\xE9 ou non des objets d'indices pass\xE9s.
if (!isAtomicMode_) {
return super.setSelection(_idx);
Added: branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/ressource/non-selectionnable.png
===================================================================
(Binary files differ)
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/ressource/non-selectionnable.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: svn:keywords
+ Id
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayer2dLine.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayer2dLine.java 2009-01-09 10:31:50 UTC (rev 4338)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayer2dLine.java 2009-01-09 10:59:45 UTC (rev 4339)
@@ -54,4 +54,8 @@
super.setActions(acts);
}
+
+ public boolean canSetSelectable() {
+ return true;
+ }
}
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayer2dMultiPoint.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayer2dMultiPoint.java 2009-01-09 10:31:50 UTC (rev 4338)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayer2dMultiPoint.java 2009-01-09 10:59:45 UTC (rev 4339)
@@ -53,4 +53,8 @@
super.setActions(acts);
}
+
+ public boolean canSetSelectable() {
+ return true;
+ }
}
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/view/VueBief.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/view/VueBief.java 2009-01-09 10:31:50 UTC (rev 4338)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/view/VueBief.java 2009-01-09 10:59:45 UTC (rev 4339)
@@ -70,14 +70,17 @@
BGroupeCalque groupeCalque=new BGroupeCalque();
// Ajout du calque d'axe hydraulique
MdlLayer1dAxe axeHydraulique=new MdlLayer1dAxe((FSigEditor)gisEditor_);
+ axeHydraulique.setSelectable(false);
axeHydraulique.modele(bief.axeHydraulique_);
groupeCalque.add(axeHydraulique);
// Ajout du calque de lignes directrices
MdlLayer2dDirectionLine lignesDirectrices=new MdlLayer2dDirectionLine((FSigEditor)gisEditor_);
+ lignesDirectrices.setSelectable(false);
lignesDirectrices.modele(bief.lignesDirectrices_);
groupeCalque.add(lignesDirectrices);
// Ajout du calque de limites de stockage
MdlLayer2dConstraintLine limitesStockage=new MdlLayer2dConstraintLine((FSigEditor)gisEditor_);
+ limitesStockage.setSelectable(false);
limitesStockage.modele(bief.limitesStockages_);
groupeCalque.add(limitesStockage);
// Ajout du calque de profils
@@ -86,6 +89,7 @@
groupeCalque.add(profils);
// Ajout du calque de rives
MdlLayer1dBank rives=new MdlLayer1dBank((FSigEditor)gisEditor_);
+ rives.setSelectable(false);
rives.modele(bief.rives_);
groupeCalque.add(rives);
// Fin
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <emm...@us...> - 2009-01-09 10:31:58
|
Revision: 4338
http://fudaa.svn.sourceforge.net/fudaa/?rev=4338&view=rev
Author: emmanuel_martin
Date: 2009-01-09 10:31:50 +0000 (Fri, 09 Jan 2009)
Log Message:
-----------
L'orientation des profils ?\195?\160 ?\195?\169t?\195?\169 invers?\195?\169e ; les labels peuvent ?\195?\170tre chang?\195?\169s de point ; correction d'une regression dans le changement d'abscisse curviligne d'un point.
Modified Paths:
--------------
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/model/Bief.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/model/ProfilContainer.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/model/ProfilContainerAdapter.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/model/UtilsProfil1d.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/view/VueCourbe.java
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/model/Bief.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/model/Bief.java 2009-01-08 16:45:23 UTC (rev 4337)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/model/Bief.java 2009-01-09 10:31:50 UTC (rev 4338)
@@ -182,7 +182,7 @@
vProfilH=new Coordinate(seqProfil.getCoordinate(idxNext).x-interAxeProfil.x, seqProfil.getCoordinate(idxNext).y-interAxeProfil.y, 0);
// Inversion du sens du profil si besoin
double produitVectorielCoordZ=vAxeH.x*vProfilH.y-vAxeH.y*vProfilH.x;
- if (produitVectorielCoordZ<0) {
+ if (produitVectorielCoordZ>0) {
Coordinate[] coords=((Geometry)profil).getCoordinates();
for (int l=0; l<coords.length/2; l++) {
Coordinate tmp=coords[l];
@@ -205,14 +205,14 @@
seqProfil=((GISCoordinateSequenceContainerInterface)profil).getCoordinateSequence();
// Valuation des attributs avec les index des points des intersections \\
// Rives
- zone.setAttributValue(idxAttRiveGauche, k, seqProfil.size()-1, null);
- zone.setAttributValue(idxAttRiveDroite, k, 0, null);
+ zone.setAttributValue(idxAttRiveGauche, k, 0, null);
+ zone.setAttributValue(idxAttRiveDroite, k, seqProfil.size()-1, null);
for (int l=0; l<rives_.getNombre(); l++)
valuateProfilIntersection(k, (Geometry) rives_.getObject(l), idxAttRiveGauche, idxAttRiveDroite, abscisseCurvIntersectionAxe);
// D\xE9tection des croisements zones de stockages droite et gauche \\
// Limites de stockages
- zone.setAttributValue(idxAttlsGauche, k, seqProfil.size()-1, null);
- zone.setAttributValue(idxAttlsDroite, k, 0, null);
+ zone.setAttributValue(idxAttlsGauche, k, 0, null);
+ zone.setAttributValue(idxAttlsDroite, k, seqProfil.size()-1, null);
for (int l=0; l<limitesStockages_.getNombre(); l++)
valuateProfilIntersection(k, (Geometry) limitesStockages_.getObject(l), idxAttlsGauche, idxAttlsDroite, abscisseCurvIntersectionAxe);
}
@@ -236,7 +236,7 @@
if (inter.getNumPoints()==1) {
Coordinate coord= inter.getCoordinate();
int idxIntersection=UtilsProfil1d.getIndex(profils_.getGeomData().getCoordinateSequence(_idxProfil), coord);
- if (_absCurvAxeHydrau>UtilsProfil1d.abscisseCurviligne(profils_.getGeomData().getCoordinateSequence(_idxProfil), coord))
+ if (_absCurvAxeHydrau<UtilsProfil1d.abscisseCurviligne(profils_.getGeomData().getCoordinateSequence(_idxProfil), coord))
profils_.getGeomData().setAttributValue(_idxAttrDroite, _idxProfil, idxIntersection, null);
else
profils_.getGeomData().setAttributValue(_idxAttrGauche, _idxProfil, idxIntersection, null);
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/model/ProfilContainer.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/model/ProfilContainer.java 2009-01-08 16:45:23 UTC (rev 4337)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/model/ProfilContainer.java 2009-01-09 10:31:50 UTC (rev 4338)
@@ -92,4 +92,16 @@
* {@link IllegalArgumentException} est lev\xE9e.
*/
public boolean setAbsCurvProfilOnAxeHydraulique(double _value, CtuluCommandContainer _cmd) throws ProfilContainerException;
+
+ /** Place l'intersection du profil avec la limite de stockage gauche \xE0 l'index _idx. */
+ public void setLimiteGauche(int _idx, CtuluCommandContainer _cmd);
+
+ /** Place l'intersection du profil avec la limite de stockage droite \xE0 l'index _idx. */
+ public void setLimiteDroite(int _idx, CtuluCommandContainer _cmd);
+
+ /** Place l'intersection du profil avec la rive gauche \xE0 l'index _idx. */
+ public void setRiveGauche(int _idx, CtuluCommandContainer _cmd);
+
+ /** Place l'intersection du profil avec la rive droite \xE0 l'index _idx. */
+ public void setRiveDroite(int _idx, CtuluCommandContainer _cmd);
}
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/model/ProfilContainerAdapter.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/model/ProfilContainerAdapter.java 2009-01-08 16:45:23 UTC (rev 4337)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/model/ProfilContainerAdapter.java 2009-01-09 10:31:50 UTC (rev 4338)
@@ -343,25 +343,25 @@
public double getAbsCurvRiveGauche() {
if(idxProfilSelected_==-1)
return -1;
- return UtilsProfil1d.abscisseCurviligne(getCoordSeq(), getCoordSeq().getCoordinate(getValueOf(GISAttributeConstants.INTERSECTION_RIVE_GAUCHE)));
+ return getCurv(getValueOf(GISAttributeConstants.INTERSECTION_RIVE_GAUCHE));
}
public double getAbsCurvRiveDroite() {
if(idxProfilSelected_==-1)
return -1;
- return UtilsProfil1d.abscisseCurviligne(getCoordSeq(), getCoordSeq().getCoordinate(getValueOf(GISAttributeConstants.INTERSECTION_RIVE_DROITE)));
+ return getCurv(getValueOf(GISAttributeConstants.INTERSECTION_RIVE_DROITE));
}
public double getAbsCurvLimiteStockageGauche() {
if(idxProfilSelected_==-1)
return -1;
- return UtilsProfil1d.abscisseCurviligne(getCoordSeq(), getCoordSeq().getCoordinate(getValueOf(GISAttributeConstants.INTERSECTION_LIMITE_STOCKAGE_GAUCHE)));
+ return getCurv(getValueOf(GISAttributeConstants.INTERSECTION_LIMITE_STOCKAGE_GAUCHE));
}
public double getAbsCurvLimiteStockageDroite() {
if(idxProfilSelected_==-1)
return -1;
- return UtilsProfil1d.abscisseCurviligne(getCoordSeq(), getCoordSeq().getCoordinate(getValueOf(GISAttributeConstants.INTERSECTION_LIMITE_STOCKAGE_DROITE)));
+ return getCurv(getValueOf(GISAttributeConstants.INTERSECTION_LIMITE_STOCKAGE_DROITE));
}
public double getAbsCurvProfilOnAxeHydraulique() {
@@ -372,14 +372,80 @@
}
public double getAbsCurvAxeHydrauliqueOnProfil() {
+ if(idxProfilSelected_==-1||biefContainer_.getZoneAxeHydraulique().getNbGeometries()==0)
+ return -1;
Geometry intersection=biefContainer_.getZoneAxeHydraulique().getGeometry(0).intersection(
biefContainer_.getZoneProfils().getGeometry(idxProfilSelected_));
if (intersection.getNumPoints()!=1)
return -1;
- return UtilsProfil1d.abscisseCurviligne(((GISCoordinateSequenceContainerInterface)biefContainer_.getZoneAxeHydraulique()
- .getGeometry(0)).getCoordinateSequence(), intersection.getCoordinate());
+ return UtilsProfil1d.abscisseCurviligne(getCoordSeq(), intersection.getCoordinate());
}
+ public void setLimiteGauche(int _idx, CtuluCommandContainer _cmd) {
+ int idxRiveGauche=getValueOf(GISAttributeConstants.INTERSECTION_RIVE_GAUCHE);
+ if(_idx>=idxRiveGauche)
+ setIndexIn(GISAttributeConstants.INTERSECTION_LIMITE_STOCKAGE_GAUCHE, _idx, _cmd);
+ else
+ throw new IllegalArgumentException(FudaaLib.getS("La limite gauche doit rester \xE0 gauche de la rive gauche."));
+ }
+
+ public void setLimiteDroite(int _idx, CtuluCommandContainer _cmd) {
+ int idxRiveDroite=getValueOf(GISAttributeConstants.INTERSECTION_RIVE_DROITE);
+ if(-_idx<=idxRiveDroite)
+ setIndexIn(GISAttributeConstants.INTERSECTION_LIMITE_STOCKAGE_DROITE, _idx, _cmd);
+ else
+ throw new IllegalArgumentException(FudaaLib.getS("La limite droite doit rester \xE0 droite de la rive droite."));
+ }
+
+ public void setRiveGauche(int _idx, CtuluCommandContainer _cmd) {
+ int idxLimiteGauche=getValueOf(GISAttributeConstants.INTERSECTION_LIMITE_STOCKAGE_GAUCHE);
+ int idxRiveDroite=getValueOf(GISAttributeConstants.INTERSECTION_RIVE_DROITE);
+ if(_idx<=idxLimiteGauche&&_idx>idxRiveDroite)
+ setIndexIn(GISAttributeConstants.INTERSECTION_RIVE_GAUCHE, _idx, _cmd);
+ else
+ throw new IllegalArgumentException(FudaaLib.getS("La rive gauche doit rester entre la limite gauche et la rive droite."));
+ }
+
+ public void setRiveDroite(int _idx, CtuluCommandContainer _cmd) {
+ int idxLimiteDroite=getValueOf(GISAttributeConstants.INTERSECTION_LIMITE_STOCKAGE_DROITE);
+ int idxRiveGauche=getValueOf(GISAttributeConstants.INTERSECTION_RIVE_GAUCHE);
+ if(_idx>=idxLimiteDroite&&_idx<idxRiveGauche)
+ setIndexIn(GISAttributeConstants.INTERSECTION_RIVE_DROITE, _idx, _cmd);
+ else
+ throw new IllegalArgumentException(FudaaLib.getS("La rive droite doit rester entre la limite droite et la rive gauche."));
+ }
+
+ private void setIndexIn(GISAttributeInterface _attr, int _idx, CtuluCommandContainer _cmd) {
+ if(idxProfilSelected_==-1||_idx<0||_idx>=getNbPoint())
+ throw new IllegalArgumentException("Cet index n'existe pas");
+ class UndoRedoSetIndexIn implements CtuluCommand, CtuluNamedCommand {
+ GISAttributeInterface attr_;
+ CtuluCommandComposite cmd_;
+ public UndoRedoSetIndexIn(GISAttributeInterface _attr, CtuluCommandComposite _cmd) {
+ attr_=_attr;
+ cmd_=_cmd;
+ }
+ public String getName() {
+ return FudaaLib.getS("Changement de "+attr_.getName());
+ }
+ public void redo() {
+ cmd_.redo();
+ fireProfilContainerDataModified();
+ }
+ public void undo() {
+ cmd_.undo();
+ fireProfilContainerDataModified();
+ }
+ }
+ int idxAttr=biefContainer_.getZoneProfils().getIndiceOf(_attr);
+ CtuluCommandComposite cmd=new CtuluCommandComposite();
+ if(_idx!=(Integer) biefContainer_.getZoneProfils().getValue(idxAttr, idxProfilSelected_))
+ biefContainer_.getZoneProfils().setAttributValue(idxAttr, idxProfilSelected_, _idx, cmd);
+ if(_cmd!=null)
+ _cmd.addCmd(new UndoRedoSetIndexIn(_attr, cmd));
+ fireProfilContainerDataModified();
+ }
+
public boolean setAbsCurvProfilOnAxeHydraulique(double _value, CtuluCommandContainer _cmd) throws ProfilContainerException {
CoordinateSequence axeHydrau=((GISCoordinateSequenceContainerInterface)biefContainer_.getZoneAxeHydraulique().getGeometry(0))
.getCoordinateSequence();
@@ -742,16 +808,17 @@
if (Math.abs(coords[idxFin].x-coords[idxDeb].x)>tolerance) {
double sign=Math.signum(coords[idxFin].x-coords[idxDeb].x);
double newCoefDirecteur=(coords[idxFin].y-coords[idxDeb].y)/(coords[idxFin].x-coords[idxDeb].x);
- for (int i=idxDeb+1; i<idxFin; i++)
- coords[i]=new Coordinate(coords[idxDeb].x+sign*(curv_.get(i)-curv_.get(idxDeb))
- /Math.sqrt(1+newCoefDirecteur*newCoefDirecteur), coords[i].y=coords[idxDeb].y+newCoefDirecteur*(coords[i].x-coords[idxDeb].x), coords[i].z);
+ for (int i=idxDeb+1; i<idxFin; i++) {
+ coords[i]=new Coordinate(0, 0, coords[i].z);
+ coords[i].x=coords[idxDeb].x+sign*(curv_.get(i)-curv_.get(idxDeb))/Math.sqrt(1+newCoefDirecteur*newCoefDirecteur);
+ coords[i].y=coords[idxDeb].y+newCoefDirecteur*(coords[i].x-coords[idxDeb].x);
+ }
}
else { // Cas du bout de profil vertical
double sign=Math.signum(coords[idxFin].y-coords[idxDeb].y);
for (int i=idxDeb+1; i<idxFin; i++)
- coords[i]=new Coordinate(coords[idxDeb].x, coords[i].y=coords[idxDeb].y+sign*(curv_.get(i)-curv_.get(idxDeb)),
+ coords[i]=new Coordinate(coords[idxDeb].x, coords[idxDeb].y+sign*(curv_.get(i)-curv_.get(idxDeb)),
coords[i].z);
-
}
}
}
@@ -768,7 +835,6 @@
public void setZ(int _idxPoint, double _value, CtuluCommandContainer _cmd) {
if (z_==null||_idxPoint<0||_idxPoint>=z_.getSize())
throw new IllegalArgumentException("Cet index n'existe pas.");
-
CtuluCommandComposite cmd=new CtuluCommandComposite("Changement z");
// Mise \xE0 jour du z \\
z_.setObject(_idxPoint, _value, cmd);
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/model/UtilsProfil1d.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/model/UtilsProfil1d.java 2009-01-08 16:45:23 UTC (rev 4337)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/model/UtilsProfil1d.java 2009-01-09 10:31:50 UTC (rev 4338)
@@ -8,6 +8,7 @@
package org.fudaa.fudaa.modeleur.modeleur1d.model;
import org.fudaa.ctulu.gis.GISCoordinateSequenceContainerInterface;
+import org.fudaa.ctulu.gis.GISCoordinateSequenceFactory;
import org.fudaa.ctulu.gis.GISGeometryFactory;
import org.fudaa.ctulu.gis.GISPoint;
import org.fudaa.ctulu.gis.GISZoneCollection;
@@ -329,8 +330,6 @@
idx2=i;
valCurv=_abscisseCurv-oldAbsCurv;
}
- if(idx1>=_geom.size()||idx2>=_geom.size())
- System.out.println("zz");
if(valCurv<tolerance_)
return _geom.getCoordinate(i);
// Calcul des nouvelles coordonn\xE9es
@@ -349,6 +348,15 @@
}
return new Coordinate(newX, newY, 0);
}
+
+ /**
+ * Retourne la coordonn\xE9e correspondant \xE0 'abscisseCurv' sur '_geom'. La
+ * valeur de z est mise \xE0 0. _abscisseCurv peut \xEAtre n\xE9gatif : le point
+ * retourn\xE9 sera avec le premier ou sup\xE9rieur au max.
+ */
+ static public Coordinate getCoordinateXY(Coordinate[] _geom, double _abscisseCurv) {
+ return getCoordinateXY(new GISCoordinateSequenceFactory().create(_geom), _abscisseCurv);
+ }
/**
* Retourne l'angle form\xE9 par les segments _a_b et _b_c. _a, _b et _c doivent
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/view/VueCourbe.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/view/VueCourbe.java 2009-01-08 16:45:23 UTC (rev 4337)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/view/VueCourbe.java 2009-01-09 10:31:50 UTC (rev 4338)
@@ -9,6 +9,8 @@
import java.awt.Color;
import java.awt.Dimension;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
import java.text.DecimalFormat;
import java.util.ArrayList;
import java.util.Arrays;
@@ -45,6 +47,7 @@
import org.fudaa.fudaa.modeleur.modeleur1d.model.ProfilContainerListener;
import com.memoire.bu.BuBorderLayout;
+import com.memoire.bu.BuButton;
import com.memoire.bu.BuPanel;
import com.memoire.bu.BuSpecificBar;
@@ -82,6 +85,60 @@
data_.addProfilContainerListener(this);
}
+ /**
+ * Place l'intersection du profil avec la limite de stockage gauche \xE0
+ * l'index _idx.
+ */
+ public void setLimiteGauche(int _idx) {
+ controller_.clearError();
+ try {
+ data_.setLimiteGauche(_idx, controller_.getCommandManager());
+ }
+ catch(IllegalArgumentException _e) {
+ controller_.showError(_e.getMessage());
+ }
+ }
+
+ /**
+ * Place l'intersection du profil avec la limite de stockage droite \xE0
+ * l'index _idx.
+ */
+ public void setLimiteDroite(int _idx) {
+ controller_.clearError();
+ try {
+ data_.setLimiteDroite(_idx, controller_.getCommandManager());
+ }
+ catch(IllegalArgumentException _e) {
+ controller_.showError(_e.getMessage());
+ }
+ }
+
+ /**
+ * Place l'intersection du profil avec la rive gauche \xE0 l'index _idx.
+ */
+ public void setRiveGauche(int _idx) {
+ controller_.clearError();
+ try {
+ data_.setRiveGauche(_idx, controller_.getCommandManager());
+ }
+ catch(IllegalArgumentException _e) {
+ controller_.showError(_e.getMessage());
+ }
+ }
+
+ /**
+ * Place l'intersection du profil avec la rive droite \xE0 l'index _idx.
+ */
+ public void setRiveDroite(int _idx) {
+ controller_.clearError();
+ try {
+ data_.setRiveDroite(_idx, controller_.getCommandManager());
+ }
+ catch(IllegalArgumentException _e) {
+ controller_.showError(_e.getMessage());
+ }
+ }
+
private void updateLabels() {
courbe_.removeLabels();
// Rive gauche
@@ -92,6 +149,10 @@
absCurv=data_.getAbsCurvRiveDroite();
if(absCurv!=-1)
courbe_.addLabel(absCurv, "RD");
+ // Axe hydraulique
+ absCurv=data_.getAbsCurvAxeHydrauliqueOnProfil();
+ if(absCurv!=-1)
+ courbe_.addLabel(absCurv, "AH");
// Limite stockage gauche
absCurv=data_.getAbsCurvLimiteStockageGauche();
if(absCurv!=-1)
@@ -100,16 +161,15 @@
absCurv=data_.getAbsCurvLimiteStockageDroite();
if(absCurv!=-1)
courbe_.addLabel(absCurv, "SD");
+ grapheVue_.structureChanged();
}
public void profilContainerDataModified() {
updateLabels();
- grapheVue_.structureChanged();
}
public void profilContainerSelectedChanged(int _idxOldProfil, int _idxNewProfil){
updateLabels();
- grapheVue_.structureChanged();
grapheVue_.restore();
}
@@ -306,6 +366,13 @@
private EGGraphe grapheVue_;
/** Le container principal de la courbe. */
private EGFillePanel containerCourbe_;
+ /** Le model de la courbe */
+ CourbeGeomModel courbeModel_;
+ // Les boutons permettant de modifier les positions des rives et des limites de stockages. \\
+ BuButton limiteGauche_;
+ BuButton riveGauche_;
+ BuButton riveDroite_;
+ BuButton limiteDroite_;
public VueCourbe(Controller1d _controller, ProfilContainer _dataGeom){
controller_=_controller;
@@ -323,7 +390,7 @@
// Axe Y \\
EGAxeVertical axeY = new EGAxeVertical();
axeY.setGraduations(true);
- axeY.setGrille(new TraceLigneModel(TraceLigne.LISSE, 1, Color.LIGHT_GRAY));
+ axeY.setGrille(new TraceLigneModel(TraceLigne.POINTILLE, 1, Color.LIGHT_GRAY));
axeY.setTitre(FudaaLib.getS("Ordonn\xE9e : z"));
axeY.setUnite(FudaaLib.getS("m\xE8tre"));
DecimalFormat df=CtuluLib.getDecimalFormat();
@@ -332,8 +399,8 @@
axeY.setBounds(0, 50);
axeY.setLineColor(Color.BLACK);
// Cr\xE9ation de la courbe \\
- EGModel courbeModel=new CourbeGeomModel(_dataGeom);
- courbe_=new EGCourbeSimple(axeY, courbeModel);
+ courbeModel_=new CourbeGeomModel(_dataGeom);
+ courbe_=new EGCourbeSimple(axeY, courbeModel_);
courbe_.setAspectContour(Color.RED);
grapheModel.addCourbe(courbe_, null);
// Cr\xE9ation du panel contenant l'ensemble des courbes \\
@@ -357,6 +424,44 @@
button.setText("");
actions.add(button);
}
+ // Les boutons personnalis\xE9s \\
+ limiteGauche_=new BuButton("SG");
+ limiteGauche_.addActionListener(new ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ int[] idx=getSelection();
+ if(idx!=null&&idx.length==1)
+ courbeModel_.setLimiteGauche(idx[0]);
+ }
+ });
+ actions.add(limiteGauche_);
+ riveGauche_=new BuButton("RG");
+ riveGauche_.addActionListener(new ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ int[] idx=getSelection();
+ if(idx!=null&&idx.length==1)
+ courbeModel_.setRiveGauche(idx[0]);
+ }
+ });
+ actions.add(riveGauche_);
+ riveDroite_=new BuButton("RD");
+ riveDroite_.addActionListener(new ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ int[] idx=getSelection();
+ if(idx!=null&&idx.length==1)
+ courbeModel_.setRiveDroite(idx[0]);
+ }
+ });
+ actions.add(riveDroite_);
+ limiteDroite_=new BuButton("SD");
+ limiteDroite_.addActionListener(new ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ int[] idx=getSelection();
+ if(idx!=null&&idx.length==1)
+ courbeModel_.setLimiteDroite(idx[0]);
+ }
+ });
+ actions.add(limiteDroite_);
+ // Ajout des boutons \xE0 la barre
speBar.addTools(actions.toArray(new JComponent[0]));
add(speBar, BuBorderLayout.NORTH);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <emm...@us...> - 2009-01-08 16:45:27
|
Revision: 4337
http://fudaa.svn.sourceforge.net/fudaa/?rev=4337&view=rev
Author: emmanuel_martin
Date: 2009-01-08 16:45:23 +0000 (Thu, 08 Jan 2009)
Log Message:
-----------
Mise ?\195?\160 jour de l'exporteur mascaret.
Modified Paths:
--------------
branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/mascaret/io/MascaretWriter.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/controller/Controller1d.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/model/UtilsProfil1d.java
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/mascaret/io/MascaretWriter.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/mascaret/io/MascaretWriter.java 2009-01-08 15:58:18 UTC (rev 4336)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/mascaret/io/MascaretWriter.java 2009-01-08 16:45:23 UTC (rev 4337)
@@ -23,7 +23,7 @@
import org.fudaa.ctulu.gis.GISGeometryFactory;
import org.fudaa.ctulu.gis.GISPoint;
import org.fudaa.ctulu.gis.GISPolyligne;
-import org.fudaa.ctulu.gis.GISZoneCollectionLigneBrisee;
+import org.fudaa.ctulu.gis.GISZoneCollection;
import com.vividsolutions.jts.geom.Coordinate;
import com.vividsolutions.jts.geom.CoordinateSequence;
@@ -32,7 +32,7 @@
/**
* Ecrit au format mascaret 1d et 2d.
* @author Emmanuel MARTIN
- * @version $Id:$
+ * @version $Id$
*/
public class MascaretWriter extends FileWriteOperationAbstract {
@@ -47,10 +47,10 @@
* Cette classe permet \xE0 l'exporteur de selectionner les
* profils \xE0 exporter. G\xE9n\xE9ralement les profiles invalides sont ignor\xE9s.
* @author Emmanuel MARTIN
- * @version $Id:$
+ * @version $Id$
*/
public interface FunctorSelectProfil {
- public boolean exportProfil(GISZoneCollectionLigneBrisee _zone, int _idxProfil);
+ public boolean exportProfil(GISZoneCollection _zone, int _idxProfil);
}
public MascaretWriter() {}
@@ -79,7 +79,7 @@
if(((Object[])_o).length!=4)
throw new IllegalArgumentException("Il doit y avoir 4 param\xE8tres dans _o.");
String nomBief=(String)((Object[])_o)[0];
- GISZoneCollectionLigneBrisee[] zones=(GISZoneCollectionLigneBrisee[])((Object[])_o)[1];
+ GISZoneCollection[] zones=(GISZoneCollection[])((Object[])_o)[1];
FunctorSelectProfil selectorProfil=(FunctorSelectProfil)((Object[])_o)[2];
version_=(String)((Object[])_o)[3];
if (nomBief==null)
@@ -152,9 +152,9 @@
* @throws MascaretDataError
* @throws MascaretDataIncomplete
*/
- private void generateMascaretProfilAbstractRepresentations(String _nomBief, GISZoneCollectionLigneBrisee[] _zones, FunctorSelectProfil _selectorProfil) throws MascaretDataError, MascaretDataIncomplete{
+ private void generateMascaretProfilAbstractRepresentations(String _nomBief, GISZoneCollection[] _zones, FunctorSelectProfil _selectorProfil) throws MascaretDataError, MascaretDataIncomplete{
// Recherche de l'axe hydraulique \\
- GISZoneCollectionLigneBrisee zoneAxeHydraulique=null;
+ GISZoneCollection zoneAxeHydraulique=null;
int indexAxeHydraulique=-1;
for (int i=0; i<_zones.length; i++) {
int idxAttNature=_zones[i].getIndiceOf(GISAttributeConstants.NATURE);
@@ -172,7 +172,7 @@
throw new MascaretDataIncomplete("Il n'y a pas d'axes hydrauliques.");
// Recherche des profils \\
- List<GISZoneCollectionLigneBrisee> profils=new ArrayList<GISZoneCollectionLigneBrisee>();
+ List<GISZoneCollection> profils=new ArrayList<GISZoneCollection>();
List<Integer> indexProfils=new ArrayList<Integer>();
for (int i=0; i<_zones.length; i++) {
int idxAttNature=_zones[i].getIndiceOf(GISAttributeConstants.NATURE);
@@ -189,23 +189,19 @@
int countNoName=1;
GISPolyligne axeHydraulique=(GISPolyligne)zoneAxeHydraulique.getGeometry(indexAxeHydraulique);
for (int i=0;i<profils.size();i++) {
- GISZoneCollectionLigneBrisee zoneProfil=profils.get(i);
+ GISZoneCollection zoneProfil=profils.get(i);
int idxProfil=indexProfils.get(i);
GISPolyligne profil=(GISPolyligne) zoneProfil.getGeometry(idxProfil);
MascaretProfilAbstractRepresentation profilAbs=new MascaretProfilAbstractRepresentation();
// Information globales sur le profil \\
// Nom bief
- if(_nomBief.contains(" "))
- throw new MascaretDataError("Le nom du bief ne doit pas contenir d'espace.");
- profilAbs.nomBief=_nomBief;
+ profilAbs.nomBief=_nomBief.replace(' ', '_');
// Nom profil
int idxTitle=zoneProfil.getIndiceOf(GISAttributeConstants.TITRE);
if(idxTitle!=-1){
String nomProfil=(String) zoneProfil.getValue(idxTitle, idxProfil);
- if(nomProfil.contains(" "))
- throw new MascaretDataError("Le nom du profil ne doit pas contenir d'espace.");
- profilAbs.nomProfil=nomProfil;
+ profilAbs.nomProfil=nomProfil.replace(' ', '_');
}
else
profilAbs.nomProfil="No_Name_"+countNoName++;
@@ -238,38 +234,30 @@
ArrayList<Integer> seps=new ArrayList<Integer>();
//INTERSECTION_RIVE_GAUCHE
int idxInterRiveG=zoneProfil.getIndiceOf(GISAttributeConstants.INTERSECTION_RIVE_GAUCHE);
- Coordinate intersectionRiveGauche;
Integer idxRG=-1;
if(idxInterRiveG!=-1) {
- intersectionRiveGauche=(Coordinate) zoneProfil.getValue(idxInterRiveG, idxProfil);
- idxRG=idxIntersection(coordSeq, intersectionRiveGauche);
+ idxRG=(Integer) zoneProfil.getValue(idxInterRiveG, idxProfil);
seps.add(idxRG);
}
//INTERSECTION_RIVE_DROITE
int idxInterRiveD=zoneProfil.getIndiceOf(GISAttributeConstants.INTERSECTION_RIVE_DROITE);
- Coordinate intersectionRiveDroite;
Integer idxRD=-1;
if(idxInterRiveD!=-1) {
- intersectionRiveDroite=(Coordinate) zoneProfil.getValue(idxInterRiveD, idxProfil);
- idxRD=idxIntersection(coordSeq, intersectionRiveDroite);
+ idxRD=(Integer) zoneProfil.getValue(idxInterRiveD, idxProfil);
seps.add(idxRD);
}
//INTERSECTION_LIMITE_STOCKAGE_GAUCHE
int idxInterStockageG=zoneProfil.getIndiceOf(GISAttributeConstants.INTERSECTION_LIMITE_STOCKAGE_GAUCHE);
- Coordinate intersectionStockageGauche;
Integer idxSG=-1;
if(idxInterStockageG!=-1) {
- intersectionStockageGauche=(Coordinate) zoneProfil.getValue(idxInterStockageG, idxProfil);
- idxSG=idxIntersection(coordSeq, intersectionStockageGauche);
+ idxSG=(Integer) zoneProfil.getValue(idxInterStockageG, idxProfil);
seps.add(idxSG);
}
//INTERSECTION_LIMITE_STOCKAGE_DROITE
int idxInterStockageD=zoneProfil.getIndiceOf(GISAttributeConstants.INTERSECTION_LIMITE_STOCKAGE_DROITE);
- Coordinate intersectionStockageDroit;
Integer idxSD=-1;
if(idxInterStockageD!=-1) {
- intersectionStockageDroit=(Coordinate) zoneProfil.getValue(idxInterStockageD, idxProfil);
- idxSD=idxIntersection(coordSeq, intersectionStockageDroit);
+ idxSD=(Integer) zoneProfil.getValue(idxInterStockageD, idxProfil);
seps.add(idxSD);
}
if(idxRG==-1&&idxRD!=-1||idxRG!=-1&&idxRD==-1)
@@ -281,9 +269,9 @@
// Bathy Topo ou Stockage
if(sepsT.length==4){
int j;
- for(j=0;j<sepsT[0];j++)
+ for(j=0;j<=sepsT[0];j++)
profilAbs.bathyOuTopoOuStockage.add('S');
- for(;j<sepsT[1];j++)
+ for(;j<=sepsT[1];j++)
profilAbs.bathyOuTopoOuStockage.add('T');
for(;j<sepsT[2];j++)
profilAbs.bathyOuTopoOuStockage.add('B');
@@ -292,10 +280,10 @@
for(;j<coordSeq.size();j++)
profilAbs.bathyOuTopoOuStockage.add('S');
}
- if(sepsT.length==2) {
+ else if(sepsT.length==2) {
if(sepsT[0]==idxRG||sepsT[0]==idxRD){
int j;
- for(j=0;j<sepsT[0];j++)
+ for(j=0;j<=sepsT[0];j++)
profilAbs.bathyOuTopoOuStockage.add('T');
for(;j<sepsT[1];j++)
profilAbs.bathyOuTopoOuStockage.add('B');
@@ -304,7 +292,7 @@
}
else{
int j;
- for(j=0;j<sepsT[0];j++)
+ for(j=0;j<=sepsT[0];j++)
profilAbs.bathyOuTopoOuStockage.add('S');
for(;j<sepsT[1];j++)
profilAbs.bathyOuTopoOuStockage.add('B');
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/controller/Controller1d.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/controller/Controller1d.java 2009-01-08 15:58:18 UTC (rev 4336)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/controller/Controller1d.java 2009-01-08 16:45:23 UTC (rev 4337)
@@ -32,6 +32,7 @@
import org.fudaa.ctulu.CtuluListSelectionListener;
import org.fudaa.ctulu.CtuluNamedCommand;
import org.fudaa.ctulu.gis.GISAttributeConstants;
+import org.fudaa.ctulu.gis.GISZoneCollection;
import org.fudaa.ctulu.gis.GISZoneCollectionLigneBrisee;
import org.fudaa.dodico.mascaret.io.MascaretWriter;
import org.fudaa.ebli.calque.ZCalqueAffichageDonneesInterface;
@@ -367,13 +368,13 @@
mascaretWriter.setFile(vueExport.getFile());
Bief bief=controllerBief_.getSelectedBief();
if(bief==null) {
- appli_.warn(FudaaLib.getS("Attention"), FudaaLib.getS("Il n'y a pas de bief \xE0 exporter."));
+ appli_.warn(FudaaLib.getS("Attention"), FudaaLib.getS("Il n'y a pas de bief selectionn\xE9."));
return;
}
- Object[] zones=new Object[]{bief.axeHydraulique_.getGeomData(), bief.lignesDirectrices_.getGeomData(),
+ GISZoneCollection[] zones=new GISZoneCollection[]{bief.axeHydraulique_.getGeomData(), bief.lignesDirectrices_.getGeomData(),
bief.limitesStockages_.getGeomData(), bief.profils_.getGeomData(), bief.rives_.getGeomData()};
MascaretWriter.FunctorSelectProfil functorSelectProfil=new MascaretWriter.FunctorSelectProfil() {
- public boolean exportProfil(GISZoneCollectionLigneBrisee _zone, int _idxProfil) {
+ public boolean exportProfil(GISZoneCollection _zone, int _idxProfil) {
return UtilsProfil1d.isProfilCorrect(_zone, _idxProfil);
}
};
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/model/UtilsProfil1d.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/model/UtilsProfil1d.java 2009-01-08 15:58:18 UTC (rev 4336)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/model/UtilsProfil1d.java 2009-01-08 16:45:23 UTC (rev 4337)
@@ -10,7 +10,7 @@
import org.fudaa.ctulu.gis.GISCoordinateSequenceContainerInterface;
import org.fudaa.ctulu.gis.GISGeometryFactory;
import org.fudaa.ctulu.gis.GISPoint;
-import org.fudaa.ctulu.gis.GISZoneCollectionLigneBrisee;
+import org.fudaa.ctulu.gis.GISZoneCollection;
import org.fudaa.fudaa.commun.FudaaLib;
import com.vividsolutions.jts.geom.Coordinate;
@@ -30,7 +30,7 @@
/**
* Retourne vrai si le profil est correct.
*/
- static public boolean isProfilCorrect(GISZoneCollectionLigneBrisee _zone, int _idxProfil) {
+ static public boolean isProfilCorrect(GISZoneCollection _zone, int _idxProfil) {
CoordinateSequence seq=((GISCoordinateSequenceContainerInterface)_zone.getGeometry(_idxProfil)).getCoordinateSequence();
// Verifie qu'on a bien au minimum deux points. \\
if (seq.size()<2)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <emm...@us...> - 2009-01-08 15:58:22
|
Revision: 4336
http://fudaa.svn.sourceforge.net/fudaa/?rev=4336&view=rev
Author: emmanuel_martin
Date: 2009-01-08 15:58:18 +0000 (Thu, 08 Jan 2009)
Log Message:
-----------
Les donn?\195?\169es des attributs des g?\195?\169om?\195?\169tries volatiles (rives, limites de stockages...) sont concerv?\195?\169s dans le temps.
Modified Paths:
--------------
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/controller/ControllerBief.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/model/Bief.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/view/VueCourbe.java
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/controller/ControllerBief.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/controller/ControllerBief.java 2009-01-08 13:57:00 UTC (rev 4335)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/controller/ControllerBief.java 2009-01-08 15:58:18 UTC (rev 4336)
@@ -67,7 +67,7 @@
public void disableSynchronisers() {
String[] names=biefSet_.getBiefNames();
for(int i=0;i<names.length;i++)
- biefSet_.getBief(names[i]).disableSynchroniser(false);
+ biefSet_.getBief(names[i]).disableSynchroniser();
}
/**
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/model/Bief.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/model/Bief.java 2009-01-08 13:57:00 UTC (rev 4335)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/model/Bief.java 2009-01-08 15:58:18 UTC (rev 4336)
@@ -18,6 +18,7 @@
import org.fudaa.ctulu.CtuluNamedCommand;
import org.fudaa.ctulu.gis.GISAttributeConstants;
import org.fudaa.ctulu.gis.GISAttributeInterface;
+import org.fudaa.ctulu.gis.GISAttributeModel;
import org.fudaa.ctulu.gis.GISCoordinateSequenceContainerInterface;
import org.fudaa.ctulu.gis.GISCoordinateSequenceFactory;
import org.fudaa.ctulu.gis.GISPolyligne;
@@ -26,7 +27,6 @@
import org.fudaa.ctulu.gis.GISZoneCollectionLigneBrisee;
import org.fudaa.ebli.calque.ZModelGeometryListener;
import org.fudaa.ebli.calque.ZModeleLigneBrisee;
-import org.fudaa.ebli.calque.edition.ZModeleLigneBriseeEditable;
import org.fudaa.fudaa.commun.FudaaLib;
import org.fudaa.fudaa.modeleur.layer.MdlModel1dAxe;
import org.fudaa.fudaa.modeleur.layer.MdlModel1dBank;
@@ -194,7 +194,7 @@
seqProfil=((GISCoordinateSequenceContainerInterface)profil).getCoordinateSequence();
}
double abscisseCurvIntersectionAxe=UtilsProfil1d.abscisseCurviligne(seqProfil, interAxeProfil);
- // Ajout des points au profil si n\xE9c\xE9ssaire pour les intersections \\
+ // Ajout des points au profil si n\xE9c\xE9ssaire pour les intersections \\
// Rives
for (int l=0; l<rives_.getNombre(); l++)
createPointIfNeeded(k, (GISPolyligne) rives_.getObject(l));
@@ -217,15 +217,6 @@
valuateProfilIntersection(k, (Geometry) limitesStockages_.getObject(l), idxAttlsGauche, idxAttlsDroite, abscisseCurvIntersectionAxe);
}
}
- // Suppression des anciennes g\xE9om\xE9tries de rives, limites de stockage et lignes directrices \\
- int[] idxRives=new int[rives_.getNombre()];
- for(int i=0;i<rives_.getNombre();i++)
- idxRives[i]=i;
- ((ZModeleLigneBriseeEditable) rives_).removeLigneBrisee(idxRives, null);
- int[] idxLimiteStockage=new int[limitesStockages_.getNombre()];
- for(int i=0;i<limitesStockages_.getNombre();i++)
- idxLimiteStockage[i]=i;
- limitesStockages_.getGeomData().removeGeometries(idxLimiteStockage, null);
// Activation du synchroniser
gisSynchroniser_.enable();
}
@@ -327,7 +318,7 @@
public void redo() {
boolean synchroniserEnable=isSynchroniserActived();
if(synchroniserEnable)
- gisSynchroniser_.disable(true);
+ gisSynchroniser_.disable();
cmd_.redo();
if(synchroniserEnable)
gisSynchroniser_.enable();
@@ -335,7 +326,7 @@
public void undo() {
boolean synchroniserEnable=isSynchroniserActived();
if(synchroniserEnable)
- gisSynchroniser_.disable(true);
+ gisSynchroniser_.disable();
cmd_.undo();
if(synchroniserEnable)
gisSynchroniser_.enable();
@@ -347,7 +338,7 @@
CtuluCommandComposite cmd=new CtuluCommandComposite("R\xE9ordonnancement des profils");
boolean synchroniserEnable=isSynchroniserActived();
if(synchroniserEnable)
- gisSynchroniser_.disable(true);
+ gisSynchroniser_.disable();
Geometry axeHydraulique=(Geometry)axeHydraulique_.getObject(0);
CoordinateSequence seqAxeHydraulique=((GISCoordinateSequenceContainerInterface)axeHydraulique).getCoordinateSequence();
// R\xE9ordonnancement des profils selon leur placement sur l'axe hydaulique (abs curv) \\
@@ -412,13 +403,9 @@
/**
* D\xE9sactive le synchroniser.
- *
- * @param _removeGeom
- * si \xE0 vrai les g\xE9om\xE9tries g\xE9n\xE9r\xE9es par le synchroniser seront
- * d\xE9ruites dans l'op\xE9ration.
*/
- public void disableSynchroniser(boolean _removeGeom) {
- gisSynchroniser_.disable(_removeGeom);
+ public void disableSynchroniser() {
+ gisSynchroniser_.disable();
}
/**
@@ -427,7 +414,7 @@
* Note :
* Une fois activ\xE9 le synchroniser met automatiquement \xE0 jour les gis. Cette
* m\xE9thode n'est utile que si les instances des models ont \xE9t\xE9 manuellement
- * chang\xE9, auquel cas le synchroniser continuea sa synchronisation sur les
+ * chang\xE9, sinon le synchroniser continuea sa synchronisation sur les
* anciens models.
*/
public void updateSynchroniser() {
@@ -458,7 +445,6 @@
private int idxAttRiveDroite_=-1;
private int idxAttlsGauche_=-1;
private int idxAttlsDroite_=-1;
- // TODO lignes directrices
/**
* Active/met \xE0 jour le synchroniser.
@@ -476,18 +462,74 @@
idxAttRiveDroite_=profilsListen_.getGeomData().getIndiceOf(GISAttributeConstants.INTERSECTION_RIVE_DROITE);
idxAttlsGauche_=profilsListen_.getGeomData().getIndiceOf(GISAttributeConstants.INTERSECTION_LIMITE_STOCKAGE_GAUCHE);
idxAttlsDroite_=profilsListen_.getGeomData().getIndiceOf(GISAttributeConstants.INTERSECTION_LIMITE_STOCKAGE_DROITE);
- // TODO lignes directrices
+ // D\xE9termination des index de g\xE9om\xE9tries
+ // Rives
+ if(rivesModified_.getNombre()>0) {
+ if(isDroite(rivesModified_.getGeomData().getGeometry(0)))
+ idxRiveDroite_=0;
+ else
+ idxRiveGauche_=0;
+ }
+ if(rivesModified_.getNombre()>1) {
+ if(isDroite(rivesModified_.getGeomData().getGeometry(1)))
+ idxRiveDroite_=1;
+ else
+ idxRiveGauche_=1;
+ }
+ if(rivesModified_.getNombre()>2)
+ throw new IllegalArgumentException("Le nombre de rives est sup\xE9rieur \xE0 deux.");
+ // Limites de stockages
+ if(limitesStockagsesModified_.getNombre()>0) {
+ if(isDroite(limitesStockagsesModified_.getGeomData().getGeometry(0)))
+ idxLimiteStockageDroite_=0;
+ else
+ idxLimiteStockageGauche_=0;
+ }
+ if(limitesStockagsesModified_.getNombre()>1) {
+ if(isDroite(limitesStockagsesModified_.getGeomData().getGeometry(1)))
+ idxLimiteStockageDroite_=1;
+ else
+ idxLimiteStockageGauche_=1;
+ }
+ if(limitesStockagsesModified_.getNombre()>2)
+ throw new IllegalArgumentException("Le nombre de limite de stockage est sup\xE9rieur \xE0 deux.");
}
regenerateAll();
}
/**
+ * D\xE9termine si la courbe est \xE0 gauche de l'axe hydraulique.
+ */
+ private boolean isDroite(Geometry _geom) {
+ // Recherche d'intersection de _geom avec un profil
+ boolean found=false;
+ int i=-1;
+ Coordinate intersectionRive=null;
+ while(!found&&++i<profilsListen_.getNombre()) {
+ Geometry inter=_geom.intersection((Geometry) profilsListen_.getObject(i));
+ if(inter.getNumPoints()==1) {
+ found=true;
+ intersectionRive=inter.getCoordinate();
+ }
+ }
+ // Calcul de l'abscisse curviligne de l'axe hydraulique sur le profil.
+ Geometry axeHydraulique=(Geometry) axeHydraulique_.getObject(0);
+ Geometry intersection=((Geometry) profilsListen_.getObject(i)).intersection(axeHydraulique);
+ // D\xE9termination de la gauche
+ if(found&&intersection.getNumPoints()==1) {
+ CoordinateSequence seqProfil=profilsListen_.getGeomData().getCoordinateSequence(i);
+ double abscisseCurvIntersectionAxe=UtilsProfil1d.abscisseCurviligne(seqProfil, intersection.getCoordinate());
+ if(abscisseCurvIntersectionAxe>UtilsProfil1d.abscisseCurviligne(seqProfil, intersectionRive))
+ return true;
+ }
+ return false;
+ }
+
+ /**
* D\xE9active le synchroniser.
* @param indique si les g\xE9om\xE9tries volatiles doivent \xEAtre d\xE9truites
*/
- public void disable(boolean _destroyGeometries) {
- if(_destroyGeometries)
- destroyGeometries();
+ public void disable() {
if(profilsListen_!=null) {
profilsListen_.removeModelListener(this);
profilsListen_=null;
@@ -503,7 +545,6 @@
idxAttRiveDroite_=-1;
idxAttlsGauche_=-1;
idxAttlsDroite_=-1;
- // TODO lignes directrices
}
}
@@ -562,7 +603,6 @@
updateGeom(_idxGeom, limitesStockagsesModified_, idxLimiteStockageGauche_, idxAttlsGauche_);
else if(_att==GISAttributeConstants.INTERSECTION_LIMITE_STOCKAGE_DROITE)
updateGeom(_idxGeom, limitesStockagsesModified_, idxLimiteStockageDroite_, idxAttlsDroite_);
- // TODO lignes directrices
}
public void geometryAction(Object _source, int _idxGeom, Geometry _geom, int _action) {
@@ -571,7 +611,6 @@
updateGeom(_idxGeom, rivesModified_, idxRiveDroite_, idxAttRiveDroite_);
updateGeom(_idxGeom, limitesStockagsesModified_, idxLimiteStockageGauche_, idxAttlsGauche_);
updateGeom(_idxGeom, limitesStockagsesModified_, idxLimiteStockageDroite_, idxAttlsDroite_);
- // TODO lignes directrices
}
}
@@ -580,8 +619,6 @@
*/
private void regenerateAll() {
GISZoneCollection zone=profilsListen_.getGeomData();
- // Suppression des anciennes g\xE9om\xE9tries \\
- destroyGeometries();
// Cr\xE9ation des nouvelles g\xE9om\xE9tries \\
// Rives
Coordinate[] riveGauche=new Coordinate[profilsListen_.getNombre()];
@@ -597,26 +634,44 @@
lsGauche[i]=zone.getCoordinateSequence(i).getCoordinate((Integer)zone.getValue(idxAttlsGauche_, i));
lsDroite[i]=zone.getCoordinateSequence(i).getCoordinate((Integer)zone.getValue(idxAttlsDroite_, i));
}
- // Lignes directrices
- //TODO
// Ajout des nouvelles g\xE9o\xE9mtries \\
- //Rives
+ // Extraction des anciennes donn\xE9es
+ Object[] dataRiveGauche=getData(idxRiveGauche_, rivesModified_.getGeomData());
+ Object[] dataRiveDroite=getData(idxRiveDroite_, rivesModified_.getGeomData());
+ Object[] dataLsGauche=getData(idxLimiteStockageGauche_, rivesModified_.getGeomData());
+ Object[] dataLsDroite=getData(idxLimiteStockageDroite_, rivesModified_.getGeomData());
+ // Destruction des g\xE9om\xE9tries
+ destroyGeometries();
+ // Ajout des geometries
if (riveGauche.length>1&&riveGauche[0]!=null&&rivesModified_!=null)
- idxRiveGauche_=rivesModified_.getGeomData().addGeometry(new GISPolyligne(new GISCoordinateSequenceFactory().create(riveGauche)), null, null);
+ idxRiveGauche_=rivesModified_.getGeomData().addGeometry(new GISPolyligne(new GISCoordinateSequenceFactory().create(riveGauche)), dataRiveGauche, null);
if (riveDroite.length>1&&riveDroite[0]!=null&&rivesModified_!=null)
- idxRiveDroite_=rivesModified_.getGeomData().addGeometry(new GISPolyligne(new GISCoordinateSequenceFactory().create(riveDroite)), null, null);
+ idxRiveDroite_=rivesModified_.getGeomData().addGeometry(new GISPolyligne(new GISCoordinateSequenceFactory().create(riveDroite)), dataRiveDroite, null);
// Limites de stockages
if (lsGauche.length>1&&lsGauche[0]!=null&&limitesStockagsesModified_!=null)
idxLimiteStockageGauche_=limitesStockagsesModified_.getGeomData().addGeometry(
- new GISPolyligne(new GISCoordinateSequenceFactory().create(lsGauche)), null, null);
+ new GISPolyligne(new GISCoordinateSequenceFactory().create(lsGauche)), dataLsGauche, null);
if (lsDroite.length>1&&lsDroite[0]!=null&&limitesStockagsesModified_!=null)
idxLimiteStockageDroite_=limitesStockagsesModified_.getGeomData().addGeometry(
- new GISPolyligne(new GISCoordinateSequenceFactory().create(lsDroite)), null, null);
- // Lignes directrices
- // TODO
+ new GISPolyligne(new GISCoordinateSequenceFactory().create(lsDroite)), dataLsDroite, null);
}
/**
+ * Retourne les donn\xE9es.
+ * retourne null si _idxGeom est invalide.
+ */
+ private Object[] getData(int _idxGeom, GISZoneCollection _zone) {
+ Object[] data=null;
+ if (_idxGeom>=0&&_idxGeom<_zone.getNbGeometries()) {
+ GISAttributeModel[] models=_zone.getModels();
+ data=new Object[models.length];
+ for (int i=0; i<data.length; i++)
+ data[i]=models[i].getObjectValueAt(_idxGeom);
+ }
+ return data;
+ }
+
+ /**
* Met \xE0 jour la geometrie volatile indiqu\xE9. Le param\xE8tre pass\xE9 est l'index du point \xE0
* mettre \xE0 jour (qui correspond \xE9galement \xE0 la g\xE9om\xE9trie modifi\xE9).
*/
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/view/VueCourbe.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/view/VueCourbe.java 2009-01-08 13:57:00 UTC (rev 4335)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/view/VueCourbe.java 2009-01-08 15:58:18 UTC (rev 4336)
@@ -95,11 +95,11 @@
// Limite stockage gauche
absCurv=data_.getAbsCurvLimiteStockageGauche();
if(absCurv!=-1)
- courbe_.addLabel(absCurv, "LG");
+ courbe_.addLabel(absCurv, "SG");
// Limite stockage droite
absCurv=data_.getAbsCurvLimiteStockageDroite();
if(absCurv!=-1)
- courbe_.addLabel(absCurv, "LD");
+ courbe_.addLabel(absCurv, "SD");
}
public void profilContainerDataModified() {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bma...@us...> - 2009-01-08 13:57:08
|
Revision: 4335
http://fudaa.svn.sourceforge.net/fudaa/?rev=4335&view=rev
Author: bmarchan
Date: 2009-01-08 13:57:00 +0000 (Thu, 08 Jan 2009)
Log Message:
-----------
BugFix #127 : Edition de sommets par double clic mal g?\195?\169r?\195?\169e.
Modified Paths:
--------------
branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZEditorDefault.java
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZEditorDefault.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZEditorDefault.java 2009-01-08 13:49:42 UTC (rev 4334)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZEditorDefault.java 2009-01-08 13:57:00 UTC (rev 4335)
@@ -721,11 +721,6 @@
}
public String edit() {
- // On controle qu'en mode sommet, une seule g\xE9om\xE9trie est selectionn\xE9e.
- if (getSupport().isAtomicMode() && getSupport().getSelectionHelper().getUniqueSelectedIdx()==-1) {
- ui_.warn(EbliLib.getS("Edition impossible"), EbliLib.getS("L'\xE9dition ne peut se faire que sur\n des sommets d'une m\xEAme g\xE9om\xE9trie."), false);
- return EbliLib.getS("L'\xE9dition ne peut se faire que sur\n des sommets d'une m\xEAme g\xE9om\xE9trie.");
- }
// R\xE9cup\xE9ration des calques contenant des g\xE9om\xE9tries selectionn\xE9es \\
ZCalqueAffichageDonneesInterface[] calques=panel_.getScene().getAllLayers();
ArrayList<ZCalqueAffichageDonneesInterface> calquesWithSelectedObjects=new ArrayList<ZCalqueAffichageDonneesInterface>();
@@ -736,8 +731,8 @@
if (calquesWithSelectedObjects.size()==0)
return EbliLib.getS("La s\xE9lection courante est vide");
else if (calquesWithSelectedObjects.size()>1){
- ui_.warn(EbliLib.getS("Edition impossible"), EbliLib.getS("L'\xE9dition ne peut se faire simultan\xE9ment\nsur des g\xE9om\xE9tries de calques diff\xE9rents."), false);
- return EbliLib.getS("L'\xE9dition ne peut se faire simultan\xE9ment\nsur des g\xE9om\xE9tries de calques diff\xE9rents.");
+ ui_.warn(EbliLib.getS("Edition impossible"), EbliLib.getS("L'\xE9dition ne peut se faire simultan\xE9ment\nque sur des g\xE9om\xE9tries d'un m\xEAme calque."), false);
+ return EbliLib.getS("L'\xE9dition ne peut se faire simultan\xE9ment\nque sur des g\xE9om\xE9tries d'un m\xEAme calque.");
}
if (!(calquesWithSelectedObjects.get(0) instanceof ZCalqueEditable))
// Calque n'impl\xE9mentant pas l'interface ZCalqueEditable, donc on le laisse g\xE9rer son \xE9dition.
@@ -746,8 +741,14 @@
ZCalqueEditable calque=(ZCalqueEditable)calquesWithSelectedObjects.get(0);
// G\xE9n\xE9ration d'une boite d'\xE9dition selon le type de selection et
// d'\xE9dition \\
- if (((ZCalqueEditable)calque).isAtomicMode())
+ if (((ZCalqueEditable)calque).isAtomicMode()) {
+ // On controle qu'en mode sommet, une seule g\xE9om\xE9trie est selectionn\xE9e.
+ if (getSupport().getSelectionHelper().getUniqueSelectedIdx()==-1) {
+ ui_.warn(EbliLib.getS("Edition impossible"), EbliLib.getS("L'\xE9dition ne peut se faire simultan\xE9ment que sur\n des sommets d'une m\xEAme g\xE9om\xE9trie."), false);
+ return EbliLib.getS("L'\xE9dition ne peut se faire simultan\xE9ment que sur\n des sommets d'une m\xEAme g\xE9om\xE9trie.");
+ }
editVertexObject(calque);
+ }
else if (calque.isOnlyOneObjectSelected())
// Une seule g\xE9om\xE9trie est \xE0 \xE9diter
editSingleObject(calque);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <emm...@us...> - 2009-01-08 13:49:52
|
Revision: 4334
http://fudaa.svn.sourceforge.net/fudaa/?rev=4334&view=rev
Author: emmanuel_martin
Date: 2009-01-08 13:49:42 +0000 (Thu, 08 Jan 2009)
Log Message:
-----------
modeleur1d : Un test suppl?\195?\169mentaire est effectu?\195?\169 lors du d?\195?\169placement de profil (il ne doit pas couper en plusieurs endroits l'axe hydraulique).
Modified Paths:
--------------
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/model/ProfilContainerAdapter.java
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/model/ProfilContainerAdapter.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/model/ProfilContainerAdapter.java 2009-01-08 13:19:25 UTC (rev 4333)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/model/ProfilContainerAdapter.java 2009-01-08 13:49:42 UTC (rev 4334)
@@ -424,6 +424,13 @@
-UtilsProfil1d.getAngle(axeHydrau.getCoordinate(i), axeHydrau.getCoordinate(i+1), axeHydrau.getCoordinate(i+2));
// Application de la rotation
biefContainer_.getModelProfils().rotateGlobal(selection, newAngle-oldAngle, newCoordCroisement.x, newCoordCroisement.y, cmd);
+ // Verifie que le profil ne coupe pas deux fois l'axe hydraulique
+ Geometry intersect=geomAxeHydrau.intersection(biefContainer_.getZoneProfils().getGeometry(idxProfilSelected_));
+ if(intersect.getNumPoints()!=1) {
+ cmd.undo(); // Annulation des modifications
+ throw new ProfilContainerException(FudaaLib.getS("Le profil couperait l'axe hydraulique en au moins deux endroits."));
+ }
+ // Gestion de l'undo/redo
if (_cmd!=null)
_cmd.addCmd(cmd.getSimplify());
// Retourne vrai si il faut r\xE9ordonnancer les profils
@@ -432,19 +439,19 @@
oldPreviousIdx=0;
if(idxProfilSelected_==0) {
if(biefContainer_.getNbProfil()>1) {
- Geometry intersect=geomAxeHydrau.intersection(biefContainer_.getZoneProfils().getGeometry(idxProfilSelected_+1));
- if(intersect.getNumPoints()!=1)
+ Geometry inter=geomAxeHydrau.intersection(biefContainer_.getZoneProfils().getGeometry(idxProfilSelected_+1));
+ if(inter.getNumPoints()!=1)
throw new ProfilContainerException(FudaaLib.getS("Au moins un profil n'a pas de croisement avec l'axe hydraulique ou en a plusieurs."));
- if (_value>UtilsProfil1d.abscisseCurviligne(axeHydrau, intersect.getCoordinate()))
+ if (_value>UtilsProfil1d.abscisseCurviligne(axeHydrau, inter.getCoordinate()))
return true;
}
}
else if (idxProfilSelected_==biefContainer_.getNbProfil()-1) {
if(biefContainer_.getNbProfil()>1) {
- Geometry intersect=geomAxeHydrau.intersection(biefContainer_.getZoneProfils().getGeometry(idxProfilSelected_-1));
- if(intersect.getNumPoints()!=1)
+ Geometry inter=geomAxeHydrau.intersection(biefContainer_.getZoneProfils().getGeometry(idxProfilSelected_-1));
+ if(inter.getNumPoints()!=1)
throw new ProfilContainerException(FudaaLib.getS("Au moins un profil n'a pas de croisement avec l'axe hydraulique ou en a plusieurs."));
- if (_value<UtilsProfil1d.abscisseCurviligne(axeHydrau, intersect.getCoordinate()))
+ if (_value<UtilsProfil1d.abscisseCurviligne(axeHydrau, inter.getCoordinate()))
return true;
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bma...@us...> - 2009-01-08 13:19:32
|
Revision: 4333
http://fudaa.svn.sourceforge.net/fudaa/?rev=4333&view=rev
Author: bmarchan
Date: 2009-01-08 13:19:25 +0000 (Thu, 08 Jan 2009)
Log Message:
-----------
BugFix#127 : Edition impossible si les sommets selectionn?\195?\169s ne sont pas tous sur la m?\195?\170me g?\195?\169om?\195?\169trie.
Modified Paths:
--------------
branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZEditorDefault.java
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZEditorDefault.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZEditorDefault.java 2009-01-08 09:39:03 UTC (rev 4332)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZEditorDefault.java 2009-01-08 13:19:25 UTC (rev 4333)
@@ -721,24 +721,29 @@
}
public String edit() {
+ // On controle qu'en mode sommet, une seule g\xE9om\xE9trie est selectionn\xE9e.
+ if (getSupport().isAtomicMode() && getSupport().getSelectionHelper().getUniqueSelectedIdx()==-1) {
+ ui_.warn(EbliLib.getS("Edition impossible"), EbliLib.getS("L'\xE9dition ne peut se faire que sur\n des sommets d'une m\xEAme g\xE9om\xE9trie."), false);
+ return EbliLib.getS("L'\xE9dition ne peut se faire que sur\n des sommets d'une m\xEAme g\xE9om\xE9trie.");
+ }
// R\xE9cup\xE9ration des calques contenant des g\xE9om\xE9tries selectionn\xE9es \\
ZCalqueAffichageDonneesInterface[] calques=panel_.getScene().getAllLayers();
- ArrayList<ZCalqueAffichageDonneesInterface> claquesWithSelectedObjects=new ArrayList<ZCalqueAffichageDonneesInterface>();
+ ArrayList<ZCalqueAffichageDonneesInterface> calquesWithSelectedObjects=new ArrayList<ZCalqueAffichageDonneesInterface>();
for (int i=0; i<calques.length; i++)
if (!calques[i].isSelectionEmpty())
- claquesWithSelectedObjects.add(calques[i]);
+ calquesWithSelectedObjects.add(calques[i]);
// Verification du nombre de calques contenant des selections
- if (claquesWithSelectedObjects.size()==0)
+ if (calquesWithSelectedObjects.size()==0)
return EbliLib.getS("La s\xE9lection courante est vide");
- else if (claquesWithSelectedObjects.size()>1){
- ui_.warn("Information", "La selection dans plusieurs calques n'est pas g\xE9r\xE9e par la fen\xEAtre d'\xE9dition.", false);
- return EbliLib.getS("La selection dans plusieurs calques n'est pas g\xE9r\xE9e par la fen\xEAtre d'\xE9dition.");
+ else if (calquesWithSelectedObjects.size()>1){
+ ui_.warn(EbliLib.getS("Edition impossible"), EbliLib.getS("L'\xE9dition ne peut se faire simultan\xE9ment\nsur des g\xE9om\xE9tries de calques diff\xE9rents."), false);
+ return EbliLib.getS("L'\xE9dition ne peut se faire simultan\xE9ment\nsur des g\xE9om\xE9tries de calques diff\xE9rents.");
}
- if (!(claquesWithSelectedObjects.get(0) instanceof ZCalqueEditable))
+ if (!(calquesWithSelectedObjects.get(0) instanceof ZCalqueEditable))
// Calque n'impl\xE9mentant pas l'interface ZCalqueEditable, donc on le laisse g\xE9rer son \xE9dition.
- claquesWithSelectedObjects.get(0).editSelected();
+ calquesWithSelectedObjects.get(0).editSelected();
else {
- ZCalqueEditable calque=(ZCalqueEditable)claquesWithSelectedObjects.get(0);
+ ZCalqueEditable calque=(ZCalqueEditable)calquesWithSelectedObjects.get(0);
// G\xE9n\xE9ration d'une boite d'\xE9dition selon le type de selection et
// d'\xE9dition \\
if (((ZCalqueEditable)calque).isAtomicMode())
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <emm...@us...> - 2009-01-08 09:39:12
|
Revision: 4332
http://fudaa.svn.sourceforge.net/fudaa/?rev=4332&view=rev
Author: emmanuel_martin
Date: 2009-01-08 09:39:03 +0000 (Thu, 08 Jan 2009)
Log Message:
-----------
Correction d'un bug lors de l'ajout d'un point ?\195?\160 un profil.
Modified Paths:
--------------
branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISZoneCollectionGeometry.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/MdlFille1d.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/controller/Controller1d.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/model/Bief.java
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISZoneCollectionGeometry.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISZoneCollectionGeometry.java 2009-01-08 09:22:51 UTC (rev 4331)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISZoneCollectionGeometry.java 2009-01-08 09:39:03 UTC (rev 4332)
@@ -131,6 +131,8 @@
Geometry geom = (Geometry)super.geometry_.getValueAt(_idxGeom);
final Coordinate[] oldcs = geom.getCoordinates();
final int initSize = oldcs.length;
+ if(_idxBefore<0||_idxBefore>=initSize)
+ throw new IllegalArgumentException("L'index du point \xE0 ajouter doit appartenir \xE0 la g\xE9om\xE9trie.");
final Coordinate[] cs = new Coordinate[initSize + 1];
int idx = 0;
for (int i = 0; i < initSize; i++) {
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/MdlFille1d.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/MdlFille1d.java 2009-01-08 09:22:51 UTC (rev 4331)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/MdlFille1d.java 2009-01-08 09:39:03 UTC (rev 4332)
@@ -15,7 +15,6 @@
import javax.swing.JComponent;
import javax.swing.JSplitPane;
-import javax.swing.SwingUtilities;
import org.fudaa.ctulu.CtuluCommandManager;
import org.fudaa.ctulu.CtuluExportDataInterface;
@@ -38,7 +37,6 @@
import com.db4o.ObjectSet;
import com.db4o.query.Query;
import com.memoire.bu.BuBorderLayout;
-import com.memoire.bu.BuCommonImplementation;
import com.memoire.bu.BuUndoRedoInterface;
import com.memoire.fu.FuLog;
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/controller/Controller1d.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/controller/Controller1d.java 2009-01-08 09:22:51 UTC (rev 4331)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/controller/Controller1d.java 2009-01-08 09:39:03 UTC (rev 4332)
@@ -12,7 +12,6 @@
import java.util.HashSet;
import java.util.List;
import java.util.Observable;
-import java.util.Observer;
import javax.swing.Action;
import javax.swing.DefaultListModel;
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/model/Bief.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/model/Bief.java 2009-01-08 09:22:51 UTC (rev 4331)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/model/Bief.java 2009-01-08 09:39:03 UTC (rev 4332)
@@ -264,7 +264,7 @@
int previousIdx=UtilsProfil1d.getPreviousIndex(seq, coord);
int nextIdx=UtilsProfil1d.getNextIndex(seq, coord);
// Le point n'appartient pas au profil ou La coordonn\xE9e correspond d\xE9j\xE0 \xE0 un point
- if (previousIdx==-2||nextIdx==-2||previousIdx+1==nextIdx-1||previousIdx==seq.size()-2&&nextIdx==-1||previousIdx==-1&&nextIdx==1)
+ if (previousIdx==-2||nextIdx==-2||previousIdx+1==nextIdx-1||nextIdx==-1||previousIdx==-1)
return;
// La coordonn\xE9e correspond \xE0 aucun point connu
((GISZoneCollectionGeometry)profils_.getGeomData()).addAtomic(_idxProfil, previousIdx, coord.x, coord.y, null);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <emm...@us...> - 2009-01-08 09:22:56
|
Revision: 4331
http://fudaa.svn.sourceforge.net/fudaa/?rev=4331&view=rev
Author: emmanuel_martin
Date: 2009-01-08 09:22:51 +0000 (Thu, 08 Jan 2009)
Log Message:
-----------
Les profils sont maintenant d?\195?\169pla?\195?\167ables sur l'axe hydraulique en indiquant leur abscisse curviligne.
Modified Paths:
--------------
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/MdlFille1d.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/controller/Controller1d.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/controller/ControllerBief.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/controller/ControllerProfil.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/model/Bief.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/model/BiefContainer.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/model/BiefContainerAdapter.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/model/ProfilContainer.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/model/ProfilContainerAdapter.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/model/UtilsProfil1d.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/view/VueTableau.java
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/MdlFille1d.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/MdlFille1d.java 2009-01-07 18:22:13 UTC (rev 4330)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/MdlFille1d.java 2009-01-08 09:22:51 UTC (rev 4331)
@@ -265,6 +265,7 @@
// public void run() {
// Taille des vues
try {
+ @SuppressWarnings("unused")
int w=Integer.parseInt(_props.getProperty("viewBief.width"));
int h=Integer.parseInt(_props.getProperty("viewBief.height"));
((JSplitPane)controller_.getVueBief().getParent()).setDividerLocation(h);
@@ -272,6 +273,7 @@
catch (NumberFormatException _exc) {}
try {
int w=Integer.parseInt(_props.getProperty("viewTableau.width"));
+ @SuppressWarnings("unused")
int h=Integer.parseInt(_props.getProperty("viewTableau.height"));
((JSplitPane)controller_.getVueTableau().getParent()).setDividerLocation(w);
}
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/controller/Controller1d.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/controller/Controller1d.java 2009-01-07 18:22:13 UTC (rev 4330)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/controller/Controller1d.java 2009-01-08 09:22:51 UTC (rev 4331)
@@ -24,10 +24,14 @@
import javax.swing.event.ListSelectionEvent;
import javax.swing.event.ListSelectionListener;
+import org.fudaa.ctulu.CtuluCommand;
+import org.fudaa.ctulu.CtuluCommandComposite;
+import org.fudaa.ctulu.CtuluCommandContainer;
import org.fudaa.ctulu.CtuluCommandManager;
import org.fudaa.ctulu.CtuluIOOperationSynthese;
import org.fudaa.ctulu.CtuluListSelectionEvent;
import org.fudaa.ctulu.CtuluListSelectionListener;
+import org.fudaa.ctulu.CtuluNamedCommand;
import org.fudaa.ctulu.gis.GISAttributeConstants;
import org.fudaa.ctulu.gis.GISZoneCollectionLigneBrisee;
import org.fudaa.dodico.mascaret.io.MascaretWriter;
@@ -123,10 +127,10 @@
// Vue Bief
controllerBief_.getVueBief().getScene().addSelectionListener(this);
// Vue tableau
- vueTableau_=new VueTableau(this, controllerProfil_.getDataGeometry());
+ vueTableau_=new VueTableau(this, controllerProfil_.getProfilContainer());
vueTableau_.addSelectionListener(this);
// Vue courbe
- vueCourbe_=new VueCourbe(this, controllerProfil_.getDataGeometry());
+ vueCourbe_=new VueCourbe(this, controllerProfil_.getProfilContainer());
vueCourbe_.addSelectionListener(this);
// Vue error
vueError_.setForeground(Color.RED);
@@ -134,6 +138,45 @@
clearError();
}
+ // Op\xE9rations sp\xE9ciales n\xE9c\xE9ssitant l'intervention de plusieurs controller \\
+
+ /**
+ * R\xE9ordonne les profils du bief selectionn\xE9. La selection est mise \xE0 jour.
+ */
+ public void orderProfils(CtuluCommandContainer _cmd) {
+ // Gestion de l'undo/Redo sur la profil selectionn\xE9
+ class UndoRedoChangeSelectionProfil implements CtuluCommand, CtuluNamedCommand {
+ int oldIdx_;
+ int newIdx_;
+ CtuluCommandComposite cmd_;
+ public UndoRedoChangeSelectionProfil(int _oldIdx, int _newIdx, CtuluCommandComposite _cmd) {
+ oldIdx_=_oldIdx;
+ newIdx_=_newIdx;
+ cmd_=_cmd;
+ }
+ public void redo() {
+ controllerProfil_.getProfilSelectionModel().setSelectedProfil(-1);
+ cmd_.redo();
+ controllerProfil_.getProfilSelectionModel().setSelectedProfil(newIdx_);
+ }
+ public void undo() {
+ controllerProfil_.getProfilSelectionModel().setSelectedProfil(-1);
+ cmd_.undo();
+ controllerProfil_.getProfilSelectionModel().setSelectedProfil(oldIdx_);
+ }
+ public String getName() {
+ return FudaaLib.getS("R\xE9ordonnancement des profils");
+ }
+ }
+ CtuluCommandComposite cmd=new CtuluCommandComposite();
+ int oldIdxProfil=controllerProfil_.getProfilSelectionModel().getSelectedProfil();
+ controllerProfil_.getProfilSelectionModel().setSelectedProfil(-1);
+ int newIdxProfil=controllerBief_.orderProfils(controllerProfil_.getProfilSelectionModel().getSelectedProfil(), cmd);
+ controllerProfil_.getProfilSelectionModel().setSelectedProfil(newIdxProfil);
+ if(_cmd!=null)
+ _cmd.addCmd(new UndoRedoChangeSelectionProfil(oldIdxProfil, newIdxProfil, cmd));
+ }
+
// Getters des vues \\
public VueBief getVueBief(){
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/controller/ControllerBief.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/controller/ControllerBief.java 2009-01-07 18:22:13 UTC (rev 4330)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/controller/ControllerBief.java 2009-01-08 09:22:51 UTC (rev 4331)
@@ -13,6 +13,7 @@
import javax.swing.DefaultListSelectionModel;
import javax.swing.event.ListSelectionListener;
+import org.fudaa.ctulu.CtuluCommandContainer;
import org.fudaa.ebli.calque.BCalque;
import org.fudaa.ebli.calque.ZModeleLigneBrisee;
import org.fudaa.fudaa.modeleur.modeleur1d.model.Bief;
@@ -66,8 +67,16 @@
public void disableSynchronisers() {
String[] names=biefSet_.getBiefNames();
for(int i=0;i<names.length;i++)
- biefSet_.getBief(names[i]).enableSynchroniser(false);
+ biefSet_.getBief(names[i]).disableSynchroniser(false);
}
+
+ /**
+ * R\xE9ordonne les profils du bief selectionn\xE9. retourne le nouvel indice de
+ * l'indice pass\xE9 en param\xE8tre (-1 si inutilis\xE9).
+ */
+ public int orderProfils(int _idx, CtuluCommandContainer _cmd) {
+ return biefSet_.getBief(biefSelectionModel_.getSelectedName()).orderProfils(_idx, _cmd);
+ }
/**
* Importe les biefs du 2d vers le 1d.
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/controller/ControllerProfil.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/controller/ControllerProfil.java 2009-01-07 18:22:13 UTC (rev 4330)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/controller/ControllerProfil.java 2009-01-08 09:22:51 UTC (rev 4331)
@@ -44,7 +44,7 @@
vueModuleGestionProfil_=new VueModuleGestionProfil(this);
}
- public ProfilContainer getDataGeometry(){
+ public ProfilContainer getProfilContainer(){
return profilContainerAdapter_;
}
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/model/Bief.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/model/Bief.java 2009-01-07 18:22:13 UTC (rev 4330)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/model/Bief.java 2009-01-08 09:22:51 UTC (rev 4331)
@@ -12,6 +12,10 @@
import java.util.Comparator;
import java.util.List;
+import org.fudaa.ctulu.CtuluCommand;
+import org.fudaa.ctulu.CtuluCommandComposite;
+import org.fudaa.ctulu.CtuluCommandContainer;
+import org.fudaa.ctulu.CtuluNamedCommand;
import org.fudaa.ctulu.gis.GISAttributeConstants;
import org.fudaa.ctulu.gis.GISAttributeInterface;
import org.fudaa.ctulu.gis.GISCoordinateSequenceContainerInterface;
@@ -23,6 +27,7 @@
import org.fudaa.ebli.calque.ZModelGeometryListener;
import org.fudaa.ebli.calque.ZModeleLigneBrisee;
import org.fudaa.ebli.calque.edition.ZModeleLigneBriseeEditable;
+import org.fudaa.fudaa.commun.FudaaLib;
import org.fudaa.fudaa.modeleur.layer.MdlModel1dAxe;
import org.fudaa.fudaa.modeleur.layer.MdlModel1dBank;
import org.fudaa.fudaa.modeleur.layer.MdlModel2dConstraintLine;
@@ -152,40 +157,7 @@
if (axeHydraulique_.getNombre()==1) {
Geometry axeHydraulique=(Geometry)axeHydraulique_.getObject(0);
CoordinateSequence seqAxeHydraulique=((GISCoordinateSequenceContainerInterface)axeHydraulique).getCoordinateSequence();
- // R\xE9ordonnancement des profils selon leur placement sur l'axe hydaulique (abs curv) \\
- // Calcul des abscisses curvilignes
- Object[][] idxAbsCurv=new Object[profils_.getNombre()][];
- for(int j=0;j<profils_.getNombre();j++) {
- Geometry intersection=axeHydraulique.intersection((Geometry) profils_.getObject(j));
- if(intersection.getNumPoints()!=1)
- throw new IllegalArgumentException("Au moins un des profils est coup\xE9 plusieurs fois ou jamais.");
- idxAbsCurv[j]=new Object[]{j, UtilsProfil1d.abscisseCurviligne(seqAxeHydraulique, intersection.getCoordinate())};
- }
- // Tri en fonction des abcsisses curvilignes
- Arrays.sort((Object[])idxAbsCurv, new Comparator<Object>(){
- public int compare(Object o1, Object o2) {
- double absCurvO1=(Double)((Object[])o1)[1];
- double absCurvO2=(Double)((Object[])o2)[1];
- if(absCurvO1<absCurvO2) return -1;
- if(absCurvO1==absCurvO2) return 0;
- else return 1;
- }
- });
- // R\xE9odonnancement en fonction du nouvel ordre
- for (int i=0; i<idxAbsCurv.length; i++) {
- if(i!=(Integer)idxAbsCurv[i][0]) {
- // Mise \xE0 jour de la table de correspondance
- boolean found=false;
- int k=i;
- while(!found&&++k<idxAbsCurv.length)
- found=(Integer) idxAbsCurv[k][0]==i;
- if(found)
- idxAbsCurv[k][0]=idxAbsCurv[i][0];
- // Mise \xE0 jour de la gis
- profils_.getGeomData().switchGeometries((Integer) idxAbsCurv[i][0], i, null);
-
- }
- }
+ orderProfils(-1, null);
// Construction des rives et limites de stockages \\
for (int k=0; k<profils_.getNombre(); k++) {
Geometry profil=zone.getGeometry(k);
@@ -342,17 +314,114 @@
}
/**
- * Active ou d\xE9active la synchronisation des gis. (G\xE9n\xE9ration et r\xE9g\xE9n\xE9ration
- * des g\xE9om\xE9tries volatiles du type rives, limites et lignes directrices).
+ * R\xE9ordonne les profils du bief. Retourne le nouvel indice de l'indice pass\xE9
+ * en param\xE8tre (-1 si inutilis\xE9).
*/
- public void enableSynchroniser(boolean _bool) {
- if(_bool)
+ public int orderProfils(int _idx, CtuluCommandContainer _cmd) {
+ // Gestion de l'undo/Redo pour le r\xE9ordonnancement de profils
+ class UndoRedoReorderProfils implements CtuluCommand, CtuluNamedCommand {
+ CtuluCommandComposite cmd_;
+ public UndoRedoReorderProfils(CtuluCommandComposite _cmd) {
+ cmd_=_cmd;
+ }
+ public void redo() {
+ boolean synchroniserEnable=isSynchroniserActived();
+ if(synchroniserEnable)
+ gisSynchroniser_.disable(true);
+ cmd_.redo();
+ if(synchroniserEnable)
+ gisSynchroniser_.enable();
+ }
+ public void undo() {
+ boolean synchroniserEnable=isSynchroniserActived();
+ if(synchroniserEnable)
+ gisSynchroniser_.disable(true);
+ cmd_.undo();
+ if(synchroniserEnable)
+ gisSynchroniser_.enable();
+ }
+ public String getName() {
+ return FudaaLib.getS("R\xE9ordonnancement des profils");
+ }
+ }
+ CtuluCommandComposite cmd=new CtuluCommandComposite("R\xE9ordonnancement des profils");
+ boolean synchroniserEnable=isSynchroniserActived();
+ if(synchroniserEnable)
+ gisSynchroniser_.disable(true);
+ Geometry axeHydraulique=(Geometry)axeHydraulique_.getObject(0);
+ CoordinateSequence seqAxeHydraulique=((GISCoordinateSequenceContainerInterface)axeHydraulique).getCoordinateSequence();
+ // R\xE9ordonnancement des profils selon leur placement sur l'axe hydaulique (abs curv) \\
+ // Calcul des abscisses curvilignes
+ Object[][] idxAbsCurv=new Object[profils_.getNombre()][];
+ for(int j=0;j<profils_.getNombre();j++) {
+ Geometry intersection=axeHydraulique.intersection((Geometry) profils_.getObject(j));
+ if(intersection.getNumPoints()!=1)
+ throw new IllegalArgumentException("Au moins un des profils est coup\xE9 plusieurs fois ou jamais.");
+ idxAbsCurv[j]=new Object[]{j, UtilsProfil1d.abscisseCurviligne(seqAxeHydraulique, intersection.getCoordinate())};
+ }
+ // Tri en fonction des abcsisses curvilignes
+ Arrays.sort((Object[])idxAbsCurv, new Comparator<Object>(){
+ public int compare(Object o1, Object o2) {
+ double absCurvO1=(Double)((Object[])o1)[1];
+ double absCurvO2=(Double)((Object[])o2)[1];
+ if(absCurvO1<absCurvO2) return -1;
+ if(absCurvO1==absCurvO2) return 0;
+ else return 1;
+ }
+ });
+ int newIdx=_idx;
+ // R\xE9odonnancement en fonction du nouvel ordre
+ for (int i=0; i<idxAbsCurv.length; i++) {
+ if(i!=(Integer)idxAbsCurv[i][0]) {
+ // Mise \xE0 jour de la table de correspondance
+ boolean found=false;
+ int k=i;
+ while(!found&&++k<idxAbsCurv.length)
+ found=(Integer) idxAbsCurv[k][0]==i;
+ if(found)
+ idxAbsCurv[k][0]=idxAbsCurv[i][0];
+ // Mise \xE0 jour de newIdx
+ if(newIdx==(Integer) idxAbsCurv[i][0])
+ newIdx=i;
+ else if(newIdx==i)
+ newIdx=(Integer) idxAbsCurv[i][0];
+ // Mise \xE0 jour de la gis
+ profils_.getGeomData().switchGeometries((Integer) idxAbsCurv[i][0], i, cmd);
+ }
+ }
+ if(synchroniserEnable)
gisSynchroniser_.enable();
- else
- gisSynchroniser_.disable();
+ if(_cmd!=null)
+ _cmd.addCmd(new UndoRedoReorderProfils(cmd));
+ return newIdx;
}
+
+ /**
+ * Retourne vrai si le synchroniser est activ\xE9.
+ */
+ public boolean isSynchroniserActived() {
+ return gisSynchroniser_.isActived();
+ }
+
+ /**
+ * Active le synchroniser.
+ */
+ public void enableSynchroniser() {
+ gisSynchroniser_.enable();
+ }
/**
+ * D\xE9sactive le synchroniser.
+ *
+ * @param _removeGeom
+ * si \xE0 vrai les g\xE9om\xE9tries g\xE9n\xE9r\xE9es par le synchroniser seront
+ * d\xE9ruites dans l'op\xE9ration.
+ */
+ public void disableSynchroniser(boolean _removeGeom) {
+ gisSynchroniser_.disable(_removeGeom);
+ }
+
+ /**
* Indique au synchroniser que les models du bief ont potentiellement chang\xE9.
* L'appelle \xE0 cette m\xE9thode active automatiquement le synchroniser.
* Note :
@@ -414,8 +483,11 @@
/**
* D\xE9active le synchroniser.
+ * @param indique si les g\xE9om\xE9tries volatiles doivent \xEAtre d\xE9truites
*/
- public void disable() {
+ public void disable(boolean _destroyGeometries) {
+ if(_destroyGeometries)
+ destroyGeometries();
if(profilsListen_!=null) {
profilsListen_.removeModelListener(this);
profilsListen_=null;
@@ -435,35 +507,10 @@
}
}
- public void attributeAction(Object _source, int att, GISAttributeInterface _att, int _action) {}
-
- public void attributeValueChangeAction(Object _source, int att, GISAttributeInterface _att, int _idxGeom, Object value) {
- if(_att==GISAttributeConstants.INTERSECTION_RIVE_GAUCHE)
- updateGeom(_idxGeom, rivesModified_, idxRiveGauche_, idxAttRiveGauche_);
- else if(_att==GISAttributeConstants.INTERSECTION_RIVE_DROITE)
- updateGeom(_idxGeom, rivesModified_, idxRiveDroite_, idxAttRiveDroite_);
- else if(_att==GISAttributeConstants.INTERSECTION_LIMITE_STOCKAGE_GAUCHE)
- updateGeom(_idxGeom, limitesStockagsesModified_, idxLimiteStockageGauche_, idxAttlsGauche_);
- else if(_att==GISAttributeConstants.INTERSECTION_LIMITE_STOCKAGE_DROITE)
- updateGeom(_idxGeom, limitesStockagsesModified_, idxLimiteStockageDroite_, idxAttlsDroite_);
- // TODO lignes directrices
- }
-
- public void geometryAction(Object _source, int _idxGeom, Geometry _geom, int _action) {
- if(_action==ZModelGeometryListener.GEOMETRY_ACTION_MODIFY) {
- updateGeom(_idxGeom, rivesModified_, idxRiveGauche_, idxAttRiveGauche_);
- updateGeom(_idxGeom, rivesModified_, idxRiveDroite_, idxAttRiveDroite_);
- updateGeom(_idxGeom, limitesStockagsesModified_, idxLimiteStockageGauche_, idxAttlsGauche_);
- updateGeom(_idxGeom, limitesStockagsesModified_, idxLimiteStockageDroite_, idxAttlsDroite_);
- // TODO lignes directrices
- }
- }
-
/**
- * R\xE9g\xE9n\xE8re toutes les g\xE9om\xE9tries volatiles.
+ * D\xE9truit les g\xE9om\xE9tries volatiles
*/
- private void regenerateAll() {
- GISZoneCollection zone=profilsListen_.getGeomData();
+ private void destroyGeometries() {
// Suppression des anciennes g\xE9om\xE9tries \\
// Rives
int[] idxRives=new int[0];
@@ -495,6 +542,46 @@
lignesDirectricesModified_.getGeomData().removeGeometries(idxLD, null);
idxLignesDirectrices_.clear();
}
+ }
+
+ /**
+ * Retourne vrai si activ\xE9.
+ */
+ public boolean isActived() {
+ return profilsListen_!=null;
+ }
+
+ public void attributeAction(Object _source, int att, GISAttributeInterface _att, int _action) {}
+
+ public void attributeValueChangeAction(Object _source, int att, GISAttributeInterface _att, int _idxGeom, Object value) {
+ if(_att==GISAttributeConstants.INTERSECTION_RIVE_GAUCHE)
+ updateGeom(_idxGeom, rivesModified_, idxRiveGauche_, idxAttRiveGauche_);
+ else if(_att==GISAttributeConstants.INTERSECTION_RIVE_DROITE)
+ updateGeom(_idxGeom, rivesModified_, idxRiveDroite_, idxAttRiveDroite_);
+ else if(_att==GISAttributeConstants.INTERSECTION_LIMITE_STOCKAGE_GAUCHE)
+ updateGeom(_idxGeom, limitesStockagsesModified_, idxLimiteStockageGauche_, idxAttlsGauche_);
+ else if(_att==GISAttributeConstants.INTERSECTION_LIMITE_STOCKAGE_DROITE)
+ updateGeom(_idxGeom, limitesStockagsesModified_, idxLimiteStockageDroite_, idxAttlsDroite_);
+ // TODO lignes directrices
+ }
+
+ public void geometryAction(Object _source, int _idxGeom, Geometry _geom, int _action) {
+ if(_action==ZModelGeometryListener.GEOMETRY_ACTION_MODIFY) {
+ updateGeom(_idxGeom, rivesModified_, idxRiveGauche_, idxAttRiveGauche_);
+ updateGeom(_idxGeom, rivesModified_, idxRiveDroite_, idxAttRiveDroite_);
+ updateGeom(_idxGeom, limitesStockagsesModified_, idxLimiteStockageGauche_, idxAttlsGauche_);
+ updateGeom(_idxGeom, limitesStockagsesModified_, idxLimiteStockageDroite_, idxAttlsDroite_);
+ // TODO lignes directrices
+ }
+ }
+
+ /**
+ * R\xE9g\xE9n\xE8re toutes les g\xE9om\xE9tries volatiles.
+ */
+ private void regenerateAll() {
+ GISZoneCollection zone=profilsListen_.getGeomData();
+ // Suppression des anciennes g\xE9om\xE9tries \\
+ destroyGeometries();
// Cr\xE9ation des nouvelles g\xE9om\xE9tries \\
// Rives
Coordinate[] riveGauche=new Coordinate[profilsListen_.getNombre()];
@@ -519,10 +606,10 @@
if (riveDroite.length>1&&riveDroite[0]!=null&&rivesModified_!=null)
idxRiveDroite_=rivesModified_.getGeomData().addGeometry(new GISPolyligne(new GISCoordinateSequenceFactory().create(riveDroite)), null, null);
// Limites de stockages
- if (lsGauche.length>0&&lsGauche[0]!=null&&limitesStockagsesModified_!=null)
+ if (lsGauche.length>1&&lsGauche[0]!=null&&limitesStockagsesModified_!=null)
idxLimiteStockageGauche_=limitesStockagsesModified_.getGeomData().addGeometry(
new GISPolyligne(new GISCoordinateSequenceFactory().create(lsGauche)), null, null);
- if (lsDroite.length>0&&lsDroite[0]!=null&&limitesStockagsesModified_!=null)
+ if (lsDroite.length>1&&lsDroite[0]!=null&&limitesStockagsesModified_!=null)
idxLimiteStockageDroite_=limitesStockagsesModified_.getGeomData().addGeometry(
new GISPolyligne(new GISCoordinateSequenceFactory().create(lsDroite)), null, null);
// Lignes directrices
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/model/BiefContainer.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/model/BiefContainer.java 2009-01-07 18:22:13 UTC (rev 4330)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/model/BiefContainer.java 2009-01-08 09:22:51 UTC (rev 4331)
@@ -9,12 +9,13 @@
import org.fudaa.ctulu.CtuluCommandContainer;
import org.fudaa.ctulu.gis.GISZoneCollectionLigneBrisee;
+import org.fudaa.ebli.calque.edition.ZModeleLigneBriseeEditable;
/**
* Une interface permettant d'acc\xE9der aux informations du bief selectionn\xE9.
*
* @author Emmanuel MARTIN
- * @version $Id:$
+ * @version $Id$
*/
public interface BiefContainer {
@@ -36,6 +37,9 @@
/** Retourne la zone contenant les profils. */
public GISZoneCollectionLigneBrisee getZoneProfils();
+ /** Retourne le model contenant les profils. */
+ public ZModeleLigneBriseeEditable getModelProfils();
+
/** Retourne la zone contenant les rives. */
public GISZoneCollectionLigneBrisee getZoneRives();
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/model/BiefContainerAdapter.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/model/BiefContainerAdapter.java 2009-01-07 18:22:13 UTC (rev 4330)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/model/BiefContainerAdapter.java 2009-01-08 09:22:51 UTC (rev 4331)
@@ -16,6 +16,7 @@
import org.fudaa.ctulu.CtuluNamedCommand;
import org.fudaa.ctulu.gis.GISAttributeConstants;
import org.fudaa.ctulu.gis.GISZoneCollectionLigneBrisee;
+import org.fudaa.ebli.calque.edition.ZModeleLigneBriseeEditable;
import org.fudaa.fudaa.commun.FudaaLib;
/**
@@ -23,7 +24,7 @@
* simplement. Il n'affiche que le bief selectionn\xE9.
*
* @author Emmanuel MARTIN
- * @version $Id:$
+ * @version $Id$
*/
public class BiefContainerAdapter implements BiefContainer, BiefSetListener {
@@ -82,6 +83,12 @@
return (GISZoneCollectionLigneBrisee)biefSet_.getBief(nomBiefSelected_).profils_.getGeomData();
}
+ public ZModeleLigneBriseeEditable getModelProfils() {
+ if(nomBiefSelected_==null)
+ return null;
+ return (ZModeleLigneBriseeEditable)biefSet_.getBief(nomBiefSelected_).profils_;
+ }
+
public GISZoneCollectionLigneBrisee getZoneRives() {
if(nomBiefSelected_==null)
return null;
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/model/ProfilContainer.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/model/ProfilContainer.java 2009-01-07 18:22:13 UTC (rev 4330)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/model/ProfilContainer.java 2009-01-08 09:22:51 UTC (rev 4331)
@@ -56,6 +56,9 @@
/** Retourne l'abscisse curviligne de l'intersection avec la limite de stockage droite. -1 si inexistant. */
public double getAbsCurvLimiteStockageDroite();
+ /** Retourne l'abscisse curviligne de l'axe sur le profil (ne pas confondre avec getAbsCurvProfilOnAxeHydraulique). -1 si inexistant. */
+ public double getAbsCurvAxeHydrauliqueOnProfil();
+
/**
* Enregistre l'abcisse curviligne du point indiqu\xE9 en param\xE8tre.
* Ce changement d'abscisse curviligne fonctionne sur tout les points.
@@ -79,4 +82,14 @@
/** Retourne l'abscisse curviligne du profil sur l'axe hydraulique. -1 si inexistant. */
public double getAbsCurvProfilOnAxeHydraulique();
+
+ /**
+ * Met l'abscisse curviligne du profil sur l'axe hydraulique \xE0 _value.
+ * Retourne vrai il est n\xE9c\xE9ssaire d'effectuer une r\xE9ordonnancement des
+ * profils sur l'axe hydraulique.
+ * _value ne peut \xEAtre ni n\xE9gatif ni sup\xE9rieur \xE0 l'abscisse curviligne total
+ * de l'axe, dans ces cas une exception de type
+ * {@link IllegalArgumentException} est lev\xE9e.
+ */
+ public boolean setAbsCurvProfilOnAxeHydraulique(double _value, CtuluCommandContainer _cmd) throws ProfilContainerException;
}
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/model/ProfilContainerAdapter.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/model/ProfilContainerAdapter.java 2009-01-07 18:22:13 UTC (rev 4330)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/model/ProfilContainerAdapter.java 2009-01-08 09:22:51 UTC (rev 4331)
@@ -8,6 +8,7 @@
package org.fudaa.fudaa.modeleur.modeleur1d.model;
import java.util.ArrayList;
+import java.util.BitSet;
import java.util.List;
import org.fudaa.ctulu.CtuluCommand;
@@ -370,6 +371,137 @@
.getCoordinateSequence(), getCoordSeq());
}
+ public double getAbsCurvAxeHydrauliqueOnProfil() {
+ Geometry intersection=biefContainer_.getZoneAxeHydraulique().getGeometry(0).intersection(
+ biefContainer_.getZoneProfils().getGeometry(idxProfilSelected_));
+ if (intersection.getNumPoints()!=1)
+ return -1;
+ return UtilsProfil1d.abscisseCurviligne(((GISCoordinateSequenceContainerInterface)biefContainer_.getZoneAxeHydraulique()
+ .getGeometry(0)).getCoordinateSequence(), intersection.getCoordinate());
+ }
+
+ public boolean setAbsCurvProfilOnAxeHydraulique(double _value, CtuluCommandContainer _cmd) throws ProfilContainerException {
+ CoordinateSequence axeHydrau=((GISCoordinateSequenceContainerInterface)biefContainer_.getZoneAxeHydraulique().getGeometry(0))
+ .getCoordinateSequence();
+ Geometry geomAxeHydrau=biefContainer_.getZoneAxeHydraulique().getGeometry(0);
+ if (_value<0||_value>UtilsProfil1d.abscisseCurviligne(axeHydrau, axeHydrau.getCoordinate(axeHydrau.size()-1)))
+ throw new IllegalArgumentException(FudaaLib.getS("L'abscisse curviligne doit \xEAtre entre 0 et "
+ +UtilsProfil1d.abscisseCurviligne(axeHydrau, axeHydrau.getCoordinate(axeHydrau.size()-1))+" inclus."));
+ CtuluCommandComposite cmd=new CtuluCommandComposite(FudaaLib.getS("D\xE9placement d'un profil"));
+ // Calcul de la coordonn\xE9e actuelle de croisement entre l'axe et le profil
+ Geometry intersection=geomAxeHydrau.intersection(
+ biefContainer_.getZoneProfils().getGeometry(idxProfilSelected_));
+ if (intersection.getNumPoints()!=1)
+ throw new ProfilContainerException(FudaaLib
+ .getS("Soit il n'y a pas de croisement avec l'axe hydraulique, soit il y en a plusieurs."));
+ // Point de croisement actuel entre l'axe et le profil
+ Coordinate oldCoordCroisement=intersection.getCoordinate();
+ double oldAbscisseCurviligne=UtilsProfil1d.abscisseCurviligne(axeHydrau, oldCoordCroisement);
+ if (!UtilsProfil1d.egal(_value, oldAbscisseCurviligne)) {
+ // Cr\xE9ation d'une selection contenant la g\xE9om\xE9trie \xE0 modifier
+ BitSet bs=new BitSet(biefContainer_.getZoneProfils().getNbGeometries());
+ bs.set(idxProfilSelected_);
+ CtuluListSelection selection=new CtuluListSelection(bs);
+ // Calcul du future point de croisement entre l'axe et le profil
+ Coordinate newCoordCroisement=UtilsProfil1d.getCoordinateXY(axeHydrau, _value);
+ // Application de la translation
+ Coordinate move=UtilsProfil1d.vec(oldCoordCroisement, newCoordCroisement);
+ biefContainer_.getModelProfils().moveGlobal(selection, move.x, move.y, 0, cmd);
+ // Somme de tous les angles de l'axe entre les deux points de translation
+ int oldNextIdx=UtilsProfil1d.getNextIndex(axeHydrau, oldCoordCroisement);
+ if (oldNextIdx==-1)
+ oldNextIdx=axeHydrau.size()-1;
+ double oldAngle=0;
+ for (int i=0; i+2<=oldNextIdx; i++)
+ oldAngle+=Math.PI
+ -UtilsProfil1d.getAngle(axeHydrau.getCoordinate(i), axeHydrau.getCoordinate(i+1), axeHydrau.getCoordinate(i+2));
+ int newNextIdx=UtilsProfil1d.getNextIndex(axeHydrau, newCoordCroisement);
+ if (newNextIdx==-1)
+ newNextIdx=axeHydrau.size()-1;
+ double newAngle=0;
+ for (int i=0; i+2<=newNextIdx; i++)
+ newAngle+=Math.PI
+ -UtilsProfil1d.getAngle(axeHydrau.getCoordinate(i), axeHydrau.getCoordinate(i+1), axeHydrau.getCoordinate(i+2));
+ // Application de la rotation
+ biefContainer_.getModelProfils().rotateGlobal(selection, newAngle-oldAngle, newCoordCroisement.x, newCoordCroisement.y, cmd);
+ if (_cmd!=null)
+ _cmd.addCmd(cmd.getSimplify());
+ // Retourne vrai si il faut r\xE9ordonnancer les profils
+ int oldPreviousIdx=UtilsProfil1d.getPreviousIndex(axeHydrau, oldCoordCroisement);
+ if (oldPreviousIdx==-1)
+ oldPreviousIdx=0;
+ if(idxProfilSelected_==0) {
+ if(biefContainer_.getNbProfil()>1) {
+ Geometry intersect=geomAxeHydrau.intersection(biefContainer_.getZoneProfils().getGeometry(idxProfilSelected_+1));
+ if(intersect.getNumPoints()!=1)
+ throw new ProfilContainerException(FudaaLib.getS("Au moins un profil n'a pas de croisement avec l'axe hydraulique ou en a plusieurs."));
+ if (_value>UtilsProfil1d.abscisseCurviligne(axeHydrau, intersect.getCoordinate()))
+ return true;
+ }
+ }
+ else if (idxProfilSelected_==biefContainer_.getNbProfil()-1) {
+ if(biefContainer_.getNbProfil()>1) {
+ Geometry intersect=geomAxeHydrau.intersection(biefContainer_.getZoneProfils().getGeometry(idxProfilSelected_-1));
+ if(intersect.getNumPoints()!=1)
+ throw new ProfilContainerException(FudaaLib.getS("Au moins un profil n'a pas de croisement avec l'axe hydraulique ou en a plusieurs."));
+ if (_value<UtilsProfil1d.abscisseCurviligne(axeHydrau, intersect.getCoordinate()))
+ return true;
+ }
+ }
+ else {
+ Geometry intersect1=geomAxeHydrau.intersection(biefContainer_.getZoneProfils().getGeometry(idxProfilSelected_+1));
+ Geometry intersect2=geomAxeHydrau.intersection(biefContainer_.getZoneProfils().getGeometry(idxProfilSelected_-1));
+ if(intersect1.getNumPoints()!=1||intersect2.getNumPoints()!=1)
+ throw new ProfilContainerException(FudaaLib.getS("Au moins un profil n'a pas de croisement avec l'axe hydraulique ou en a plusieurs."));
+ double abscCurvProfilPrecedent=UtilsProfil1d.abscisseCurviligne(axeHydrau, intersect2.getCoordinate());
+ double abscCurvProfilSuivant=UtilsProfil1d.abscisseCurviligne(axeHydrau, intersect1.getCoordinate());
+ if (_value<abscCurvProfilPrecedent||_value>abscCurvProfilSuivant)
+ return true;
+ }
+ }
+ return false;
+ }
+
+ /**
+ * Retourne l'angle entre l'axe hydraulique et le profil
+ * @throws ProfilContainerException
+ */
+ @SuppressWarnings("unused")
+ private double getAngleAxeHydrauProfil() throws ProfilContainerException {
+ CoordinateSequence axeHydraulique=((GISCoordinateSequenceContainerInterface)biefContainer_.getZoneAxeHydraulique().getGeometry(
+ 0)).getCoordinateSequence();
+ // Calcul de la coordonn\xE9e de croisement entre l'axe et le profil
+ Geometry intersection=biefContainer_.getZoneAxeHydraulique().getGeometry(0).intersection(
+ biefContainer_.getZoneProfils().getGeometry(idxProfilSelected_));
+ if (intersection.getNumPoints()!=1)
+ throw new ProfilContainerException(FudaaLib
+ .getS("Soit il n'y a pas de croisement avec l'axe hydraulique, soit il y en a plusieurs."));
+ Coordinate coordCroisement=intersection.getCoordinate();
+ // Recherche du point pr\xE9c\xE9dent le croisement sur l'axe hydraulique
+ Coordinate previousPointAH;
+ int idxPointPreviousAH=UtilsProfil1d.getPreviousIndex(axeHydraulique, coordCroisement);
+ if (idxPointPreviousAH!=-1)
+ previousPointAH=axeHydraulique.getCoordinate(idxPointPreviousAH);
+ else
+ // Cr\xE9ation d'un nouveau point en faisant la sym\xE9trie du second par
+ // rapport au premier.
+ previousPointAH=new Coordinate(axeHydraulique.getCoordinate(0).x*2-axeHydraulique.getCoordinate(1).x, axeHydraulique
+ .getCoordinate(0).y*2-axeHydraulique.getCoordinate(1).y, 0);
+ // Recherche du point suivant le croisement sur le profil
+ Coordinate previousPointP;
+ int idxPointPreviousP=UtilsProfil1d.getPreviousIndex(getCoordSeq(), coordCroisement);
+ if (idxPointPreviousP!=-1)
+ previousPointP=getCoordSeq().getCoordinate(idxPointPreviousAH);
+ else {
+ CoordinateSequence seq=getCoordSeq();
+ // Cr\xE9ation d'un nouveau point en faisant la sym\xE9trie du second par
+ // rapport au premier.
+ previousPointP=new Coordinate(seq.getCoordinate(seq.size()-1).x*2-seq.getCoordinate(seq.size()-2).x, seq.getCoordinate(seq
+ .size()-1).y*2-seq.getCoordinate(seq.size()-2).y, 0);
+ }
+ return UtilsProfil1d.getAngle(previousPointAH, coordCroisement, previousPointP);
+ }
+
public double getCurv(int _idxPoint) {
if(curv_==null||_idxPoint<0||_idxPoint>=curv_.size())
throw new IllegalArgumentException("Cet index n'existe pas.");
@@ -391,10 +523,10 @@
/*
* A propos de coords : le tableau retourn\xE9 est r\xE9f\xE9renc\xE9 (via une weak
* reference) par le cache de la coordinate sequence dont il est issu. Donc,
- * pour \xE9viter des probl\xE8mes de point fantome, il faut le clon\xE9. Cependant
- * les coordinantes qu'il contient doivent \xE9galement \xEAtre clon\xE9 sinon \xE7a ne
- * sert a rien. Pour ne pas trop perdre en performance, seul les coordonn\xE9es
- * modifi\xE9es sont clon\xE9es.
+ * pour \xE9viter des probl\xE8mes de point fantome, il faut le cloner. Cependant
+ * les coordinantes qu'il contient doivent \xE9galement \xEAtre clon\xE9es pour la
+ * m\xEAme raison. Pour ne pas trop perdre en performance, seuls les
+ * coordonn\xE9es modifi\xE9es sont clon\xE9es.
*/
// Les nouvelles valeurs du points \xE0 d\xE9placer
double newX;
@@ -410,35 +542,9 @@
if (_idxPoint!=idxRupture1_&&_idxPoint!=idxRupture2_) {
// Le point reste encadr\xE9 par les deux m\xEAme points => le signe de xa-xb et
// de ya-yb ne change pas
- // D\xE9termination des deux index \xE0 utiliser
- int idx1;
- int idx2;
- double valCurv;
- if (_idxPoint>0) { // Le premier point n'est pas selectionn\xE9
- idx1=_idxPoint-1;
- idx2=_idxPoint;
- valCurv=_value-curv_.get(idx1);
- }
- else {
- idx1=_idxPoint+1;
- idx2=_idxPoint;
- valCurv=Math.abs(_value-curv_.get(idx1));
- }
- // Calcul des nouvelles coordonn\xE9es
- if (Math.abs(seq.getX(idx2)-seq.getX(idx1))>tolerance) {
- // Extraction du signe de xa-xb
- double sign=Math.signum(seq.getX(idx2)-seq.getX(idx1));
- double coefDirecteur=(seq.getY(idx2)-seq.getY(idx1))/(seq.getX(idx2)-seq.getX(idx1));
- newX=seq.getX(idx1)+sign*valCurv/Math.sqrt(1+coefDirecteur*coefDirecteur);
- newY=seq.getY(idx1)+coefDirecteur*(newX-seq.getX(idx1));
- }
- else { // Cas du bout de profil vertical
- // Extraction du signe de ya-yb
- double sign=Math.signum(seq.getY(idx2)-seq.getY(idx1));
- newX=seq.getX(idx1);
- newY=seq.getY(idx1)+sign*valCurv;
- }
- coords[_idxPoint]=new Coordinate(newX, newY, coords[_idxPoint].z);
+ Coordinate newCoord=UtilsProfil1d.getCoordinateXY(seq, _value);
+ newCoord.z=coords[_idxPoint].z;
+ coords[_idxPoint]=newCoord;
// Mise a jour de la table des valeurs curvilignes
if (_idxPoint==0)
for (int i=1; i<curv_.size(); i++)
@@ -505,7 +611,7 @@
* Derni\xE8re petite note pour la fin, le cas dit 'simple' pr\xE9c\xE9dent
* (d\xE9placement d'un point qui n'est pas un point de rupture) n'est qu'un
* cas particulier de la r\xE9solution ci dessus (la solution de l'\xE9quation
- * du second degr\xE9 serait unique). On pourrait donc l'enlever, je pense que
+ * du second degr\xE9 serait unique). On pourrait donc l'enlever, mais je pense que
* s\xE9parer ces deux cas ne fait pas de mal pour une \xE9ventuelle relecture
* et/ou modification de ce code.
*/
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/model/UtilsProfil1d.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/model/UtilsProfil1d.java 2009-01-07 18:22:13 UTC (rev 4330)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/model/UtilsProfil1d.java 2009-01-08 09:22:51 UTC (rev 4331)
@@ -11,13 +11,14 @@
import org.fudaa.ctulu.gis.GISGeometryFactory;
import org.fudaa.ctulu.gis.GISPoint;
import org.fudaa.ctulu.gis.GISZoneCollectionLigneBrisee;
+import org.fudaa.fudaa.commun.FudaaLib;
import com.vividsolutions.jts.geom.Coordinate;
import com.vividsolutions.jts.geom.CoordinateSequence;
import com.vividsolutions.jts.geom.Geometry;
/**
- * Quelques fonctions aidant pour la manipulation des profils en 1d.
+ * Quelques fonctions utilis\xE9es dans le module modeleur1d.
* @author Emmanuel MARTIN
* @version $Id$
*/
@@ -190,6 +191,20 @@
}
/**
+ * Retourne la tol\xE9rance utilis\xE9e par defaut dans cette classe.
+ */
+ static public double getTolerance() {
+ return tolerance_;
+ }
+
+ /**
+ * Retourne vrai si les deux param\xE8tres sont \xE9gaux \xE0 une tol\xE9rance pr\xE8s.
+ */
+ static public boolean egal(double _d1, double _d2) {
+ return Math.abs(_d1-_d2)<tolerance_;
+ }
+
+ /**
* Retourne l'index du point pr\xE9c\xE9dent la coordonn\xE9e indiqu\xE9e sur la coordinateSequence donn\xE9e.
* Retourne -1 si la coordonn\xE9e donn\xE9e correspond \xE0 l'index 0.
* Retourne -2 si la coordonn\xE9e n'appartient pas \xE0 la g\xE9om\xE9trie.
@@ -275,4 +290,117 @@
else
return abscisseCurviligne(_geom1, intersection.getCoordinate());
}
+
+ /**
+ * Retourne la coordonn\xE9e correspondant \xE0 'abscisseCurv' sur '_geom'. La
+ * valeur de z est mise \xE0 0. _abscisseCurv peut \xEAtre n\xE9gatif : le point
+ * retourn\xE9 sera avec le premier ou sup\xE9rieur au max.
+ */
+ static public Coordinate getCoordinateXY(CoordinateSequence _geom, double _abscisseCurv) {
+ // Recherche du point pr\xE9c\xE9dent '_abscisseCurv'
+ int i=0;
+ double oldAbsCurv=0;
+ double currentAbsCurv=0;
+ while(currentAbsCurv<=_abscisseCurv&&++i<_geom.size()) {
+ oldAbsCurv=currentAbsCurv;
+ currentAbsCurv+=_geom.getCoordinate(i-1).distance(_geom.getCoordinate(i));
+ }
+ // Index du point pr\xE9c\xE9dent _abscisseCurv
+ if(i>0)
+ i--;
+ // Calcul de la coordonn\xE9e \\
+ int idx1;
+ int idx2;
+ double valCurv;
+ double newX;
+ double newY;
+ if(i==0) { // Premier point
+ idx1=i+1;
+ idx2=i;
+ valCurv=Math.abs(_abscisseCurv-abscisseCurviligne(_geom, _geom.getCoordinate(idx1)));
+ }
+ else if (i+1<_geom.size()) { // Point au milieu
+ idx1=i;
+ idx2=i+1;
+ valCurv=_abscisseCurv-oldAbsCurv;
+ }
+ else { // Dernier point
+ idx1=i-1;
+ idx2=i;
+ valCurv=_abscisseCurv-oldAbsCurv;
+ }
+ if(idx1>=_geom.size()||idx2>=_geom.size())
+ System.out.println("zz");
+ if(valCurv<tolerance_)
+ return _geom.getCoordinate(i);
+ // Calcul des nouvelles coordonn\xE9es
+ if (Math.abs(_geom.getX(idx2)-_geom.getX(idx1))>tolerance_) {
+ // Extraction du signe de xa-xb
+ double sign=Math.signum(_geom.getX(idx2)-_geom.getX(idx1));
+ double coefDirecteur=(_geom.getY(idx2)-_geom.getY(idx1))/(_geom.getX(idx2)-_geom.getX(idx1));
+ newX=_geom.getX(idx1)+sign*valCurv/Math.sqrt(1+coefDirecteur*coefDirecteur);
+ newY=_geom.getY(idx1)+coefDirecteur*(newX-_geom.getX(idx1));
+ }
+ else { // Cas du bout de profil vertical
+ // Extraction du signe de ya-yb
+ double sign=Math.signum(_geom.getY(idx2)-_geom.getY(idx1));
+ newX=_geom.getX(idx1);
+ newY=_geom.getY(idx1)+sign*valCurv;
+ }
+ return new Coordinate(newX, newY, 0);
+ }
+
+ /**
+ * Retourne l'angle form\xE9 par les segments _a_b et _b_c. _a, _b et _c doivent
+ * \xEAtre non confondus sous peine d'avoir un {@link IllegalArgumentException}.
+ * L'angle est toujours positif.
+ * L'ordonn\xE9 z n'est pas prise en compte.
+ * L'angle retourn\xE9 est en radian.
+ */
+ static public double getAngle(Coordinate _a, Coordinate _b, Coordinate _c) {
+ Coordinate a=new Coordinate(_a.x, _a.y, 0);
+ Coordinate b=new Coordinate(_b.x, _b.y, 0);
+ Coordinate c=new Coordinate(_c.x, _c.y, 0);
+ if(egal(a, b)||egal(b, c)||egal(a, c))
+ throw new IllegalArgumentException(FudaaLib.getS("Les trois points doivent \xEAtre non confonus."));
+ // Projection de b sur ac
+ Coordinate b2=proj(b, a, c);
+ // Calcul des angles interm\xE9diaires
+ double angleCBB2=Math.asin(b2.distance(c)/c.distance(b));
+ double angleB2BA=Math.asin(b2.distance(a)/a.distance(b));
+ if(angleCBB2==Double.NaN||angleB2BA==Double.NaN)
+ return Math.PI;
+ // Selon que B2 appartient ou non \xE0 ac, la d\xE9termination de l'angle final diff\xE8re.
+ double angle;
+ int position=getPositionXY(b2, a, c);
+ if(position==-1)
+ angle=angleCBB2-angleB2BA;
+ else if(position==1)
+ angle=angleB2BA-angleCBB2;
+ else
+ angle=angleCBB2+angleB2BA;
+ return angle;
+ }
+
+ /**
+ * Soit _a, _b, _c align\xE9s et non confondus. Retourne -1 si _a avant _b_c, 0
+ * si _a est entre _b_c (inclu), +1 sinon. Si _a, _b et _c ne sont pas
+ * align\xE9s, {@link IllegalArgumentException} est lev\xE9.
+ */
+ static public int getPositionXY(Coordinate _a, Coordinate _b, Coordinate _c) {
+ if(!egal(proj(_a, _b, _c), _a)||egal(_a, _b)||egal(_b, _c)||egal(_a, _c))
+ throw new IllegalArgumentException(FudaaLib.getS("Les trois points doivent \xEAtre align\xE9s et non confonus."));
+ Coordinate vecBC=vec(_b, _c);
+ double k;
+ if(vecBC.x!=0)
+ k=(_a.x-_b.x)/vecBC.x;
+ else
+ k=(_a.y-_b.y)/vecBC.y;
+ if(k<0)
+ return -1;
+ else if(k>1)
+ return 1;
+ else
+ return 0;
+ }
}
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/view/VueTableau.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/view/VueTableau.java 2009-01-07 18:22:13 UTC (rev 4330)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/view/VueTableau.java 2009-01-08 09:22:51 UTC (rev 4331)
@@ -8,13 +8,17 @@
package org.fudaa.fudaa.modeleur.modeleur1d.view;
import java.awt.Dimension;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
import javax.swing.Box;
import javax.swing.BoxLayout;
import javax.swing.JTable;
+import javax.swing.SwingUtilities;
import javax.swing.event.ListSelectionListener;
import javax.swing.table.DefaultTableModel;
+import org.fudaa.ctulu.CtuluCommandComposite;
import org.fudaa.ctulu.gui.CtuluTable;
import org.fudaa.ebli.commun.EbliFormatterInterface;
import org.fudaa.fudaa.commun.FudaaLib;
@@ -27,6 +31,7 @@
import com.memoire.bu.BuLabel;
import com.memoire.bu.BuPanel;
import com.memoire.bu.BuScrollPane;
+import com.memoire.bu.BuTextField;
/**
* Cette classe permet le visionnage des informations sous forme d'un tableau.
@@ -62,11 +67,34 @@
private void updateAbscisseCurvAxeHydraulique() {
double abscCurv=data_.getAbsCurvProfilOnAxeHydraulique();
if(abscCurv==-1)
- lblAxeHydraulique_.setText(" - ");
+ tfAxeHydraulique_.setText(" - ");
else
- lblAxeHydraulique_.setText(formater_.getXYFormatter().format(abscCurv));
+ tfAxeHydraulique_.setText(formater_.getXYFormatter().format(abscCurv));
}
+
+ /**
+ * Retourne la valeur de l'abscisse curviligne du profil sur l'axe
+ * hydraulique.
+ */
+ public double getAbsCurvProfilOnAxeHydraulique() {
+ return data_.getAbsCurvProfilOnAxeHydraulique();
+ }
+ /**
+ * Met l'abscisse curviligne du profil sur l'axe hydraulique \xE0 _value.
+ * _value ne peut \xEAtre ni n\xE9gatif ni sup\xE9rieur \xE0 l'abscisse curviligne total
+ * de l'axe, dans ces cas une exception de type
+ * {@link IllegalArgumentException} est lev\xE9e.
+ * @throws ProfilContainerException
+ */
+ public void setAbsCurvProfilOnAxeHydraulique(double _value) throws ProfilContainerException {
+ CtuluCommandComposite cmd=new CtuluCommandComposite("R\xE9ordonnancement des profils");
+ boolean result=data_.setAbsCurvProfilOnAxeHydraulique(_value, cmd);
+ if(result)
+ controller_.orderProfils(cmd);
+ controller_.getCommandManager().addCmd(cmd.getSimplify());
+ }
+
public void profilContainerDataModified() {
fireTableDataChanged();
updateAbscisseCurvAxeHydraulique();
@@ -120,9 +148,9 @@
/** La vue du tableau. */
private JTable table_;
/** Le model du tableau affich\xE9 par le panel. */
- private DefaultTableModel modelTable_;
+ private TableGeomModel modelTable_;
/** L'abscisse curviligne du profil sur l'axe hydraulique. */
- private BuLabel lblAxeHydraulique_=new BuLabel();
+ private BuTextField tfAxeHydraulique_=BuTextField.createDoubleField();
public VueTableau(Controller1d _controller, ProfilContainer _data){
controller_=_controller;
@@ -132,9 +160,27 @@
table_=new CtuluTable(modelTable_);
add(new BuScrollPane(table_), BuBorderLayout.CENTER);
// Abscisse curviligne du profil sur l'axe hydraulique
+ tfAxeHydraulique_.setHorizontalAlignment(SwingUtilities.CENTER);
+ tfAxeHydraulique_.addActionListener(new ActionListener(){
+ public void actionPerformed(ActionEvent e) {
+ double oldValue=modelTable_.getAbsCurvProfilOnAxeHydraulique();
+ try {
+ modelTable_.setAbsCurvProfilOnAxeHydraulique(Double.parseDouble(tfAxeHydraulique_.getText()));
+ }
+ catch(NumberFormatException _exc) {
+ tfAxeHydraulique_.setText(controller_.getFormater().getXYFormatter().format(oldValue));
+ }
+ catch(IllegalArgumentException _exc) {
+ controller_.showError(_exc.getMessage());
+ }
+ catch (ProfilContainerException _exc) {
+ controller_.showError(_exc.getMessage());
+ }
+ }
+ });
Box absCurv=new Box(BoxLayout.X_AXIS);
absCurv.add(new BuLabel(FudaaLib.getS("Abscisse Curviligne : ")));
- absCurv.add(lblAxeHydraulique_);
+ absCurv.add(tfAxeHydraulique_);
add(absCurv, BuBorderLayout.SOUTH);
// Taille
setPreferredSize(new Dimension(200, 200));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
