Menu
▾
▴
fudaa-cvs-commit — Mailing list for CVS commit messages
You can subscribe to this list here.
| 2003 |
Jan
|
Feb
(89) |
Mar
(219) |
Apr
(82) |
May
(33) |
Jun
(11) |
Jul
(129) |
Aug
(357) |
Sep
(34) |
Oct
(37) |
Nov
(42) |
Dec
(182) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
(59) |
Feb
(74) |
Mar
(196) |
Apr
(205) |
May
(109) |
Jun
(268) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <de...@us...> - 2004-01-21 10:07:33
|
Update of /cvsroot/fudaa/fudaa_devel/aide/src/prepro In directory sc8-pr-cvs1:/tmp/cvs-serv6356/prepro Log Message: Directory /cvsroot/fudaa/fudaa_devel/aide/src/prepro added to the repository |
|
From: <jm_...@us...> - 2004-01-12 14:55:33
|
Update of /cvsroot/fudaa//fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor
In directory sc8-pr-cvs1:/tmp/cvs-serv22509/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor
Modified Files:
Hydraulique1dSeuilTransEditor.java
Log Message:
fudaa/distribution.xml : ajout la dépendance avec dodico/lido pour mascaret
Hydraulique1dSeuilTransEditor : changement du libellé gradient de débit ->gradient d'abaissement de la crête
MascaretImplementation : correction du "annuler" lors de l'ouverture d'un fichier projet.
Index: Hydraulique1dSeuilTransEditor.java
===================================================================
RCS file: /cvsroot/fudaa//fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dSeuilTransEditor.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Hydraulique1dSeuilTransEditor.java 8 Dec 2003 18:22:47 -0000 1.8
--- Hydraulique1dSeuilTransEditor.java 12 Jan 2004 14:55:29 -0000 1.9
***************
*** 115,120 ****
new EmptyBorder(new Insets(5, 5, 5, 5))));
int textSize= 5;
BuLabel lbNumero= new BuLabel("N° barrage / seuil");
! Dimension dimLabel= lbNumero.getPreferredSize();
tfNumero_= BuTextField.createIntegerField();
tfNumero_.setColumns(textSize);
--- 115,122 ----
new EmptyBorder(new Insets(5, 5, 5, 5))));
int textSize= 5;
+ BuLabel lbLargeur= new BuLabel("Gradient d'abaissement de la crête");
+ Dimension dimLabel= lbLargeur.getPreferredSize();
BuLabel lbNumero= new BuLabel("N° barrage / seuil");
! lbNumero.setPreferredSize(dimLabel);
tfNumero_= BuTextField.createIntegerField();
tfNumero_.setColumns(textSize);
***************
*** 181,185 ****
tfGradient_.setColumns(textSize);
tfGradient_.setEditable(true);
- BuLabel lbLargeur= new BuLabel("Gradient débit");
lbLargeur.setPreferredSize(dimLabel);
pnLargeur_.add(lbLargeur, 0);
--- 183,186 ----
***************
*** 195,198 ****
--- 196,200 ----
taillePrefere.width= taillePrefere.width * 3;
cmbNomLoi_.setPreferredSize(taillePrefere);
+
pnParamAvances_.add(cmbNomLoi_, 3);
btDefinirLoi_.setActionCommand("DEFINIR_LOI_HYDROGRAMME");
|
|
From: <jm_...@us...> - 2004-01-12 14:55:33
|
Update of /cvsroot/fudaa//fudaa_devel/fudaa/src/org/fudaa/fudaa/mascaret
In directory sc8-pr-cvs1:/tmp/cvs-serv22509/fudaa/src/org/fudaa/fudaa/mascaret
Modified Files:
MascaretImplementation.java
Log Message:
fudaa/distribution.xml : ajout la dépendance avec dodico/lido pour mascaret
Hydraulique1dSeuilTransEditor : changement du libellé gradient de débit ->gradient d'abaissement de la crête
MascaretImplementation : correction du "annuler" lors de l'ouverture d'un fichier projet.
Index: MascaretImplementation.java
===================================================================
RCS file: /cvsroot/fudaa//fudaa_devel/fudaa/src/org/fudaa/fudaa/mascaret/MascaretImplementation.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** MascaretImplementation.java 7 Jan 2004 16:54:06 -0000 1.10
--- MascaretImplementation.java 12 Jan 2004 14:55:29 -0000 1.11
***************
*** 974,986 ****
usine.setEventMuet(true);
//NOTE: pour eviter d'envoyer des evt
! if (ietude1d_ == null) {
! ietude1d_= usine.creeHydraulique1dEtude1d();
! }
! projet_.setEtude1d(ietude1d_);
projet_.setIhmRepository(ihmP_);
if (!projet_.ouvrir(arg)) {
return;
}
- // projet_.ouvrir(arg);
ietude1d_= projet_.getEtude1d();
if (ietude1d_ != null) {
--- 974,983 ----
usine.setEventMuet(true);
//NOTE: pour eviter d'envoyer des evt
! IEtude1d ietude1dTmp = usine.creeHydraulique1dEtude1d();
! projet_.setEtude1d(ietude1dTmp);
projet_.setIhmRepository(ihmP_);
if (!projet_.ouvrir(arg)) {
return;
}
ietude1d_= projet_.getEtude1d();
if (ietude1d_ != null) {
|
|
From: <jm_...@us...> - 2004-01-12 14:55:33
|
Update of /cvsroot/fudaa//fudaa_devel/fudaa
In directory sc8-pr-cvs1:/tmp/cvs-serv22509/fudaa
Modified Files:
distribution.xml
Log Message:
fudaa/distribution.xml : ajout la dépendance avec dodico/lido pour mascaret
Hydraulique1dSeuilTransEditor : changement du libellé gradient de débit ->gradient d'abaissement de la crête
MascaretImplementation : correction du "annuler" lors de l'ouverture d'un fichier projet.
Index: distribution.xml
===================================================================
RCS file: /cvsroot/fudaa//fudaa_devel/fudaa/distribution.xml,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** distribution.xml 8 Jan 2004 17:55:57 -0000 1.14
--- distribution.xml 12 Jan 2004 14:55:29 -0000 1.15
***************
*** 412,415 ****
--- 412,418 ----
<include name="org.fudaa.dodico.commun."/>
+ <include name="org.fudaa.dodico.corba.lido."/>
+ <include name="org.fudaa.dodico.lido."/>
+
<include name="org.fudaa.dodico.corba.hydraulique1d."/>
<include name="org.fudaa.dodico.hydraulique1d."/>
|
|
From: <jm_...@us...> - 2004-01-12 10:27:11
|
Update of /cvsroot/fudaa//fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/casier
In directory sc8-pr-cvs1:/tmp/cvs-serv7272/dodico/src/org/fudaa/dodico/hydraulique1d/casier
Modified Files:
DCalageImage.java
Log Message:
Sécurisation du "set" sur les points 2D pour éviter une "null pointer exception"
Index: DCalageImage.java
===================================================================
RCS file: /cvsroot/fudaa//fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/casier/DCalageImage.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** DCalageImage.java 2 Dec 2003 19:54:40 -0000 1.3
--- DCalageImage.java 12 Jan 2004 10:27:08 -0000 1.4
***************
*** 77,81 ****
}
public void pt1Pixel(SPoint2D s) {
! if ( (s.x==pt1Pixel_.x)&&(s.y==pt1Pixel_.y) ) return;
pt1Pixel_= s;
CDodico.findUsine().fireObjetModifie(toString(), tie(), "pt1Pixel");
--- 77,84 ----
}
public void pt1Pixel(SPoint2D s) {
! if ((pt1Pixel_ != null)&&(s != null)) {
! if ( (s.x == pt1Pixel_.x) && (s.y == pt1Pixel_.y))
! return;
! }
pt1Pixel_= s;
CDodico.findUsine().fireObjetModifie(toString(), tie(), "pt1Pixel");
***************
*** 86,90 ****
}
public void pt1Utilisateur(SPoint2D s) {
! if ( (s.x==pt1Utilisateur_.x)&&(s.y==pt1Utilisateur_.y) ) return;
pt1Utilisateur_= s;
CDodico.findUsine().fireObjetModifie(toString(), tie(), "pt1Utilisateur");
--- 89,96 ----
}
public void pt1Utilisateur(SPoint2D s) {
! if ((pt1Utilisateur_ != null)&&(s != null)) {
! if ( (s.x == pt1Utilisateur_.x) && (s.y == pt1Utilisateur_.y))
! return;
! }
pt1Utilisateur_= s;
CDodico.findUsine().fireObjetModifie(toString(), tie(), "pt1Utilisateur");
***************
*** 95,99 ****
}
public void pt2Pixel(SPoint2D s) {
! if ( (s.x==pt2Pixel_.x)&&(s.y==pt2Pixel_.y) ) return;
pt2Pixel_= s;
CDodico.findUsine().fireObjetModifie(toString(), tie(), "pt2Pixel");
--- 101,108 ----
}
public void pt2Pixel(SPoint2D s) {
! if ((pt2Pixel_ != null)&&(s != null)) {
! if ( (s.x == pt2Pixel_.x) && (s.y == pt2Pixel_.y))
! return;
! }
pt2Pixel_= s;
CDodico.findUsine().fireObjetModifie(toString(), tie(), "pt2Pixel");
***************
*** 104,108 ****
}
public void pt2Utilisateur(SPoint2D s) {
! if ( (s.x==pt2Utilisateur_.x)&&(s.y==pt2Utilisateur_.y) ) return;
pt2Utilisateur_= s;
CDodico.findUsine().fireObjetModifie(toString(), tie(), "pt2Utilisateur");
--- 113,120 ----
}
public void pt2Utilisateur(SPoint2D s) {
! if ((pt2Utilisateur_ != null)&&(s != null)) {
! if ( (s.x == pt2Utilisateur_.x) && (s.y == pt2Utilisateur_.y))
! return;
! }
pt2Utilisateur_= s;
CDodico.findUsine().fireObjetModifie(toString(), tie(), "pt2Utilisateur");
***************
*** 113,117 ****
}
public void pt3Pixel(SPoint2D s) {
! if ( (s.x==pt3Pixel_.x)&&(s.y==pt3Pixel_.y) ) return;
pt3Pixel_= s;
CDodico.findUsine().fireObjetModifie(toString(), tie(), "pt3Pixel");
--- 125,132 ----
}
public void pt3Pixel(SPoint2D s) {
! if ((pt3Pixel_ != null)&&(s != null)) {
! if ( (s.x == pt3Pixel_.x) && (s.y == pt3Pixel_.y))
! return;
! }
pt3Pixel_= s;
CDodico.findUsine().fireObjetModifie(toString(), tie(), "pt3Pixel");
***************
*** 122,126 ****
}
public void pt3Utilisateur(SPoint2D s) {
! if ( (s.x==pt3Utilisateur_.x)&&(s.y==pt3Utilisateur_.y) ) return;
pt3Utilisateur_= s;
CDodico.findUsine().fireObjetModifie(toString(), tie(), "pt3Utilisateur");
--- 137,144 ----
}
public void pt3Utilisateur(SPoint2D s) {
! if ((pt3Utilisateur_ != null)&&(s != null)) {
! if ( (s.x == pt3Utilisateur_.x) && (s.y == pt3Utilisateur_.y))
! return;
! }
pt3Utilisateur_= s;
CDodico.findUsine().fireObjetModifie(toString(), tie(), "pt3Utilisateur");
|
|
From: <jm_...@us...> - 2004-01-09 16:11:02
|
Update of /cvsroot/fudaa//fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d
In directory sc8-pr-cvs1:/tmp/cvs-serv23217/dodico/src/org/fudaa/dodico/hydraulique1d
Modified Files:
DExtremite.java
Log Message:
Correction édition de l'éditeur du noyau transcritique
Index: DExtremite.java
===================================================================
RCS file: /cvsroot/fudaa//fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/DExtremite.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** DExtremite.java 2 Dec 2003 19:54:40 -0000 1.4
--- DExtremite.java 9 Jan 2004 16:10:58 -0000 1.5
***************
*** 140,144 ****
public void point1(SPoint2D s) {
if (point1_==s) return;
! if ((point1_.x==s.x)&&(point1_.y==s.y)) return;
point1_= s;
CDodico.findUsine().fireObjetModifie(toString(), tie(), "point1");
--- 140,147 ----
public void point1(SPoint2D s) {
if (point1_==s) return;
! if ((point1_ != null)&&(s != null)) {
! if ( (point1_.x == s.x) && (point1_.y == s.y))
! return;
! }
point1_= s;
CDodico.findUsine().fireObjetModifie(toString(), tie(), "point1");
***************
*** 150,154 ****
public void point2(SPoint2D s) {
if (point2_==s) return;
! if ((point2_.x==s.x)&&(point2_.y==s.y)) return;
point2_= s;
CDodico.findUsine().fireObjetModifie(toString(), tie(), "point2");
--- 153,160 ----
public void point2(SPoint2D s) {
if (point2_==s) return;
! if ((point2_ != null)&&(s != null)) {
! if ( (point2_.x == s.x) && (point2_.y == s.y))
! return;
! }
point2_= s;
CDodico.findUsine().fireObjetModifie(toString(), tie(), "point2");
***************
*** 160,164 ****
public void pointMilieu(SPoint2D s) {
if (pointMilieu_==s) return;
! if ((pointMilieu_.x==s.x)&&(pointMilieu_.y==s.y)) return;
pointMilieu_= s;
CDodico.findUsine().fireObjetModifie(toString(), tie(), "pointMilieu");
--- 166,173 ----
public void pointMilieu(SPoint2D s) {
if (pointMilieu_==s) return;
! if ((pointMilieu_ != null)&&(s != null)) {
! if ( (pointMilieu_.x == s.x) && (pointMilieu_.y == s.y))
! return;
! }
pointMilieu_= s;
CDodico.findUsine().fireObjetModifie(toString(), tie(), "pointMilieu");
|
|
From: <jm_...@us...> - 2004-01-08 17:58:26
|
Update of /cvsroot/fudaa//fudaa_devel/dodico/src/org/fudaa/dodico/mascaret
In directory sc8-pr-cvs1:/tmp/cvs-serv22647/dodico/src/org/fudaa/dodico/mascaret
Modified Files:
DCalculMascaret.java
Log Message:
Lancement sous linux de l'executable mascaret avec le path et dans le
répertoire du serveur.
Index: DCalculMascaret.java
===================================================================
RCS file: /cvsroot/fudaa//fudaa_devel/dodico/src/org/fudaa/dodico/mascaret/DCalculMascaret.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** DCalculMascaret.java 8 Dec 2003 18:22:47 -0000 1.8
--- DCalculMascaret.java 8 Jan 2004 17:58:23 -0000 1.9
***************
*** 235,239 ****
} else {
cmd= new String[3];
! cmd[0]= "mascaret";
cmd[1]= "-RV5P2";
cmd[2]= ficCAS.getCanonicalPath();
--- 235,239 ----
} else {
cmd= new String[3];
! cmd[0]= path+"mascaret";
cmd[1]= "-RV5P2";
cmd[2]= ficCAS.getCanonicalPath();
***************
*** 242,245 ****
--- 242,246 ----
CExec ex= new CExec();
ex.setCommand(cmd);
+ ex.setExecDirectory(new File(path.substring(0,path.length()-1)));
ex.setOutStream(System.out);
ex.setErrStream(System.err);
|
|
From: <jm_...@us...> - 2004-01-08 17:56:00
|
Update of /cvsroot/fudaa//fudaa_devel/fudaa
In directory sc8-pr-cvs1:/tmp/cvs-serv22297
Modified Files:
distribution.xml
Log Message:
Ajout de tout les packages corba pour jar_mascaret
Index: distribution.xml
===================================================================
RCS file: /cvsroot/fudaa//fudaa_devel/fudaa/distribution.xml,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** distribution.xml 7 Jan 2004 16:49:42 -0000 1.13
--- distribution.xml 8 Jan 2004 17:55:57 -0000 1.14
***************
*** 335,350 ****
<class>
<fileset dir="${fudaa.dist.classes.dir}">
<include name="org/fudaa/dodico/corba/base/*.class"/>
<include name="org/fudaa/dodico/corba/calcul/*.class"/>
! <include name="org/fudaa/dodico/corba/association/*.class"/>
<include name="org/fudaa/dodico/corba/evenement/*.class"/>
- <include name="org/fudaa/dodico/corba/objet/*.class"/>
<include name="org/fudaa/dodico/corba/geometrie/*.class"/>
<include name="org/fudaa/dodico/corba/hydraulique1d/*.class"/>
<include name="org/fudaa/dodico/corba/hydraulique1d/casier/*.class"/>
<include name="org/fudaa/dodico/corba/hydraulique1d/loi/*.class"/>
<include name="org/fudaa/dodico/corba/hydraulique1d/singularite/*.class"/>
<include name="org/fudaa/dodico/corba/mascaret/*.class"/>
<include name="org/fudaa/dodico/corba/usine/*.class"/>
</fileset>
</class>
--- 335,389 ----
<class>
<fileset dir="${fudaa.dist.classes.dir}">
+ <include name="org/fudaa/dodico/corba/association/*.class"/>
<include name="org/fudaa/dodico/corba/base/*.class"/>
<include name="org/fudaa/dodico/corba/calcul/*.class"/>
! <include name="org/fudaa/dodico/corba/collection/*.class"/>
! <include name="org/fudaa/dodico/corba/courant/*.class"/>
! <include name="org/fudaa/dodico/corba/cubature/*.class"/>
! <include name="org/fudaa/dodico/corba/curvi/*.class"/>
! <include name="org/fudaa/dodico/corba/diapre/*.class"/>
! <include name="org/fudaa/dodico/corba/dimduc/*.class"/>
! <include name="org/fudaa/dodico/corba/ducalbe/*.class"/>
! <include name="org/fudaa/dodico/corba/dunes/*.class"/>
! <include name="org/fudaa/dodico/corba/ef/*.class"/>
! <include name="org/fudaa/dodico/corba/ef/serviceDunes/*.class"/>
<include name="org/fudaa/dodico/corba/evenement/*.class"/>
<include name="org/fudaa/dodico/corba/geometrie/*.class"/>
+ <include name="org/fudaa/dodico/corba/hiswa/*.class"/>
+ <include name="org/fudaa/dodico/corba/houle/*.class"/>
+ <include name="org/fudaa/dodico/corba/hydraulique/*.class"/>
<include name="org/fudaa/dodico/corba/hydraulique1d/*.class"/>
<include name="org/fudaa/dodico/corba/hydraulique1d/casier/*.class"/>
<include name="org/fudaa/dodico/corba/hydraulique1d/loi/*.class"/>
<include name="org/fudaa/dodico/corba/hydraulique1d/singularite/*.class"/>
+ <include name="org/fudaa/dodico/corba/interpolateur/*.class"/>
+ <include name="org/fudaa/dodico/corba/lido/*.class"/>
<include name="org/fudaa/dodico/corba/mascaret/*.class"/>
+ <include name="org/fudaa/dodico/corba/mathematiques/*.class"/>
+ <include name="org/fudaa/dodico/corba/mesure/*.class"/>
+ <include name="org/fudaa/dodico/corba/navigation/*.class"/>
+ <include name="org/fudaa/dodico/corba/navmer/*.class"/>
+ <include name="org/fudaa/dodico/corba/objet/*.class"/>
+ <include name="org/fudaa/dodico/corba/olb/*.class"/>
+ <include name="org/fudaa/dodico/corba/oscar/*.class"/>
+ <include name="org/fudaa/dodico/corba/planification/*.class"/>
+ <include name="org/fudaa/dodico/corba/probabilite/*.class"/>
+ <include name="org/fudaa/dodico/corba/reflux/*.class"/>
+ <include name="org/fudaa/dodico/corba/reflux3d/*.class"/>
+ <include name="org/fudaa/dodico/corba/refonde/*.class"/>
+ <include name="org/fudaa/dodico/corba/representation/*.class"/>
+ <include name="org/fudaa/dodico/corba/sedimentologie/*.class"/>
+ <include name="org/fudaa/dodico/corba/seuil/*.class"/>
+ <include name="org/fudaa/dodico/corba/simboat/*.class"/>
+ <include name="org/fudaa/dodico/corba/simulation/*.class"/>
+ <include name="org/fudaa/dodico/corba/sinavi/*.class"/>
+ <include name="org/fudaa/dodico/corba/sipor/*.class"/>
+ <include name="org/fudaa/dodico/corba/sisyphe/*.class"/>
+ <include name="org/fudaa/dodico/corba/taucomac/*.class"/>
+ <include name="org/fudaa/dodico/corba/tr/*.class"/>
+ <include name="org/fudaa/dodico/corba/transport/*.class"/>
<include name="org/fudaa/dodico/corba/usine/*.class"/>
+ <include name="org/fudaa/dodico/corba/utilitaire/*.class"/>
+ <include name="org/fudaa/dodico/corba/vag/*.class"/>
</fileset>
</class>
|
|
From: <jm_...@us...> - 2004-01-07 16:54:09
|
Update of /cvsroot/fudaa//fudaa_devel/fudaa/src/org/fudaa/fudaa/mascaret
In directory sc8-pr-cvs1:/tmp/cvs-serv18896/fudaa/src/org/fudaa/fudaa/mascaret
Modified Files:
MascaretImplementation.java
Log Message:
Mise à jour de la version : 1.1.2 et de la date 07-jan-2004
Index: MascaretImplementation.java
===================================================================
RCS file: /cvsroot/fudaa//fudaa_devel/fudaa/src/org/fudaa/fudaa/mascaret/MascaretImplementation.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** MascaretImplementation.java 8 Dec 2003 18:22:48 -0000 1.9
--- MascaretImplementation.java 7 Jan 2004 16:54:06 -0000 1.10
***************
*** 137,142 ****
static {
isApp_.name= "Mascaret";
! isApp_.version= "1.1.1";
! isApp_.date= "08-Dec-2003";
isApp_.rights= "Tous droits réservés. EDF (c) 2001-2003";
isApp_.contact= "nic...@ed...";
--- 137,142 ----
static {
isApp_.name= "Mascaret";
! isApp_.version= "1.1.2";
! isApp_.date= "07-Jan-2004";
isApp_.rights= "Tous droits réservés. EDF (c) 2001-2003";
isApp_.contact= "nic...@ed...";
***************
*** 156,160 ****
isApp_.thanks= new String[] { "Fudaa team" };
idApp_.name= "Etude";
! idApp_.version= "1.1.1";
idApp_.organization= "EDF";
idApp_.author= "Jean-Marc.Lacombe";
--- 156,160 ----
isApp_.thanks= new String[] { "Fudaa team" };
idApp_.name= "Etude";
! idApp_.version= "1.1.2";
idApp_.organization= "EDF";
idApp_.author= "Jean-Marc.Lacombe";
|
|
From: <jm_...@us...> - 2004-01-07 16:49:46
|
Update of /cvsroot/fudaa//fudaa_devel/fudaa
In directory sc8-pr-cvs1:/tmp/cvs-serv17800
Modified Files:
distribution.xml
Log Message:
Correction bug : ajout des classes corba et les ressources dja pour jar_mascaret
Index: distribution.xml
===================================================================
RCS file: /cvsroot/fudaa//fudaa_devel/fudaa/distribution.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** distribution.xml 7 Jan 2004 13:19:29 -0000 1.12
--- distribution.xml 7 Jan 2004 16:49:42 -0000 1.13
***************
*** 340,344 ****
--- 340,348 ----
<include name="org/fudaa/dodico/corba/evenement/*.class"/>
<include name="org/fudaa/dodico/corba/objet/*.class"/>
+ <include name="org/fudaa/dodico/corba/geometrie/*.class"/>
<include name="org/fudaa/dodico/corba/hydraulique1d/*.class"/>
+ <include name="org/fudaa/dodico/corba/hydraulique1d/casier/*.class"/>
+ <include name="org/fudaa/dodico/corba/hydraulique1d/loi/*.class"/>
+ <include name="org/fudaa/dodico/corba/hydraulique1d/singularite/*.class"/>
<include name="org/fudaa/dodico/corba/mascaret/*.class"/>
<include name="org/fudaa/dodico/corba/usine/*.class"/>
***************
*** 381,384 ****
--- 385,389 ----
<include name="org/fudaa/dodico/commun/"/>
<include name="com/memoire/bu/"/>
+ <include name="com/memoire/dja/"/>
<include name="org/fudaa/dodico/hydraulique1d/"/>
<include name="org/fudaa/dodico/mascaret/"/>
|
|
From: <jm_...@us...> - 2004-01-07 13:19:32
|
Update of /cvsroot/fudaa//fudaa_devel/fudaa
In directory sc8-pr-cvs1:/tmp/cvs-serv7081
Modified Files:
distribution.xml
Log Message:
modification de la cible jar_mascaret
Index: distribution.xml
===================================================================
RCS file: /cvsroot/fudaa//fudaa_devel/fudaa/distribution.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** distribution.xml 19 Dec 2003 16:31:39 -0000 1.11
--- distribution.xml 7 Jan 2004 13:19:29 -0000 1.12
***************
*** 56,60 ****
<property name="fudaa.dist.javadocAll.dir" location="${fudaa.dist.dir}/doc/fudaa_javadoc"/>
<property name="fudaa.dist.javadocAll.link" location="http://java.sun.com/j2se/1.3/docs/api/"/>
!
--- 56,60 ----
<property name="fudaa.dist.javadocAll.dir" location="${fudaa.dist.dir}/doc/fudaa_javadoc"/>
<property name="fudaa.dist.javadocAll.link" location="http://java.sun.com/j2se/1.3/docs/api/"/>
!
***************
*** 76,80 ****
<echo message="Vous devez utiliser java 1.3"/>
<echo message="version utilisee: ${ant.java.version}"/>
!
<path id="fudaaDist.classpath.id">
<pathelement path="${fudaa.dist.classes.dir}"/>
--- 76,80 ----
<echo message="Vous devez utiliser java 1.3"/>
<echo message="version utilisee: ${ant.java.version}"/>
!
<path id="fudaaDist.classpath.id">
<pathelement path="${fudaa.dist.classes.dir}"/>
***************
*** 178,182 ****
<mkdir dir="${fudaa.dist.dir}"/>
<delete file="${fudaa.zip.file}"/>
!
<tar destfile="${fudaa.zip.file}" longfile="gnu" compression="gzip">
<tarfileset dir="${projet.dir}" prefix="fudaa_devel">
--- 178,182 ----
<mkdir dir="${fudaa.dist.dir}"/>
<delete file="${fudaa.zip.file}"/>
!
<tar destfile="${fudaa.zip.file}" longfile="gnu" compression="gzip">
<tarfileset dir="${projet.dir}" prefix="fudaa_devel">
***************
*** 245,249 ****
<include name="**/dist.sh"/>
</tarfileset>
!
</tar>
</target>
--- 245,249 ----
<include name="**/dist.sh"/>
</tarfileset>
!
</tar>
</target>
***************
*** 273,277 ****
</fileset>
</class>
!
<resource>
<fileset dir="${fudaa.dist.classes.dir}">
--- 273,277 ----
</fileset>
</class>
!
<resource>
<fileset dir="${fudaa.dist.classes.dir}">
***************
*** 280,297 ****
<include name="org/fudaa/ebli/ressource/"/>
<include name="org/fudaa/fudaa/ressource/"/>
!
<include name="org/fudaa/fudaa/lido/"/>
</fileset>
</resource>
!
<classfilter>
<exclude name="org.fudaa.dodico.corba."/>
<exclude name="org.fudaa.dodico."/>
!
<include name="org.fudaa.dodico.corba.base."/>
<include name="org.fudaa.dodico.corba.calcul."/>
<include name="org.fudaa.dodico.calcul."/>
!
<include name="org.fudaa.dodico.corba.evenement."/>
<include name="org.fudaa.dodico.evenement."/>
--- 280,297 ----
<include name="org/fudaa/ebli/ressource/"/>
<include name="org/fudaa/fudaa/ressource/"/>
!
<include name="org/fudaa/fudaa/lido/"/>
</fileset>
</resource>
!
<classfilter>
<exclude name="org.fudaa.dodico.corba."/>
<exclude name="org.fudaa.dodico."/>
!
<include name="org.fudaa.dodico.corba.base."/>
<include name="org.fudaa.dodico.corba.calcul."/>
<include name="org.fudaa.dodico.calcul."/>
!
<include name="org.fudaa.dodico.corba.evenement."/>
<include name="org.fudaa.dodico.evenement."/>
***************
*** 308,322 ****
<include name="org.fudaa.dodico.fortran."/>
<include name="org.fudaa.dodico.commun."/>
!
<include name="org.fudaa.dodico.corba.lido."/>
<include name="org.fudaa.dodico.lido."/>
</classfilter>
-
-
</genjar>
!
</target>
! <target name="jar_mascaret" depends=".initialisationCheck"
description="cree fudaa_mascaret.jar">
<property name="fudaa.mascaret.jar.file" value="${fudaa.dist.jar.dir}/fudaa_mascaret.jar"/>
--- 308,322 ----
<include name="org.fudaa.dodico.fortran."/>
<include name="org.fudaa.dodico.commun."/>
!
<include name="org.fudaa.dodico.corba.lido."/>
<include name="org.fudaa.dodico.lido."/>
</classfilter>
</genjar>
!
</target>
!
!
! <target name="jar_mascaret" depends="build"
description="cree fudaa_mascaret.jar">
<property name="fudaa.mascaret.jar.file" value="${fudaa.dist.jar.dir}/fudaa_mascaret.jar"/>
***************
*** 327,330 ****
--- 327,333 ----
<delete file="${fudaa.mascaret.jar.file}"/>
<genjar jarfile="${fudaa.mascaret.jar.file}">
+ <manifest>
+ <attribute name="Main-Class" value="org.fudaa.fudaa.mascaret.Mascaret"/>
+ </manifest>
<classpath path="${fudaaDist.classpath}"/>
<class name="org.fudaa.fudaa.mascaret.Mascaret"/>
***************
*** 337,367 ****
<include name="org/fudaa/dodico/corba/evenement/*.class"/>
<include name="org/fudaa/dodico/corba/objet/*.class"/>
- <include name="org/fudaa/dodico/corba/mascaret/*.class"/>
<include name="org/fudaa/dodico/corba/hydraulique1d/*.class"/>
<include name="org/fudaa/dodico/corba/usine/*.class"/>
</fileset>
</class>
!
! <resource>
! <fileset dir="${fudaa.dist.classes.dir}">
! <patternset refid="ressources.fic"/>
! <include name="com/memoire/bu/"/>
! <include name="org/fudaa/ebli/ressource/"/>
! <include name="org/fudaa/fudaa/ressource/"/>
!
! <include name="org/fudaa/fudaa/hydraulique1d/"/>
! <include name="org/fudaa/fudaa/mascaret/"/>
! </fileset>
! </resource>
!
! <classfilter>
<exclude name="org.fudaa.dodico.corba."/>
<exclude name="org.fudaa.dodico."/>
!
<include name="org.fudaa.dodico.corba.base."/>
<include name="org.fudaa.dodico.corba.calcul."/>
<include name="org.fudaa.dodico.calcul."/>
!
<include name="org.fudaa.dodico.corba.evenement."/>
<include name="org.fudaa.dodico.evenement."/>
--- 340,357 ----
<include name="org/fudaa/dodico/corba/evenement/*.class"/>
<include name="org/fudaa/dodico/corba/objet/*.class"/>
<include name="org/fudaa/dodico/corba/hydraulique1d/*.class"/>
+ <include name="org/fudaa/dodico/corba/mascaret/*.class"/>
<include name="org/fudaa/dodico/corba/usine/*.class"/>
</fileset>
</class>
! <classfilter>
<exclude name="org.fudaa.dodico.corba."/>
<exclude name="org.fudaa.dodico."/>
!
<include name="org.fudaa.dodico.corba.base."/>
<include name="org.fudaa.dodico.corba.calcul."/>
<include name="org.fudaa.dodico.calcul."/>
!
<include name="org.fudaa.dodico.corba.evenement."/>
<include name="org.fudaa.dodico.evenement."/>
***************
*** 378,392 ****
<include name="org.fudaa.dodico.fortran."/>
<include name="org.fudaa.dodico.commun."/>
!
<include name="org.fudaa.dodico.corba.hydraulique1d."/>
<include name="org.fudaa.dodico.hydraulique1d."/>
!
<include name="org.fudaa.dodico.corba.mascaret."/>
<include name="org.fudaa.dodico.mascaret."/>
</classfilter>
</genjar>
-
- </target>
<target name="jar_tr" depends="build"
description="cree fudaa_tr.jar">
--- 368,397 ----
<include name="org.fudaa.dodico.fortran."/>
<include name="org.fudaa.dodico.commun."/>
!
<include name="org.fudaa.dodico.corba.hydraulique1d."/>
<include name="org.fudaa.dodico.hydraulique1d."/>
!
<include name="org.fudaa.dodico.corba.mascaret."/>
<include name="org.fudaa.dodico.mascaret."/>
</classfilter>
+
+ <resource>
+ <fileset dir="${fudaa.dist.classes.dir}">
+ <patternset refid="ressources.fic"/>
+ <include name="org/fudaa/dodico/commun/"/>
+ <include name="com/memoire/bu/"/>
+ <include name="org/fudaa/dodico/hydraulique1d/"/>
+ <include name="org/fudaa/dodico/mascaret/"/>
+ <include name="org/fudaa/ebli/ressource/"/>
+ <include name="org/fudaa/fudaa/ressource/"/>
+ <include name="org/fudaa/fudaa/hydraulique1d/"/>
+ <include name="org/fudaa/fudaa/mascaret/"/>
+ </fileset>
+ </resource>
+
+
</genjar>
+ </target>
<target name="jar_tr" depends="build"
description="cree fudaa_tr.jar">
***************
*** 413,417 ****
<exclude name="org.fudaa.dodico.usine."/>
</classfilter>
!
<resource>
<fileset dir="${fudaa.dist.classes.dir}">
--- 418,422 ----
<exclude name="org.fudaa.dodico.usine."/>
</classfilter>
!
<resource>
<fileset dir="${fudaa.dist.classes.dir}">
***************
*** 421,433 ****
<include name="org/fudaa/dodico/h2d/"/>
<include name="org/fudaa/ebli/ressource/"/>
! <include name="org/fudaa/fudaa/ressource/"/>
<include name="org/fudaa/fudaa/tr/"/>
<include name="org/fudaa/fudaa/dico/"/>
</fileset>
</resource>
!
</genjar>
!
</target>
--- 426,438 ----
<include name="org/fudaa/dodico/h2d/"/>
<include name="org/fudaa/ebli/ressource/"/>
! <include name="org/fudaa/fudaa/ressource/"/>
<include name="org/fudaa/fudaa/tr/"/>
<include name="org/fudaa/fudaa/dico/"/>
</fileset>
</resource>
!
</genjar>
!
</target>
|
|
From: <jm_...@us...> - 2003-12-19 16:31:42
|
Update of /cvsroot/fudaa//fudaa_devel/fudaa
In directory sc8-pr-cvs1:/tmp/cvs-serv16932
Modified Files:
distribution.xml
Log Message:
Construction du jar mascaret
Index: distribution.xml
===================================================================
RCS file: /cvsroot/fudaa//fudaa_devel/fudaa/distribution.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** distribution.xml 29 Oct 2003 11:47:16 -0000 1.10
--- distribution.xml 19 Dec 2003 16:31:39 -0000 1.11
***************
*** 318,321 ****
--- 318,391 ----
</target>
+ <target name="jar_mascaret" depends=".initialisationCheck"
+ description="cree fudaa_mascaret.jar">
+ <property name="fudaa.mascaret.jar.file" value="${fudaa.dist.jar.dir}/fudaa_mascaret.jar"/>
+ <echo>
+ ---FUDAA: creation du jar ${fudaa.mascaret.jar.file}
+ </echo>
+ <mkdir dir="${fudaa.dist.jar.dir}"/>
+ <delete file="${fudaa.mascaret.jar.file}"/>
+ <genjar jarfile="${fudaa.mascaret.jar.file}">
+ <classpath path="${fudaaDist.classpath}"/>
+ <class name="org.fudaa.fudaa.mascaret.Mascaret"/>
+
+ <class>
+ <fileset dir="${fudaa.dist.classes.dir}">
+ <include name="org/fudaa/dodico/corba/base/*.class"/>
+ <include name="org/fudaa/dodico/corba/calcul/*.class"/>
+ <include name="org/fudaa/dodico/corba/association/*.class"/>
+ <include name="org/fudaa/dodico/corba/evenement/*.class"/>
+ <include name="org/fudaa/dodico/corba/objet/*.class"/>
+ <include name="org/fudaa/dodico/corba/mascaret/*.class"/>
+ <include name="org/fudaa/dodico/corba/hydraulique1d/*.class"/>
+ <include name="org/fudaa/dodico/corba/usine/*.class"/>
+ </fileset>
+ </class>
+
+ <resource>
+ <fileset dir="${fudaa.dist.classes.dir}">
+ <patternset refid="ressources.fic"/>
+ <include name="com/memoire/bu/"/>
+ <include name="org/fudaa/ebli/ressource/"/>
+ <include name="org/fudaa/fudaa/ressource/"/>
+
+ <include name="org/fudaa/fudaa/hydraulique1d/"/>
+ <include name="org/fudaa/fudaa/mascaret/"/>
+ </fileset>
+ </resource>
+
+ <classfilter>
+ <exclude name="org.fudaa.dodico.corba."/>
+ <exclude name="org.fudaa.dodico."/>
+
+ <include name="org.fudaa.dodico.corba.base."/>
+
+ <include name="org.fudaa.dodico.corba.calcul."/>
+ <include name="org.fudaa.dodico.calcul."/>
+
+ <include name="org.fudaa.dodico.corba.evenement."/>
+ <include name="org.fudaa.dodico.evenement."/>
+
+ <include name="org.fudaa.dodico.corba.association."/>
+ <include name="org.fudaa.dodico.association."/>
+
+ <include name="org.fudaa.dodico.corba.usine."/>
+ <include name="org.fudaa.dodico.usine."/>
+
+ <include name="org.fudaa.dodico.corba.objet."/>
+ <include name="org.fudaa.dodico.objet."/>
+
+ <include name="org.fudaa.dodico.fortran."/>
+ <include name="org.fudaa.dodico.commun."/>
+
+ <include name="org.fudaa.dodico.corba.hydraulique1d."/>
+ <include name="org.fudaa.dodico.hydraulique1d."/>
+
+ <include name="org.fudaa.dodico.corba.mascaret."/>
+ <include name="org.fudaa.dodico.mascaret."/>
+ </classfilter>
+ </genjar>
+
+ </target>
<target name="jar_tr" depends="build"
|
|
From: <de...@us...> - 2003-12-19 14:18:17
|
Update of /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/graphe
In directory sc8-pr-cvs1:/tmp/cvs-serv18553
Modified Files:
Graphe.java
Log Message:
Gestion titre
CVS:
----------------------------------------------------------------------
Index: Graphe.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/graphe/Graphe.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** Graphe.java 19 Dec 2003 14:02:08 -0000 1.10
--- Graphe.java 19 Dec 2003 14:18:14 -0000 1.11
***************
*** 343,350 ****
--- 343,356 ----
g2d.setColor(Color.black);
fm= g2d.getFontMetrics();
+ int legendeYShift= y;
g2d.drawString(
titre,
x + (w - fm.stringWidth(titre)) / 2,
y + (marges.haut + f.getSize()) / 2);
+ if ((titre != null) && (titre.length() > 0)) {
+ int max= (int) (y + (marges.haut + f.getSize()) / 2);
+ if (max > legendeYShift)
+ legendeYShift= max;
+ }
f= ftSousTitre;
g2d.setFont(f);
***************
*** 355,359 ****
x + (w - fm.stringWidth(soustitre)) / 2,
y + marges.haut - 2);
- int legendeYShift= y;
if (copyright) {
g2d.setColor(Color.orange);
--- 361,364 ----
***************
*** 363,367 ****
fm= g2d.getFontMetrics();
g2d.drawString(t, x + w - 2 - fm.stringWidth(t), y + f.getSize() + 5);
! legendeYShift= y + f.getSize() + 5;
}
g2d.setColor(Color.black);
--- 368,374 ----
fm= g2d.getFontMetrics();
g2d.drawString(t, x + w - 2 - fm.stringWidth(t), y + f.getSize() + 5);
! int max= y + f.getSize() + 5;
! if (max > legendeYShift)
! legendeYShift= max;
}
g2d.setColor(Color.black);
|
|
From: <de...@us...> - 2003-12-19 14:02:12
|
Update of /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/graphe
In directory sc8-pr-cvs1:/tmp/cvs-serv15919
Modified Files:
Graphe.java
Log Message:
Corrections bogues
Index: Graphe.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/graphe/Graphe.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** Graphe.java 19 Dec 2003 12:06:42 -0000 1.9
--- Graphe.java 19 Dec 2003 14:02:08 -0000 1.10
***************
*** 437,440 ****
--- 437,448 ----
}
}
+ for (int i= nbCourbe - 1; i >= 0; i--) {
+ GrapheComponent c= (GrapheComponent)courbes.get(i);
+ if (c.isLegendAvailable() && c.isVisible()) {
+ temp= fm.stringWidth(c.getTitre());
+ if (temp > maxWidthForLegend)
+ maxWidthForLegend= temp;
+ }
+ }
if (maxWidthForLegend == 0) {
return;
***************
*** 454,457 ****
--- 462,484 ----
for (int i= 0; i < nbElement; i++) {
GrapheComponent c= (GrapheComponent)grComponents.get(i);
+ if (c.isLegendAvailable()
+ && c.isVisible()
+ && (c.getTitre() != null)
+ && (c.getTitre().length() > 0)) {
+ g2d.setColor(c.getAspectSurface());
+ g2d.fillRect(xLeft, yl - hRect, wRect, hRect);
+ g2d.setColor(c.getAspectContour());
+ g2d.fillRect(
+ xLeft,
+ yl - ((hRect - hTrait) / 2) - hTrait,
+ wTrait,
+ hTrait);
+ g2d.drawString(c.getTitre(), xTitre, yl);
+
+ }
+ yl += hLine;
+ }
+ for (int i= 0; i < nbCourbe; i++) {
+ GrapheComponent c= (GrapheComponent)courbes.get(i);
if (c.isLegendAvailable()
&& c.isVisible()
|
|
From: <de...@us...> - 2003-12-19 12:12:04
|
Update of /cvsroot/fudaa/fudaa_devel/fudaa
In directory sc8-pr-cvs1:/tmp/cvs-serv29538/fudaa
Modified Files:
build.xml
Log Message:
Remove the xcf extension from the resource pattern
Index: build.xml
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/build.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** build.xml 14 Nov 2003 08:28:40 -0000 1.9
--- build.xml 19 Dec 2003 12:12:00 -0000 1.10
***************
*** 81,85 ****
<patternset id="ressources.fic"
excludes="*.properties,*.xml,**/*.log,**/*.old,**/*.bck,**/.xvpics/**,
! **/CVS/**,**/Cvs/**,**/cvs/**,**/*.java,**/*.NEW" />
<condition property="sourcesAvailable">
<and>
--- 81,85 ----
<patternset id="ressources.fic"
excludes="*.properties,*.xml,**/*.log,**/*.old,**/*.bck,**/.xvpics/**,
! **/CVS/**,**/Cvs/**,**/cvs/**,**/*.java,**/*.NEW,**/*.xcf" />
<condition property="sourcesAvailable">
<and>
|
|
From: <de...@us...> - 2003-12-19 12:12:04
|
Update of /cvsroot/fudaa/fudaa_devel/ebli
In directory sc8-pr-cvs1:/tmp/cvs-serv29538/ebli
Modified Files:
build.xml
Log Message:
Remove the xcf extension from the resource pattern
Index: build.xml
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/ebli/build.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** build.xml 14 Nov 2003 08:28:40 -0000 1.6
--- build.xml 19 Dec 2003 12:12:00 -0000 1.7
***************
*** 75,79 ****
<patternset id="ressources.fic"
excludes="*.properties,*.xml,**/*.log,**/*.old,**/*.bck,**/*.xvpics,
! **/CVS/**,**/Cvs/**,**/cvs/**,**/*.java,**/*.NEW" />
<condition property="sourcesAvailable">
<and>
--- 75,79 ----
<patternset id="ressources.fic"
excludes="*.properties,*.xml,**/*.log,**/*.old,**/*.bck,**/*.xvpics,
! **/CVS/**,**/Cvs/**,**/cvs/**,**/*.java,**/*.NEW,**/*.xcf" />
<condition property="sourcesAvailable">
<and>
|
|
From: <de...@us...> - 2003-12-19 12:12:04
|
Update of /cvsroot/fudaa/fudaa_devel/dodico
In directory sc8-pr-cvs1:/tmp/cvs-serv29538/dodico
Modified Files:
build.xml
Log Message:
Remove the xcf extension from the resource pattern
Index: build.xml
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/build.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** build.xml 14 Nov 2003 08:28:40 -0000 1.10
--- build.xml 19 Dec 2003 12:12:00 -0000 1.11
***************
*** 76,80 ****
<patternset id="ressources.fic"
excludes="*.properties,*.xml,**/*.log,**/*.old,**/*.bck,**/*.xvpics,
! **/CVS/**,**/Cvs/**,**/cvs/**,**/*.java,**/*.NEW" />
<!-- variable definie si les repertoires sont corrects-->
<condition property="sourcesAvailable">
--- 76,80 ----
<patternset id="ressources.fic"
excludes="*.properties,*.xml,**/*.log,**/*.old,**/*.bck,**/*.xvpics,
! **/CVS/**,**/Cvs/**,**/cvs/**,**/*.java,**/*.NEW,**/*.xcf" />
<!-- variable definie si les repertoires sont corrects-->
<condition property="sourcesAvailable">
|
|
From: <de...@us...> - 2003-12-19 12:12:03
|
Update of /cvsroot/fudaa/fudaa_devel/ctulu
In directory sc8-pr-cvs1:/tmp/cvs-serv29538/ctulu
Modified Files:
build.xml
Log Message:
Remove the xcf extension from the resource pattern
Index: build.xml
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/ctulu/build.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** build.xml 13 Oct 2003 09:58:06 -0000 1.5
--- build.xml 19 Dec 2003 12:12:00 -0000 1.6
***************
*** 63,67 ****
<patternset id="ressources.fic"
excludes="*.properties,*.xml,**/*.log,**/*.old,**/*.bck,**/*.xvpics,
! **/CVS/**,**/Cvs/**,**/cvs/**,**/*.java,**/*.NEW" />
<path id="ctulu.classpath.id">
<pathelement path="${ctulu.classes.dir}"/>
--- 63,67 ----
<patternset id="ressources.fic"
excludes="*.properties,*.xml,**/*.log,**/*.old,**/*.bck,**/*.xvpics,
! **/CVS/**,**/Cvs/**,**/cvs/**,**/*.java,**/*.NEW,**/*.xcf" />
<path id="ctulu.classpath.id">
<pathelement path="${ctulu.classes.dir}"/>
|
|
From: <de...@us...> - 2003-12-19 12:12:03
|
Update of /cvsroot/fudaa/fudaa_devel In directory sc8-pr-cvs1:/tmp/cvs-serv29538 Modified Files: ant.default.properties Log Message: Remove the xcf extension from the resource pattern Index: ant.default.properties =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/ant.default.properties,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** ant.default.properties 29 Oct 2003 11:47:16 -0000 1.6 --- ant.default.properties 19 Dec 2003 12:12:00 -0000 1.7 *************** *** 24,28 **** # # Les motifs des fichiers a ne pas compiler ! # ## ctulu.ignore.patterns= com/memoire/editor/EditorJext.java com/memoire/script/ --- 24,28 ---- # # Les motifs des fichiers a ne pas compiler ! # Separer par des espaces ## ctulu.ignore.patterns= com/memoire/editor/EditorJext.java com/memoire/script/ |
|
From: <de...@us...> - 2003-12-19 12:11:08
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/commun
In directory sc8-pr-cvs1:/tmp/cvs-serv28839/commun
Modified Files:
DodicoLib.java dodico_en.fr_txt
Removed Files:
DodicoDoubleDoubleSortedList.java
Log Message:
Update for h2d model
Add support for evolution
Index: DodicoLib.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/commun/DodicoLib.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** DodicoLib.java 12 Dec 2003 10:30:52 -0000 1.20
--- DodicoLib.java 19 Dec 2003 12:10:33 -0000 1.21
***************
*** 579,590 ****
return r;
}
- public static void main(String[] args) {
- String[] i= new String[] { "v1", "v4" };
- ArrayList l= new ArrayList(5);
- l.add("v1");
- l.add("v5");
- l.add("v3");
- l.add("v2");
- DodicoLib.printObject(mergeAndSort(i, l), true);
- }
}
--- 579,581 ----
Index: dodico_en.fr_txt
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/commun/dodico_en.fr_txt,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** dodico_en.fr_txt 11 Dec 2003 12:41:26 -0000 1.5
--- dodico_en.fr_txt 19 Dec 2003 12:10:35 -0000 1.6
***************
*** 53,55 ****
Maillage=Grid
Fichier vide=Empty file
! Le dossier {0} du serveur est introuvable=The folder {0} used by the computation code can't be found.
\ No newline at end of file
--- 53,61 ----
Maillage=Grid
Fichier vide=Empty file
! Le dossier {0} du serveur est introuvable=The folder {0} used by the computation code can't be found.
! Courbes=Curves
! Fichier contenant plusieurs courbes=File containing several curves
! Seules les versions > à {0} sont autorisées=Only version upper than {0} are valid
! Fichier csv (texte)=File csv (texte)
! Fichier crb (preflux)=File crb (preflux)
! courbes transitoires (preflux, format binaire)=Transient curves (preflux, binary format)
\ No newline at end of file
--- DodicoDoubleDoubleSortedList.java DELETED ---
|
|
From: <de...@us...> - 2003-12-19 12:10:59
|
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/telemac
In directory sc8-pr-cvs1:/tmp/cvs-serv28766/tr/telemac
Modified Files:
TrTelemac2dParametres.java TrTelemacCommunParametres.java
TrTelemacCommunProjectListener.java TrTelemacCommunProjet.java
Added Files:
TrTelemacDurationEditor.java
Log Message:
General update for prepro
--- NEW FILE: TrTelemacDurationEditor.java ---
(This appears to be a binary file; contents omitted.)
Index: TrTelemac2dParametres.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/telemac/TrTelemac2dParametres.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** TrTelemac2dParametres.java 12 Dec 2003 11:29:42 -0000 1.5
--- TrTelemac2dParametres.java 19 Dec 2003 12:10:55 -0000 1.6
***************
*** 8,12 ****
--- 8,16 ----
*/
package org.fudaa.fudaa.tr.telemac;
+ import gnu.trove.TDoubleArrayList;
+ import gnu.trove.TDoubleHashSet;
+
import java.io.File;
+ import java.util.Arrays;
import java.util.Map;
***************
*** 22,26 ****
--- 26,32 ----
import org.fudaa.dodico.telemac.io.TelemacLiquideInterface;
+ import org.fudaa.fudaa.commun.FudaaLib;
import org.fudaa.fudaa.tr.TrImplementation;
+ import org.fudaa.fudaa.tr.TrResource;
/**
* @author deniger
***************
*** 28,31 ****
--- 34,38 ----
*/
public class TrTelemac2dParametres extends TrTelemacCommunParametres {
+
TrTelemac2dParametres(
TrImplementation _ui,
***************
*** 40,49 ****
protected void loadAllAction(ProgressionInterface _prg) {
super.loadAllAction(_prg);
! if(isBoundaryConditionLoaded())
! loadConditionsLimiteLiquide(_prg);
}
!
!
! public H2dEvolutionManager getEvolMng(){
return getTelemacParametres().getEvolMng();
}
--- 47,55 ----
protected void loadAllAction(ProgressionInterface _prg) {
super.loadAllAction(_prg);
! if (isBoundaryConditionLoaded())
! loadConditionsLimiteLiquide(_prg);
}
!
! public H2dEvolutionManager getEvolMng() {
return getTelemacParametres().getEvolMng();
}
***************
*** 52,62 ****
}
public boolean isAllLoaded() {
! boolean b=super.isAllLoaded();
! if(!b) return false;
return isLiquidTransientConditionPresent();
}
!
private boolean loadConditionsLimiteLiquide(ProgressionInterface _prg) {
! if(isLiquidTransientConditionPresent()) return false;
DicoEntite entFile= getTelemacFileFormatVersion().getCLLiquideEntiteFile();
if ((entFile == null) || (!isValueSetFor(entFile)))
--- 58,70 ----
}
public boolean isAllLoaded() {
! boolean b= super.isAllLoaded();
! if (!b)
! return false;
return isLiquidTransientConditionPresent();
}
!
private boolean loadConditionsLimiteLiquide(ProgressionInterface _prg) {
! if (isLiquidTransientConditionPresent())
! return false;
DicoEntite entFile= getTelemacFileFormatVersion().getCLLiquideEntiteFile();
if ((entFile == null) || (!isValueSetFor(entFile)))
***************
*** 73,89 ****
getTelemacParametres().setEvolution(
inter.getEvolutionsFrontieresLiquides());
! dicoParams_.setLoaded(entFile, f, false);
return true;
}
!
/**
* @return true if the file can be saved.
*/
! protected boolean saveClLiquidFile(ProgressionInterface _prog, File _f){
! H2dEvolutionFrontiereLiquide[] liqs=getTelemacParametres().getTelemacCLManager().getLiquideEvolution();
! if(liqs==null) return false;
! TelemacLiquideAbstract inter=new TelemacLiquideAbstract();
inter.setEvolutionsFrontieresLiquides(liqs);
! FileOperationSynthese op=TelemacLiquideFileFormat.getInstance().getLastVersionImpl().writeClLiquid(_f, inter, _prog);
return !getUI().manageAnalyzeAndIsFatal(op.getAnalyze().toAnalyze());
}
--- 81,163 ----
getTelemacParametres().setEvolution(
inter.getEvolutionsFrontieresLiquides());
! boolean modified=getEvolMng().isUsedCurveNotEnoughWidth(
! 0,
! (double)getTelemacParametres().getComputationDuration());
! dicoParams_.setLoaded(
! entFile,
! f,modified
! );
! if(modified){
! getImpl().message(entFile.getNom(), TrResource.getS("Certaines courbes temporelles ne sont pas assez étendues dans le temps( cela sera automatiquement corrigé)"));
! }
return true;
}
!
/**
* @return true if the file can be saved.
*/
! protected boolean saveClLiquidFile(ProgressionInterface _prog, File _f) {
! if (FudaaLib.INFO) {
! FudaaLib.info("save Liquid file in " + _f);
! }
! H2dEvolutionFrontiereLiquide[] liqs=
! getTelemacParametres().getTelemacCLManager().getLiquideEvolution();
! if ((liqs == null) || (liqs.length == 0))
! return false;
! H2dEvolutionFrontiereLiquide first= liqs[0];
! TDoubleHashSet hashSet= new TDoubleHashSet(first.getPasTempNb());
! boolean mustResize= false;
! for (int i= liqs.length - 1; i > 0; i--) {
! mustResize
! |= !(first.getEvol().isEvolutionWithSameX(liqs[i].getEvol(), hashSet));
! }
! double[] newTimes= null;
! long max= getTelemacParametres().getComputationDuration();
! if (mustResize) {
! FudaaLib.info("LIQUID CURVES ARE NOT BASED ON SAME TIMES STEP");
! newTimes= hashSet.toArray();
! Arrays.sort(newTimes);
! mustResize= false;
! if (newTimes[0] != 0) {
! mustResize= true;
! hashSet.add(0d);
! }
! if (((long) (newTimes[newTimes.length - 1])) < max) {
! mustResize= true;
! hashSet.add((double)max);
! }
! if (mustResize) {
! newTimes= hashSet.toArray();
! Arrays.sort(newTimes);
! }
! } else {
! if ((first.getEvol().getQuickPasDeTemps(0) != 0)
! || (first.getEvol().getQuickPasDeTemps(first.getPasTempNb() - 1) < max)) {
! FudaaLib.info("LIQUID CURVES ARE NOT WIDTH ENOUGH");
! TDoubleArrayList l= new TDoubleArrayList(first.getEvol().getArrayX());
! if (first.getEvol().getQuickPasDeTemps(0) != 0) {
! l.insert(0, 0);
! }
! if (first.getEvol().getQuickPasDeTemps(first.getPasTempNb() - 1) < max)
! l.add((double)max);
! newTimes= l.toNativeArray();
! }
! }
! if (newTimes != null) {
! for (int i= liqs.length - 1; i >= 0; i--) {
! liqs[i].setEvolution(
! liqs[i].getEvol().createH2dEvolutionFromInterpolation(newTimes));
! }
! }
! TelemacLiquideAbstract inter= new TelemacLiquideAbstract();
inter.setEvolutionsFrontieresLiquides(liqs);
! FileOperationSynthese op=
! TelemacLiquideFileFormat
! .getInstance()
! .getLastVersionImpl()
! .writeClLiquid(
! _f,
! inter,
! _prog);
return !getUI().manageAnalyzeAndIsFatal(op.getAnalyze().toAnalyze());
}
***************
*** 95,101 ****
File _f,
ProgressionInterface _interface) {
! if (_entFile == getDicoFileFormatVersion().getCLLiquideEntiteFile()) {
! return saveClLiquidFile(_interface, _f);
! }
return super.saveDicoEntiteFileAction(_entFile, _f, _interface);
}
--- 169,175 ----
File _f,
ProgressionInterface _interface) {
! if (_entFile == getDicoFileFormatVersion().getCLLiquideEntiteFile()) {
! return saveClLiquidFile(_interface, _f);
! }
return super.saveDicoEntiteFileAction(_entFile, _f, _interface);
}
Index: TrTelemacCommunParametres.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/telemac/TrTelemacCommunParametres.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** TrTelemacCommunParametres.java 12 Dec 2003 11:29:42 -0000 1.6
--- TrTelemacCommunParametres.java 19 Dec 2003 12:10:56 -0000 1.7
***************
*** 64,68 ****
}
! public boolean isTransientAvailable(){
return params_.isTransientAvailable();
}
--- 64,68 ----
}
! public boolean canImportEvolution(){
return params_.isTransientAvailable();
}
***************
*** 72,75 ****
--- 72,77 ----
}
+
+
public FudaaCommonImplementation getImpl() {
return (FudaaCommonImplementation)getUI();
***************
*** 315,318 ****
--- 317,321 ----
return infoSenderDelegate_;
}
+
Index: TrTelemacCommunProjectListener.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/telemac/TrTelemacCommunProjectListener.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** TrTelemacCommunProjectListener.java 12 Dec 2003 11:29:42 -0000 1.6
--- TrTelemacCommunProjectListener.java 19 Dec 2003 12:10:56 -0000 1.7
***************
*** 20,23 ****
--- 20,24 ----
import org.fudaa.dodico.h2d.type.H2dVariableType;
+ import org.fudaa.fudaa.commun.FudaaLib;
import org.fudaa.fudaa.tr.TrProjectDispatcherListener;
import org.fudaa.fudaa.tr.TrResource;
***************
*** 36,39 ****
--- 37,60 ----
proj_= _params;
}
+
+ private void updateLiqCurve(DicoEntite _e) {
+ if (proj_.isTransientAvailable()) {
+ if ((_e == proj_.getTelemacFileFormatVersion().getDureeDuCalcul())
+ || (_e == proj_.getTelemacFileFormatVersion().getNbPasTemps())
+ || (_e == proj_.getTelemacFileFormatVersion().getPasTemps())) {
+ H2dEvolutionManager mng= proj_.getEvolMng();
+ if ((mng != null) || (!mng.isNoCurveUsed())) {
+ long time=
+ proj_
+ .getTrTelemacParams()
+ .getTelemacParametres()
+ .getComputationDuration();
+ if (mng.isUsedCurveNotEnoughWidth(0, time))
+ modifyLiquidFile();
+ FudaaLib.info("LIQUID CURVES NO WIDTH ENOUGH");
+ }
+ }
+ }
+ }
/**
*
***************
*** 44,47 ****
--- 65,70 ----
String _oldValue) {
super.dicoParamsEntiteRemoved(_cas, _ent, _oldValue);
+ updateLiqCurve(_ent);
+ updateFrame();
if (_ent.isFileType()) {
TrTelemacCommunParametres p= proj_.getTrTelemacParams();
***************
*** 155,157 ****
--- 178,225 ----
}
}
+ /**
+ *
+ */
+ public void dicoParamsEntiteAdded(DicoParams _cas, DicoEntite _ent) {
+ super.dicoParamsEntiteAdded(_cas, _ent);
+ updateLiqCurve(_ent);
+ updateFrame();
+ }
+
+ /**
+ *
+ */
+ public void dicoParamsEntiteUpdated(
+ DicoParams _cas,
+ DicoEntite _ent,
+ String _oldValue) {
+ super.dicoParamsEntiteUpdated(_cas, _ent, _oldValue);
+ updateLiqCurve(_ent);
+ updateFrame();
+ }
+
+
+
+ /**
+ *
+ */
+ public void dicoParamsProjectModifyStateChanged(DicoParams _cas) {
+ super.dicoParamsProjectModifyStateChanged(_cas);
+ updateFrame();
+ }
+
+ private void updateFrame(){
+ changedMainFrameState(proj_.isModified(), proj_.getImpl().getFrame());
+ }
+
+ /**
+ *
+ */
+ public void dicoParamsStateLoadedEntiteChanged(
+ DicoParams _cas,
+ DicoEntite _ent) {
+ super.dicoParamsStateLoadedEntiteChanged(_cas, _ent);
+ updateFrame();
+ }
+
}
Index: TrTelemacCommunProjet.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/telemac/TrTelemacCommunProjet.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** TrTelemacCommunProjet.java 12 Dec 2003 11:29:42 -0000 1.6
--- TrTelemacCommunProjet.java 19 Dec 2003 12:10:56 -0000 1.7
***************
*** 8,33 ****
--- 8,45 ----
*/
package org.fudaa.fudaa.tr.telemac;
+ import java.awt.Component;
import java.awt.event.ActionEvent;
+ import java.awt.event.ActionListener;
import javax.swing.Action;
+ import javax.swing.BorderFactory;
+ import javax.swing.JPanel;
import javax.swing.SwingUtilities;
+ import com.memoire.bu.BuButton;
import com.memoire.bu.BuCommonImplementation;
import com.memoire.bu.BuDynamicMenu;
+ import com.memoire.bu.BuGridLayout;
import com.memoire.bu.BuMenu;
import com.memoire.bu.BuResource;
import com.memoire.bu.BuTaskOperation;
+ import com.memoire.bu.BuToolButton;
+ import org.fudaa.dodico.commun.DodicoCmdMngListener;
+ import org.fudaa.dodico.commun.DodicoCommandComposite;
import org.fudaa.dodico.dico.DicoEntite;
import org.fudaa.dodico.fichiers.FileFormatSoftware;
import org.fudaa.dodico.h2d.H2dEvolutionManager;
import org.fudaa.dodico.h2d.H2dResource;
+ import org.fudaa.dodico.h2d.telemac.H2dTelemacDicoFileFormatVersion;
import org.fudaa.ebli.calque.action.EbliActionInterface;
import org.fudaa.ebli.calque.action.EbliComponentFactory;
import org.fudaa.ebli.calque.action.EbliSimpleAction;
+ import org.fudaa.ebli.dialog.EbliSimpleDialogPanel;
import org.fudaa.ebli.ressource.EbliResource;
import org.fudaa.fudaa.commun.FudaaCommonImplementation;
+ import org.fudaa.fudaa.dico.FDicoFilleProjet;
import org.fudaa.fudaa.dico.FDicoProjet;
import org.fudaa.fudaa.ressource.FudaaResource;
***************
*** 44,48 ****
* @version $Id$
*/
! public class TrTelemacCommunProjet extends FDicoProjet implements TrProjet {
//TrTelemacCommunParametres params_;
TrTelemacFilleVisu visu_;
--- 56,62 ----
* @version $Id$
*/
! public class TrTelemacCommunProjet
! extends FDicoProjet
! implements TrProjet, ActionListener {
//TrTelemacCommunParametres params_;
TrTelemacFilleVisu visu_;
***************
*** 68,72 ****
public boolean isTransientAvailable() {
! return getTrTelemacParams().isTransientAvailable();
}
--- 82,86 ----
public boolean isTransientAvailable() {
! return getTrTelemacParams().canImportEvolution();
}
***************
*** 81,84 ****
--- 95,132 ----
}
+ /**
+ * Composant qui sera ajoute au panel entite.
+ */
+ private Component buildLeftUpComponent() {
+ JPanel r= new JPanel();
+ r.setBorder(BorderFactory.createEtchedBorder());
+ r.setLayout(new BuGridLayout(3, 2, 2));
+ BuToolButton b;
+ if (getTelemacFileFormatVersion().getTitreEntite() != null) {
+ b= new BuToolButton(TrResource.TR.getToolIcon("modify-title"));
+ b.setToolTipText(TrResource.getS("Modifier le titre du projet"));
+ b.setActionCommand("MODIFY_TITLE");
+ b.addActionListener(this);
+ r.add(b);
+ }
+ if ((getTelemacFileFormatVersion().getPasTemps() != null)
+ && (getTelemacFileFormatVersion().getNbPasTemps() != null)) {
+ b= new BuToolButton(TrResource.TR.getToolIcon("time"));
+ b.setToolTipText(TrResource.getS("Définir la durée de la simultation"));
+ b.setActionCommand("SIMULATION_DURATION");
+ b.addActionListener(this);
+ r.add(b);
+ }
+
+ return r;
+
+ }
+
+ protected void buildEntiteFille() {
+ if (entiteFille_ != null)
+ return;
+ entiteFille_= new FDicoFilleProjet(this, getImpl(), buildLeftUpComponent());
+ }
+
public void active(TrImplementation _impl) {
boolean change= false;
***************
*** 149,164 ****
if ((getImpl() == null)
|| (!isTransientAvailable())
! || (getEvolMng()== null))
return;
if (this.courbeFille_ == null) {
courbeFille_=
new TrGrapheFille(getImpl(), getInformationsDocument(), getEvolMng());
TrLib.initFrameDimensionWithPref(
! courbeFille_,
"curve",
getImpl().getMainPanel().getDesktop().getSize());
! courbeFille_.setPreferredSize(courbeFille_.getPreferredSize());
! System.out.println(courbeFille_.getPreferredSize());
! getImpl().addInternalFrame(courbeFille_);
} else if (courbeFille_.isClosed())
getImpl().addInternalFrame(courbeFille_);
--- 197,211 ----
if ((getImpl() == null)
|| (!isTransientAvailable())
! || (getEvolMng() == null))
return;
if (this.courbeFille_ == null) {
courbeFille_=
new TrGrapheFille(getImpl(), getInformationsDocument(), getEvolMng());
+ getImpl().addInternalFrame(courbeFille_);
TrLib.initFrameDimensionWithPref(
! courbeFille_,
"curve",
getImpl().getMainPanel().getDesktop().getSize());
!
} else if (courbeFille_.isClosed())
getImpl().addInternalFrame(courbeFille_);
***************
*** 176,180 ****
if (impl instanceof TrImplementation)
visu_.refreshArbreCalque(((TrImplementation)impl).getArbreCalque());
- visu_.pack();
TrLib.initFrameDimensionWithPref(
visu_,
--- 223,226 ----
***************
*** 194,198 ****
new BuTaskOperation(null, TrResource.getS("Chargement fichiers")) {
public void act() {
! TrImplementation impl=(TrImplementation)getImpl();
impl.setGlassPaneStop();
getTrTelemacParams().loadAll(getUI().createProgressionInterface(this));
--- 240,244 ----
new BuTaskOperation(null, TrResource.getS("Chargement fichiers")) {
public void act() {
! TrImplementation impl= (TrImplementation)getImpl();
impl.setGlassPaneStop();
getTrTelemacParams().loadAll(getUI().createProgressionInterface(this));
***************
*** 294,298 ****
}
! if (courbeAction_ == null) {
courbeAction_=
new EbliSimpleAction(
--- 340,344 ----
}
! if ((courbeAction_ == null) && (getTrParams().canImportEvolution())) {
courbeAction_=
new EbliSimpleAction(
***************
*** 337,342 ****
add(projectAction_.buildMenuItem(EbliComponentFactory.INSTANCE));
add(visuAction_.buildMenuItem(EbliComponentFactory.INSTANCE));
! add(courbeAction_.buildMenuItem(EbliComponentFactory.INSTANCE));
!
}
--- 383,388 ----
add(projectAction_.buildMenuItem(EbliComponentFactory.INSTANCE));
add(visuAction_.buildMenuItem(EbliComponentFactory.INSTANCE));
! if (getTrParams().canImportEvolution())
! add(courbeAction_.buildMenuItem(EbliComponentFactory.INSTANCE));
}
***************
*** 346,357 ****
*/
public EbliActionInterface[] getSpecificActions() {
! EbliActionInterface[] r= new EbliActionInterface[5];
! r[0]= getCalculActions().getCalcul();
! r[1]= getDiffAction();
buildFilleActions();
! r[2]= loadAction_;
! r[3]= visuAction_;
! r[4]= courbeAction_;
return r;
}
}
--- 392,458 ----
*/
public EbliActionInterface[] getSpecificActions() {
! EbliActionInterface[] r=
! new EbliActionInterface[getTrParams().canImportEvolution() ? 5 : 4];
! int i= 0;
! r[i++]= getCalculActions().getCalcul();
! r[i++]= getDiffAction();
buildFilleActions();
! r[i++]= loadAction_;
! r[i++]= visuAction_;
! if (getTrParams().canImportEvolution())
! r[i++]= courbeAction_;
return r;
}
+
+ public H2dTelemacDicoFileFormatVersion getTelemacFileFormatVersion() {
+ return getTrTelemacParams().getTelemacParametres().getTelemacVersion();
+ }
+ /**
+ *
+ */
+ public void actionPerformed(ActionEvent e) {
+ String c= e.getActionCommand();
+ if (c.equals("MODIFY_TITLE")) {
+ if (entiteFille_.getSelectedComponent() == entiteFille_.getEntitePanel())
+ super.changeTitleProjet(entiteFille_.getActiveCmdMng());
+ } else if (c.equals("SIMULATION_DURATION")) {
+ if (entiteFille_.getSelectedComponent() != entiteFille_.getEntitePanel())
+ return;
+ TrTelemacDurationEditor editor=
+ new TrTelemacDurationEditor(
+ getTrTelemacParams().getTelemacParametres());
+ if (EbliSimpleDialogPanel
+ .isOkResponse(editor.afficheModale(getImpl().getFrame()))) {
+ DodicoCommandComposite cmd= new DodicoCommandComposite();
+ if (editor.isDuration()) {
+ cmd.addCmd(
+ getDicoParams().setValueAndGenerateCommand(
+ getTelemacFileFormatVersion().getDureeDuCalcul(),
+ editor.getDurationString()));
+ cmd.addCmd(
+ getDicoParams().setValueAndGenerateCommand(
+ getTelemacFileFormatVersion().getPasTemps(),
+ editor.getTimeStep()));
+ cmd.addCmd(
+ getDicoParams().removeValueAndGenerateCommand(
+ getTelemacFileFormatVersion().getNbPasTemps()));
+ } else {
+ cmd.addCmd(
+ getDicoParams().setValueAndGenerateCommand(
+ getTelemacFileFormatVersion().getNbPasTemps(),
+ editor.getNbTimeStep()));
+ cmd.addCmd(
+ getDicoParams().setValueAndGenerateCommand(
+ getTelemacFileFormatVersion().getPasTemps(),
+ editor.getTimeStep()));
+ cmd.addCmd(
+ getDicoParams().removeValueAndGenerateCommand(
+ getTelemacFileFormatVersion().getDureeDuCalcul()));
+ }
+ if (!cmd.isEmpty())
+ entiteFille_.getActiveCmdMng().addCmd(cmd);
+ }
+ }
+ }
+
}
|
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr
In directory sc8-pr-cvs1:/tmp/cvs-serv28766/tr
Modified Files:
TrExport.java TrFileFormatManager.java TrGrapheFille.java
TrImplementation.java TrLib.java TrParametres.java
TrProjectDispatcherListener.java TrProjet.java tr_en.fr_txt
Added Files:
banner.png banner.xcf modify-title_16.png modify-title_20.png
modify-title_24.png modify_title.xcf prepro.png time.xcf
time_16.png time_20.png time_24.png
Log Message:
General update for prepro
--- NEW FILE: banner.png ---
(This appears to be a binary file; contents omitted.)
--- NEW FILE: banner.xcf ---
(This appears to be a binary file; contents omitted.)
--- NEW FILE: modify-title_16.png ---
(This appears to be a binary file; contents omitted.)
--- NEW FILE: modify-title_20.png ---
(This appears to be a binary file; contents omitted.)
--- NEW FILE: modify-title_24.png ---
(This appears to be a binary file; contents omitted.)
--- NEW FILE: modify_title.xcf ---
(This appears to be a binary file; contents omitted.)
--- NEW FILE: prepro.png ---
(This appears to be a binary file; contents omitted.)
--- NEW FILE: time.xcf ---
(This appears to be a binary file; contents omitted.)
--- NEW FILE: time_16.png ---
(This appears to be a binary file; contents omitted.)
--- NEW FILE: time_20.png ---
(This appears to be a binary file; contents omitted.)
--- NEW FILE: time_24.png ---
(This appears to be a binary file; contents omitted.)
Index: TrExport.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/TrExport.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** TrExport.java 12 Dec 2003 11:29:41 -0000 1.10
--- TrExport.java 19 Dec 2003 12:10:55 -0000 1.11
***************
*** 45,49 ****
*/
public class TrExport {
- public static String EXPORT_PREF= "EXPORT";
protected TrParametres params_;
FudaaCommonImplementation ui_;
--- 45,48 ----
***************
*** 62,66 ****
}
public void export(String _s) {
! String f= _s.substring(EXPORT_PREF.length());
if (CtuluLib.DEBUG)
CtuluLib.debug("export " + f);
--- 61,65 ----
}
public void export(String _s) {
! String f= _s.substring(TrFileFormatManager.EXPORT_PREF.length());
if (CtuluLib.DEBUG)
CtuluLib.debug("export " + f);
***************
*** 230,234 ****
boolean fatal=
ui_.manageErrorOperationAndIsFatal(
! _ftMaillage.writeMaillage(f, maillage, _prog));
ui_.unsetMainProgression();
ui_.unsetMainMessage();
--- 229,233 ----
boolean fatal=
ui_.manageErrorOperationAndIsFatal(
! _ftMaillage.writeGrid(f, maillage, _prog));
ui_.unsetMainProgression();
ui_.unsetMainMessage();
Index: TrFileFormatManager.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/TrFileFormatManager.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** TrFileFormatManager.java 11 Dec 2003 12:50:55 -0000 1.6
--- TrFileFormatManager.java 19 Dec 2003 12:10:55 -0000 1.7
***************
*** 15,22 ****
--- 15,28 ----
import java.util.ArrayList;
import java.util.Arrays;
+ import java.util.Collections;
+ import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.TreeMap;
+ import javax.swing.JMenuItem;
+
+ import org.fudaa.ctulu.CtuluLib;
+
import com.memoire.bu.BuInformationsSoftware;
import com.memoire.bu.BuMenu;
***************
*** 24,30 ****
--- 30,40 ----
import org.fudaa.dodico.dunes.io.DunesFileFormat;
import org.fudaa.dodico.fichiers.FileFormat;
+ import org.fudaa.dodico.h2d.H2dCSVFileFormat;
+ import org.fudaa.dodico.h2d.H2dFileFormatEvolutionVersion;
import org.fudaa.dodico.h2d.type.H2dEnumType;
import org.fudaa.dodico.h2d.type.H2dFileFormatType;
+ import org.fudaa.dodico.reflux.io.CLTransitoireFileFormat;
import org.fudaa.dodico.reflux.io.CorEleBthFileFormat;
+ import org.fudaa.dodico.reflux.io.CrbFileFormat;
import org.fudaa.dodico.reflux.io.INPFileFormat;
import org.fudaa.dodico.telemac.io.SerafinFileFormat;
***************
*** 40,43 ****
--- 50,56 ----
public class TrFileFormatManager {
private FileFormat[] formats_;
+
+ public static String EXPORT_PREF= "EXPORT";
+ public static String IMPORT_PREF= "IMPORT";
/**
*
***************
*** 48,61 ****
buildFormat();
}
private final void buildFormat() {
! formats_= new FileFormat[7];
! int i= 0;
! formats_[i++]= INPFileFormat.getInstance();
! formats_[i++]= DunesFileFormat.getInstance();
! formats_[i++]= CorEleBthFileFormat.getInstance();
! formats_[i++]= Telemac2dFileFormat.getInstance();
! formats_[i++]= SerafinFileFormat.getInstance();
! formats_[i++]= TelemacCLFileFormat.getInstance();
! formats_[i++]= TelemacLiquideFileFormat.getInstance();
}
public static FileFormat[] getArray(ArrayList _l) {
--- 61,89 ----
buildFormat();
}
+
+ public FileFormat getFileFormatWithID(String _id) {
+ if (formats_ == null)
+ buildFormat();
+ for (int i= formats_.length - 1; i >= 0; i--) {
+ if (formats_[i].getID().equals(_id))
+ return formats_[i];
+ }
+ return null;
+ }
private final void buildFormat() {
! HashSet s= new HashSet(15);
! s.add(INPFileFormat.getInstance());
! s.add(DunesFileFormat.getInstance());
! s.add(CorEleBthFileFormat.getInstance());
! s.add(Telemac2dFileFormat.getInstance());
! s.add(SerafinFileFormat.getInstance());
! s.add(TelemacCLFileFormat.getInstance());
! s.add(TelemacLiquideFileFormat.getInstance());
! s.add(H2dCSVFileFormat.getInstance());
! s.add(CrbFileFormat.getInstance());
! s.add(CLTransitoireFileFormat.getInstance());
! formats_= new FileFormat[s.size()];
! s.toArray(formats_);
!
}
public static FileFormat[] getArray(ArrayList _l) {
***************
*** 65,68 ****
--- 93,114 ----
}
+ public FileFormat[] getFileFormatForImportEvol() {
+ ArrayList r= new ArrayList(10);
+ if (formats_ == null)
+ buildFormat();
+ FileFormat ft;
+ for (int i= formats_.length - 1; i >= 0; i--) {
+ ft= formats_[i];
+ if ((ft.getType() == H2dFileFormatType.COURBE_TRANSITOIRE.getId())
+ && (ft.getLastVersionInstance()
+ instanceof H2dFileFormatEvolutionVersion)) {
+ r.add(ft);
+ }
+ }
+ FileFormat[] rf= new FileFormat[r.size()];
+ r.toArray(rf);
+ return rf;
+ }
+
public FileFormat[] getFormatWithGridSupport() {
ArrayList r= new ArrayList(formats_.length);
***************
*** 121,129 ****
*/
public void buildExportMenu(BuMenu _m, TrImplementation _impl) {
! List l= H2dFileFormatType.LIST;
int n= l.size();
//on recupere les fileformat dans l'ordre des id
for (int i= 0; i < n; i++) {
! H2dFileFormatType ft= (H2dFileFormatType)H2dEnumType.getIdInList(l, i);
FileFormat[] fts= getFormatWithType(ft.getId());
BuMenu me= new BuMenu(ft.getNom(), ft.getNom());
--- 167,178 ----
*/
public void buildExportMenu(BuMenu _m, TrImplementation _impl) {
! List l= new ArrayList(H2dFileFormatType.LIST);
! Collections.sort(l, new H2dEnumType.H2dEnumIDComparator());
int n= l.size();
//on recupere les fileformat dans l'ordre des id
for (int i= 0; i < n; i++) {
! H2dFileFormatType ft= (H2dFileFormatType)l.get(i);
! if (ft == null)
! continue;
FileFormat[] fts= getFormatWithType(ft.getId());
BuMenu me= new BuMenu(ft.getNom(), ft.getNom());
***************
*** 135,139 ****
for (Iterator it= map.keySet().iterator(); it.hasNext();) {
String id= (String)it.next();
! me.addMenuItem(id, TrExport.EXPORT_PREF + (String)map.get(id), _impl);
}
//TODO : a ameliorer
--- 184,191 ----
for (Iterator it= map.keySet().iterator(); it.hasNext();) {
String id= (String)it.next();
! me.addMenuItem(
! id,
! TrFileFormatManager.EXPORT_PREF + (String)map.get(id),
! _impl);
}
//TODO : a ameliorer
***************
*** 141,143 ****
--- 193,223 ----
}
}
+ public void buildImportMenu(BuMenu _m, TrImplementation _impl) {
+ BuMenu m=
+ new BuMenu(
+ H2dFileFormatType.COURBE_TRANSITOIRE.getNom(),
+ CtuluLib.getString(H2dFileFormatType.COURBE_TRANSITOIRE.getId()));
+ FileFormat[] ft= getFileFormatForImportEvol();
+ Arrays.sort(ft);
+ int n= ft.length;
+ for (int i= 0; i < n; i++) {
+ m.addMenuItem(ft[i].getName(), IMPORT_PREF + ft[i].getID(), _impl);
+ }
+ _m.add(m);
+ }
+
+ public JMenuItem getMenuImportCourbeTrans(TrImplementation _impl) {
+ BuMenu m= (BuMenu)_impl.getMainMenuBar().getMenu("IMPORTER");
+ if (m == null)
+ return null;
+ String actCmd=
+ CtuluLib.getString(H2dFileFormatType.COURBE_TRANSITOIRE.getId());
+ for (int i= m.getItemCount() - 1; i >= 0; i--) {
+ JMenuItem it= m.getItem(i);
+ if (actCmd.equals(it.getActionCommand()))
+ return it;
+ }
+ return null;
+ }
+
}
Index: TrGrapheFille.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/TrGrapheFille.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TrGrapheFille.java 12 Dec 2003 11:29:41 -0000 1.1
--- TrGrapheFille.java 19 Dec 2003 12:10:55 -0000 1.2
***************
*** 12,15 ****
--- 12,16 ----
import java.awt.Container;
import java.util.List;
+ import java.util.Random;
import com.memoire.bu.BuBorderLayout;
***************
*** 18,23 ****
--- 19,26 ----
import org.fudaa.dodico.h2d.H2dEvolution;
+ import org.fudaa.dodico.h2d.H2dEvolutionListener;
import org.fudaa.dodico.h2d.H2dEvolutionManager;
import org.fudaa.dodico.h2d.H2dResource;
+ import org.fudaa.dodico.mesure.EvolutionReguliere;
import org.fudaa.ebli.graphe.Axe;
***************
*** 25,28 ****
--- 28,32 ----
import org.fudaa.ebli.graphe.CourbeModelAbstract;
import org.fudaa.ebli.graphe.EbliFilleGraphe;
+ import org.fudaa.ebli.graphe.EbliFilleGrapheController;
import org.fudaa.ebli.graphe.Graphe;
***************
*** 31,35 ****
* @version $Id$
*/
! public class TrGrapheFille extends EbliFilleGraphe {
H2dEvolutionManager evol_;
--- 35,41 ----
* @version $Id$
*/
! public class TrGrapheFille
! extends EbliFilleGrapheController
! implements H2dEvolutionListener {
H2dEvolutionManager evol_;
***************
*** 41,44 ****
--- 47,52 ----
H2dEvolutionManager _evol) {
super(
+ false,
+ false,
H2dResource.getS("Courbes temporelles"),
true,
***************
*** 49,61 ****
_id);
evol_= _evol;
List evolstemp= evol_.createList();
int n= evolstemp.size();
- Graphe g= new Graphe();
for (int i= 0; i < n; i++) {
EvolCourbe addEvol= new EvolCourbe((H2dEvolution)evolstemp.get(i));
! addEvol.aspect.contour= getColor(((double) (i + 1) / (double)n));
! g.ajoute(addEvol);
}
- graphe_= new BGraphe();
double[] minMax= evol_.getXMinMaxYMinMax(evolstemp);
xmin_= minMax[0];
--- 57,68 ----
_id);
evol_= _evol;
+ evol_.addListener(this);
List evolstemp= evol_.createList();
int n= evolstemp.size();
for (int i= 0; i < n; i++) {
EvolCourbe addEvol= new EvolCourbe((H2dEvolution)evolstemp.get(i));
! addEvol.aspect.contour= getColor(i);
! controller_.ajouteComponent(addEvol);
}
double[] minMax= evol_.getXMinMaxYMinMax(evolstemp);
xmin_= minMax[0];
***************
*** 63,67 ****
ymin_= minMax[2];
ymax_= minMax[3];
- g.copyright= false;
Axe axe= new Axe();
axe.vertical= true;
--- 70,73 ----
***************
*** 69,73 ****
axe.minimum= ymin_;
axe.graduations= true;
! g.ajoute(axe);
axe= new Axe();
axe.vertical= false;
--- 75,79 ----
axe.minimum= ymin_;
axe.graduations= true;
! controller_.ajoute(axe);
axe= new Axe();
axe.vertical= false;
***************
*** 75,114 ****
axe.minimum= xmin_;
axe.graduations= true;
! g.ajoute(axe);
! graphe_.setGraphe(g);
! Container c= getContentPane();
! c.setLayout(new BuBorderLayout());
! c.add(graphe_, BuBorderLayout.CENTER);
}
! private Color getColor(double _z) {
int r, v, b, a;
double rmin, vmin, bmin, amin;
double rmax, vmax, bmax, amax;
! double n= _z * 255.;
! rmin= Color.yellow.getRed();
! vmin= Color.yellow.getGreen();
! bmin= Color.yellow.getBlue();
! amin= Color.yellow.getAlpha();
! rmax= Color.black.getRed();
! vmax= Color.black.getGreen();
! bmax= Color.black.getBlue();
! amax= Color.black.getAlpha();
! r= (int) (rmin + (rmax - rmin) * n / 255);
if (r < 0)
r= 0;
else if (r > 255)
r= 255;
! v= (int) (vmin + (vmax - vmin) * n / 255);
if (v < 0)
v= 0;
else if (v > 255)
v= 255;
! b= (int) (bmin + (bmax - bmin) * n / 255);
if (b < 0)
b= 0;
else if (b > 255)
b= 255;
! a= (int) (amin + (amax - amin) * n / 255);
if (a < 0)
a= 0;
--- 81,130 ----
axe.minimum= xmin_;
axe.graduations= true;
! controller_.ajoute(axe);
}
! private Color getColor(int _z) {
! if(_z==0) return Color.black;
! else if(_z==1) return Color.cyan;
! else if(_z==2) return Color.green;
! else if(_z==3) return Color.gray;
! else if(_z==4) return Color.orange;
! else if(_z==5) return Color.yellow;
! else if(_z==6) return Color.red;
! else if(_z==7) return Color.blue;
! else if(_z==8) return Color.pink;
! double n=_z*15;
! n=n/255;
! if((n<0) || (n>1)){
! n=Math.random();
! }
int r, v, b, a;
double rmin, vmin, bmin, amin;
double rmax, vmax, bmax, amax;
!
! rmin= Color.cyan.getRed();
! vmin= Color.cyan.getGreen();
! bmin= Color.cyan.getBlue();
! amin= Color.cyan.getAlpha();
! rmax= Color.green.getRed();
! vmax= Color.green.getGreen();
! bmax= Color.green.getBlue();
! amax= Color.green.getAlpha();
! r= (int) (rmin + (rmax - rmin) * n);
if (r < 0)
r= 0;
else if (r > 255)
r= 255;
! v= (int) (vmin + (vmax - vmin) * n);
if (v < 0)
v= 0;
else if (v > 255)
v= 255;
! b= (int) (bmin + (bmax - bmin) * n);
if (b < 0)
b= 0;
else if (b > 255)
b= 255;
! a= (int) (amin + (amax - amin) * n);
if (a < 0)
a= 0;
***************
*** 148,151 ****
--- 164,195 ----
}
+
+ /**
+ *
+ */
+ public void evolutionUsedChanged(H2dEvolution _e, int _old, int _new) {}
+
+ /**
+ *
+ */
+ public void evolutionChanged(EvolutionReguliere _e) {}
+
+
+ /**
+ *
+ */
+ public void evolutionAdd(EvolutionReguliere _e) {
+ EvolCourbe c=new EvolCourbe((H2dEvolution)_e);
+ c.setAspectContour(getColor(evol_.getNbEvol()-1));
+ controller_.ajouteComponent(c);
+ controller_.updateAxes();
+ controller_.restaurer();
+
+ }
+
+ /**
+ *
+ */
+ public void evolutionRemove(EvolutionReguliere _e) {}
}
Index: TrImplementation.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/TrImplementation.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** TrImplementation.java 12 Dec 2003 11:29:41 -0000 1.17
--- TrImplementation.java 19 Dec 2003 12:10:55 -0000 1.18
***************
*** 22,25 ****
--- 22,26 ----
import javax.swing.JFrame;
import javax.swing.JMenu;
+ import javax.swing.JMenuItem;
import javax.swing.JScrollPane;
***************
*** 45,49 ****
--- 46,57 ----
import org.fudaa.dodico.commun.ProgressionInterface;
+ import org.fudaa.dodico.fichiers.FileFormat;
import org.fudaa.dodico.fichiers.FileFormatSoftware;
+ import org.fudaa.dodico.fichiers.FileOperationSynthese;
+ import org.fudaa.dodico.h2d.H2dCSVFileFormat;
+ import org.fudaa.dodico.h2d.H2dEvolution;
+ import org.fudaa.dodico.h2d.H2dEvolutionManager;
+ import org.fudaa.dodico.h2d.H2dFileFormatEvolutionVersion;
+ import org.fudaa.dodico.h2d.type.H2dFileFormatType;
import org.fudaa.dodico.telemac.io.TelemacDicoFileFormat;
***************
*** 75,87 ****
new BuInformationsSoftware();
static {
! isRt_.name= "Tr";
! isRt_.version= "0.03";
! isRt_.date= "01-septembre-2003";
! isRt_.rights= TrResource.getS("Tous droits réservés") + ". CETMEF (c)2003";
isRt_.contact= "fre...@eq...";
isRt_.license= "GPL2";
isRt_.languages= "fr,en";
! isRt_.logo= null;
! isRt_.banner= null;
isRt_.http= "http://fudaa.sourceforge.net";
isRt_.update= "";
--- 83,95 ----
new BuInformationsSoftware();
static {
! isRt_.name= "Prepro";
! isRt_.version= "0.04";
! isRt_.date= "2003-12-18";
! isRt_.rights= TrResource.getS("Tous droits réservés") + ". CETMEF (c)2003-2004";
isRt_.contact= "fre...@eq...";
isRt_.license= "GPL2";
isRt_.languages= "fr,en";
! isRt_.logo= TrResource.TR.getIcon("prepro");
! isRt_.banner= TrResource.TR.getIcon("banner");
isRt_.http= "http://fudaa.sourceforge.net";
isRt_.update= "";
***************
*** 242,251 ****
glassPaneStop_.setVisible(true);
}
!
public void unsetGlassPaneStop() {
! if(glassPaneStop_!=null) glassPaneStop_.setVisible(false);
}
-
-
protected void ouvrir(final File _f) {
--- 250,258 ----
glassPaneStop_.setVisible(true);
}
!
public void unsetGlassPaneStop() {
! if (glassPaneStop_ != null)
! glassPaneStop_.setVisible(false);
}
protected void ouvrir(final File _f) {
***************
*** 315,319 ****
.start();
} else if ("FERMER".equals(action)) {
! new BuTaskOperation(this, CtuluLib.EMPTY_STRING) {
public void act() {
saveAndCloseProjet(createProgressionInterface(this), this);
--- 322,326 ----
.start();
} else if ("FERMER".equals(action)) {
! new BuTaskOperation(null, CtuluLib.EMPTY_STRING) {
public void act() {
saveAndCloseProjet(createProgressionInterface(this), this);
***************
*** 325,334 ****
} else if ("CONSOLE".equals(action)) {
openLogFrame();
! } else if (action.startsWith(TrExport.EXPORT_PREF)) {
projetCourant().export(action);
} else {
super.actionPerformed(_evt);
}
}
protected void connecter() {
System.out.println("pas de connexion");
--- 332,381 ----
} else if ("CONSOLE".equals(action)) {
openLogFrame();
! } else if (action.startsWith(TrFileFormatManager.EXPORT_PREF)) {
projetCourant().export(action);
+ } else if (action.startsWith(TrFileFormatManager.IMPORT_PREF)) {
+ importAction(action.substring(TrFileFormatManager.IMPORT_PREF.length()));
} else {
super.actionPerformed(_evt);
}
}
+
+ /**
+ * Methode s'occupant d'importer les fichiers demandes. Methode appelee par actionPerformed.
+ */
+ private void importAction(String _id){
+ if(CtuluLib.DEBUG) CtuluLib.debug("import "+_id);
+ FileFormat ft=fileFormatMng_.getFileFormatWithID(_id);
+ if(ft==null) return;
+ if(ft.getType()==H2dFileFormatType.COURBE_TRANSITOIRE.getId()){
+ importCurvesAction((H2dFileFormatEvolutionVersion)ft.getLastVersionInstance());
+ }
+ }
+
+ /**
+ * Importer des courbes a partir du format _v.
+ */
+ private void importCurvesAction(final H2dFileFormatEvolutionVersion _v){
+ if(currentProject_==null) return;
+ final H2dEvolutionManager mng=currentProject_.getEvolMng();
+ FileFormat ft=_v.getFileFormat();
+ if(mng==null) return;
+ if(ft.getID()==H2dCSVFileFormat.getInstance().getID()){
+ }
+ else{
+ final File f=ouvrirFileChooser(ft.getExtensions(), ft.getDescription());
+ if(f!=null){
+ new BuTaskOperation(this,TrResource.getS("Import")+CtuluLib.ESPACE+ft.getName()){
+ public void act(){
+ FileOperationSynthese s=_v.readEvolutions(f, createProgressionInterface(this));
+ if(!manageErrorOperationAndIsFatal(s)){
+ mng.add((H2dEvolution[])s.getSource());
+ }
+ }
+ }.start();
+
+ }
+ }
+ }
protected void connecter() {
System.out.println("pas de connexion");
***************
*** 427,430 ****
--- 474,478 ----
mb.add(menuApp, index);
mb.getMenu("EXPORTER").addItemListener(this);
+ mb.getMenu("IMPORTER").addItemListener(this);
it= new BuMenuItem(TrResource.getS("Console"));
it.setActionCommand("CONSOLE");
***************
*** 447,451 ****
"Si vous répondez non, toutes vos modifications seront perdues")
+ "."))) {
- initTaskView(_bu);
currentProject_.save(_interface);
currentProject_.close();
--- 495,498 ----
***************
*** 462,465 ****
--- 509,513 ----
setEnabledForAction("FERMER", false);
setEnabledForAction("EXPORTER", false);
+ setEnabledForAction("IMPORTER", false);
}
}
***************
*** 476,479 ****
--- 524,529 ----
setEnabledForAction("ENREGISTRERCOPIE", true);
setEnabledForAction("EXPORTER", true);
+ setEnabledForAction("IMPORTER", true);
+ updateImportMenu();
_o.active(this);
}
***************
*** 585,590 ****
return arbre_;
} /**
! *
! */
public void exit() {
--- 635,640 ----
return arbre_;
} /**
! *
! */
public void exit() {
***************
*** 619,623 ****
(BuMenu)getMainMenuBar().getMenu("EXPORTER"),
this);
! } /**
*
*/
--- 669,690 ----
(BuMenu)getMainMenuBar().getMenu("EXPORTER"),
this);
! }
!
! private void buildImportMenu() {
! fileFormatMng_.buildImportMenu(
! (BuMenu)getMainMenuBar().getMenu("IMPORTER"),
! this);
! updateImportMenu();
! }
!
! private void updateImportMenu() {
! if (currentProject_ != null) {
! JMenuItem ctrans= fileFormatMng_.getMenuImportCourbeTrans(this);
! if (ctrans != null)
! ctrans.setEnabled(currentProject_.getTrParams().canImportEvolution());
! }
! }
!
! /**
*
*/
***************
*** 627,634 ****
if (menu.getMenuComponentCount() != 0)
return;
! if (menu.getActionCommand().equals("EXPORTER")) {
buildExporterMenu();
! menu.removeItemListener(this);
}
}
}
--- 694,706 ----
if (menu.getMenuComponentCount() != 0)
return;
! String com= menu.getActionCommand();
! if (com.equals("EXPORTER")) {
buildExporterMenu();
!
! }
! if (com.equals("IMPORTER")) {
! buildImportMenu();
}
+ menu.removeItemListener(this);
}
}
Index: TrLib.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/TrLib.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** TrLib.java 12 Dec 2003 11:29:41 -0000 1.6
--- TrLib.java 19 Dec 2003 12:10:55 -0000 1.7
***************
*** 63,66 ****
--- 63,67 ----
if(_nameToSave!=null)
TrLib.saveFrameDimensionInPref(_f, _nameToSave);
+ _f.dispose();
_impl.removeInternalFrame(_f);
_f.setVisible(false);
Index: TrParametres.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/TrParametres.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** TrParametres.java 11 Dec 2003 12:50:55 -0000 1.8
--- TrParametres.java 19 Dec 2003 12:10:55 -0000 1.9
***************
*** 22,24 ****
--- 22,25 ----
public H2dParameters getH2dParametres();
public TrPanelInfoSender getPanelInfoSender();
+ public boolean canImportEvolution();
}
Index: TrProjectDispatcherListener.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/TrProjectDispatcherListener.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** TrProjectDispatcherListener.java 12 Dec 2003 11:29:41 -0000 1.5
--- TrProjectDispatcherListener.java 19 Dec 2003 12:10:55 -0000 1.6
***************
*** 8,13 ****
*/
package org.fudaa.fudaa.tr;
! import java.util.HashSet;
! import java.util.Set;
import org.fudaa.ctulu.CtuluLib;
--- 8,12 ----
*/
package org.fudaa.fudaa.tr;
! import java.awt.Frame;
import org.fudaa.ctulu.CtuluLib;
***************
*** 18,25 ****
import org.fudaa.dodico.h2d.H2dBoundary;
import org.fudaa.dodico.h2d.H2dEvolution;
! import org.fudaa.dodico.h2d.H2dEvolutionListener;
import org.fudaa.dodico.h2d.H2dProjectDispatcherListener;
import org.fudaa.dodico.h2d.type.H2dBoundaryType;
import org.fudaa.dodico.h2d.type.H2dVariableType;
import org.fudaa.fudaa.commun.FudaaLib;
--- 17,25 ----
import org.fudaa.dodico.h2d.H2dBoundary;
import org.fudaa.dodico.h2d.H2dEvolution;
! import org.fudaa.dodico.h2d.H2dEvolutionListenerDispatcherDefault;
import org.fudaa.dodico.h2d.H2dProjectDispatcherListener;
import org.fudaa.dodico.h2d.type.H2dBoundaryType;
import org.fudaa.dodico.h2d.type.H2dVariableType;
+ import org.fudaa.dodico.mesure.EvolutionReguliere;
import org.fudaa.fudaa.commun.FudaaLib;
***************
*** 28,34 ****
* @version $Id$
*/
! public class TrProjectDispatcherListener
implements H2dProjectDispatcherListener {
- Set evolListener_;
/**
*
--- 28,33 ----
* @version $Id$
*/
! public class TrProjectDispatcherListener extends H2dEvolutionListenerDispatcherDefault
implements H2dProjectDispatcherListener {
/**
*
***************
*** 37,40 ****
--- 36,52 ----
super();
}
+
+ protected static void changedMainFrameState(boolean _modified, Frame _f) {
+ String s= _f.getTitle();
+ if (_modified) {
+ if (!s.startsWith("*")) {
+ _f.setTitle("*" + s);
+ }
+ } else {
+ if (s.startsWith("*")) {
+ _f.setTitle(s.substring(1));
+ }
+ }
+ }
/**
*
***************
*** 118,145 ****
: CtuluLib.EMPTY_STRING));
}
/**
*
*/
! public void addEvolutionListener(H2dEvolutionListener _l) {
! if (evolListener_ == null)
! evolListener_= new HashSet();
! evolListener_.add(_l);
! }
! /**
! *
! */
! public boolean containsEvolutionListener(H2dEvolutionListener _l) {
! return evolListener_ == null ? false : evolListener_.contains(_l);
! }
! /**
! *
! */
! public void removeEvolutionListener(H2dEvolutionListener _l) {
! if(evolListener_!=null) evolListener_.remove(_l);
! }
! /**
! *
! */
! public void evolutionChanged(H2dEvolution _e) {
FudaaLib.info("CHANGE: EVOLUTION "+_e.getNom());
}
--- 130,139 ----
: CtuluLib.EMPTY_STRING));
}
+
/**
*
*/
! public void evolutionChanged(EvolutionReguliere _e) {
! super.evolutionChanged(_e);
FudaaLib.info("CHANGE: EVOLUTION "+_e.getNom());
}
***************
*** 148,151 ****
--- 142,146 ----
*/
public void evolutionUsedChanged(H2dEvolution _e, int _old, int _new) {
+ super.evolutionUsedChanged(_e, _old, _new);
if( (_old>0) || (_new>0)){
FudaaLib.info("CHANGE: EVOLUTION "+_e.getNom()+" USED CHANGED ( old="+_old+", new= "+_new+" )");
***************
*** 153,156 ****
--- 148,168 ----
}
+
+ /**
+ *
+ */
+ public void evolutionAdd(EvolutionReguliere _e) {
+ super.evolutionAdd(_e);
+ FudaaLib.info("ADD: EVOLUTION "+_e.getNom());
+
+ }
+
+ public void evolutionRemove(EvolutionReguliere _e) {
+ super.evolutionRemove(_e);
+ FudaaLib.info("REMOVE: EVOLUTION "+_e.getNom());
+
+ }
+
+
}
Index: TrProjet.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/TrProjet.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** TrProjet.java 11 Dec 2003 12:50:55 -0000 1.12
--- TrProjet.java 19 Dec 2003 12:10:55 -0000 1.13
***************
*** 13,16 ****
--- 13,18 ----
import com.memoire.bu.BuMenu;
import org.fudaa.dodico.commun.ProgressionInterface;
+ import org.fudaa.dodico.h2d.H2dEvolutionManager;
+
import org.fudaa.ebli.calque.action.EbliActionInterface;
import org.fudaa.fudaa.commun.FudaaCommonImplementation;
***************
*** 36,38 ****
--- 38,42 ----
public BuMenu getProjectMenu();
public TrFilleVisu getVisuFille();
+ public TrParametres getTrParams();
+ public H2dEvolutionManager getEvolMng();
}
Index: tr_en.fr_txt
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/tr_en.fr_txt,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** tr_en.fr_txt 12 Dec 2003 11:29:41 -0000 1.11
--- tr_en.fr_txt 19 Dec 2003 12:10:55 -0000 1.12
***************
*** 188,190 ****
optimisation maillage=Grid optimization
Le fichier {0} n'existe pas=The file {0} doesn't exist
! Afficher la fenêtres des courbes temporelles=Show the frame for the time curves
\ No newline at end of file
--- 188,195 ----
optimisation maillage=Grid optimization
Le fichier {0} n'existe pas=The file {0} doesn't exist
! Afficher la fenêtres des courbes temporelles=Show the frame for the time curves
! Définir la durée de la simultation=Set the simulation duration
! Ans, mois, jours=Years, months, days
! Heures, minutes, secondes=Hours, minutes, seconds
! Durée (sec)=Duration (sec)
! Certaines courbes temporelles ne sont pas assez étendues dans le temps( cela sera automatiquement corrigé)=Some time curves are not width enough (this will be automtically corrected)
\ No newline at end of file
|
|
From: <de...@us...> - 2003-12-19 12:10:59
|
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/vag
In directory sc8-pr-cvs1:/tmp/cvs-serv28766/vag
Modified Files:
VagFilleCalques.java
Log Message:
General update for prepro
Index: VagFilleCalques.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/vag/VagFilleCalques.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** VagFilleCalques.java 25 Nov 2003 10:14:33 -0000 1.6
--- VagFilleCalques.java 19 Dec 2003 12:10:56 -0000 1.7
***************
*** 30,34 ****
BuToggleButton btDessin_;
BuToggleButton btOrtho_;
! BCalqueInteraction cqOrthoI_;
BCalqueInteraction cqDessinI_;
public VagFilleCalques(
--- 30,34 ----
BuToggleButton btDessin_;
BuToggleButton btOrtho_;
! VagCalqueOrthogonalesInteraction cqOrthoI_;
BCalqueInteraction cqDessinI_;
public VagFilleCalques(
***************
*** 45,49 ****
calqueActif_= null;
BCalque cqRoot= getVueCalque().getCalque();
! cqOrthoI_= (BCalqueInteraction)cqRoot.getCalqueParNom("cqORTHOGONALESI");
cqDessinI_= (BCalqueInteraction)cqRoot.getCalqueParNom("cqDESSINI");
btOrtho_= new BuToggleButton("Orthogonales");
--- 45,49 ----
calqueActif_= null;
BCalque cqRoot= getVueCalque().getCalque();
! cqOrthoI_= (VagCalqueOrthogonalesInteraction)cqRoot.getCalqueParNom("cqORTHOGONALESI");
cqDessinI_= (BCalqueInteraction)cqRoot.getCalqueParNom("cqDESSINI");
btOrtho_= new BuToggleButton("Orthogonales");
***************
*** 61,86 ****
public JComponent[] getSpecificTools() {
BuPopupButton tempBp= null;
! for (int j= 0; j < tools_.length; j++) {
! try {
! tempBp= ((BuPopupButton)tools_[j]);
! tempBp.setDesktop((BuDesktop)getDesktopPane());
! /*fred deniger: ces lignes sont a supprimer par la suite. Il y a un
! probleme d'affichage pour ce BuPopupButton:les sliders ne sont pas
! affiches la premiere fois.
! Solution temporaire: la fenetre de ce BuPopButton est affichee puis cachee
! aussitot.
! */
! if ("DEFINIRLISSAGE".equals(tempBp.getActionCommand())) {
! //pour ne pas voir l'affichage temporaire.
! tempBp.setLocation(-1000, -1000);
! tempBp.setSelected(true);
! tempBp.setVisible(true);
! tempBp.setVisible(false);
! tempBp.setSelected(false);
! tempBp.setLocation(0, 0);
! }
! //fin du code a supprimer
! } catch (ClassCastException e) {}
! }
JComponent[] supertools= super.getSpecificTools();
JComponent[] tools= new JComponent[supertools.length + tools_.length];
--- 61,86 ----
public JComponent[] getSpecificTools() {
BuPopupButton tempBp= null;
! // for (int j= 0; j < tools_.length; j++) {
! // try {
! // tempBp= ((BuPopupButton)tools_[j]);
! // tempBp.setDesktop((BuDesktop)getDesktopPane());
! // /*fred deniger: ces lignes sont a supprimer par la suite. Il y a un
! // probleme d'affichage pour ce BuPopupButton:les sliders ne sont pas
! // affiches la premiere fois.
! // Solution temporaire: la fenetre de ce BuPopButton est affichee puis cachee
! // aussitot.
! // */
! // if ("DEFINIRLISSAGE".equals(tempBp.getActionCommand())) {
! // //pour ne pas voir l'affichage temporaire.
! // tempBp.setLocation(-1000, -1000);
! // tempBp.setSelected(true);
! // // tempBp.setVisible(true);
! // // tempBp.setVisible(false);
! // tempBp.setSelected(false);
! // tempBp.setLocation(0, 0);
! // }
! // //fin du code a supprimer
! // } catch (ClassCastException e) {}
! // }
JComponent[] supertools= super.getSpecificTools();
JComponent[] tools= new JComponent[supertools.length + tools_.length];
***************
*** 131,135 ****
public void actionPerformed(ActionEvent e) {
if (e.getSource() == btDessin_) {
- System.out.println("desssssssssin");
getArbreCalqueModel().setSelectionCalque(cqDessinI_);
// if( btDessin_.isSelected() ) setInteractif("cqDESSINI");
--- 131,134 ----
***************
*** 137,141 ****
// getArbreCalque().repaint();
} else if (e.getSource() == btOrtho_) {
- System.out.println("othhhhhoo");
getArbreCalqueModel().setSelectionCalque(cqOrthoI_);
// getArbreCalque().repaint();
--- 136,139 ----
|
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/reflux
In directory sc8-pr-cvs1:/tmp/cvs-serv28766/tr/reflux
Modified Files:
TrRefluxParametres.java TrRefluxProjectDispatcherListener.java
TrRefluxProjet.java TrRefluxTimeStepsEditor.java
Log Message:
General update for prepro
Index: TrRefluxParametres.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/reflux/TrRefluxParametres.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** TrRefluxParametres.java 12 Dec 2003 11:29:41 -0000 1.15
--- TrRefluxParametres.java 19 Dec 2003 12:10:55 -0000 1.16
***************
*** 121,125 ****
*/
public H2dProjetType getTypeProjet() {
! return H2dProjetType.COURANTOLOGIE_2D;
}
/**
--- 121,125 ----
*/
public H2dProjetType getTypeProjet() {
! return params_.getProjetType();
}
/**
***************
*** 141,144 ****
--- 141,151 ----
return false;
}
+ /**
+ *
+ */
+ public double getTimeBeginningForTrans() {
+ return params_.getBeginTimeForTrans();
+ }
+
}
private boolean fileIsProject_;
***************
*** 361,364 ****
--- 368,378 ----
if(infoSenderDelegate_==null) infoSenderDelegate_=new TrRefluxInfoSenderDefault(getH2dRefluxParametres());
return infoSenderDelegate_;
+ }
+
+ /**
+ *
+ */
+ public boolean canImportEvolution() {
+ return true;
}
Index: TrRefluxProjectDispatcherListener.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/reflux/TrRefluxProjectDispatcherListener.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** TrRefluxProjectDispatcherListener.java 12 Dec 2003 11:29:41 -0000 1.4
--- TrRefluxProjectDispatcherListener.java 19 Dec 2003 12:10:55 -0000 1.5
***************
*** 35,51 ****
proj_= proj;
}
private void changed() {
if (proj_.fille_ != null) {
proj_.fille_.updateState();
! String s= proj_.getImpl().getFrame().getTitle();
! if (proj_.isModified()) {
! if (!s.startsWith("*")) {
! proj_.getImpl().getFrame().setTitle("*" + s);
! }
! } else {
! if (s.startsWith("*")) {
! proj_.getImpl().getFrame().setTitle(s.substring(1));
! }
! }
}
}
--- 35,44 ----
proj_= proj;
}
+
+
private void changed() {
if (proj_.fille_ != null) {
proj_.fille_.updateState();
! changedMainFrameState(proj_.isModified(), proj_.getImpl().getFrame());
}
}
***************
*** 126,130 ****
*/
public void evolutionUsedChanged(H2dEvolution _e, int _old, int _new) {
! if(CtuluLib.DEBUG) super.evolutionUsedChanged(_e, _old, _new);
}
--- 119,124 ----
*/
public void evolutionUsedChanged(H2dEvolution _e, int _old, int _new) {
! if (CtuluLib.DEBUG)
! super.evolutionUsedChanged(_e, _old, _new);
}
Index: TrRefluxProjet.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/reflux/TrRefluxProjet.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** TrRefluxProjet.java 12 Dec 2003 11:29:41 -0000 1.15
--- TrRefluxProjet.java 19 Dec 2003 12:10:55 -0000 1.16
***************
*** 48,51 ****
--- 48,52 ----
import org.fudaa.fudaa.tr.TrImplementation;
import org.fudaa.fudaa.tr.TrLib;
+ import org.fudaa.fudaa.tr.TrParametres;
import org.fudaa.fudaa.tr.TrProjet;
import org.fudaa.fudaa.tr.TrResource;
***************
*** 90,110 ****
return params_.getH2dRefluxParametres().getElementPropMng();
}
!
! public H2dEvolutionManager getEvolMng(){
return params_.getH2dRefluxParametres().getEvolMng();
}
!
protected synchronized void activeGrapheFille() {
! if ((impl_ == null) || (getEvolMng() == null))
return;
if (this.courbeFille_ == null) {
! courbeFille_=new TrGrapheFille(getImpl(),getInformationsDocument(),getEvolMng());
courbeFille_.setVisible(true);
- visu_.pack();
- TrLib.initFrameDimensionWithPref(
- courbeFille_,
- "curve",
- getImpl().getMainPanel().getDesktop().getSize());
getImpl().addInternalFrame(courbeFille_);
} else if (courbeFille_.isClosed())
getImpl().addInternalFrame(courbeFille_);
--- 91,113 ----
return params_.getH2dRefluxParametres().getElementPropMng();
}
!
! public H2dEvolutionManager getEvolMng() {
return params_.getH2dRefluxParametres().getEvolMng();
}
!
protected synchronized void activeGrapheFille() {
! if ((impl_ == null) || (getEvolMng() == null))
return;
if (this.courbeFille_ == null) {
! courbeFille_=
! new TrGrapheFille(getImpl(), getInformationsDocument(), getEvolMng());
courbeFille_.setVisible(true);
getImpl().addInternalFrame(courbeFille_);
+ visu_.pack();
+ TrLib.initFrameDimensionWithPref(
+ courbeFille_,
+ "curve",
+ getImpl().getMainPanel().getDesktop().getSize());
+
} else if (courbeFille_.isClosed())
getImpl().addInternalFrame(courbeFille_);
***************
*** 153,157 ****
if (fille_ == null) {
fille_= new TrRefluxFilleProjet(this);
- fille_.pack();
getImpl().addInternalFrame(fille_);
TrLib.initFrameDimensionWithPref(
--- 156,159 ----
***************
*** 196,203 ****
fille_= null;
TrLib.closeInternalFrame(impl_, visu_, "layer");
! visu_= null;
! TrLib.closeInternalFrame(impl_,courbeFille_, "curve");
! courbeFille_= null;
! }
/**
--- 198,207 ----
fille_= null;
TrLib.closeInternalFrame(impl_, visu_, "layer");
! if(visu_!=null)
! impl_.getMainMenuBar().remove(visu_.getLayerMenu());
! visu_= null;
! TrLib.closeInternalFrame(impl_, courbeFille_, "curve");
! courbeFille_= null;
! }
/**
***************
*** 342,351 ****
return projectAction_;
}
!
public EbliActionInterface getCourbeFilleAction() {
! buildFilleActions();
! return courbeAction_;
! }
!
public EbliActionInterface getMainFilleAction() {
return visuAction_;
--- 346,355 ----
return projectAction_;
}
!
public EbliActionInterface getCourbeFilleAction() {
! buildFilleActions();
! return courbeAction_;
! }
!
public EbliActionInterface getMainFilleAction() {
return visuAction_;
***************
*** 356,361 ****
new EbliSimpleAction(
TrResource.getS("Paramètres généraux"),
! BuResource.BU.getToolIcon("maison")
! ,
"MAIN_PROJECT_VIEW") {
public void actionPerformed(ActionEvent _ae) {
--- 360,364 ----
new EbliSimpleAction(
TrResource.getS("Paramètres généraux"),
! BuResource.BU.getToolIcon("maison"),
"MAIN_PROJECT_VIEW") {
public void actionPerformed(ActionEvent _ae) {
***************
*** 371,375 ****
new EbliSimpleAction(
TrResource.getS("Vue du maillage"),
! BuResource.BU.getToolIcon("voir"),
"GRID_PROJECT_VIEW") {
public void actionPerformed(ActionEvent _ae) {
--- 374,378 ----
new EbliSimpleAction(
TrResource.getS("Vue du maillage"),
! BuResource.BU.getToolIcon("voir"),
"GRID_PROJECT_VIEW") {
public void actionPerformed(ActionEvent _ae) {
***************
*** 394,400 ****
Action.SHORT_DESCRIPTION,
TrResource.getS("Afficher la fenêtres des courbes temporelles"));
! courbeAction_.setEnabled((getH2dRefluxParametres().getEvolMng()!=null) && (getH2dRefluxParametres().getEvolMng().getNbEvol()>0));
}
!
}
/**
--- 397,405 ----
Action.SHORT_DESCRIPTION,
TrResource.getS("Afficher la fenêtres des courbes temporelles"));
! courbeAction_.setEnabled(
! (getH2dRefluxParametres().getEvolMng() != null)
! && (getH2dRefluxParametres().getEvolMng().getNbEvol() > 0));
}
!
}
/**
***************
*** 423,429 ****
}
protected void editTimeSteps() {
TrRefluxTimeStepsEditor editor=
new TrRefluxTimeStepsEditor(
! params_.getH2dRefluxParametres().getGroupePasTempsTab());
if (EbliSimpleDialogPanel
.isOkResponse(
--- 428,436 ----
}
protected void editTimeSteps() {
+ H2dRefluxParameters p= params_.getH2dRefluxParametres();
TrRefluxTimeStepsEditor editor=
new TrRefluxTimeStepsEditor(
! p.getGroupePasTempsTab(),
! p.getBeginTimeForTrans());
if (EbliSimpleDialogPanel
.isOkResponse(
***************
*** 431,436 ****
impl_.getFrame(),
TrResource.getS("Intégration en temps")))) {
! params_.getH2dRefluxParametres().setTimeGroups(editor.getTimeSteps());
! }
}
/**
--- 438,454 ----
impl_.getFrame(),
TrResource.getS("Intégration en temps")))) {
!
! p.setTimeGroups(editor.getTimeSteps());
! p.setBeginTimeForTrans(editor.getBeginning());
! //DEBUG TO REMOVE
! System.out.println(p.getMinTime());
! System.out.println(p.getMaxTime());
! double[] t=p.getTimeStep();
! for(int i=0;i<t.length-1;i++){
! System.out.print(t[i]+" ; ");
! }
! System.out.println(t[t.length-1]);
!
! }
}
/**
***************
*** 442,444 ****
--- 460,469 ----
}
}
+ /**
+ *
+ */
+ public TrParametres getTrParams() {
+ return params_;
+ }
+
}
Index: TrRefluxTimeStepsEditor.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/reflux/TrRefluxTimeStepsEditor.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TrRefluxTimeStepsEditor.java 12 Dec 2003 11:29:41 -0000 1.2
--- TrRefluxTimeStepsEditor.java 19 Dec 2003 12:10:55 -0000 1.3
***************
*** 57,69 ****
public class TrRefluxTimeStepsEditor
extends EbliSimpleDialogPanel
! implements ItemListener {
EbliPanelListEditor pnPrinc;
JRadioButton cbStationnaire;
TimeTableModelStationnaire statModel_;
TimeTableModelTransitoire transModel_;
/**
*
*/
! public TrRefluxTimeStepsEditor(H2dTimeStepGroup[] _t) {
boolean isStationnaire=
(_t[0].getSchema() == H2dResolutionSchemaType.STATIONNAIRE);
--- 57,70 ----
public class TrRefluxTimeStepsEditor
extends EbliSimpleDialogPanel
! implements ItemListener,CaretListener {
EbliPanelListEditor pnPrinc;
JRadioButton cbStationnaire;
TimeTableModelStationnaire statModel_;
TimeTableModelTransitoire transModel_;
+ JTextField txtTimeBeginning_;
/**
*
*/
! public TrRefluxTimeStepsEditor(H2dTimeStepGroup[] _t,double _timeBeginning) {
boolean isStationnaire=
(_t[0].getSchema() == H2dResolutionSchemaType.STATIONNAIRE);
***************
*** 78,81 ****
--- 79,83 ----
top.add(cbTrans);
gp.add(cbTrans);
+ txtTimeBeginning_=addLabelDoubleText(top, TrResource.getS("Début:"));
if (isStationnaire)
cbStationnaire.setSelected(true);
***************
*** 87,97 ****
--- 89,107 ----
statModel_= new TimeTableModelStationnaire(_t);
pnPrinc= new EbliPanelListEditor(statModel_, false, false, false, true);
+ txtTimeBeginning_.setEnabled(false);
} else {
+ txtTimeBeginning_.setText(Double.toString(_timeBeginning));
transModel_= new TimeTableModelTransitoire(_t);
pnPrinc= new EbliPanelListEditor(transModel_, true, true, true, true);
}
pnPrinc.setDoubleClickEdit(true);
+ txtTimeBeginning_.addCaretListener(this);
add(pnPrinc, BuBorderLayout.CENTER);
}
+
+ protected double getBeginning(){
+ String t=txtTimeBeginning_.getText();
+ return t.length()==0?0:Double.parseDouble(t);
+ }
protected H2dTimeStepGroup[] getTimeSteps() {
if (cbStationnaire.isSelected()) {
***************
*** 187,191 ****
}
public double getBeginTime(int _r) {
! double r= 0;
for (int i= _r - 1; i >= 0; i--) {
r += ((H2dTimeStepGroup)getValueAt(i)).getTimeLength();
--- 197,201 ----
}
public double getBeginTime(int _r) {
! double r= getBeginning();
for (int i= _r - 1; i >= 0; i--) {
r += ((H2dTimeStepGroup)getValueAt(i)).getTimeLength();
***************
*** 293,298 ****
--- 303,310 ----
if (e.getStateChange() == ItemEvent.SELECTED) {
changeToStat();
+ txtTimeBeginning_.setEnabled(false);
} else {
changeToTrans();
+ txtTimeBeginning_.setEnabled(true);
}
}
***************
*** 520,526 ****
*/
public void itemStateChanged(ItemEvent e) {
! if (e.getStateChange() == ItemEvent.SELECTED)
changeMethod();
}
}
}
--- 532,551 ----
*/
public void itemStateChanged(ItemEvent e) {
! if (e.getStateChange() == ItemEvent.SELECTED){
changeMethod();
+ }
+ }
+ }
+ /**
+ *
+ */
+ public void caretUpdate(CaretEvent e) {
+ if((statModel_!=null) && (cbStationnaire.isSelected())){
+ statModel_.fireTableDataChanged();
}
+ else if( transModel_!=null) transModel_.fireTableDataChanged();
+
+
}
+
}
|
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/dico
In directory sc8-pr-cvs1:/tmp/cvs-serv28766/dico
Modified Files:
FDicoEntitePanel.java FDicoEntiteTableModel.java
FDicoFilleProjet.java FDicoFiltreChooserAbstract.java
FDicoFiltreChooserListAbstract.java
FDicoFiltreChooserName.java FDicoFiltreChooserRubrique.java
FDicoFiltreController.java FDicoParams.java
FDicoProjectPanel.java FDicoProjet.java fdico_en.fr_txt
Log Message:
General update for prepro
Index: FDicoEntitePanel.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/dico/FDicoEntitePanel.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** FDicoEntitePanel.java 12 Dec 2003 11:29:39 -0000 1.10
--- FDicoEntitePanel.java 19 Dec 2003 12:10:55 -0000 1.11
***************
*** 20,23 ****
--- 20,24 ----
import javax.swing.AbstractAction;
+ import javax.swing.AbstractButton;
import javax.swing.Action;
import javax.swing.BorderFactory;
***************
*** 57,61 ****
import org.fudaa.dodico.commun.DodicoCommandManager;
- import org.fudaa.dodico.commun.DodicoLib;
import org.fudaa.dodico.dico.DicoEntite;
import org.fudaa.dodico.dico.DicoParams;
--- 58,61 ----
***************
*** 364,371 ****
FDicoEntiteTableModel tableModel_;
FDicoFiltreChooserName findFiltre_;
! // public FDicoEntitePanel(FDicoEntiteTableModel _model) {
! // this(_model,null);
! // }
public FDicoEntitePanel(FDicoEntiteTableModel _model) {
tableModel_= _model;
TableCellRenderer valueRenderer=
--- 364,380 ----
FDicoEntiteTableModel tableModel_;
FDicoFiltreChooserName findFiltre_;
!
! /**
! * @param _model le model pour les mot-cles
! */
public FDicoEntitePanel(FDicoEntiteTableModel _model) {
+ this(_model,null);
+ }
+
+ /**
+ * @param _model le model pour les mot-cles
+ * @param _leftUp un composant qui sera ajoute en haut a gauche (si non null)
+ */
+ public FDicoEntitePanel(FDicoEntiteTableModel _model,Component _leftUp) {
tableModel_= _model;
TableCellRenderer valueRenderer=
***************
*** 410,414 ****
table_.getColumnModel().getColumnIndex(
FDicoTableColumnIdentifier.COLUMN_VALEUR))) {
! table_.getEditorComponent().requestFocus();
}
}
--- 419,428 ----
table_.getColumnModel().getColumnIndex(
FDicoTableColumnIdentifier.COLUMN_VALEUR))) {
! Component c= table_.getEditorComponent();
! c.requestFocus();
! if (c instanceof AbstractButton) {
! ((AbstractButton)c).doClick();
!
! }
}
}
***************
*** 420,423 ****
--- 434,440 ----
BuResource.BU.getIcon("annuler")) {
public void actionPerformed(ActionEvent _ae) {
+ if ((table_.isEditing()) && (table_.getCellEditor() != null)) {
+ table_.getCellEditor().stopCellEditing();
+ }
ListSelectionModel sel= table_.getSelectionModel();
int min= sel.getMinSelectionIndex();
***************
*** 474,482 ****
JScrollPane sp= new BuScrollPane(table_);
sp.addMouseListener(l);
- //// sp.setVerticalScrollBarPolicy(JScrollPane.VERTICAL_SCROLLBAR_ALWAYS);
- //// final BuToolButton m= new BuToolButton(BuResource.BU.getIcon("visible_16"));
- // m.setActionCommand("COL_VISIBILITY");
- // m.addActionListener(this);
- // sp.setCorner(JScrollPane.UPPER_RIGHT_CORNER, m);
pnTable_.add(sp, BuBorderLayout.CENTER);
pnTable_.setPreferredSize(new Dimension(400, 500));
--- 491,494 ----
***************
*** 494,500 ****
"EDITER");
getActionMap().put("EDITER", actionEditerSelected_);
! JPanel pn= filtre.buildPanel();
! pn.setPreferredSize(new Dimension(150, 500));
! setLeftComponent(pn);
setMiddleComponent(pnTable_);
setOneTouchExpandable(true);
--- 506,516 ----
"EDITER");
getActionMap().put("EDITER", actionEditerSelected_);
! JPanel left= new BuPanel();
! left.setLayout(new BuVerticalLayout(5, true, false));
! if(_leftUp!=null) left.add(_leftUp);
! filtre.buildPanel(left);
! //JPanel pn= filtre.buildPanel();
! left.setPreferredSize(new Dimension(150, 500));
! setLeftComponent(left);
setMiddleComponent(pnTable_);
setOneTouchExpandable(true);
***************
*** 512,515 ****
--- 528,547 ----
return tableModel_.getCmdMng();
}
+
+ protected void saveView() {
+ for (Iterator it= FDicoTableColumnIdentifier.IDENTIFIERS.iterator();
+ it.hasNext();
+ ) {
+ FDicoTableColumnIdentifier colId= (FDicoTableColumnIdentifier)it.next();
+ TableColumn col= colModel_.findColumnWithIdentifierFast(colId);
+ if (colId.isCloseable()) {
+ FDicoPreferences.FD.putBooleanProperty(
+ FDicoTableColumnIdentifier.getColVisiblePref(colId),
+ col != null);
+ }
+ if (col != null)
+ colId.savePos(colModel_.getColumnIndex(colId));
+ }
+ }
/**
*
***************
*** 532,548 ****
String com= e.getActionCommand();
if ("ENREGISTRER".equals(com)) {
! for (Iterator it= FDicoTableColumnIdentifier.IDENTIFIERS.iterator();
! it.hasNext();
! ) {
! FDicoTableColumnIdentifier colId= (FDicoTableColumnIdentifier)it.next();
! TableColumn col= colModel_.findColumnWithIdentifierFast(colId);
! if (colId.isCloseable()) {
! FDicoPreferences.FD.putBooleanProperty(
! FDicoTableColumnIdentifier.getColVisiblePref(colId),
! col != null);
! }
! if (col != null)
! colId.savePos(colModel_.getColumnIndex(colId));
! }
} else {
BuCheckBoxMenuItem chIt= (BuCheckBoxMenuItem)e.getSource();
--- 564,568 ----
String com= e.getActionCommand();
if ("ENREGISTRER".equals(com)) {
! saveView();
} else {
BuCheckBoxMenuItem chIt= (BuCheckBoxMenuItem)e.getSource();
***************
*** 622,632 ****
}
}
- menu.addSeparator();
- BuMenuItem mEnr= new BuMenuItem(BuResource.BU.getString("Enregistrer"));
- mEnr.setActionCommand("ENREGISTRER");
- mEnr.addActionListener(this);
- mEnr.setIcon(BuResource.BU.loadMenuCommandIcon("ENREGISTRER"));
- mEnr.setEnabled(true);
- menu.add(mEnr);
menu.show(_c, _x, _y);
}
--- 642,645 ----
Index: FDicoEntiteTableModel.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/dico/FDicoEntiteTableModel.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** FDicoEntiteTableModel.java 12 Dec 2003 11:29:39 -0000 1.8
--- FDicoEntiteTableModel.java 19 Dec 2003 12:10:55 -0000 1.9
***************
*** 233,239 ****
*/
public void dicoParamsEntiteAdded(DicoParams _cas, DicoEntite _ent) {
- if (_cas == projet_.getDicoParams()) {
dicoParamsModelEntiteEvent(_ent, _ent.getDefautValue());
- }
}
private void dicoParamsModelEntiteEvent(DicoEntite _ent, String _oldValue) {
--- 233,237 ----
***************
*** 297,306 ****
DicoEntite _ent,
String _old) {
- if (projet_.getDicoParams() == projet_) {
dicoParamsModelEntiteEvent(_ent, _old);
- }
}
public void dicoParamsValidStateEntiteUpdated(DicoParams _cas, DicoEntite _ent) {
- if (projet_.getDicoParams() == projet_) {
int index= entitesViewed_.indexOf(_ent);
if (index >= 0) {
--- 295,301 ----
***************
*** 309,313 ****
CtuluLib.debug("Maj table index " + index);
}
- }
}
/**
--- 304,307 ----
Index: FDicoFilleProjet.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/dico/FDicoFilleProjet.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** FDicoFilleProjet.java 11 Dec 2003 12:50:54 -0000 1.11
--- FDicoFilleProjet.java 19 Dec 2003 12:10:55 -0000 1.12
***************
*** 14,17 ****
--- 14,19 ----
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
+ import javax.swing.event.InternalFrameEvent;
+
import com.memoire.bu.BuCommonImplementation;
import com.memoire.bu.BuInternalFrame;
***************
*** 37,41 ****
--- 39,47 ----
private FDicoEntitePanel pnEnt_;
BuCommonImplementation impl_;
+
public FDicoFilleProjet(FDicoProjet _proj, FudaaCommonImplementation _impl) {
+ this(_proj,_impl,null);
+ }
+ public FDicoFilleProjet(FDicoProjet _proj, FudaaCommonImplementation _impl,Component _leftUp) {
super(_proj.getTitle(), true, true, true, true, _impl.getUndoCmdListener());
impl_= _impl;
***************
*** 48,52 ****
projPane.getCmdMng());
DodicoCommandManager cmd= new DodicoCommandManager();
! pnEnt_= new FDicoEntitePanel(new FDicoEntiteTableModel(_proj, cmd));
super.addTab(
FDicoResource.getS("Mot-clés"),
--- 54,58 ----
projPane.getCmdMng());
DodicoCommandManager cmd= new DodicoCommandManager();
! pnEnt_= new FDicoEntitePanel(new FDicoEntiteTableModel(_proj, cmd),_leftUp);
super.addTab(
FDicoResource.getS("Mot-clés"),
***************
*** 57,60 ****
--- 63,73 ----
projet_= _proj;
}
+
+ public FDicoEntitePanel getEntitePanel(){
+ return pnEnt_;
+ }
+
+
+
/**
*
***************
*** 144,147 ****
--- 157,171 ----
if(impl_!=null)
impl_.setEnabledForAction("RECHERCHER", (pnEnt_!=null) && (getSelectedComponent() == pnEnt_));
+ }
+
+ /**
+ *
+ */
+ protected void fireInternalFrameEvent(int id) {
+ if(id==InternalFrameEvent.INTERNAL_FRAME_CLOSED){
+ if(pnEnt_!=null) pnEnt_.saveView();
+
+ }
+ super.fireInternalFrameEvent(id);
}
Index: FDicoFiltreChooserAbstract.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/dico/FDicoFiltreChooserAbstract.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** FDicoFiltreChooserAbstract.java 25 Nov 2003 10:13:40 -0000 1.2
--- FDicoFiltreChooserAbstract.java 19 Dec 2003 12:10:55 -0000 1.3
***************
*** 9,17 ****
--- 9,29 ----
package org.fudaa.fudaa.dico;
import java.awt.Font;
+ import java.awt.Point;
+ import java.awt.event.ActionEvent;
+ import java.awt.event.ActionListener;
+ import java.awt.event.MouseEvent;
+ import java.awt.event.MouseListener;
import java.util.List;
import java.util.Observable;
+
import javax.swing.JMenuItem;
import javax.swing.JPanel;
import javax.swing.ListCellRenderer;
+
+ import org.fudaa.ctulu.CtuluLib;
+
+ import com.memoire.bu.BuPopupMenu;
+ import com.memoire.bu.BuResource;
+
import org.fudaa.dodico.dico.DicoEntite;
/**
***************
*** 33,35 ****
--- 45,104 ----
public abstract String getName();
public abstract JPanel buildPanel(Font _f, ListCellRenderer _r);
+
+ protected class FiltrePopupMenu implements MouseListener, ActionListener {
+ FDicoFiltreChooserAbstract f_;
+
+ protected FiltrePopupMenu(FDicoFiltreChooserAbstract f) {
+ f_= f;
+ }
+
+ /**
+ *
+ */
+ public void mouseClicked(MouseEvent _evt) {
+ if (_evt.isPopupTrigger()
+ || ((_evt.getModifiers() & MouseEvent.BUTTON3_MASK) != 0)) {
+ Point p= _evt.getPoint();
+ BuPopupMenu menu= new BuPopupMenu();
+ menu
+ .addMenuItem(
+ FDicoResource.getS("Initialiser le filtre")+CtuluLib.ESPACE+f_.getName(),
+ "CLEAR",
+ BuResource.BU.getToolIcon("effacer"),
+ true)
+ .addActionListener(this);
+ menu.show(_evt.getComponent(), p.x, p.y);
+ }
+ }
+
+ /**
+ *
+ */
+ public void mouseEntered(MouseEvent e) {}
+
+ /**
+ *
+ */
+ public void mouseExited(MouseEvent e) {}
+
+ /**
+ *
+ */
+ public void mousePressed(MouseEvent e) {}
+
+ /**
+ *
+ */
+ public void mouseReleased(MouseEvent e) {}
+
+ /**
+ *
+ */
+ public void actionPerformed(ActionEvent e) {
+ if ("CLEAR".equals(e.getActionCommand())) {
+ f_.clearFiltre();
+ }
+ }
+
+ }
}
Index: FDicoFiltreChooserListAbstract.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/dico/FDicoFiltreChooserListAbstract.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** FDicoFiltreChooserListAbstract.java 25 Nov 2003 10:13:40 -0000 1.2
--- FDicoFiltreChooserListAbstract.java 19 Dec 2003 12:10:55 -0000 1.3
***************
*** 103,123 ****
l.setSelectionModel(buildListSelectionModel());
JPanel pn= new BuPanel();
! JPanel pnButton= new BuPanel();
! pnButton.setLayout(new BuButtonLayout(3, BuButtonLayout.LEFT));
! BuToolButton bu= new BuToolButton(BuResource.BU.getToolIcon("effacer"));
! pnButton.add(bu);
! bu.setRequestFocusEnabled(false);
! bu.addActionListener(new ActionListener() {
! public void actionPerformed(ActionEvent _ae) {
! clearFiltre();
! }
! });
! pn.setLayout(new BuBorderLayout(3, 3));
pn.setBorder(
BorderFactory.createTitledBorder(
BorderFactory.createLineBorder(Color.gray),
getName()));
! pn.add(pnButton, BuBorderLayout.NORTH);
pn.add(l, BuBorderLayout.CENTER);
return pn;
}
--- 103,126 ----
l.setSelectionModel(buildListSelectionModel());
JPanel pn= new BuPanel();
! // JPanel pnButton= new BuPanel();
! // pnButton.setLayout(new BuButtonLayout(3, BuButtonLayout.LEFT));
! // BuToolButton bu= new BuToolButton(BuResource.BU.getToolIcon("effacer"));
! // pnButton.add(bu);
! // bu.setRequestFocusEnabled(false);
! // bu.addActionListener(new ActionListener() {
! // public void actionPerformed(ActionEvent _ae) {
! // clearFiltre();
! // }
! // });
! pn.setLayout(new BuBorderLayout(0, 0));
pn.setBorder(
BorderFactory.createTitledBorder(
BorderFactory.createLineBorder(Color.gray),
getName()));
! //pn.add(pnButton, BuBorderLayout.NORTH);
! FDicoFiltreChooserAbstract.FiltrePopupMenu listener=new FDicoFiltreChooserAbstract.FiltrePopupMenu(this);
pn.add(l, BuBorderLayout.CENTER);
+ l.addMouseListener(listener);
+ pn.addMouseListener(listener);
return pn;
}
Index: FDicoFiltreChooserName.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/dico/FDicoFiltreChooserName.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** FDicoFiltreChooserName.java 11 Dec 2003 12:50:54 -0000 1.4
--- FDicoFiltreChooserName.java 19 Dec 2003 12:10:55 -0000 1.5
***************
*** 21,24 ****
--- 21,26 ----
import javax.swing.event.CaretEvent;
import javax.swing.event.CaretListener;
+
+ import com.memoire.bu.BuBorderLayout;
import com.memoire.bu.BuGridLayout;
import com.memoire.bu.BuLabel;
***************
*** 86,108 ****
//"find" action
r.setName("pnFind");
! r.setLayout(new BuGridLayout(2));
r.setBorder(
BorderFactory.createTitledBorder(
BorderFactory.createLineBorder(Color.gray),
getName()));
! BuToolButton bu= new BuToolButton(BuResource.BU.getToolIcon("effacer"));
! bu.setRequestFocusEnabled(false);
! bu.addActionListener(new ActionListener() {
! public void actionPerformed(ActionEvent _ae) {
! clearFiltre();
! }
! });
final FiltreTextField t= new FiltreTextField();
t.setName("txtFind");
if (filtre_ != null)
t.setText(filtre_);
! r.add(bu);
! r.add(t);
addObserver(t);
return r;
}
--- 88,113 ----
//"find" action
r.setName("pnFind");
! r.setLayout(new BuBorderLayout());
r.setBorder(
BorderFactory.createTitledBorder(
BorderFactory.createLineBorder(Color.gray),
getName()));
! //BuToolButton bu= new BuToolButton(BuResource.BU.getToolIcon("effacer"));
! //bu.setRequestFocusEnabled(false);
! // bu.addActionListener(new ActionListener() {
! // public void actionPerformed(ActionEvent _ae) {
! // clearFiltre();
! // }
! // });
final FiltreTextField t= new FiltreTextField();
t.setName("txtFind");
if (filtre_ != null)
t.setText(filtre_);
! // r.add(bu);
! r.add(t,BuBorderLayout.CENTER);
addObserver(t);
+ FDicoFiltreChooserAbstract.FiltrePopupMenu listener=new FDicoFiltreChooserAbstract.FiltrePopupMenu(this);
+ r.addMouseListener(listener);
+ t.addMouseListener(listener);
return r;
}
Index: FDicoFiltreChooserRubrique.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/dico/FDicoFiltreChooserRubrique.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** FDicoFiltreChooserRubrique.java 12 Dec 2003 11:29:39 -0000 1.5
--- FDicoFiltreChooserRubrique.java 19 Dec 2003 12:10:55 -0000 1.6
***************
*** 9,16 ****
--- 9,18 ----
package org.fudaa.fudaa.dico;
import gnu.trove.TObjectIntHashMap;
+
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.util.Arrays;
import java.util.BitSet;
+
import javax.swing.JMenuItem;
***************
*** 18,25 ****
--- 20,31 ----
import com.memoire.bu.BuMenuItem;
+
import org.fudaa.dodico.commun.DodicoLib;
import org.fudaa.dodico.dico.DicoEntite;
import org.fudaa.dodico.dico.DicoParamsInterface;
+
import org.fudaa.fudaa.ressource.FudaaResource;
+
+
public final class FDicoFiltreChooserRubrique
extends FDicoFiltreChooserListAbstract
Index: FDicoFiltreController.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/dico/FDicoFiltreController.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** FDicoFiltreController.java 12 Dec 2003 11:29:39 -0000 1.9
--- FDicoFiltreController.java 19 Dec 2003 12:10:55 -0000 1.10
***************
*** 66,70 ****
listener_= _l;
}
!
public void add(FDicoFiltreChooserAbstract _f) {
synchronized (filtreChoosers_) {
--- 66,70 ----
listener_= _l;
}
!
public void add(FDicoFiltreChooserAbstract _f) {
synchronized (filtreChoosers_) {
***************
*** 95,103 ****
}
}
!
!
! public JPanel buildPanel() {
! JPanel r= new BuPanel();
! r.setLayout(new BuVerticalLayout(5, true, false));
ListCellRenderer renderer= new EbliCellTextRenderer() {
public Component getListCellRendererComponent(
--- 95,100 ----
}
}
!
! public void buildPanel(JPanel _p) {
ListCellRenderer renderer= new EbliCellTextRenderer() {
public Component getListCellRendererComponent(
***************
*** 120,125 ****
for (Iterator it= filtreChoosers_.iterator(); it.hasNext();) {
FDicoFiltreChooserAbstract filtre= (FDicoFiltreChooserAbstract)it.next();
! r.add(filtre.buildPanel(f, renderer));
}
return r;
}
--- 117,128 ----
for (Iterator it= filtreChoosers_.iterator(); it.hasNext();) {
FDicoFiltreChooserAbstract filtre= (FDicoFiltreChooserAbstract)it.next();
! _p.add(filtre.buildPanel(f, renderer));
}
+
+ }
+ public JPanel buildPanel() {
+ JPanel r= new JPanel();
+ r.setLayout(new BuVerticalLayout(5, true, false));
+ buildPanel(r);
return r;
}
Index: FDicoParams.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/dico/FDicoParams.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** FDicoParams.java 12 Dec 2003 11:29:39 -0000 1.15
--- FDicoParams.java 19 Dec 2003 12:10:55 -0000 1.16
***************
*** 289,295 ****
*/
public void dicoParamsEntiteAdded(DicoParams _cas, DicoEntite _ent) {
! if ((_cas == FDicoParams.this.dicoParams_)
! && (_ent.isFileType())
! && (!entites_.contains(_ent))) {
entites_.add(_ent);
fireTableDataChanged();
--- 289,293 ----
*/
public void dicoParamsEntiteAdded(DicoParams _cas, DicoEntite _ent) {
! if ((_ent.isFileType()) && (!entites_.contains(_ent))) {
entites_.add(_ent);
fireTableDataChanged();
***************
*** 302,306 ****
}
private void updateFor(DicoParams _cas, DicoEntite _ent) {
! if ((_cas == dicoParams_) && (_ent.isFileType())) {
int index= entites_.indexOf(_ent);
if (index >= 0)
--- 300,304 ----
}
private void updateFor(DicoParams _cas, DicoEntite _ent) {
! if (_ent.isFileType()) {
int index= entites_.indexOf(_ent);
if (index >= 0)
***************
*** 315,322 ****
DicoEntite _ent,
String _old) {
! if ((_cas == FDicoParams.this.dicoParams_)
! && (_ent.isFileType())
! && (!_ent.isRequired())) {
! entites_.remove(_ent);
fireTableDataChanged();
}
--- 313,319 ----
DicoEntite _ent,
String _old) {
! if (_ent.isFileType()) {
! if (!_ent.isRequired())
! entites_.remove(_ent);
fireTableDataChanged();
}
***************
*** 741,756 ****
}
} /**
! *
! */
public String getCasFileName() {
return casFileName_;
} /**
! *
! */
public long getCasFileTimeLoaded() {
return fileLastModified_;
} /**
! *
! */
public File getDirBase() {
return dirBase_;
--- 738,753 ----
}
} /**
! *
! */
public String getCasFileName() {
return casFileName_;
} /**
! *
! */
public long getCasFileTimeLoaded() {
return fileLastModified_;
} /**
! *
! */
public File getDirBase() {
return dirBase_;
***************
*** 759,791 ****
return dicoParams_.getDicoFileFormatVersion();
} /**
! *
! */
public FudaaUI getUI() {
return ui_;
} /**
! *
! */ /**
! *
! */
public String canUpdate(DicoEntite _ent) {
return dicoParams_.canUpdate(_ent);
} /**
! *
! */
public boolean contains(DicoEntite _ent) {
return dicoParams_.contains(_ent);
} /**
! *
! */
public Set getAllEntiteWithValuesSet() {
return dicoParams_.getAllEntiteWithValuesSet();
} /**
! *
! */
public DicoModelAbstract getDico() {
return dicoParams_.getDico();
} /**
! *
! */
public DicoCasInterface getDicoCasInterface() {
return dicoParams_.getDicoCasInterface();
--- 756,788 ----
return dicoParams_.getDicoFileFormatVersion();
} /**
! *
! */
public FudaaUI getUI() {
return ui_;
} /**
! *
! */ /**
! *
! */
public String canUpdate(DicoEntite _ent) {
return dicoParams_.canUpdate(_ent);
} /**
! *
! */
public boolean contains(DicoEntite _ent) {
return dicoParams_.contains(_ent);
} /**
! *
! */
public Set getAllEntiteWithValuesSet() {
return dicoParams_.getAllEntiteWithValuesSet();
} /**
! *
! */
public DicoModelAbstract getDico() {
return dicoParams_.getDico();
} /**
! *
! */
public DicoCasInterface getDicoCasInterface() {
return dicoParams_.getDicoCasInterface();
***************
*** 794,859 ****
return dicoParams_.getEntiteFileNb();
} /**
! *
! */
public Map getEntiteValues() {
return dicoParams_.getEntiteValues();
} /**
! *
! */
public void getEntiteValues(Map _m) {
dicoParams_.getEntiteValues(_m);
} /**
! *
! */
public String getTitle() {
return dicoParams_.getTitle();
} /**
! *
! */
public String getValue(DicoEntite _e) {
return dicoParams_.getValue(_e);
} /**
! *
! */
public int getValuesSize() {
return dicoParams_.getValuesSize();
} /**
! *
! */
public boolean isValide() {
return isValide_ && dicoParams_.isValide();
} /**
! *
! */
public boolean isValueSetFor(DicoEntite _ent) {
return dicoParams_.isValueSetFor(_ent);
} /**
! *
! */
public boolean isValueValideFor(DicoEntite _ent) {
return dicoParams_.isValueValideFor(_ent);
} /**
! *
! */
public void removeModelListener(DicoParamsListener _l) {
dicoParams_.removeModelListener(_l);
} /**
! *
! */
public void removeValue(DicoEntite _ent) {
dicoParams_.removeValue(_ent);
} /**
! *
! */
public void removeValues(DicoEntite[] _ent) {
dicoParams_.removeValues(_ent);
} /**
! *
! */
public void removeValues(DicoEntite[] _ent, int _max) {
dicoParams_.removeValues(_ent, _max);
} /**
! *
! */
public void setValue(DicoEntite _ent, String _value) {
dicoParams_.setValue(_ent, _value);
--- 791,856 ----
return dicoParams_.getEntiteFileNb();
} /**
! *
! */
public Map getEntiteValues() {
return dicoParams_.getEntiteValues();
} /**
! *
! */
public void getEntiteValues(Map _m) {
dicoParams_.getEntiteValues(_m);
} /**
! *
! */
public String getTitle() {
return dicoParams_.getTitle();
} /**
! *
! */
public String getValue(DicoEntite _e) {
return dicoParams_.getValue(_e);
} /**
! *
! */
public int getValuesSize() {
return dicoParams_.getValuesSize();
} /**
! *
! */
public boolean isValide() {
return isValide_ && dicoParams_.isValide();
} /**
! *
! */
public boolean isValueSetFor(DicoEntite _ent) {
return dicoParams_.isValueSetFor(_ent);
} /**
! *
! */
public boolean isValueValideFor(DicoEntite _ent) {
return dicoParams_.isValueValideFor(_ent);
} /**
! *
! */
public void removeModelListener(DicoParamsListener _l) {
dicoParams_.removeModelListener(_l);
} /**
! *
! */
public void removeValue(DicoEntite _ent) {
dicoParams_.removeValue(_ent);
} /**
! *
! */
public void removeValues(DicoEntite[] _ent) {
dicoParams_.removeValues(_ent);
} /**
! *
! */
public void removeValues(DicoEntite[] _ent, int _max) {
dicoParams_.removeValues(_ent, _max);
} /**
! *
! */
public void setValue(DicoEntite _ent, String _value) {
dicoParams_.setValue(_ent, _value);
Index: FDicoProjectPanel.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/dico/FDicoProjectPanel.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** FDicoProjectPanel.java 12 Dec 2003 11:29:39 -0000 1.10
--- FDicoProjectPanel.java 19 Dec 2003 12:10:55 -0000 1.11
***************
*** 75,79 ****
JLabel lbFile_;
JTextField txtName_;
! DicoEntite title_;
JLabel lbErreur_;
JLabel lbModifie_;
--- 75,79 ----
JLabel lbFile_;
JTextField txtName_;
! // DicoEntite title_;
JLabel lbErreur_;
JLabel lbModifie_;
***************
*** 113,118 ****
BuPanel pn= new BuPanel();
pn.setLayout(new BuGridLayout(2, 10, 10));
! title_= proj.getDicoParams().getDicoFileFormatVersion().getTitreEntite();
! if (title_ != null) {
pn.add(new BuLabel(FDicoResource.getS("Nom du projet:")));
txtName_= new BuTextField(80);
--- 113,118 ----
BuPanel pn= new BuPanel();
pn.setLayout(new BuGridLayout(2, 10, 10));
! DicoEntite title= proj.getDicoParams().getDicoFileFormatVersion().getTitreEntite();
! if (title != null) {
pn.add(new BuLabel(FDicoResource.getS("Nom du projet:")));
txtName_= new BuTextField(80);
***************
*** 220,235 ****
public void actionPerformed(ActionEvent _evt) {
if (_evt.getSource() == txtName_) {
! EbliSimpleDialogPanel pn= new EbliSimpleDialogPanel();
! BuTextField f= new BuTextField();
! f.setText(proj_.getTitle());
! pn.setLayout(new BuBorderLayout());
! pn.add(f, BuBorderLayout.CENTER);
! if (EbliSimpleDialogPanel
! .isOkResponse(pn.afficheModale(proj_.getImpl().getFrame()))) {
! cmdMng.addCmd(
! proj_.getDicoParams().setValueAndGenerateCommand(
! title_,
! f.getText()));
! }
} else if ("EDITER".equals(_evt.getActionCommand())) {
int r= table_.getSelectedRow();
--- 220,235 ----
public void actionPerformed(ActionEvent _evt) {
if (_evt.getSource() == txtName_) {
! // EbliSimpleDialogPanel pn= new EbliSimpleDialogPanel();
! // BuTextField f= new BuTextField();
! // f.setText(proj_.getTitle());
! // pn.setLayout(new BuBorderLayout());
! // pn.add(f, BuBorderLayout.CENTER);
! // if (EbliSimpleDialogPanel
! // .isOkResponse(pn.afficheModale(proj_.getImpl().getFrame()))) {
! // cmdMng.addCmd(
! // proj_.getDicoParams().setValueAndGenerateCommand(
! // title_,
! // f.getText()));
! // }
} else if ("EDITER".equals(_evt.getActionCommand())) {
int r= table_.getSelectedRow();
***************
*** 369,389 ****
public void mouseClicked(MouseEvent _evt) {
if ((_evt.getSource() == txtName_)) {
! EbliSimpleDialogPanel pn= new EbliSimpleDialogPanel();
! BuTextField f= new BuTextField();
! f.setText(proj_.getTitle());
! pn.setLayout(new BuBorderLayout());
! pn.addEmptyBorder(5);
! pn.add(f, BuBorderLayout.CENTER);
! if (EbliSimpleDialogPanel
! .isOkResponse(
! pn.afficheModale(
! proj_.getImpl().getFrame(),
! FDicoResource.getS("Modifier le titre du projet")))) {
! cmdMng.addCmd(
! proj_.getDicoParams().setValueAndGenerateCommand(
! title_,
! f.getText()));
}
- }
}
/**
--- 369,374 ----
public void mouseClicked(MouseEvent _evt) {
if ((_evt.getSource() == txtName_)) {
! proj_.changeTitleProjet(cmdMng);
}
}
/**
***************
*** 438,442 ****
}
private void updateTitle(DicoEntite _e) {
! if ((title_ != null) && (_e == title_)) {
txtName_.setText(proj_.getTitle());
}
--- 423,427 ----
}
private void updateTitle(DicoEntite _e) {
! if((txtName_!=null) && (_e == proj_.getTitleEntite())) {
txtName_.setText(proj_.getTitle());
}
Index: FDicoProjet.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/dico/FDicoProjet.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** FDicoProjet.java 12 Dec 2003 11:29:39 -0000 1.10
--- FDicoProjet.java 19 Dec 2003 12:10:55 -0000 1.11
***************
*** 25,32 ****
--- 25,36 ----
import com.memoire.bu.BuScrollPane;
import com.memoire.bu.BuTaskOperation;
+ import com.memoire.bu.BuTextField;
import org.fudaa.dodico.calcul.CalculLauncher;
+ import org.fudaa.dodico.commun.DodicoCmdMngListener;
+ import org.fudaa.dodico.commun.DodicoCommandManager;
import org.fudaa.dodico.commun.ProgressionInterface;
import org.fudaa.dodico.dico.DicoCasFileFormatVersion;
+ import org.fudaa.dodico.dico.DicoEntite;
import org.fudaa.dodico.dico.DicoManager;
import org.fudaa.dodico.dico.DicoParams;
***************
*** 35,38 ****
--- 39,43 ----
import org.fudaa.ebli.calque.action.EbliActionInterface;
import org.fudaa.ebli.calque.action.EbliSimpleAction;
+ import org.fudaa.ebli.dialog.EbliSimpleDialogPanel;
import org.fudaa.fudaa.commun.FudaaCommonImplementation;
***************
*** 72,75 ****
--- 77,103 ----
}
+ public DicoEntite getTitleEntite(){
+ return getDicoParams().getDicoFileFormatVersion().getTitreEntite();
+ }
+
+
+ public void changeTitleProjet(DodicoCommandManager _mng){
+ EbliSimpleDialogPanel pn= new EbliSimpleDialogPanel();
+ BuTextField f= new BuTextField();
+ f.setText(getTitle());
+ pn.setLayout(new BuBorderLayout());
+ pn.addEmptyBorder(5);
+ pn.add(f, BuBorderLayout.CENTER);
+ if (EbliSimpleDialogPanel
+ .isOkResponse(
+ pn.afficheModale(
+ getImpl().getFrame(),
+ FDicoResource.getS("Modifier le titre du projet")))) {
+ _mng.addCmd(
+ getDicoParams().setValueAndGenerateCommand(getTitleEntite(),
+ f.getText()));
+ }
+ }
+
/**
*
***************
*** 113,116 ****
--- 141,145 ----
entiteFille_= new FDicoFilleProjet(this, impl_);
}
+
public void active(FudaaCommonImplementation _impl) {
if (impl_ != null)
Index: fdico_en.fr_txt
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/dico/fdico_en.fr_txt,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** fdico_en.fr_txt 14 Nov 2003 08:24:06 -0000 1.6
--- fdico_en.fr_txt 19 Dec 2003 12:10:55 -0000 1.7
***************
*** 30,31 ****
--- 30,32 ----
Fichier chargé=Loaded file
Modifier le titre du projet=Modify the project's title
+ Initialiser le filtre=Initialyze filter
\ No newline at end of file
|
