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: <jm_...@us...> - 2003-12-18 09:40:23
|
Update of /cvsroot/fudaa//fudaa_devel/fudaa/src/org/fudaa/fudaa/refonde
In directory sc8-pr-cvs1:/tmp/cvs-serv1693/fudaa/src/org/fudaa/fudaa/refonde
Modified Files:
RefondeMiseEnPage.java
Log Message:
DBief : correction bug sur la mise à jour des extremitées
RefondeMiseEnPage : correction compilation methode getTimeLength() -> getLength() pour un Element.
Index: RefondeMiseEnPage.java
===================================================================
RCS file: /cvsroot/fudaa//fudaa_devel/fudaa/src/org/fudaa/fudaa/refonde/RefondeMiseEnPage.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** RefondeMiseEnPage.java 11 Dec 2003 12:50:54 -0000 1.5
--- RefondeMiseEnPage.java 18 Dec 2003 09:40:20 -0000 1.6
***************
*** 745,749 ****
private String getTexteValeur(Element _el) throws SAXException {
NodeList nls= _el.getChildNodes();
! for (int i= 0; i < nls.getTimeLength(); i++) {
if (nls.item(i) instanceof Text)
return ((Text)nls.item(i)).getNodeValue();
--- 745,749 ----
private String getTexteValeur(Element _el) throws SAXException {
NodeList nls= _el.getChildNodes();
! for (int i= 0; i < nls.getLength(); i++) {
if (nls.item(i) instanceof Text)
return ((Text)nls.item(i)).getNodeValue();
***************
*** 760,764 ****
private int getIntValeur(Element _el) throws SAXException {
NodeList nls= _el.getChildNodes();
! for (int i= 0; i < nls.getTimeLength(); i++) {
if (nls.item(i) instanceof Text) {
try {
--- 760,764 ----
private int getIntValeur(Element _el) throws SAXException {
NodeList nls= _el.getChildNodes();
! for (int i= 0; i < nls.getLength(); i++) {
if (nls.item(i) instanceof Text) {
try {
***************
*** 781,785 ****
private double getDoubleValeur(Element _el) throws SAXException {
NodeList nls= _el.getChildNodes();
! for (int i= 0; i < nls.getTimeLength(); i++) {
if (nls.item(i) instanceof Text) {
try {
--- 781,785 ----
private double getDoubleValeur(Element _el) throws SAXException {
NodeList nls= _el.getChildNodes();
! for (int i= 0; i < nls.getLength(); i++) {
if (nls.item(i) instanceof Text) {
try {
***************
*** 806,810 ****
Element r= null;
NodeList nls= _el.getChildNodes();
! for (int i= 0; i < nls.getTimeLength(); i++) {
if (nls.item(i) instanceof Element
&& ((Element)nls.item(i)).getTagName().equals(_nom)) {
--- 806,810 ----
Element r= null;
NodeList nls= _el.getChildNodes();
! for (int i= 0; i < nls.getLength(); i++) {
if (nls.item(i) instanceof Element
&& ((Element)nls.item(i)).getTagName().equals(_nom)) {
***************
*** 841,845 ****
Vector vr= new Vector();
NodeList nls= _el.getChildNodes();
! for (int i= 0; i < nls.getTimeLength(); i++) {
if (nls.item(i) instanceof Element
&& ((Element)nls.item(i)).getTagName().equals(_nom)) {
--- 841,845 ----
Vector vr= new Vector();
NodeList nls= _el.getChildNodes();
! for (int i= 0; i < nls.getLength(); i++) {
if (nls.item(i) instanceof Element
&& ((Element)nls.item(i)).getTagName().equals(_nom)) {
|
|
From: <jm_...@us...> - 2003-12-18 09:40:23
|
Update of /cvsroot/fudaa//fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d
In directory sc8-pr-cvs1:/tmp/cvs-serv1693/dodico/src/org/fudaa/dodico/hydraulique1d
Modified Files:
DBief.java
Log Message:
DBief : correction bug sur la mise à jour des extremitées
RefondeMiseEnPage : correction compilation methode getTimeLength() -> getLength() pour un Element.
Index: DBief.java
===================================================================
RCS file: /cvsroot/fudaa//fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/DBief.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** DBief.java 8 Dec 2003 18:22:46 -0000 1.7
--- DBief.java 18 Dec 2003 09:40:20 -0000 1.8
***************
*** 159,163 ****
}
public void profils(IProfil[] s, boolean _trie) {
! if (egale(profils_ , s)) return;
profils_= s;
if (_trie)
--- 159,166 ----
}
public void profils(IProfil[] s, boolean _trie) {
! if (egale(profils_ , s)) {
! miseAJourExtremite();
! return;
! }
profils_= s;
if (_trie)
***************
*** 741,814 ****
return res;
}
- /* public double[][] getTableauResultatsTemporels(int[] indiceVariable, int[] indiceSection) {
- if (indiceVariable==null) return new double[0][0];
- if (indiceVariable.length==0) return new double[0][0];
- if (indiceSection==null) return new double[0][0];
- if (indiceSection.length==0) return new double[0][0];
- if (resultatsBief_==null) return new double[0][0];
- if (resultatsBief_.pasTemps()==null) return new double[0][0];
- if (resultatsBief_.pasTemps().length==0) return new double[0][0];
- if (sectionsCalculees_==null) return new double[0][0];
- if (sectionsCalculees_.length==0) return new double[0][0];
-
- int nbVariable = indiceVariable.length*indiceSection.length;
- int nbPasTemps = resultatsBief_.pasTemps().length;
- double[][] res = new double[nbVariable+1][nbPasTemps];
-
- // extraction de l'abscisse temporel
- IResultatsBiefPasTemps[] pasTps = resultatsBief_.pasTemps();
- for (int i=0; i < nbPasTemps ; i++) {
- res[0][i] = pasTps[i].infoTemps().t();
- }
- // extraction des ordonnées
- for (int i=0; i < indiceSection.length ; i++) {
- ISectionCalculee sec = sectionsCalculees_[indiceSection[i]];
- for (int j=0; j < sec.pasTemps().length ; j++) {
- double[] vals = sec.pasTemps()[j].valeurs();
- for (int k=0; k < indiceVariable.length ; k++) {
- res[k+1][j] = vals[indiceVariable[k]];
- }
- }
- }
- return res;
- }
-
- public double[][] getTableauResultatsSpacial(int[] indiceVariable, int[] indicePasTemps) {
- if (indiceVariable==null) return new double[0][0];
- if (indiceVariable.length==0) return new double[0][0];
- if (indicePasTemps==null) return new double[0][0];
- if (indicePasTemps.length==0) return new double[0][0];
- if (resultatsBief_==null) return new double[0][0];
- if (resultatsBief_.pasTemps()==null) return new double[0][0];
- if (resultatsBief_.pasTemps().length==0) return new double[0][0];
- if (sectionsCalculees_==null) return new double[0][0];
- if (sectionsCalculees_.length==0) return new double[0][0];
-
- int nbVariable = indiceVariable.length*indicePasTemps.length;
- int nbSection = sectionsCalculees_.length;
- double[][] res = new double[nbVariable+1][nbSection];
-
- // extraction de l'abscisse spacial
- for (int i=0; i < nbSection ; i++) {
- res[0][i] = sectionsCalculees_[i].abscisse();
- }
-
- // extraction des ordonnées
- for (int i=0; i < nbSection ; i++) {
- ISectionCalculeePasTemps[] pas = sectionsCalculees_[i].pasTemps();
- for (int j=0; j < indicePasTemps.length ; j++) {
- double[] vals = pas[indicePasTemps[j]].valeurs();
- for (int k=0; k < indiceVariable.length ; k++) {
- res[k+1][i] = vals[indiceVariable[k]];
- }
- }
- }
- return res;
- }
- */
private void trieProfils() {
if (profils_ == null)
return;
Arrays.sort(profils_, DProfil.COMPARATOR);
if (profils_.length > 0) {
if (extrAmont_ != null)
--- 744,755 ----
return res;
}
private void trieProfils() {
if (profils_ == null)
return;
Arrays.sort(profils_, DProfil.COMPARATOR);
+ miseAJourExtremite();
+ }
+ private void miseAJourExtremite() {
+ if (profils_ == null) return;
if (profils_.length > 0) {
if (extrAmont_ != null)
|
|
From: <jm_...@us...> - 2003-12-17 09:45:11
|
Update of /cvsroot/fudaa//fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d
In directory sc8-pr-cvs1:/tmp/cvs-serv4471
Modified Files:
DParametresTailleMaxFichier.java
Log Message:
Modification des tailles de fichier résultats maximum.
Index: DParametresTailleMaxFichier.java
===================================================================
RCS file: /cvsroot/fudaa//fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/DParametresTailleMaxFichier.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** DParametresTailleMaxFichier.java 2 Dec 2003 19:54:40 -0000 1.4
--- DParametresTailleMaxFichier.java 17 Dec 2003 09:45:08 -0000 1.5
***************
*** 45,50 ****
maxListingCode_= 500.;
maxListingDamocles_= 10.;
! maxResultatOpthyca_= 2000.;
! maxResultatRubens_= 2000.;
maxResultatReprise_= 1000.;
}
--- 45,50 ----
maxListingCode_= 500.;
maxListingDamocles_= 10.;
! maxResultatOpthyca_= 40000.;
! maxResultatRubens_= 20000.;
maxResultatReprise_= 1000.;
}
|
|
From: <de...@us...> - 2003-12-12 11:45:39
|
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/vag In directory sc8-pr-cvs1:/tmp/cvs-serv31168/vag Modified Files: VagImplementation.java Log Message: Suppression import fudaa.commun.tableau Index: VagImplementation.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/vag/VagImplementation.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** VagImplementation.java 12 Dec 2003 11:29:42 -0000 1.8 --- VagImplementation.java 12 Dec 2003 11:45:36 -0000 1.9 *************** *** 23,27 **** import org.fudaa.fudaa.commun.dodico.*; import org.fudaa.fudaa.commun.projet.*; - import org.fudaa.fudaa.commun.tableau.*; import org.fudaa.fudaa.utilitaire.*; import com.memoire.bu.*; --- 23,26 ---- |
|
From: <de...@us...> - 2003-12-12 11:45:39
|
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/navmer In directory sc8-pr-cvs1:/tmp/cvs-serv31168/navmer Modified Files: NavmerFilleTableauResultats.java NavmerImplementation.java Log Message: Suppression import fudaa.commun.tableau Index: NavmerFilleTableauResultats.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/navmer/NavmerFilleTableauResultats.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** NavmerFilleTableauResultats.java 12 Dec 2003 11:29:40 -0000 1.6 --- NavmerFilleTableauResultats.java 12 Dec 2003 11:45:36 -0000 1.7 *************** *** 16,20 **** import com.memoire.bu.*; import org.fudaa.fudaa.commun.*; - import org.fudaa.fudaa.commun.tableau.*; import org.fudaa.dodico.corba.navmer.*; import org.fudaa.ebli.graphe.*; --- 16,19 ---- Index: NavmerImplementation.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/navmer/NavmerImplementation.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** NavmerImplementation.java 12 Dec 2003 11:29:40 -0000 1.7 --- NavmerImplementation.java 12 Dec 2003 11:45:36 -0000 1.8 *************** *** 13,17 **** import org.fudaa.fudaa.commun.dodico.*; import org.fudaa.fudaa.commun.projet.*; - import org.fudaa.fudaa.commun.tableau.*; import org.fudaa.fudaa.ressource.*; import org.fudaa.ebli.calque.*; --- 13,16 ---- |
|
From: <de...@us...> - 2003-12-12 11:45:39
|
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/hiswa In directory sc8-pr-cvs1:/tmp/cvs-serv31168/hiswa Modified Files: HiswaFilleTableau.java Log Message: Suppression import fudaa.commun.tableau Index: HiswaFilleTableau.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/hiswa/HiswaFilleTableau.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** HiswaFilleTableau.java 12 Dec 2003 11:29:40 -0000 1.6 --- HiswaFilleTableau.java 12 Dec 2003 11:45:36 -0000 1.7 *************** *** 22,26 **** import org.fudaa.ebli.ressource.*; import org.fudaa.fudaa.commun.*; - import org.fudaa.fudaa.commun.tableau.*; /** * Une fenetre fille pour le Tableau de Resultats. --- 22,25 ---- |
|
From: <de...@us...> - 2003-12-12 11:45:39
|
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/dimduc In directory sc8-pr-cvs1:/tmp/cvs-serv31168/dimduc Modified Files: DimducImplementation.java Log Message: Suppression import fudaa.commun.tableau Index: DimducImplementation.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/dimduc/DimducImplementation.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** DimducImplementation.java 12 Dec 2003 11:29:39 -0000 1.7 --- DimducImplementation.java 12 Dec 2003 11:45:36 -0000 1.8 *************** *** 24,28 **** import org.fudaa.fudaa.commun.dodico.*; import org.fudaa.fudaa.commun.projet.*; - import org.fudaa.fudaa.commun.tableau.*; import org.fudaa.fudaa.ressource.FudaaResource; import org.fudaa.fudaa.utilitaire.*; --- 24,27 ---- |
|
From: <de...@us...> - 2003-12-12 11:45:39
|
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/curvi In directory sc8-pr-cvs1:/tmp/cvs-serv31168/curvi Modified Files: CurviFilleParametresASC.java CurviFilleTableauResultats.java Log Message: Suppression import fudaa.commun.tableau Index: CurviFilleParametresASC.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/curvi/CurviFilleParametresASC.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** CurviFilleParametresASC.java 12 Dec 2003 11:29:39 -0000 1.6 --- CurviFilleParametresASC.java 12 Dec 2003 11:45:35 -0000 1.7 *************** *** 19,23 **** import org.fudaa.fudaa.commun.*; - import org.fudaa.fudaa.commun.tableau.*; /** * @version $Revision$ $Date$ by $Author$ --- 19,22 ---- Index: CurviFilleTableauResultats.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/curvi/CurviFilleTableauResultats.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** CurviFilleTableauResultats.java 12 Dec 2003 11:29:39 -0000 1.6 --- CurviFilleTableauResultats.java 12 Dec 2003 11:45:35 -0000 1.7 *************** *** 19,23 **** import org.fudaa.fudaa.commun.*; - import org.fudaa.fudaa.commun.tableau.*; /** * @version $Revision$ $Date$ by $Author$ --- 19,22 ---- |
|
From: <de...@us...> - 2003-12-12 11:30:13
|
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido In directory sc8-pr-cvs1:/tmp/cvs-serv29179/org/fudaa/fudaa/lido Modified Files: LidoExport.java LidoImplementation.java LidoImport.java Log Message: Maj general Index: LidoExport.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/LidoExport.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** LidoExport.java 25 Nov 2003 10:13:48 -0000 1.8 --- LidoExport.java 12 Dec 2003 11:29:40 -0000 1.9 *************** *** 8,15 **** */ package org.fudaa.fudaa.lido; - import org.fudaa.fudaa.commun.fileChooser.FudaaFileChooser; import org.fudaa.fudaa.lido.ihmhelper.gestion.*; import org.fudaa.dodico.corba.lido.*; import org.fudaa.dodico.lido.*; import com.memoire.bu.*; import java.io.*; --- 8,17 ---- */ package org.fudaa.fudaa.lido; import org.fudaa.fudaa.lido.ihmhelper.gestion.*; import org.fudaa.dodico.corba.lido.*; import org.fudaa.dodico.lido.*; + + import org.fudaa.ebli.filechooser.EbliFileChooser; + import com.memoire.bu.*; import java.io.*; *************** *** 213,217 **** final String ext= _ext; File res= null; ! BuFileChooser chooser= new FudaaFileChooser(false); chooser.setFileFilter(new javax.swing.filechooser.FileFilter() { public boolean accept(java.io.File f) { --- 215,219 ---- final String ext= _ext; File res= null; ! BuFileChooser chooser= new EbliFileChooser(false); chooser.setFileFilter(new javax.swing.filechooser.FileFilter() { public boolean accept(java.io.File f) { Index: LidoImplementation.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/LidoImplementation.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** LidoImplementation.java 25 Nov 2003 10:13:48 -0000 1.9 --- LidoImplementation.java 12 Dec 2003 11:29:40 -0000 1.10 *************** *** 18,26 **** import org.fudaa.fudaa.commun.aide.*; import org.fudaa.fudaa.commun.dodico.*; - import org.fudaa.fudaa.commun.fileChooser.FudaaFavoriteFiles; import org.fudaa.fudaa.commun.projet.*; import org.fudaa.fudaa.lido.ihmhelper.*; import com.memoire.bu.*; import com.memoire.fu.FuLib; import org.fudaa.ebli.geometrie.*; import org.fudaa.ebli.palette.*; --- 18,27 ---- import org.fudaa.fudaa.commun.aide.*; import org.fudaa.fudaa.commun.dodico.*; import org.fudaa.fudaa.commun.projet.*; import org.fudaa.fudaa.lido.ihmhelper.*; import com.memoire.bu.*; import com.memoire.fu.FuLib; + + import org.fudaa.ebli.filechooser.EbliFavoriteFiles; import org.fudaa.ebli.geometrie.*; import org.fudaa.ebli.palette.*; *************** *** 616,620 **** fermer(); closeConnection(); ! FudaaFavoriteFiles.INSTANCE.saveFavorites(); FudaaPreferences.FUDAA.writeIniFile(); super.exit(); --- 617,621 ---- fermer(); closeConnection(); ! EbliFavoriteFiles.INSTANCE.saveFavorites(); FudaaPreferences.FUDAA.writeIniFile(); super.exit(); Index: LidoImport.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/LidoImport.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** LidoImport.java 25 Nov 2003 10:13:48 -0000 1.8 --- LidoImport.java 12 Dec 2003 11:29:40 -0000 1.9 *************** *** 10,14 **** import org.fudaa.dodico.corba.lido.*; import org.fudaa.dodico.lido.*; ! import org.fudaa.fudaa.commun.fileChooser.FudaaFileChooser; import com.memoire.bu.*; import java.io.*; --- 10,16 ---- import org.fudaa.dodico.corba.lido.*; import org.fudaa.dodico.lido.*; ! ! import org.fudaa.ebli.filechooser.EbliFileChooser; ! import com.memoire.bu.*; import java.io.*; *************** *** 349,353 **** final String ext= _ext; File res= null; ! BuFileChooser chooser= new FudaaFileChooser(false); chooser.setFileFilter(new javax.swing.filechooser.FileFilter() { public boolean accept(java.io.File f) { --- 351,355 ---- final String ext= _ext; File res= null; ! BuFileChooser chooser= new EbliFileChooser(false); chooser.setFileFilter(new javax.swing.filechooser.FileFilter() { public boolean accept(java.io.File f) { |
|
From: <de...@us...> - 2003-12-12 11:30:13
|
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/editor
In directory sc8-pr-cvs1:/tmp/cvs-serv29179/org/fudaa/fudaa/lido/editor
Modified Files:
LidoSingulariteCourbeEditor.java
Log Message:
Maj general
Index: LidoSingulariteCourbeEditor.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/editor/LidoSingulariteCourbeEditor.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** LidoSingulariteCourbeEditor.java 25 Nov 2003 10:13:50 -0000 1.9
--- LidoSingulariteCourbeEditor.java 12 Dec 2003 11:29:40 -0000 1.10
***************
*** 10,14 ****
import org.fudaa.fudaa.commun.*;
import org.fudaa.fudaa.commun.projet.*;
- import org.fudaa.fudaa.commun.tableau.FudaaGrapheValeur;
import org.fudaa.fudaa.lido.*;
import org.fudaa.fudaa.lido.graphe.*;
--- 10,13 ----
***************
*** 21,24 ****
--- 20,24 ----
import org.fudaa.ebli.commun.*;
import org.fudaa.ebli.ressource.*;
+ import org.fudaa.ebli.tableau.EbliGrapheValeur;
import org.fudaa.ebli.graphe.*;
import org.fudaa.dodico.corba.lido.*;
***************
*** 549,553 ****
}
protected void sortTableDonneesLois() {
! FudaaGrapheValeur grapheValeur= new FudaaGrapheValeur(true);
int nb= cl_.tabParamEntier[INBPOINT];
boolean b;
--- 549,553 ----
}
protected void sortTableDonneesLois() {
! EbliGrapheValeur grapheValeur= new EbliGrapheValeur(true);
int nb= cl_.tabParamEntier[INBPOINT];
boolean b;
***************
*** 572,576 ****
}
nb= cl_.tabParamEntier[INBPOINT];
! FudaaGrapheValeur.ValeurField[] newVal= grapheValeur.getValeurField();
if (newVal.length != nb) {
System.err.println("le tri a echoué");
--- 572,576 ----
}
nb= cl_.tabParamEntier[INBPOINT];
! EbliGrapheValeur.ValeurField[] newVal= grapheValeur.getValeurField();
if (newVal.length != nb) {
System.err.println("le tri a echoué");
|
|
From: <de...@us...> - 2003-12-12 11:30:13
|
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/hiswa
In directory sc8-pr-cvs1:/tmp/cvs-serv29179/org/fudaa/fudaa/hiswa
Modified Files:
HiswaFilleTableau.java
Log Message:
Maj general
Index: HiswaFilleTableau.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/hiswa/HiswaFilleTableau.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** HiswaFilleTableau.java 25 Nov 2003 10:13:43 -0000 1.5
--- HiswaFilleTableau.java 12 Dec 2003 11:29:40 -0000 1.6
***************
*** 18,21 ****
--- 18,22 ----
import org.fudaa.ebli.calque.*;
import org.fudaa.ebli.palette.*;
+ import org.fudaa.ebli.tableau.*;
import org.fudaa.ebli.trace.*;
import org.fudaa.ebli.ressource.*;
***************
*** 28,32 ****
* @author Claudio Branco
*/
! public class HiswaFilleTableau extends FudaaFilleTableau {
JComponent[] tools_;
BuPopupButton pbSelectionResultats_;
--- 29,33 ----
* @author Claudio Branco
*/
! public class HiswaFilleTableau extends EbliFilleTableau {
JComponent[] tools_;
BuPopupButton pbSelectionResultats_;
|
|
From: <de...@us...> - 2003-12-12 11:30:13
|
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/dimduc
In directory sc8-pr-cvs1:/tmp/cvs-serv29179/org/fudaa/fudaa/dimduc
Modified Files:
DimducImplementation.java
Log Message:
Maj general
Index: DimducImplementation.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/dimduc/DimducImplementation.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** DimducImplementation.java 25 Nov 2003 10:13:42 -0000 1.6
--- DimducImplementation.java 12 Dec 2003 11:29:39 -0000 1.7
***************
*** 30,33 ****
--- 30,34 ----
import com.memoire.fu.FuLib;
import org.fudaa.ebli.ressource.*;
+ import org.fudaa.ebli.tableau.*;
import org.fudaa.ebli.impression.*;
import org.fudaa.ebli.graphe.BGraphe;
***************
*** 114,118 ****
* Description du champ
*/
! protected FudaaFilleTableau fTableau_= null;
/**
* Description du champ
--- 115,119 ----
* Description du champ
*/
! protected EbliFilleTableau fTableau_= null;
/**
* Description du champ
***************
*** 1024,1028 ****
if (fTableau_ == null) {
// creation fTableau :
! fTableau_= new FudaaFilleTableau();
table_= new DimducTableauResultats();
fTableau_.setTable(table_);
--- 1025,1029 ----
if (fTableau_ == null) {
// creation fTableau :
! fTableau_= new EbliFilleTableau();
table_= new DimducTableauResultats();
fTableau_.setTable(table_);
***************
*** 1155,1159 ****
if (fTableau_ == null) {
// creation fTableau_ :
! fTableau_= new FudaaFilleTableau();
table_= new DimducTableauResultats();
fTableau_.setTable(table_);
--- 1156,1160 ----
if (fTableau_ == null) {
// creation fTableau_ :
! fTableau_= new EbliFilleTableau();
table_= new DimducTableauResultats();
fTableau_.setTable(table_);
***************
*** 1263,1267 ****
if (fTableau_ == null) {
// creation fTableau_ :
! fTableau_= new FudaaFilleTableau();
table_= new DimducTableauResultats();
fTableau_.setTable(table_);
--- 1264,1268 ----
if (fTableau_ == null) {
// creation fTableau_ :
! fTableau_= new EbliFilleTableau();
table_= new DimducTableauResultats();
fTableau_.setTable(table_);
|
|
From: <de...@us...> - 2003-12-12 11:30:12
|
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/curvi
In directory sc8-pr-cvs1:/tmp/cvs-serv29179/org/fudaa/fudaa/curvi
Modified Files:
CurviFilleParametresASC.java CurviFilleTableauResultats.java
Log Message:
Maj general
Index: CurviFilleParametresASC.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/curvi/CurviFilleParametresASC.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** CurviFilleParametresASC.java 25 Nov 2003 10:13:37 -0000 1.5
--- CurviFilleParametresASC.java 12 Dec 2003 11:29:39 -0000 1.6
***************
*** 15,18 ****
--- 15,21 ----
import org.fudaa.dodico.corba.curvi.*;
import org.fudaa.dodico.curvi.*;
+
+ import org.fudaa.ebli.tableau.*;
+
import org.fudaa.fudaa.commun.*;
import org.fudaa.fudaa.commun.tableau.*;
***************
*** 21,25 ****
* @author Guillaume Desnoix
*/
! public class CurviFilleParametresASC extends FudaaFilleTableau {
public CurviFilleParametresASC(
CurviImplementation _app,
--- 24,28 ----
* @author Guillaume Desnoix
*/
! public class CurviFilleParametresASC extends EbliFilleTableau {
public CurviFilleParametresASC(
CurviImplementation _app,
Index: CurviFilleTableauResultats.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/curvi/CurviFilleTableauResultats.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** CurviFilleTableauResultats.java 25 Nov 2003 10:13:37 -0000 1.5
--- CurviFilleTableauResultats.java 12 Dec 2003 11:29:39 -0000 1.6
***************
*** 15,18 ****
--- 15,21 ----
import org.fudaa.dodico.corba.curvi.*;
import org.fudaa.dodico.curvi.*;
+
+ import org.fudaa.ebli.tableau.*;
+
import org.fudaa.fudaa.commun.*;
import org.fudaa.fudaa.commun.tableau.*;
***************
*** 21,25 ****
* @author Guillaume Desnoix
*/
! public class CurviFilleTableauResultats extends FudaaFilleTableau {
public CurviFilleTableauResultats(
CurviImplementation _app,
--- 24,28 ----
* @author Guillaume Desnoix
*/
! public class CurviFilleTableauResultats extends EbliFilleTableau {
public CurviFilleTableauResultats(
CurviImplementation _app,
|
|
From: <de...@us...> - 2003-12-12 11:29:46
|
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/telemac
In directory sc8-pr-cvs1:/tmp/cvs-serv29179/org/fudaa/fudaa/tr/telemac
Modified Files:
TrTelemac2dParametres.java TrTelemacBoundaryEditor.java
TrTelemacCommunParametres.java
TrTelemacCommunProjectListener.java TrTelemacCommunProjet.java
TrTelemacFilleVisu.java TrTelemacImplHelper.java
TrTelemacInfoSenderDefault.java
Log Message:
Maj general
Index: TrTelemac2dParametres.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/telemac/TrTelemac2dParametres.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** TrTelemac2dParametres.java 11 Dec 2003 12:50:56 -0000 1.4
--- TrTelemac2dParametres.java 12 Dec 2003 11:29:42 -0000 1.5
***************
*** 10,13 ****
--- 10,14 ----
import java.io.File;
import java.util.Map;
+
import org.fudaa.dodico.commun.ProgressionInterface;
import org.fudaa.dodico.dico.DicoEntite;
***************
*** 20,24 ****
import org.fudaa.dodico.telemac.io.TelemacLiquideFileFormat;
import org.fudaa.dodico.telemac.io.TelemacLiquideInterface;
! import org.fudaa.fudaa.commun.FudaaCommonImplementation;
/**
* @author deniger
--- 21,26 ----
import org.fudaa.dodico.telemac.io.TelemacLiquideFileFormat;
import org.fudaa.dodico.telemac.io.TelemacLiquideInterface;
!
! import org.fudaa.fudaa.tr.TrImplementation;
/**
* @author deniger
***************
*** 27,31 ****
public class TrTelemac2dParametres extends TrTelemacCommunParametres {
TrTelemac2dParametres(
! FudaaCommonImplementation _ui,
Map _inits,
H2dTelemacDicoFileFormatVersion _dico,
--- 29,33 ----
public class TrTelemac2dParametres extends TrTelemacCommunParametres {
TrTelemac2dParametres(
! TrImplementation _ui,
Map _inits,
H2dTelemacDicoFileFormatVersion _dico,
Index: TrTelemacBoundaryEditor.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/telemac/TrTelemacBoundaryEditor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TrTelemacBoundaryEditor.java 11 Dec 2003 12:50:56 -0000 1.1
--- TrTelemacBoundaryEditor.java 12 Dec 2003 11:29:42 -0000 1.2
***************
*** 15,19 ****
import java.awt.event.MouseEvent;
import java.awt.event.MouseListener;
- import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
--- 15,18 ----
***************
*** 22,25 ****
--- 21,25 ----
import java.util.Map;
import java.util.Vector;
+
import javax.swing.BorderFactory;
import javax.swing.ComboBoxModel;
***************
*** 29,43 ****
import javax.swing.JComponent;
import javax.swing.JLabel;
import com.memoire.bu.BuBorderLayout;
import com.memoire.bu.BuCheckBox;
import com.memoire.bu.BuComboBox;
import com.memoire.bu.BuGridLayout;
- import com.memoire.bu.BuLabel;
import com.memoire.bu.BuPanel;
import com.memoire.bu.BuTextArea;
import com.memoire.bu.BuVerticalLayout;
! import org.fudaa.dodico.commun.DodicoCommand;
import org.fudaa.dodico.commun.DodicoCommandComposite;
- import org.fudaa.dodico.commun.DodicoCommandManager;
import org.fudaa.dodico.commun.DodicoLib;
import org.fudaa.dodico.commun.DodicoPermanentList;
--- 29,44 ----
import javax.swing.JComponent;
import javax.swing.JLabel;
+
+ import org.fudaa.ctulu.CtuluLib;
+
import com.memoire.bu.BuBorderLayout;
import com.memoire.bu.BuCheckBox;
import com.memoire.bu.BuComboBox;
import com.memoire.bu.BuGridLayout;
import com.memoire.bu.BuPanel;
import com.memoire.bu.BuTextArea;
import com.memoire.bu.BuVerticalLayout;
!
import org.fudaa.dodico.commun.DodicoCommandComposite;
import org.fudaa.dodico.commun.DodicoLib;
import org.fudaa.dodico.commun.DodicoPermanentList;
***************
*** 50,54 ****
--- 51,57 ----
import org.fudaa.dodico.h2d.type.H2dBoundaryType;
import org.fudaa.dodico.h2d.type.H2dVariableType;
+
import org.fudaa.ebli.dialog.EbliSimpleDialogPanel;
+
import org.fudaa.fudaa.dico.FDicoEditorInterface;
import org.fudaa.fudaa.dico.FDicoResource;
***************
*** 312,316 ****
"Permet de spécifier une courbe temporelle pour la variable {0}",
((H2dVariableType)vs_.get(i)).getNom()));
! r.append(DodicoLib.LINE_SEP);
r.append(
TrResource.getS(
--- 315,319 ----
"Permet de spécifier une courbe temporelle pour la variable {0}",
((H2dVariableType)vs_.get(i)).getNom()));
! r.append(CtuluLib.LINE_SEP);
r.append(
TrResource.getS(
***************
*** 470,474 ****
} else {
lbValues_[i].setForeground(Color.black);
! lbValues_[i].setToolTipText(DodicoLib.EMPTY_STRING);
}
}
--- 473,477 ----
} else {
lbValues_[i].setForeground(Color.black);
! lbValues_[i].setToolTipText(CtuluLib.EMPTY_STRING);
}
}
***************
*** 515,519 ****
params_[i].getEntite().getNom()
+ ":"
! + DodicoLib.LINE_SEP
+ params_[i].getEntite().getAide());
}
--- 518,522 ----
params_[i].getEntite().getNom()
+ ":"
! + CtuluLib.LINE_SEP
+ params_[i].getEntite().getAide());
}
Index: TrTelemacCommunParametres.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/telemac/TrTelemacCommunParametres.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** TrTelemacCommunParametres.java 11 Dec 2003 12:50:56 -0000 1.5
--- TrTelemacCommunParametres.java 12 Dec 2003 11:29:42 -0000 1.6
***************
*** 11,14 ****
--- 11,16 ----
import java.util.Map;
+ import org.fudaa.ctulu.CtuluLib;
+
import org.fudaa.dodico.commun.DodicoLib;
import org.fudaa.dodico.commun.ProgressionInterface;
***************
*** 16,19 ****
--- 18,22 ----
import org.fudaa.dodico.fichiers.FileFormat;
import org.fudaa.dodico.fichiers.FileOperationSynthese;
+ import org.fudaa.dodico.h2d.H2dEvolutionManager;
import org.fudaa.dodico.h2d.H2dGrid;
import org.fudaa.dodico.h2d.H2dParameters;
***************
*** 32,35 ****
--- 35,39 ----
import org.fudaa.fudaa.commun.FudaaLib;
import org.fudaa.fudaa.dico.FDicoParams;
+ import org.fudaa.fudaa.tr.TrImplementation;
import org.fudaa.fudaa.tr.TrParametres;
import org.fudaa.fudaa.tr.TrResource;
***************
*** 47,51 ****
TrPanelInfoSender infoSenderDelegate_;
TrTelemacCommunParametres(
! FudaaCommonImplementation _ui,
Map _inits,
H2dTelemacDicoFileFormatVersion _dico,
--- 51,55 ----
TrPanelInfoSender infoSenderDelegate_;
TrTelemacCommunParametres(
! TrImplementation _ui,
Map _inits,
H2dTelemacDicoFileFormatVersion _dico,
***************
*** 59,62 ****
--- 63,75 ----
return super.isValide();
}
+
+ public boolean isTransientAvailable(){
+ return params_.isTransientAvailable();
+ }
+
+ public H2dEvolutionManager getEvolMng(){
+ return params_.getEvolMng();
+ }
+
public FudaaCommonImplementation getImpl() {
return (FudaaCommonImplementation)getUI();
***************
*** 163,167 ****
getUI().manageAnalyzeAndIsFatal(op.getAnalyze().toAnalyze());
getUI().setMainProgression(0);
! getUI().setMainMessage(DodicoLib.EMPTY_STRING);
dicoParams_.setLoaded(entFile, f, false);
return true;
--- 176,180 ----
getUI().manageAnalyzeAndIsFatal(op.getAnalyze().toAnalyze());
getUI().setMainProgression(0);
! getUI().setMainMessage(CtuluLib.EMPTY_STRING);
dicoParams_.setLoaded(entFile, f, false);
return true;
***************
*** 192,196 ****
getDicoFileFormatVersion().getDefaultTelemacCLFormat();
if (v == null) {
! FudaaLib.error("boundary conditions not supported");
return false;
}
--- 205,209 ----
getDicoFileFormatVersion().getDefaultTelemacCLFormat();
if (v == null) {
! CtuluLib.error("boundary conditions not supported");
return false;
}
Index: TrTelemacCommunProjectListener.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/telemac/TrTelemacCommunProjectListener.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** TrTelemacCommunProjectListener.java 11 Dec 2003 12:50:56 -0000 1.5
--- TrTelemacCommunProjectListener.java 12 Dec 2003 11:29:42 -0000 1.6
***************
*** 8,25 ****
*/
package org.fudaa.fudaa.tr.telemac;
! import org.fudaa.dodico.commun.DodicoLib;
import org.fudaa.dodico.dico.DicoEntite;
import org.fudaa.dodico.dico.DicoParams;
import org.fudaa.dodico.h2d.H2dBcFrontierInterface;
import org.fudaa.dodico.h2d.H2dBoundary;
- import org.fudaa.dodico.h2d.H2dBcFrontierBlockInterface;
import org.fudaa.dodico.h2d.H2dEvolution;
import org.fudaa.dodico.h2d.H2dEvolutionManager;
- import org.fudaa.dodico.h2d.telemac.H2dTelemacBoundary;
import org.fudaa.dodico.h2d.telemac.H2dTelemacProjectDispatcherListener;
- import org.fudaa.dodico.h2d.telemac.H2dTelemacBcManager.TelemacBordParFrontiere;
import org.fudaa.dodico.h2d.type.H2dBoundaryType;
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;
--- 8,23 ----
*/
package org.fudaa.fudaa.tr.telemac;
! import org.fudaa.ctulu.CtuluLib;
!
import org.fudaa.dodico.dico.DicoEntite;
import org.fudaa.dodico.dico.DicoParams;
import org.fudaa.dodico.h2d.H2dBcFrontierInterface;
import org.fudaa.dodico.h2d.H2dBoundary;
import org.fudaa.dodico.h2d.H2dEvolution;
import org.fudaa.dodico.h2d.H2dEvolutionManager;
import org.fudaa.dodico.h2d.telemac.H2dTelemacProjectDispatcherListener;
import org.fudaa.dodico.h2d.type.H2dBoundaryType;
import org.fudaa.dodico.h2d.type.H2dVariableType;
!
import org.fudaa.fudaa.tr.TrProjectDispatcherListener;
import org.fudaa.fudaa.tr.TrResource;
***************
*** 55,59 ****
"La présence du fichier {0} est obligatoire.",
_ent.getNom())
! + DodicoLib.LINE_SEP
+ TrResource.getS(
"Le projet contient des données concernant le fichier {0}. Lors de la prochaine sauvegarde, un nouveau fichier sera crée et le mot-clé {0} sera modifié",
--- 53,57 ----
"La présence du fichier {0} est obligatoire.",
_ent.getNom())
! + CtuluLib.LINE_SEP
+ TrResource.getS(
"Le projet contient des données concernant le fichier {0}. Lors de la prochaine sauvegarde, un nouveau fichier sera crée et le mot-clé {0} sera modifié",
***************
*** 72,76 ****
"La présence du fichier {0} est obligatoire.",
_ent.getNom())
! + DodicoLib.LINE_SEP
+ TrResource.getS(
"Il est conseillé d'annuler la suppression du mot-clé"));
--- 70,74 ----
"La présence du fichier {0} est obligatoire.",
_ent.getNom())
! + CtuluLib.LINE_SEP
+ TrResource.getS(
"Il est conseillé d'annuler la suppression du mot-clé"));
***************
*** 95,107 ****
}
private void modifyLiquidFile() {
! if (proj_
! .getTrTelemacParams()
! .getTelemacParametres()
! .isTransientAvailable()) {
! DicoEntite e=
! proj_
! .getTrTelemacParams()
! .getDicoFileFormatVersion()
! .getCLLiquideEntiteFile();
if (e == null)
new Throwable().printStackTrace();
--- 93,98 ----
}
private void modifyLiquidFile() {
! if (proj_.isTransientAvailable()) {
! DicoEntite e= proj_.getCLLiquideEntiteFile();
if (e == null)
new Throwable().printStackTrace();
***************
*** 141,152 ****
.getTelemacParametres()
.isTransientAvailable()) {
! H2dEvolutionManager mng=
! proj_.getTrTelemacParams().getTelemacParametres().getEvolMng();
boolean b= ((mng == null) || (mng.isNoCurveUsed()));
! DicoEntite e=
! proj_
! .getTrTelemacParams()
! .getDicoFileFormatVersion()
! .getCLLiquideEntiteFile();
if (e == null)
new Throwable().printStackTrace();
--- 132,138 ----
.getTelemacParametres()
.isTransientAvailable()) {
! H2dEvolutionManager mng= proj_.getEvolMng();
boolean b= ((mng == null) || (mng.isNoCurveUsed()));
! DicoEntite e= proj_.getCLLiquideEntiteFile();
if (e == null)
new Throwable().printStackTrace();
Index: TrTelemacCommunProjet.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/telemac/TrTelemacCommunProjet.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** TrTelemacCommunProjet.java 11 Dec 2003 12:50:56 -0000 1.5
--- TrTelemacCommunProjet.java 12 Dec 2003 11:29:42 -0000 1.6
***************
*** 13,16 ****
--- 13,17 ----
import javax.swing.SwingUtilities;
+ import com.memoire.bu.BuCommonImplementation;
import com.memoire.bu.BuDynamicMenu;
import com.memoire.bu.BuMenu;
***************
*** 18,26 ****
--- 19,31 ----
import com.memoire.bu.BuTaskOperation;
+ 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.ebli.calque.action.EbliActionInterface;
import org.fudaa.ebli.calque.action.EbliComponentFactory;
import org.fudaa.ebli.calque.action.EbliSimpleAction;
+ import org.fudaa.ebli.ressource.EbliResource;
import org.fudaa.fudaa.commun.FudaaCommonImplementation;
***************
*** 29,32 ****
--- 34,38 ----
import org.fudaa.fudaa.tr.TrExport;
import org.fudaa.fudaa.tr.TrFilleVisu;
+ import org.fudaa.fudaa.tr.TrGrapheFille;
import org.fudaa.fudaa.tr.TrImplementation;
import org.fudaa.fudaa.tr.TrLib;
***************
*** 41,46 ****
--- 47,54 ----
//TrTelemacCommunParametres params_;
TrTelemacFilleVisu visu_;
+ TrGrapheFille courbeFille_;
DicoProjectMenu projectMenu_;
EbliSimpleAction visuAction_;
+ EbliSimpleAction courbeAction_;
EbliSimpleAction projectAction_;
EbliSimpleAction loadAction_;
***************
*** 58,61 ****
--- 66,84 ----
actions_.setEnableCalcul(true);
}
+
+ public boolean isTransientAvailable() {
+ return getTrTelemacParams().isTransientAvailable();
+ }
+
+ public H2dEvolutionManager getEvolMng() {
+ return getTrTelemacParams().getEvolMng();
+ }
+
+ public DicoEntite getCLLiquideEntiteFile() {
+ return getTrTelemacParams()
+ .getDicoFileFormatVersion()
+ .getCLLiquideEntiteFile();
+ }
+
public void active(TrImplementation _impl) {
boolean change= false;
***************
*** 95,98 ****
--- 118,122 ----
return FileFormatSoftware.TELEMAC_IS.name;
}
+
private synchronized void activeVisu() {
if (getImpl() == null)
***************
*** 104,108 ****
getTrTelemacParams().loadAll(
getUI().createProgressionInterface(this));
! majAction();
if (getTrTelemacParams().isGeometrieLoaded()) {
initVisu();
--- 128,132 ----
getTrTelemacParams().loadAll(
getUI().createProgressionInterface(this));
! majAction();
if (getTrTelemacParams().isGeometrieLoaded()) {
initVisu();
***************
*** 118,121 ****
--- 142,169 ----
getImpl().activateInternalFrame(visu_);
}
+
+ /**
+ * Ajoute ou affiche la fenetre contenant les courbes temporelles.
+ */
+ protected synchronized void activeGrapheFille() {
+ 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_);
+ else
+ getImpl().activateInternalFrame(courbeFille_);
+ }
void initVisu() {
if (visu_ != null)
***************
*** 146,150 ****
--- 194,201 ----
new BuTaskOperation(null, TrResource.getS("Chargement fichiers")) {
public void act() {
+ TrImplementation impl=(TrImplementation)getImpl();
+ impl.setGlassPaneStop();
getTrTelemacParams().loadAll(getUI().createProgressionInterface(this));
+ impl.setGlassPaneStop();
if ((visu_ != null)
&& (visu_.getBoundaryGroup() == null)
***************
*** 155,158 ****
--- 206,210 ----
}
majAction();
+ impl.unsetGlassPaneStop();
}
}
***************
*** 162,165 ****
--- 214,228 ----
if (loadAction_ != null)
loadAction_.setEnabled(false);
+ majTransientCurveAction();
+ }
+
+ void majTransientCurveAction() {
+ if (courbeAction_ == null)
+ return;
+ if (isTransientAvailable()
+ && (getEvolMng() != null)
+ && (getEvolMng().getNbEvol() > 0)) {
+ courbeAction_.setEnabled(true);
+ }
}
/**
***************
*** 173,189 ****
*/
public void close() {
! if (entiteFille_ != null) {
! TrLib.saveFrameDimensionInPref(entiteFille_, "general");
! entiteFille_.setVisible(false);
! getImpl().removeInternalFrame(entiteFille_);
! entiteFille_= null;
! }
! if (visu_ != null) {
! TrLib.saveFrameDimensionInPref(visu_, "layer");
! getImpl().removeInternalFrame(visu_);
! visu_.setVisible(false);
! visu_= null;
! }
}
public BuMenu getProjectMenu() {
if (projectMenu_ == null)
--- 236,248 ----
*/
public void close() {
! BuCommonImplementation impl= getImpl();
! TrLib.closeInternalFrame(impl, entiteFille_, "general");
! entiteFille_= null;
! TrLib.closeInternalFrame(impl, visu_, "layer");
! visu_= null;
! TrLib.closeInternalFrame(impl, courbeFille_, "curve");
! courbeFille_= null;
}
+
public BuMenu getProjectMenu() {
if (projectMenu_ == null)
***************
*** 196,200 ****
new EbliSimpleAction(
TrResource.getS("Paramètres généraux"),
! null,
"MAIN_PROJECT_VIEW") {
public void actionPerformed(ActionEvent _ae) {
--- 255,259 ----
new EbliSimpleAction(
TrResource.getS("Paramètres généraux"),
! BuResource.BU.getToolIcon("maison"),
"MAIN_PROJECT_VIEW") {
public void actionPerformed(ActionEvent _ae) {
***************
*** 234,237 ****
--- 293,312 ----
TrResource.getS("Charger tous les fichiers de paramètres"));
}
+
+ if (courbeAction_ == null) {
+ courbeAction_=
+ new EbliSimpleAction(
+ H2dResource.getS("Courbes temporelles"),
+ EbliResource.EBLI.getToolIcon("curves"),
+ "TIME_CURVES") {
+ public void actionPerformed(ActionEvent _ae) {
+ activeGrapheFille();
+ }
+ };
+ courbeAction_.putValue(
+ Action.SHORT_DESCRIPTION,
+ TrResource.getS("Afficher la fenêtres des courbes temporelles"));
+ courbeAction_.setEnabled(false);
+ }
}
/**
***************
*** 253,256 ****
--- 328,332 ----
if (getMenuComponentCount() != 0)
return;
+ buildFilleActions();
add(
getCalculActions().getCalcul().buildMenuItem(
***************
*** 259,264 ****
add(loadAction_.buildMenuItem(EbliComponentFactory.INSTANCE));
addSeparator();
- add(visuAction_.buildMenuItem(EbliComponentFactory.INSTANCE));
add(projectAction_.buildMenuItem(EbliComponentFactory.INSTANCE));
}
}
--- 335,343 ----
add(loadAction_.buildMenuItem(EbliComponentFactory.INSTANCE));
addSeparator();
add(projectAction_.buildMenuItem(EbliComponentFactory.INSTANCE));
+ add(visuAction_.buildMenuItem(EbliComponentFactory.INSTANCE));
+ add(courbeAction_.buildMenuItem(EbliComponentFactory.INSTANCE));
+
+
}
}
***************
*** 267,271 ****
*/
public EbliActionInterface[] getSpecificActions() {
! EbliActionInterface[] r= new EbliActionInterface[4];
r[0]= getCalculActions().getCalcul();
r[1]= getDiffAction();
--- 346,350 ----
*/
public EbliActionInterface[] getSpecificActions() {
! EbliActionInterface[] r= new EbliActionInterface[5];
r[0]= getCalculActions().getCalcul();
r[1]= getDiffAction();
***************
*** 273,276 ****
--- 352,356 ----
r[2]= loadAction_;
r[3]= visuAction_;
+ r[4]= courbeAction_;
return r;
}
Index: TrTelemacFilleVisu.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/telemac/TrTelemacFilleVisu.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** TrTelemacFilleVisu.java 11 Dec 2003 12:50:56 -0000 1.7
--- TrTelemacFilleVisu.java 12 Dec 2003 11:29:42 -0000 1.8
***************
*** 12,15 ****
--- 12,17 ----
import javax.swing.Action;
+ import org.fudaa.ctulu.CtuluLib;
+
import org.fudaa.dodico.commun.DodicoCommand;
import org.fudaa.dodico.commun.DodicoCommandComposite;
***************
*** 27,31 ****
import org.fudaa.fudaa.commun.FudaaCommonImplementation;
- import org.fudaa.fudaa.commun.FudaaLib;
import org.fudaa.fudaa.tr.TrFilleVisu;
import org.fudaa.fudaa.tr.TrResource;
--- 29,32 ----
***************
*** 103,108 ****
if (getBcMng() != null) {
H2dTelemacBcManager bcMng= getBcMng();
! if (FudaaLib.DEBUG)
! FudaaLib.debug("add TrGroupe Cl");
TrBcLayerGroup gpCL= new TrBcLayerGroup();
TrTelemacBoundaryBlockLayer cqBord=
--- 104,109 ----
if (getBcMng() != null) {
H2dTelemacBcManager bcMng= getBcMng();
! if (CtuluLib.DEBUG)
! CtuluLib.debug("add TrGroupe Cl");
TrBcLayerGroup gpCL= new TrBcLayerGroup();
TrTelemacBoundaryBlockLayer cqBord=
***************
*** 170,180 ****
int[] debFin= layer.isSelectionContiguous(i);
if (debFin != null) {
! if (FudaaLib.DEBUG)
! FudaaLib.debug("remove liquid [" + debFin[0] + "," + debFin[1] + "]");
H2dTelemacBcManager cl= getBcMng();
cmd= cl.removeLiquidPts(debFin[0], debFin[1], i);
if (cmd != null) {
! if (FudaaLib.DEBUG)
! FudaaLib.debug(cl.getBlockFrontier(i).toString());
}
}
--- 171,181 ----
int[] debFin= layer.isSelectionContiguous(i);
if (debFin != null) {
! if (CtuluLib.DEBUG)
! CtuluLib.debug("remove liquid [" + debFin[0] + "," + debFin[1] + "]");
H2dTelemacBcManager cl= getBcMng();
cmd= cl.removeLiquidPts(debFin[0], debFin[1], i);
if (cmd != null) {
! if (CtuluLib.DEBUG)
! CtuluLib.debug(cl.getBlockFrontier(i).toString());
}
}
***************
*** 194,199 ****
if (debFin != null) {
H2dTelemacBcManager cl= getBcMng();
! if (FudaaLib.DEBUG)
! FudaaLib.debug("add liquid [" + debFin[0] + "," + debFin[1] + "]");
DodicoCommand cmd=
cl.addLiquidPts(
--- 195,200 ----
if (debFin != null) {
H2dTelemacBcManager cl= getBcMng();
! if (CtuluLib.DEBUG)
! CtuluLib.debug("add liquid [" + debFin[0] + "," + debFin[1] + "]");
DodicoCommand cmd=
cl.addLiquidPts(
***************
*** 203,208 ****
H2dBoundaryType.LIQUIDE_HAUTEUR_IMPOSEE);
if (cmd != null) {
! if (FudaaLib.DEBUG)
! FudaaLib.debug(cl.getBlockFrontier(i).toString());
if (_editor) {
DodicoCommandComposite cmdR= new DodicoCommandComposite();
--- 204,209 ----
H2dBoundaryType.LIQUIDE_HAUTEUR_IMPOSEE);
if (cmd != null) {
! if (CtuluLib.DEBUG)
! CtuluLib.debug(cl.getBlockFrontier(i).toString());
if (_editor) {
DodicoCommandComposite cmdR= new DodicoCommandComposite();
***************
*** 253,263 ****
if (debFin != null) {
H2dTelemacBcManager cl= getBcMng();
! if (FudaaLib.DEBUG)
! FudaaLib.debug(
"increase liquid [" + debFin[0] + "," + debFin[1] + "]");
DodicoCommand cmd= cl.increaseLiquidBorder(i, debFin[0], debFin[1]);
if (cmd != null) {
! if (FudaaLib.DEBUG)
! FudaaLib.debug(cl.getBlockFrontier(i).toString());
getCmdMng().addCmd(cmd);
return;
--- 254,264 ----
if (debFin != null) {
H2dTelemacBcManager cl= getBcMng();
! if (CtuluLib.DEBUG)
! CtuluLib.debug(
"increase liquid [" + debFin[0] + "," + debFin[1] + "]");
DodicoCommand cmd= cl.increaseLiquidBorder(i, debFin[0], debFin[1]);
if (cmd != null) {
! if (CtuluLib.DEBUG)
! CtuluLib.debug(cl.getBlockFrontier(i).toString());
getCmdMng().addCmd(cmd);
return;
***************
*** 273,278 ****
*/
public EbliActionInterface[] buildBcPointActions() {
! if (FudaaLib.DEBUG)
! FudaaLib.debug("build bcPointLayer actions");
EbliActionInterface[] r= new EbliActionInterface[7];
int idx= 0;
--- 274,279 ----
*/
public EbliActionInterface[] buildBcPointActions() {
! if (CtuluLib.DEBUG)
! CtuluLib.debug("build bcPointLayer actions");
EbliActionInterface[] r= new EbliActionInterface[7];
int idx= 0;
***************
*** 386,391 ****
}
public EbliActionInterface[] buildBcBoundaryBlockActions() {
! if (FudaaLib.DEBUG)
! FudaaLib.debug("build bcBoundaryBlockLayer actions");
EbliActionInterface[] actions_= new EbliActionInterface[2];
int idx= 0;
--- 387,392 ----
}
public EbliActionInterface[] buildBcBoundaryBlockActions() {
! if (CtuluLib.DEBUG)
! CtuluLib.debug("build bcBoundaryBlockLayer actions");
EbliActionInterface[] actions_= new EbliActionInterface[2];
int idx= 0;
***************
*** 416,421 ****
(H2dTelemacBoundary)cl.getBoundary(i, l.getMaxIndex());
if (b.getType().isLiquide()) {
! if (FudaaLib.DEBUG)
! FudaaLib.debug("remove b " + b + " index =" + l.getMaxIndex());
getCmdMng().addCmd(cl.removeLiquidBorder(b));
}
--- 417,422 ----
(H2dTelemacBoundary)cl.getBoundary(i, l.getMaxIndex());
if (b.getType().isLiquide()) {
! if (CtuluLib.DEBUG)
! CtuluLib.debug("remove b " + b + " index =" + l.getMaxIndex());
getCmdMng().addCmd(cl.removeLiquidBorder(b));
}
Index: TrTelemacImplHelper.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/telemac/TrTelemacImplHelper.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** TrTelemacImplHelper.java 11 Dec 2003 12:50:56 -0000 1.11
--- TrTelemacImplHelper.java 12 Dec 2003 11:29:42 -0000 1.12
***************
*** 9,18 ****
package org.fudaa.fudaa.tr.telemac;
import java.io.File;
import com.memoire.bu.BuMenuItem;
import com.memoire.bu.BuTask;
- import org.fudaa.dodico.commun.DodicoLib;
import org.fudaa.dodico.commun.ProgressionInterface;
- import org.fudaa.dodico.dico.DicoCasFileFormatVersion;
import org.fudaa.dodico.dico.DicoLanguage;
import org.fudaa.dodico.dico.DicoModelAbstract;
--- 9,19 ----
package org.fudaa.fudaa.tr.telemac;
import java.io.File;
+
+ import org.fudaa.ctulu.CtuluLib;
+
import com.memoire.bu.BuMenuItem;
import com.memoire.bu.BuTask;
import org.fudaa.dodico.commun.ProgressionInterface;
import org.fudaa.dodico.dico.DicoLanguage;
import org.fudaa.dodico.dico.DicoModelAbstract;
***************
*** 22,28 ****
import org.fudaa.dodico.telemac.io.TelemacDicoFileFormat;
import org.fudaa.dodico.telemac.io.TelemacDicoFileFormatVersion;
! import org.fudaa.ebli.dialog.EbliSimpleDialog;
import org.fudaa.ebli.dialog.EbliSimpleDialogPanel;
! import org.fudaa.ebli.impression.EbliDjaFrame;
import org.fudaa.fudaa.dico.FDicoChooserPanel;
import org.fudaa.fudaa.dico.FDicoNewProjectPanel;
--- 23,29 ----
import org.fudaa.dodico.telemac.io.TelemacDicoFileFormat;
import org.fudaa.dodico.telemac.io.TelemacDicoFileFormatVersion;
!
import org.fudaa.ebli.dialog.EbliSimpleDialogPanel;
!
import org.fudaa.fudaa.dico.FDicoChooserPanel;
import org.fudaa.fudaa.dico.FDicoNewProjectPanel;
***************
*** 102,106 ****
_op.setDesc(
TrResource.getS("import fichier cas pour")
! + DodicoLib.ESPACE
+ _ft.getName());
TelemacDicoFileFormatVersion version=
--- 103,107 ----
_op.setDesc(
TrResource.getS("import fichier cas pour")
! + CtuluLib.ESPACE
+ _ft.getName());
TelemacDicoFileFormatVersion version=
Index: TrTelemacInfoSenderDefault.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/telemac/TrTelemacInfoSenderDefault.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TrTelemacInfoSenderDefault.java 11 Dec 2003 12:50:56 -0000 1.1
--- TrTelemacInfoSenderDefault.java 12 Dec 2003 11:29:42 -0000 1.2
***************
*** 9,16 ****
package org.fudaa.fudaa.tr.telemac;
! import org.fudaa.dodico.commun.DodicoLib;
import org.fudaa.dodico.commun.DodicoPermanentList;
import org.fudaa.dodico.h2d.H2dEvolution;
- import org.fudaa.dodico.h2d.H2dParameters;
import org.fudaa.dodico.h2d.telemac.H2dTelemacBcManager;
import org.fudaa.dodico.h2d.telemac.H2dTelemacBoundary;
--- 9,16 ----
package org.fudaa.fudaa.tr.telemac;
! import org.fudaa.ctulu.CtuluLib;
!
import org.fudaa.dodico.commun.DodicoPermanentList;
import org.fudaa.dodico.h2d.H2dEvolution;
import org.fudaa.dodico.h2d.telemac.H2dTelemacBcManager;
import org.fudaa.dodico.h2d.telemac.H2dTelemacBoundary;
***************
*** 57,62 ****
_receiver.setTitle(
TrResource.getS("Bord liquide n°")
! + DodicoLib.ESPACE
! + DodicoLib.getString(bcMng.getIdxLiquidBord(b) + 1));
_receiver.put(TrResource.getS("Type du bord"), b.getType().toString());
}
--- 57,62 ----
_receiver.setTitle(
TrResource.getS("Bord liquide n°")
! + CtuluLib.ESPACE
! + CtuluLib.getString(bcMng.getIdxLiquidBord(b) + 1));
_receiver.put(TrResource.getS("Type du bord"), b.getType().toString());
}
***************
*** 64,74 ****
_receiver.put(
TrResource.getS("Nombre de points"),
! DodicoLib.getString(temp));
_receiver.put(
TrResource.getS("Index premier point"),
! DodicoLib.getString(b.getIdxDeb() + 1));
_receiver.put(
TrResource.getS("Index dernier point"),
! DodicoLib.getString(b.getIdxFin() + 1));
if (b.getType().isSolide()) {
--- 64,74 ----
_receiver.put(
TrResource.getS("Nombre de points"),
! CtuluLib.getString(temp));
_receiver.put(
TrResource.getS("Index premier point"),
! CtuluLib.getString(b.getIdxDeb() + 1));
_receiver.put(
TrResource.getS("Index dernier point"),
! CtuluLib.getString(b.getIdxFin() + 1));
if (b.getType().isSolide()) {
|
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/reflux
In directory sc8-pr-cvs1:/tmp/cvs-serv29179/org/fudaa/fudaa/tr/reflux
Modified Files:
TrRefluxFilleProjet.java TrRefluxFilleVisu.java
TrRefluxImplHelper.java TrRefluxInfoSenderDefault.java
TrRefluxParametres.java TrRefluxProjectDispatcherListener.java
TrRefluxProjectFactory.java TrRefluxProjet.java
TrRefluxTimeStepsEditor.java TrRefluxValueEditorPanel.java
Log Message:
Maj general
Index: TrRefluxFilleProjet.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/reflux/TrRefluxFilleProjet.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** TrRefluxFilleProjet.java 11 Dec 2003 12:50:56 -0000 1.8
--- TrRefluxFilleProjet.java 12 Dec 2003 11:29:41 -0000 1.9
***************
*** 16,19 ****
--- 16,20 ----
import java.text.DateFormat;
import java.util.Date;
+
import javax.swing.BorderFactory;
import javax.swing.DefaultComboBoxModel;
***************
*** 21,24 ****
--- 22,28 ----
import javax.swing.JComponent;
import javax.swing.JTextField;
+
+ import org.fudaa.ctulu.CtuluLib;
+
import com.memoire.bu.BuBorderLayout;
import com.memoire.bu.BuButton;
***************
*** 30,38 ****
import com.memoire.bu.BuResource;
import com.memoire.bu.BuTextField;
import org.fudaa.dodico.commun.DodicoCommandManager;
- import org.fudaa.dodico.commun.DodicoLib;
import org.fudaa.dodico.h2d.reflux.H2dRefluxParameters;
import org.fudaa.dodico.h2d.type.H2dProjetType;
import org.fudaa.ebli.calque.action.EbliComponentFactory;
import org.fudaa.fudaa.commun.exec.FudaaEditor;
import org.fudaa.fudaa.commun.undo.FudaaUndoCmdMngContainer;
--- 34,44 ----
import com.memoire.bu.BuResource;
import com.memoire.bu.BuTextField;
+
import org.fudaa.dodico.commun.DodicoCommandManager;
import org.fudaa.dodico.h2d.reflux.H2dRefluxParameters;
import org.fudaa.dodico.h2d.type.H2dProjetType;
+
import org.fudaa.ebli.calque.action.EbliComponentFactory;
+
import org.fudaa.fudaa.commun.exec.FudaaEditor;
import org.fudaa.fudaa.commun.undo.FudaaUndoCmdMngContainer;
***************
*** 131,136 ****
DateFormat.getInstance().format(new Date(f.lastModified())));
} else {
! txtFile.setText(DodicoLib.EMPTY_STRING);
! txtDate.setText(DodicoLib.EMPTY_STRING);
}
--- 137,142 ----
DateFormat.getInstance().format(new Date(f.lastModified())));
} else {
! txtFile.setText(CtuluLib.EMPTY_STRING);
! txtDate.setText(CtuluLib.EMPTY_STRING);
}
***************
*** 157,160 ****
--- 163,169 ----
specificComponents_[1]=
proj_.getVisuFilleAction().buildToolButton(
+ EbliComponentFactory.INSTANCE);
+ specificComponents_[1]=
+ proj_.getCourbeFilleAction().buildToolButton(
EbliComponentFactory.INSTANCE);
}
Index: TrRefluxFilleVisu.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/reflux/TrRefluxFilleVisu.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** TrRefluxFilleVisu.java 11 Dec 2003 12:50:56 -0000 1.11
--- TrRefluxFilleVisu.java 12 Dec 2003 11:29:41 -0000 1.12
***************
*** 9,28 ****
package org.fudaa.fudaa.tr.reflux;
import java.awt.event.ActionEvent;
- import java.util.HashMap;
- import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.TreeMap;
import javax.swing.Action;
import org.fudaa.dodico.h2d.H2dLib;
import org.fudaa.dodico.h2d.reflux.H2dRefluxBcManager;
import org.fudaa.dodico.h2d.type.H2dBoundaryType;
import org.fudaa.dodico.h2d.type.H2dVariableType;
import org.fudaa.ebli.calque.ZCalqueAffichageDonnees;
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;
- import org.fudaa.fudaa.commun.FudaaLib;
import org.fudaa.fudaa.tr.TrFilleVisu;
import org.fudaa.fudaa.tr.TrResource;
--- 9,31 ----
package org.fudaa.fudaa.tr.reflux;
import java.awt.event.ActionEvent;
import java.util.Map;
import java.util.Set;
import java.util.TreeMap;
+
import javax.swing.Action;
+
+ import org.fudaa.ctulu.CtuluLib;
+
import org.fudaa.dodico.h2d.H2dLib;
import org.fudaa.dodico.h2d.reflux.H2dRefluxBcManager;
import org.fudaa.dodico.h2d.type.H2dBoundaryType;
import org.fudaa.dodico.h2d.type.H2dVariableType;
+
import org.fudaa.ebli.calque.ZCalqueAffichageDonnees;
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;
import org.fudaa.fudaa.tr.TrFilleVisu;
import org.fudaa.fudaa.tr.TrResource;
***************
*** 218,223 ****
}
private EbliActionInterface[] buildBoundaryAction() {
! if (FudaaLib.DEBUG)
! FudaaLib.debug("build bcBoundaryLayer actions");
EbliActionInterface[] r= new EbliActionInterface[1];
r[0]=
--- 221,226 ----
}
private EbliActionInterface[] buildBoundaryAction() {
! if (CtuluLib.DEBUG)
! CtuluLib.debug("build bcBoundaryLayer actions");
EbliActionInterface[] r= new EbliActionInterface[1];
r[0]=
***************
*** 233,238 ****
}
private EbliActionInterface[] buildBcPointAction() {
! if (FudaaLib.DEBUG)
! FudaaLib.debug("build bcPointLayer actions");
EbliActionInterface[] r= new EbliActionInterface[2];
r[0]=
--- 236,241 ----
}
private EbliActionInterface[] buildBcPointAction() {
! if (CtuluLib.DEBUG)
! CtuluLib.debug("build bcPointLayer actions");
EbliActionInterface[] r= new EbliActionInterface[2];
r[0]=
***************
*** 261,266 ****
}
private EbliActionInterface[] buildElementAction() {
! if (FudaaLib.DEBUG)
! FudaaLib.debug("build bcElement actions");
EbliActionInterface[] r= new EbliActionInterface[1];
r[0]=
--- 264,269 ----
}
private EbliActionInterface[] buildElementAction() {
! if (CtuluLib.DEBUG)
! CtuluLib.debug("build bcElement actions");
EbliActionInterface[] r= new EbliActionInterface[1];
r[0]=
Index: TrRefluxImplHelper.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/reflux/TrRefluxImplHelper.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** TrRefluxImplHelper.java 11 Dec 2003 12:50:56 -0000 1.9
--- TrRefluxImplHelper.java 12 Dec 2003 11:29:41 -0000 1.10
***************
*** 16,19 ****
--- 16,21 ----
import javax.swing.event.CaretListener;
+ import org.fudaa.ctulu.CtuluLib;
+
import com.memoire.bu.BuComboBox;
import com.memoire.bu.BuGridLayout;
***************
*** 21,45 ****
import com.memoire.bu.BuMenuItem;
import com.memoire.bu.BuTask;
- import com.memoire.bu.BuTaskOperation;
- import org.fudaa.dodico.commun.DodicoLib;
import org.fudaa.dodico.commun.DodicoPreferences;
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.H2dFileFormatMaillageVersion;
- import org.fudaa.dodico.h2d.H2dGrid;
- import org.fudaa.dodico.h2d.H2dResource;
- import org.fudaa.dodico.h2d.type.H2dElementType;
import org.fudaa.dodico.h2d.type.H2dProjetType;
- import org.fudaa.dodico.olb.OLBExec;
import org.fudaa.dodico.reflux.io.INPFileFormat;
import org.fudaa.dodico.telemac.io.TelemacDicoFileFormat;
import org.fudaa.ebli.dialog.EbliSimpleDialogPanel;
import org.fudaa.fudaa.commun.exec.FudaaExecServerManager;
- import org.fudaa.fudaa.commun.fileChooser.FudaaFileChooser;
import org.fudaa.fudaa.ressource.FudaaResource;
import org.fudaa.fudaa.tr.TrFileFormatManager;
--- 23,40 ----
import com.memoire.bu.BuMenuItem;
import com.memoire.bu.BuTask;
import org.fudaa.dodico.commun.DodicoPreferences;
import org.fudaa.dodico.commun.ProgressionInterface;
import org.fudaa.dodico.fichiers.FileFormat;
import org.fudaa.dodico.fichiers.FileFormatSoftware;
import org.fudaa.dodico.h2d.H2dFileFormatMaillageVersion;
import org.fudaa.dodico.h2d.type.H2dProjetType;
import org.fudaa.dodico.reflux.io.INPFileFormat;
import org.fudaa.dodico.telemac.io.TelemacDicoFileFormat;
import org.fudaa.ebli.dialog.EbliSimpleDialogPanel;
+ import org.fudaa.ebli.filechooser.EbliFileChooser;
import org.fudaa.fudaa.commun.exec.FudaaExecServerManager;
import org.fudaa.fudaa.ressource.FudaaResource;
import org.fudaa.fudaa.tr.TrFileFormatManager;
***************
*** 98,105 ****
getImpl());
mp.setProgression(60);
! _op.setDesc(DodicoLib.EMPTY_STRING);
_op.setProgression(0);
mp.setMessage(TrResource.getS("Affichage") + " ...");
! mp.setMessage(DodicoLib.EMPTY_STRING);
mp.setProgression(0);
return projet;
--- 93,100 ----
getImpl());
mp.setProgression(60);
! _op.setDesc(CtuluLib.EMPTY_STRING);
_op.setProgression(0);
mp.setMessage(TrResource.getS("Affichage") + " ...");
! mp.setMessage(CtuluLib.EMPTY_STRING);
mp.setProgression(0);
return projet;
***************
*** 174,178 ****
this,
null,
! DodicoLib.EMPTY_STRING,
false,
true);
--- 169,173 ----
this,
null,
! CtuluLib.EMPTY_STRING,
false,
true);
***************
*** 200,204 ****
*/
public JFileChooser createFileChooser() {
! return new FudaaFileChooser(true);
}
--- 195,199 ----
*/
public JFileChooser createFileChooser() {
! return new EbliFileChooser(true);
}
***************
*** 229,233 ****
TrResource.getS(
"Le fichier {0} n'existe pas",
! f == null ? DodicoLib.EMPTY_STRING : f.getAbsolutePath()));
return false;
--- 224,228 ----
TrResource.getS(
"Le fichier {0} n'existe pas",
! f == null ? CtuluLib.EMPTY_STRING : f.getAbsolutePath()));
return false;
Index: TrRefluxInfoSenderDefault.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/reflux/TrRefluxInfoSenderDefault.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TrRefluxInfoSenderDefault.java 11 Dec 2003 12:50:56 -0000 1.1
--- TrRefluxInfoSenderDefault.java 12 Dec 2003 11:29:41 -0000 1.2
***************
*** 10,19 ****
import java.util.Arrays;
- import java.util.Iterator;
import java.util.Set;
import org.fudaa.dodico.commun.DodicoLib;
import org.fudaa.dodico.commun.DodicoPermanentList;
- import org.fudaa.dodico.h2d.H2dParameters;
import org.fudaa.dodico.h2d.reflux.H2dRefluxBcManager;
import org.fudaa.dodico.h2d.reflux.H2dRefluxBoundaryCondition;
--- 10,19 ----
import java.util.Arrays;
import java.util.Set;
+ import org.fudaa.ctulu.CtuluLib;
+
import org.fudaa.dodico.commun.DodicoLib;
import org.fudaa.dodico.commun.DodicoPermanentList;
import org.fudaa.dodico.h2d.reflux.H2dRefluxBcManager;
import org.fudaa.dodico.h2d.reflux.H2dRefluxBoundaryCondition;
***************
*** 139,143 ****
fr.getRefluxBc(temp).getIndexPt()
+ " ("
! + DodicoLib.getString(temp)
+ ")");
temp= _idxOnFr;
--- 139,143 ----
fr.getRefluxBc(temp).getIndexPt()
+ " ("
! + CtuluLib.getString(temp)
+ ")");
temp= _idxOnFr;
***************
*** 146,150 ****
fr.getRefluxBc(temp).getIndexPt()
+ " ("
! + DodicoLib.getString(temp)
+ ")");
temp= (_idxOnFr == fr.getNbPt() - 1 ? 0 : _idxOnFr + 1);
--- 146,150 ----
fr.getRefluxBc(temp).getIndexPt()
+ " ("
! + CtuluLib.getString(temp)
+ ")");
temp= (_idxOnFr == fr.getNbPt() - 1 ? 0 : _idxOnFr + 1);
***************
*** 153,157 ****
fr.getRefluxBc(temp).getIndexPt()
+ " ("
! + DodicoLib.getString(temp)
+ ")");
--- 153,157 ----
fr.getRefluxBc(temp).getIndexPt()
+ " ("
! + CtuluLib.getString(temp)
+ ")");
***************
*** 174,178 ****
+ (value.isDoubleValueConstant()
? ": " + value.getValue()
! : DodicoLib.EMPTY_STRING));
} else if (bcType == H2dBcType.TRANSITOIRE) {
_receiver.put(
--- 174,178 ----
+ (value.isDoubleValueConstant()
? ": " + value.getValue()
! : CtuluLib.EMPTY_STRING));
} else if (bcType == H2dBcType.TRANSITOIRE) {
_receiver.put(
***************
*** 181,185 ****
+ (value.isEvolutionFixed()
? ": " + value.getEvolution().getNom()
! : DodicoLib.EMPTY_STRING));
} else {
_receiver.put(v.getNom(), bcType.getNom());
--- 181,185 ----
+ (value.isEvolutionFixed()
? ": " + value.getEvolution().getNom()
! : CtuluLib.EMPTY_STRING));
} else {
_receiver.put(v.getNom(), bcType.getNom());
Index: TrRefluxParametres.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/reflux/TrRefluxParametres.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** TrRefluxParametres.java 11 Dec 2003 12:50:56 -0000 1.14
--- TrRefluxParametres.java 12 Dec 2003 11:29:41 -0000 1.15
***************
*** 14,17 ****
--- 14,19 ----
import java.util.Map;
+ import org.fudaa.ctulu.CtuluLib;
+
import com.memoire.bu.BuResource;
***************
*** 23,27 ****
import org.fudaa.dodico.h2d.H2dNodalPropertyMixte;
import org.fudaa.dodico.h2d.H2dParameters;
- import org.fudaa.dodico.h2d.H2dPoint;
import org.fudaa.dodico.h2d.H2dTimeStepGroup;
import org.fudaa.dodico.h2d.reflux.H2dRefluxBcManager;
--- 25,28 ----
***************
*** 38,48 ****
import org.fudaa.fudaa.commun.FudaaUI;
import org.fudaa.fudaa.ressource.FudaaResource;
- import org.fudaa.fudaa.tr.TrFilleVisu;
import org.fudaa.fudaa.tr.TrParametres;
import org.fudaa.fudaa.tr.TrPreferences;
import org.fudaa.fudaa.tr.TrResource;
import org.fudaa.fudaa.tr.data.TrPanelInfoSender;
- import org.fudaa.fudaa.tr.data.TrPanelInfoSenderDefault;
- import org.fudaa.fudaa.tr.data.TrPanelInfo.InfoData;
/**
* @author deniger
--- 39,46 ----
***************
*** 204,212 ****
new StringBuffer(
TrResource.getS("Les fichiers suivants vont être remplacés"));
! b.append(":").append(DodicoLib.LINE_SEP);
for (Iterator it= fileToOverWrite.iterator(); it.hasNext();) {
b.append((String)it.next());
}
! b.append(DodicoLib.LINE_SEP).append(
TrResource.getS("Voulez-vous continuer ?"));
if (!getUI()
--- 202,210 ----
new StringBuffer(
TrResource.getS("Les fichiers suivants vont être remplacés"));
! b.append(":").append(CtuluLib.LINE_SEP);
for (Iterator it= fileToOverWrite.iterator(); it.hasNext();) {
b.append((String)it.next());
}
! b.append(CtuluLib.LINE_SEP).append(
TrResource.getS("Voulez-vous continuer ?"));
if (!getUI()
***************
*** 245,249 ****
TrResource.getS("Erreur"),
"Il est impossible de créer un fichier dans le dossier"
! + DodicoLib.LINE_SEP
+ _f.getAbsolutePath());
return null;
--- 243,247 ----
TrResource.getS("Erreur"),
"Il est impossible de créer un fichier dans le dossier"
! + CtuluLib.LINE_SEP
+ _f.getAbsolutePath());
return null;
Index: TrRefluxProjectDispatcherListener.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/reflux/TrRefluxProjectDispatcherListener.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TrRefluxProjectDispatcherListener.java 11 Dec 2003 12:50:56 -0000 1.3
--- TrRefluxProjectDispatcherListener.java 12 Dec 2003 11:29:41 -0000 1.4
***************
*** 8,11 ****
--- 8,13 ----
*/
package org.fudaa.fudaa.tr.reflux;
+ import org.fudaa.ctulu.CtuluLib;
+
import org.fudaa.dodico.dico.DicoEntite;
import org.fudaa.dodico.dico.DicoParams;
***************
*** 16,19 ****
--- 18,22 ----
import org.fudaa.dodico.h2d.type.H2dBoundaryType;
import org.fudaa.dodico.h2d.type.H2dVariableType;
+
import org.fudaa.fudaa.commun.FudaaLib;
import org.fudaa.fudaa.tr.TrProjectDispatcherListener;
***************
*** 123,127 ****
*/
public void evolutionUsedChanged(H2dEvolution _e, int _old, int _new) {
! if(FudaaLib.DEBUG) super.evolutionUsedChanged(_e, _old, _new);
}
--- 126,130 ----
*/
public void evolutionUsedChanged(H2dEvolution _e, int _old, int _new) {
! if(CtuluLib.DEBUG) super.evolutionUsedChanged(_e, _old, _new);
}
Index: TrRefluxProjectFactory.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/reflux/TrRefluxProjectFactory.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** TrRefluxProjectFactory.java 11 Dec 2003 12:50:56 -0000 1.5
--- TrRefluxProjectFactory.java 12 Dec 2003 11:29:41 -0000 1.6
***************
*** 10,15 ****
import java.io.File;
import org.fudaa.dodico.commun.DodicoAnalyze;
- import org.fudaa.dodico.commun.DodicoLib;
import org.fudaa.dodico.commun.ProgressionInterface;
import org.fudaa.dodico.fichiers.FileOperationSynthese;
--- 10,16 ----
import java.io.File;
+ import org.fudaa.ctulu.CtuluLib;
+
import org.fudaa.dodico.commun.DodicoAnalyze;
import org.fudaa.dodico.commun.ProgressionInterface;
import org.fudaa.dodico.fichiers.FileOperationSynthese;
***************
*** 152,156 ****
analyze.setDesc(
TrResource.getS("Analyse du fichier")
! + DodicoLib.ESPACE
+ _f.getAbsolutePath());
r.params_= H2dRefluxParameters.init(inter, _progress, _ft, analyze);
--- 153,157 ----
analyze.setDesc(
TrResource.getS("Analyse du fichier")
! + CtuluLib.ESPACE
+ _f.getAbsolutePath());
r.params_= H2dRefluxParameters.init(inter, _progress, _ft, analyze);
Index: TrRefluxProjet.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/reflux/TrRefluxProjet.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** TrRefluxProjet.java 11 Dec 2003 12:50:56 -0000 1.14
--- TrRefluxProjet.java 12 Dec 2003 11:29:41 -0000 1.15
***************
*** 9,19 ****
package org.fudaa.fudaa.tr.reflux;
import ghm.followgui.FollowApp;
! import java.awt.Dimension;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
- import java.beans.PropertyVetoException;
import java.io.File;
! import java.io.IOException;
! import java.lang.reflect.InvocationTargetException;
import javax.swing.Action;
import javax.swing.SwingUtilities;
--- 9,17 ----
package org.fudaa.fudaa.tr.reflux;
import ghm.followgui.FollowApp;
!
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.io.File;
!
import javax.swing.Action;
import javax.swing.SwingUtilities;
***************
*** 22,38 ****
import com.memoire.bu.BuInformationsDocument;
import com.memoire.bu.BuMenu;
- import com.memoire.bu.BuMenuItem;
import com.memoire.bu.BuResource;
import org.fudaa.dodico.calcul.CalculLauncher;
import org.fudaa.dodico.commun.ProgressionInterface;
import org.fudaa.dodico.dico.DicoParams;
import org.fudaa.dodico.fichiers.FileFormatSoftware;
import org.fudaa.dodico.h2d.reflux.H2dRefluxElementPropertyMngAbstract;
import org.fudaa.dodico.h2d.reflux.H2dRefluxParameters;
import org.fudaa.dodico.reflux.RefluxExec;
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.fudaa.commun.FudaaCommonImplementation;
import org.fudaa.fudaa.commun.FudaaUI;
--- 20,41 ----
import com.memoire.bu.BuInformationsDocument;
import com.memoire.bu.BuMenu;
import com.memoire.bu.BuResource;
+
import org.fudaa.dodico.calcul.CalculLauncher;
import org.fudaa.dodico.commun.ProgressionInterface;
import org.fudaa.dodico.dico.DicoParams;
import org.fudaa.dodico.fichiers.FileFormatSoftware;
+ import org.fudaa.dodico.h2d.H2dEvolutionManager;
+ import org.fudaa.dodico.h2d.H2dResource;
import org.fudaa.dodico.h2d.reflux.H2dRefluxElementPropertyMngAbstract;
import org.fudaa.dodico.h2d.reflux.H2dRefluxParameters;
import org.fudaa.dodico.reflux.RefluxExec;
+
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.commun.FudaaUI;
***************
*** 42,56 ****
import org.fudaa.fudaa.tr.TrExport;
import org.fudaa.fudaa.tr.TrFilleVisu;
import org.fudaa.fudaa.tr.TrImplementation;
import org.fudaa.fudaa.tr.TrLib;
- import org.fudaa.fudaa.tr.TrPreferences;
import org.fudaa.fudaa.tr.TrProjet;
import org.fudaa.fudaa.tr.TrResource;
- import org.fudaa.fudaa.tr.data.TrBcBoundaryLegendPanel;
- import org.fudaa.fudaa.tr.data.TrBcBoundaryBlockLayer;
- import org.fudaa.fudaa.tr.data.TrBcPointLayer;
- import org.fudaa.fudaa.tr.data.TrBcLayerGroup;
- import org.fudaa.fudaa.tr.data.TrBcBoundaryBlockModelDefault;
- import org.fudaa.fudaa.tr.data.TrBcPointModelDefault;
/**
* @author deniger
--- 45,53 ----
import org.fudaa.fudaa.tr.TrExport;
import org.fudaa.fudaa.tr.TrFilleVisu;
+ import org.fudaa.fudaa.tr.TrGrapheFille;
import org.fudaa.fudaa.tr.TrImplementation;
import org.fudaa.fudaa.tr.TrLib;
import org.fudaa.fudaa.tr.TrProjet;
import org.fudaa.fudaa.tr.TrResource;
/**
* @author deniger
***************
*** 62,69 ****
--- 59,68 ----
TrRefluxParametres params_;
TrRefluxFilleProjet fille_;
+ TrGrapheFille courbeFille_;
TrFilleVisu visu_;
FudaaCalculAction calculActions_;
EbliSimpleAction projectAction_;
EbliSimpleAction visuAction_;
+ EbliSimpleAction courbeAction_;
RefluxProjectMenu projectMenu_;
TrImplementation impl_;
***************
*** 91,94 ****
--- 90,115 ----
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_);
+ else
+ getImpl().activateInternalFrame(courbeFille_);
+ }
/**
*
***************
*** 129,138 ****
*/
public void activeGeneral() {
!
if (fille_ == null) {
fille_= new TrRefluxFilleProjet(this);
fille_.pack();
getImpl().addInternalFrame(fille_);
! TrLib.initFrameDimensionWithPref(fille_, "general", getImpl().getMainPanel().getDesktop().getSize());
} else if (fille_.isClosed()) {
--- 150,162 ----
*/
public void activeGeneral() {
!
if (fille_ == null) {
fille_= new TrRefluxFilleProjet(this);
fille_.pack();
getImpl().addInternalFrame(fille_);
! TrLib.initFrameDimensionWithPref(
! fille_,
! "general",
! getImpl().getMainPanel().getDesktop().getSize());
} else if (fille_.isClosed()) {
***************
*** 153,163 ****
projectMenu_.buildVisuMenu();
getImpl().addInternalFrame(visu_);
! TrLib.initFrameDimensionWithPref(visu_, "layer", getImpl().getMainPanel().getDesktop().getSize());
! SwingUtilities.invokeLater(new Runnable(){
! public void run(){
! visu_.restaurer();
}
! });
! // visu_.restaurer();
} else if (visu_.isClosed()) {
getImpl().addInternalFrame(visu_);
--- 177,190 ----
projectMenu_.buildVisuMenu();
getImpl().addInternalFrame(visu_);
! TrLib.initFrameDimensionWithPref(
! visu_,
! "layer",
! getImpl().getMainPanel().getDesktop().getSize());
! SwingUtilities.invokeLater(new Runnable() {
! public void run() {
! visu_.restaurer();
}
! });
! // visu_.restaurer();
} else if (visu_.isClosed()) {
getImpl().addInternalFrame(visu_);
***************
*** 166,183 ****
}
public void close() {
! if (fille_ != null) {
! TrLib.saveFrameDimensionInPref(fille_, "general");
! fille_.setVisible(false);
! getImpl().removeInternalFrame(fille_);
! fille_= null;
! }
! if (visu_ != null) {
! TrLib.saveFrameDimensionInPref(visu_, "layer");
! visu_.setVisible(false);
! getImpl().removeInternalFrame(visu_);
visu_= null;
! }
! }
!
/**
*
--- 193,204 ----
}
public void close() {
! TrLib.closeInternalFrame(impl_, fille_, "general");
! fille_= null;
! TrLib.closeInternalFrame(impl_, visu_, "layer");
visu_= null;
! TrLib.closeInternalFrame(impl_,courbeFille_, "curve");
! courbeFille_= null;
! }
!
/**
*
***************
*** 294,297 ****
--- 315,319 ----
if (getMenuComponentCount() != 0)
return;
+ buildFilleActions();
addMenuItem(
TrResource.getS("Intégration en temps"),
***************
*** 305,308 ****
--- 327,331 ----
add(projectAction_.buildMenuItem(EbliComponentFactory.INSTANCE));
add(visuAction_.buildMenuItem(EbliComponentFactory.INSTANCE));
+ add(courbeAction_.buildMenuItem(EbliComponentFactory.INSTANCE));
buildVisuMenu();
}
***************
*** 319,322 ****
--- 342,351 ----
return projectAction_;
}
+
+ public EbliActionInterface getCourbeFilleAction() {
+ buildFilleActions();
+ return courbeAction_;
+ }
+
public EbliActionInterface getMainFilleAction() {
return visuAction_;
***************
*** 327,331 ****
new EbliSimpleAction(
TrResource.getS("Paramètres généraux"),
! BuResource.BU.getToolIcon("voir"),
"MAIN_PROJECT_VIEW") {
public void actionPerformed(ActionEvent _ae) {
--- 356,361 ----
new EbliSimpleAction(
TrResource.getS("Paramètres généraux"),
! BuResource.BU.getToolIcon("maison")
! ,
"MAIN_PROJECT_VIEW") {
public void actionPerformed(ActionEvent _ae) {
***************
*** 341,345 ****
new EbliSimpleAction(
TrResource.getS("Vue du maillage"),
! null,
"GRID_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) {
***************
*** 351,354 ****
--- 381,400 ----
TrResource.getS("Vue du maillage"));
}
+ if (courbeAction_ == null) {
+ courbeAction_=
+ new EbliSimpleAction(
+ H2dResource.getS("Courbes temporelles"),
+ EbliResource.EBLI.getToolIcon("curves"),
+ "TIME_CURVES") {
+ public void actionPerformed(ActionEvent _ae) {
+ activeGrapheFille();
+ }
+ };
+ courbeAction_.putValue(
+ Action.SHORT_DESCRIPTION,
+ TrResource.getS("Afficher la fenêtres des courbes temporelles"));
+ courbeAction_.setEnabled((getH2dRefluxParametres().getEvolMng()!=null) && (getH2dRefluxParametres().getEvolMng().getNbEvol()>0));
+ }
+
}
/**
Index: TrRefluxTimeStepsEditor.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/reflux/TrRefluxTimeStepsEditor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TrRefluxTimeStepsEditor.java 11 Dec 2003 12:50:56 -0000 1.1
--- TrRefluxTimeStepsEditor.java 12 Dec 2003 11:29:41 -0000 1.2
***************
*** 8,23 ****
*/
package org.fudaa.fudaa.tr.reflux;
- import java.awt.CheckboxGroup;
import java.awt.Dimension;
import java.awt.event.ItemEvent;
import java.awt.event.ItemListener;
- import java.util.ArrayList;
import java.util.Iterator;
import java.util.Map;
import java.util.TreeMap;
import javax.swing.BorderFactory;
import javax.swing.ButtonGroup;
import javax.swing.DefaultComboBoxModel;
- import javax.swing.JCheckBox;
import javax.swing.JComboBox;
import javax.swing.JLabel;
--- 8,21 ----
*/
package org.fudaa.fudaa.tr.reflux;
import java.awt.Dimension;
import java.awt.event.ItemEvent;
import java.awt.event.ItemListener;
import java.util.Iterator;
import java.util.Map;
import java.util.TreeMap;
+
import javax.swing.BorderFactory;
import javax.swing.ButtonGroup;
import javax.swing.DefaultComboBoxModel;
import javax.swing.JComboBox;
import javax.swing.JLabel;
***************
*** 28,33 ****
import javax.swing.event.CaretEvent;
import javax.swing.event.CaretListener;
import com.memoire.bu.BuBorderLayout;
- import com.memoire.bu.BuCheckBox;
import com.memoire.bu.BuComboBox;
import com.memoire.bu.BuGridLayout;
--- 26,33 ----
import javax.swing.event.CaretEvent;
import javax.swing.event.CaretListener;
+
+ import org.fudaa.ctulu.CtuluLib;
+
import com.memoire.bu.BuBorderLayout;
import com.memoire.bu.BuComboBox;
import com.memoire.bu.BuGridLayout;
***************
*** 38,51 ****
import com.memoire.bu.BuTextField;
import com.memoire.bu.BuVerticalLayout;
import org.fudaa.dodico.commun.DodicoLib;
import org.fudaa.dodico.commun.DodicoPermanentList;
- import org.fudaa.dodico.h2d.H2dSegment;
import org.fudaa.dodico.h2d.H2dTimeStepGroup;
import org.fudaa.dodico.h2d.type.H2dResolutionMethodType;
import org.fudaa.dodico.h2d.type.H2dResolutionSchemaType;
import org.fudaa.dodico.h2d.type.H2dVariableType;
import org.fudaa.ebli.dialog.EbliSimpleDialogPanel;
! import org.fudaa.fudaa.commun.tableau.FudaaPanelListEditor;
! import org.fudaa.fudaa.commun.tableau.FudaaPanelListEditorModel;
import org.fudaa.fudaa.tr.TrResource;
/**
--- 38,53 ----
import com.memoire.bu.BuTextField;
import com.memoire.bu.BuVerticalLayout;
+
import org.fudaa.dodico.commun.DodicoLib;
import org.fudaa.dodico.commun.DodicoPermanentList;
import org.fudaa.dodico.h2d.H2dTimeStepGroup;
import org.fudaa.dodico.h2d.type.H2dResolutionMethodType;
import org.fudaa.dodico.h2d.type.H2dResolutionSchemaType;
import org.fudaa.dodico.h2d.type.H2dVariableType;
+
import org.fudaa.ebli.dialog.EbliSimpleDialogPanel;
! import org.fudaa.ebli.tableau.EbliPanelListEditor;
! import org.fudaa.ebli.tableau.EbliPanelListEditorModel;
!
import org.fudaa.fudaa.tr.TrResource;
/**
***************
*** 56,60 ****
extends EbliSimpleDialogPanel
implements ItemListener {
! FudaaPanelListEditor pnPrinc;
JRadioButton cbStationnaire;
TimeTableModelStationnaire statModel_;
--- 58,62 ----
extends EbliSimpleDialogPanel
implements ItemListener {
! EbliPanelListEditor pnPrinc;
JRadioButton cbStationnaire;
TimeTableModelStationnaire statModel_;
***************
*** 84,91 ****
if (isStationnaire) {
statModel_= new TimeTableModelStationnaire(_t);
! pnPrinc= new FudaaPanelListEditor(statModel_, false, false, false, true);
} else {
transModel_= new TimeTableModelTransitoire(_t);
! pnPrinc= new FudaaPanelListEditor(transModel_, true, true, true, true);
}
pnPrinc.setDoubleClickEdit(true);
--- 86,93 ----
if (isStationnaire) {
statModel_= new TimeTableModelStationnaire(_t);
! pnPrinc= new EbliPanelListEditor(statModel_, false, false, false, true);
} else {
transModel_= new TimeTableModelTransitoire(_t);
! pnPrinc= new EbliPanelListEditor(transModel_, true, true, true, true);
}
pnPrinc.setDoubleClickEdit(true);
***************
*** 98,102 ****
return transModel_.getTimeSteps();
}
! private class TimeTableModelStationnaire extends FudaaPanelListEditorModel {
public TimeTableModelStationnaire(H2dTimeStepGroup[] _t) {
super(_t, false);
--- 100,104 ----
return transModel_.getTimeSteps();
}
! private class TimeTableModelStationnaire extends EbliPanelListEditorModel {
public TimeTableModelStationnaire(H2dTimeStepGroup[] _t) {
super(_t, false);
***************
*** 117,121 ****
if (column == 0)
return TrResource.getS("Méthode");
! return DodicoLib.EMPTY_STRING;
}
public void edit(int _row) {
--- 119,123 ----
if (column == 0)
return TrResource.getS("Méthode");
! return CtuluLib.EMPTY_STRING;
}
public void edit(int _row) {
***************
*** 135,139 ****
return ((H2dTimeStepGroup)getValueAt(_row)).getMethode().getNom();
}
! return DodicoLib.EMPTY_STRING;
}
/**
--- 137,141 ----
return ((H2dTimeStepGroup)getValueAt(_row)).getMethode().getNom();
}
! return CtuluLib.EMPTY_STRING;
}
/**
***************
*** 150,154 ****
}
}
! private class TimeTableModelTransitoire extends FudaaPanelListEditorModel {
public TimeTableModelTransitoire(H2dTimeStepGroup[] _t) {
super(_t, false);
--- 152,156 ----
}
}
! private class TimeTableModelTransitoire extends EbliPanelListEditorModel {
public TimeTableModelTransitoire(H2dTimeStepGroup[] _t) {
super(_t, false);
***************
*** 179,183 ****
else if (column == 4)
return TrResource.getS("Nombre de pas");
! return DodicoLib.EMPTY_STRING;
}
public boolean isCellEditable(int rowIndex, int columnIndex) {
--- 181,185 ----
else if (column == 4)
return TrResource.getS("Nombre de pas");
! return CtuluLib.EMPTY_STRING;
}
public boolean isCellEditable(int rowIndex, int columnIndex) {
***************
*** 209,214 ****
return s.getMethode();
else if (_col == 4)
! return DodicoLib.getString(s.getNbPasTemps());
! return DodicoLib.EMPTY_STRING;
}
/**
--- 211,216 ----
return s.getMethode();
else if (_col == 4)
! return CtuluLib.getString(s.getNbPasTemps());
! return CtuluLib.EMPTY_STRING;
}
/**
***************
*** 343,347 ****
timeValue,
H2dVariableType.NB_TIME_STEP_SCHEMA.getNom());
! tfNbTimeStep_.setText(DodicoLib.getString(step_.getNbPasTemps()));
tfNbTimeStep_.addCaretListener(this);
tfTimeStepValue_=
--- 345,349 ----
timeValue,
H2dVariableType.NB_TIME_STEP_SCHEMA.getNom());
! tfNbTimeStep_.setText(CtuluLib.getString(step_.getNbPasTemps()));
tfNbTimeStep_.addCaretListener(this);
tfTimeStepValue_=
***************
*** 355,359 ****
timeValue,
H2dVariableType.FREQUENCE_PRINT_SCHEMA.getNom());
! tfPrintFreq_.setText(DodicoLib.getString(step_.getFrequenceImpression()));
addCommonBorder(timeValue);
add(timeValue);
--- 357,361 ----
timeValue,
H2dVariableType.FREQUENCE_PRINT_SCHEMA.getNom());
! tfPrintFreq_.setText(CtuluLib.getString(step_.getFrequenceImpression()));
addCommonBorder(timeValue);
add(timeValue);
Index: TrRefluxValueEditorPanel.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/reflux/TrRefluxValueEditorPanel.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TrRefluxValueEditorPanel.java 11 Dec 2003 12:50:56 -0000 1.1
--- TrRefluxValueEditorPanel.java 12 Dec 2003 11:29:41 -0000 1.2
***************
*** 12,18 ****
--- 12,22 ----
import java.awt.event.ItemListener;
import java.util.Vector;
+
import javax.swing.DefaultComboBoxModel;
import javax.swing.JComboBox;
import javax.swing.JPanel;
+
+ import org.fudaa.ctulu.CtuluLib;
+
import com.memoire.bu.BuComboBox;
import com.memoire.bu.BuGridLayout;
***************
*** 20,24 ****
import com.memoire.bu.BuPanel;
import com.memoire.bu.BuTextField;
! import org.fudaa.dodico.commun.DodicoLib;
import org.fudaa.dodico.commun.DodicoPermanentList;
import org.fudaa.dodico.h2d.H2dEvolution;
--- 24,28 ----
import com.memoire.bu.BuPanel;
import com.memoire.bu.BuTextField;
!
import org.fudaa.dodico.commun.DodicoPermanentList;
import org.fudaa.dodico.h2d.H2dEvolution;
***************
*** 29,33 ****
import org.fudaa.dodico.h2d.type.H2dBcType;
import org.fudaa.dodico.h2d.type.H2dVariableType;
! import org.fudaa.ebli.dialog.EbliSimpleDialogPanel;
import org.fudaa.fudaa.tr.TrResource;
/**
--- 33,37 ----
import org.fudaa.dodico.h2d.type.H2dBcType;
import org.fudaa.dodico.h2d.type.H2dVariableType;
!
import org.fudaa.fudaa.tr.TrResource;
/**
***************
*** 95,99 ****
BuTextField iniTxtValue() {
BuTextField r= BuTextField.createDoubleField();
! r.setText(DodicoLib.ZERO);
return r;
}
--- 99,103 ----
BuTextField iniTxtValue() {
BuTextField r= BuTextField.createDoubleField();
! r.setText(CtuluLib.ZERO);
return r;
}
***************
*** 185,189 ****
txtValue.setText(Double.toString(vTempo_.getValue()));
else
! txtValue.setText(DodicoLib.EMPTY_STRING);
} else {
if (txtValue != null)
--- 189,193 ----
txtValue.setText(Double.toString(vTempo_.getValue()));
else
! txtValue.setText(CtuluLib.EMPTY_STRING);
} else {
if (txtValue != null)
|
|
From: <de...@us...> - 2003-12-12 11:29:45
|
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/ressource In directory sc8-pr-cvs1:/tmp/cvs-serv29179/org/fudaa/fudaa/ressource Modified Files: fudaa_en.fr_txt Log Message: Maj general Index: fudaa_en.fr_txt =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/ressource/fudaa_en.fr_txt,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** fudaa_en.fr_txt 11 Dec 2003 12:50:55 -0000 1.9 --- fudaa_en.fr_txt 12 Dec 2003 11:29:41 -0000 1.10 *************** *** 105,116 **** Modifiez le nom de votre application=Please, modify the executable name Code lancé par défaut=Default launched code - Favoris=Favorites - Ajouter le répertoire courant aux favoris=Add curent folder to favorites - Edition des favoris=Favorites edition - Editer les favoris=Edit favorites - Enlever une formule=Add a formula - Ajouter une formuleRemove a formula - Tableau=Table - Formule=Formula Connecter=Connect Analyse de l'état de la connexion=Connection state analyze --- 105,108 ---- *************** *** 143,149 **** Erreur\: paramètres nulles=Error\: parameters not found Erreur\: Résultats nuls=Error\: results not found - Ajouter un nouvel élément=Add an new item - Insérer un nouveau élément=Insert a new item - Supprimer les éléments sélectionnés=Delete selected items Précédent=Back Suivant=Next --- 135,138 ---- *************** *** 193,196 **** Fin=End Méthode=Method - Modifier=Modify Si vous répondez non, toutes vos modifications seront perdues=If no, your modifications will be lost --- 182,184 ---- |
|
From: <de...@us...> - 2003-12-12 11:29:45
|
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/vag
In directory sc8-pr-cvs1:/tmp/cvs-serv29179/org/fudaa/fudaa/vag
Modified Files:
VagImplementation.java
Log Message:
Maj general
Index: VagImplementation.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/vag/VagImplementation.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** VagImplementation.java 25 Nov 2003 10:14:33 -0000 1.7
--- VagImplementation.java 12 Dec 2003 11:29:42 -0000 1.8
***************
*** 28,31 ****
--- 28,32 ----
import org.fudaa.ebli.calque.*;
import org.fudaa.ebli.calque.dessin.*;
+ import org.fudaa.ebli.tableau.*;
import org.fudaa.ebli.trace.*;
import org.fudaa.ebli.palette.*;
***************
*** 67,71 ****
protected EbliFilleVue3D fVue3D_;
protected FudaaFilleRapport fRapport_;
! protected FudaaFilleTableau fTableau_;
protected BArbreCalque arbre_;
protected BGroupeCalque gc_;
--- 68,72 ----
protected EbliFilleVue3D fVue3D_;
protected FudaaFilleRapport fRapport_;
! protected EbliFilleTableau fTableau_;
protected BArbreCalque arbre_;
protected BGroupeCalque gc_;
***************
*** 246,250 ****
//Tableau
if (fTableau_ == null) {
! fTableau_= new FudaaFilleTableau();
fTableau_.setInformationsDocument(getInformationsDocument());
installContextHelp(fTableau_.getRootPane(), "vag/p-tableau.html");
--- 247,251 ----
//Tableau
if (fTableau_ == null) {
! fTableau_= new EbliFilleTableau();
fTableau_.setInformationsDocument(getInformationsDocument());
installContextHelp(fTableau_.getRootPane(), "vag/p-tableau.html");
|
|
From: <de...@us...> - 2003-12-12 11:29:45
|
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/data
In directory sc8-pr-cvs1:/tmp/cvs-serv29179/org/fudaa/fudaa/tr/data
Modified Files:
TrBcBoundaryBlockLayer.java TrBcBoundaryMiddleLayer.java
TrElementNumberLayer.java TrFindComponentBcPoint.java
TrPanelInfo.java TrPanelInfoSenderDefault.java
TrPointNumberLayer.java
Log Message:
Maj general
Index: TrBcBoundaryBlockLayer.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/data/TrBcBoundaryBlockLayer.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TrBcBoundaryBlockLayer.java 11 Dec 2003 12:50:55 -0000 1.3
--- TrBcBoundaryBlockLayer.java 12 Dec 2003 11:29:41 -0000 1.4
***************
*** 11,32 ****
import gnu.trove.TIntHashSet;
import gnu.trove.TIntObjectIterator;
import java.awt.Color;
import java.awt.Graphics;
import java.awt.Graphics2D;
- import java.util.ArrayList;
- import java.util.HashMap;
- import java.util.List;
- import java.util.Map;
import javax.swing.Icon;
! import org.fudaa.dodico.commun.DodicoCommandManager;
! import org.fudaa.dodico.commun.DodicoLib;
! import org.fudaa.dodico.h2d.H2dBoundary;
import org.fudaa.dodico.h2d.H2dBcFrontierBlockInterface;
! import org.fudaa.dodico.h2d.type.H2dBoundaryType;
! import org.fudaa.ebli.calque.ZCalqueAffichageDonnees;
! import org.fudaa.ebli.calque.ZCalqueAffichageDonneesMulti;
import org.fudaa.ebli.calque.ZModeleDonnees;
- import org.fudaa.ebli.calque.action.EbliActionInterface;
import org.fudaa.ebli.commun.EbliListeSelection;
import org.fudaa.ebli.commun.EbliListeSelectionMulti;
--- 11,27 ----
import gnu.trove.TIntHashSet;
import gnu.trove.TIntObjectIterator;
+
import java.awt.Color;
import java.awt.Graphics;
import java.awt.Graphics2D;
import javax.swing.Icon;
!
! import org.fudaa.ctulu.CtuluLib;
!
import org.fudaa.dodico.h2d.H2dBcFrontierBlockInterface;
! import org.fudaa.dodico.h2d.H2dBoundary;
!
import org.fudaa.ebli.calque.ZModeleDonnees;
import org.fudaa.ebli.commun.EbliListeSelection;
import org.fudaa.ebli.commun.EbliListeSelectionMulti;
***************
*** 37,45 ****
import org.fudaa.ebli.geometrie.GrSegment;
import org.fudaa.ebli.trace.TraceLigne;
! import org.fudaa.fudaa.commun.FudaaCommonImplementation;
! import org.fudaa.fudaa.commun.FudaaLib;
! import org.fudaa.fudaa.tr.TrFilleVisu;
import org.fudaa.fudaa.tr.TrResource;
- import org.fudaa.fudaa.tr.data.TrPanelInfo.InfoData;
/**
* Layer which manage the borders.
--- 32,37 ----
import org.fudaa.ebli.geometrie.GrSegment;
import org.fudaa.ebli.trace.TraceLigne;
!
import org.fudaa.fudaa.tr.TrResource;
/**
* Layer which manage the borders.
***************
*** 416,420 ****
_m.put(
TrResource.getS("Nombre de bords sélectionnés"),
! DodicoLib.getString(selection_.getNbSelectedItem()));
}
--- 408,412 ----
_m.put(
TrResource.getS("Nombre de bords sélectionnés"),
! CtuluLib.getString(selection_.getNbSelectedItem()));
}
Index: TrBcBoundaryMiddleLayer.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/data/TrBcBoundaryMiddleLayer.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TrBcBoundaryMiddleLayer.java 11 Dec 2003 12:50:55 -0000 1.3
--- TrBcBoundaryMiddleLayer.java 12 Dec 2003 11:29:41 -0000 1.4
***************
*** 15,21 ****
import java.awt.Graphics2D;
! import javax.swing.Icon;
- import org.fudaa.dodico.commun.DodicoLib;
import org.fudaa.dodico.h2d.H2dBcFrontierMiddleInterface;
import org.fudaa.dodico.h2d.H2dLib;
--- 15,20 ----
import java.awt.Graphics2D;
! import org.fudaa.ctulu.CtuluLib;
import org.fudaa.dodico.h2d.H2dBcFrontierMiddleInterface;
import org.fudaa.dodico.h2d.H2dLib;
***************
*** 299,309 ****
*
*/
! public void fillWithInfo(TrPanelInfo.InfoData _m,TrPanelInfoSender _s) {
! if(isSelectionEmpty()) return;
! int i=isSelectionInUniqueBloc();
! if(i>=0){
! EbliListeSelection l=selection_.get(i);
! if(l.isOnlyOnIndexSelected()){
! _s.fillWithBoundaryMiddleInfo(_m, i, H2dLib.getIdxFromIdxMid(l.getMaxIndex()));
return;
}
--- 298,312 ----
*
*/
! public void fillWithInfo(TrPanelInfo.InfoData _m, TrPanelInfoSender _s) {
! if (isSelectionEmpty())
! return;
! int i= isSelectionInUniqueBloc();
! if (i >= 0) {
! EbliListeSelection l= selection_.get(i);
! if (l.isOnlyOnIndexSelected()) {
! _s.fillWithBoundaryMiddleInfo(
! _m,
! i,
! H2dLib.getIdxFromIdxMid(l.getMaxIndex()));
return;
}
***************
*** 311,315 ****
_m.put(
TrResource.getS("Nombre de bords sélectionnés"),
! DodicoLib.getString(selection_.getNbSelectedItem()));
}
--- 314,318 ----
_m.put(
TrResource.getS("Nombre de bords sélectionnés"),
! CtuluLib.getString(selection_.getNbSelectedItem()));
}
Index: TrElementNumberLayer.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/data/TrElementNumberLayer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TrElementNumberLayer.java 11 Dec 2003 12:50:55 -0000 1.1
--- TrElementNumberLayer.java 12 Dec 2003 11:29:41 -0000 1.2
***************
*** 10,22 ****
import gnu.trove.TIntHashSet;
import gnu.trove.TIntIterator;
import java.awt.Color;
import java.awt.Font;
import java.awt.FontMetrics;
import java.awt.Graphics;
- import java.awt.Graphics2D;
import java.awt.geom.Rectangle2D;
- import java.util.Map;
! import org.fudaa.dodico.commun.DodicoLib;
import org.fudaa.ebli.calque.ZCalqueAffichageDonnees;
import org.fudaa.ebli.calque.ZModeleDonnees;
--- 10,22 ----
import gnu.trove.TIntHashSet;
import gnu.trove.TIntIterator;
+
import java.awt.Color;
import java.awt.Font;
import java.awt.FontMetrics;
import java.awt.Graphics;
import java.awt.geom.Rectangle2D;
! import org.fudaa.ctulu.CtuluLib;
!
import org.fudaa.ebli.calque.ZCalqueAffichageDonnees;
import org.fudaa.ebli.calque.ZModeleDonnees;
***************
*** 26,31 ****
import org.fudaa.ebli.geometrie.GrPoint;
import org.fudaa.ebli.geometrie.GrPolygone;
import org.fudaa.fudaa.tr.TrResource;
- import org.fudaa.fudaa.tr.data.TrPanelInfo.InfoData;
/**
* @author deniger
--- 26,31 ----
import org.fudaa.ebli.geometrie.GrPoint;
import org.fudaa.ebli.geometrie.GrPolygone;
+
import org.fudaa.fudaa.tr.TrResource;
/**
* @author deniger
***************
*** 147,151 ****
if (clip.contientXY(pt)) {
pt.autoApplique(versEcran);
! String s= DodicoLib.getString(idx + 1);
Rectangle2D rec= fm.getStringBounds(s, g);
x= pt.x - rec.getWidth() / 2;
--- 147,151 ----
if (clip.contientXY(pt)) {
pt.autoApplique(versEcran);
! String s= CtuluLib.getString(idx + 1);
Rectangle2D rec= fm.getStringBounds(s, g);
x= pt.x - rec.getWidth() / 2;
***************
*** 165,169 ****
p.centre(pt);
if (clip.contientXY(pt)) {
! String s= DodicoLib.getString(i + 1);
pt.autoApplique(versEcran);
Rectangle2D rec= fm.getStringBounds(s, g);
--- 165,169 ----
p.centre(pt);
if (clip.contientXY(pt)) {
! String s= CtuluLib.getString(i + 1);
pt.autoApplique(versEcran);
Rectangle2D rec= fm.getStringBounds(s, g);
Index: TrFindComponentBcPoint.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/data/TrFindComponentBcPoint.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TrFindComponentBcPoint.java 11 Dec 2003 12:50:55 -0000 1.1
--- TrFindComponentBcPoint.java 12 Dec 2003 11:29:41 -0000 1.2
***************
*** 12,15 ****
--- 12,18 ----
import javax.swing.JRadioButton;
import javax.swing.JTextField;
+
+ import org.fudaa.ctulu.CtuluLib;
+
import com.memoire.bu.BuLabel;
import com.memoire.bu.BuPanel;
***************
*** 38,44 ****
bg.add(generalData_);
bt1.setSelected(true);
! add(new BuLabel(DodicoLib.EMPTY_STRING));
add(bt1);
! add(new BuLabel(DodicoLib.EMPTY_STRING));
add(generalData_);
}
--- 41,47 ----
bg.add(generalData_);
bt1.setSelected(true);
! add(new BuLabel(CtuluLib.EMPTY_STRING));
add(bt1);
! add(new BuLabel(CtuluLib.EMPTY_STRING));
add(generalData_);
}
Index: TrPanelInfo.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/data/TrPanelInfo.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TrPanelInfo.java 11 Dec 2003 12:50:55 -0000 1.1
--- TrPanelInfo.java 12 Dec 2003 11:29:41 -0000 1.2
***************
*** 9,20 ****
package org.fudaa.fudaa.tr.data;
import java.awt.Component;
- import java.awt.Container;
import java.awt.Dimension;
import java.awt.Font;
- import java.util.Hashtable;
- import java.util.Iterator;
- import java.util.Map;
import java.util.Vector;
! import javax.swing.DefaultCellEditor;
import javax.swing.JScrollPane;
import javax.swing.JTable;
--- 9,16 ----
package org.fudaa.fudaa.tr.data;
import java.awt.Component;
import java.awt.Dimension;
import java.awt.Font;
import java.util.Vector;
!
import javax.swing.JScrollPane;
import javax.swing.JTable;
***************
*** 26,31 ****
import javax.swing.table.TableColumnModel;
import com.memoire.bu.BuBorderLayout;
- import com.memoire.bu.BuLib;
import com.memoire.bu.BuPanel;
import com.memoire.bu.BuScrollPane;
--- 22,28 ----
import javax.swing.table.TableColumnModel;
+ import org.fudaa.ctulu.CtuluLib;
+
import com.memoire.bu.BuBorderLayout;
import com.memoire.bu.BuPanel;
import com.memoire.bu.BuScrollPane;
***************
*** 37,41 ****
import org.fudaa.ebli.calque.ZSelectionEvent;
import org.fudaa.ebli.calque.ZSelectionListener;
! import org.fudaa.fudaa.commun.tableau.FudaaCellRenderer;
import org.fudaa.fudaa.tr.TrResource;
/**
--- 34,38 ----
import org.fudaa.ebli.calque.ZSelectionEvent;
import org.fudaa.ebli.calque.ZSelectionListener;
!
import org.fudaa.fudaa.tr.TrResource;
/**
***************
*** 106,110 ****
layer_= newLa;
tableModel_.clear();
! txtTitle_.setText(DodicoLib.EMPTY_STRING);
if (layer_ != null) {
layer_.fillWithInfo(tableModel_,sender_);
--- 103,107 ----
layer_= newLa;
tableModel_.clear();
! txtTitle_.setText(CtuluLib.EMPTY_STRING);
if (layer_ != null) {
layer_.fillWithInfo(tableModel_,sender_);
***************
*** 181,185 ****
if (isVisible() && (_evt.getSource() == layer_)) {
if (layer_ != null) {
! txtTitle_.setText(DodicoLib.EMPTY_STRING);
tableModel_.clear();
layer_.fillWithInfo(tableModel_,sender_);
--- 178,182 ----
if (isVisible() && (_evt.getSource() == layer_)) {
if (layer_ != null) {
! txtTitle_.setText(CtuluLib.EMPTY_STRING);
tableModel_.clear();
layer_.fillWithInfo(tableModel_,sender_);
Index: TrPanelInfoSenderDefault.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/data/TrPanelInfoSenderDefault.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TrPanelInfoSenderDefault.java 11 Dec 2003 12:50:55 -0000 1.1
--- TrPanelInfoSenderDefault.java 12 Dec 2003 11:29:41 -0000 1.2
***************
*** 8,11 ****
--- 8,13 ----
*/
package org.fudaa.fudaa.tr.data;
+ import org.fudaa.ctulu.CtuluLib;
+
import org.fudaa.dodico.commun.DodicoLib;
import org.fudaa.dodico.h2d.H2dElement;
***************
*** 13,16 ****
--- 15,19 ----
import org.fudaa.dodico.h2d.H2dParameters;
import org.fudaa.dodico.h2d.H2dPoint;
+
import org.fudaa.fudaa.tr.TrFilleVisu;
import org.fudaa.fudaa.tr.TrResource;
***************
*** 42,53 ****
_receiver.put(
TrResource.getS("Nombre de points séléctionnés"),
! DodicoLib.getString(n));
return;
}
String title=
! TrResource.getS("Point n° {0}", DodicoLib.getString(_idx[0] + 1));
int idxOnFr= getGrid().getFrontiers().getIdxOnFrontier(_idx[0]);
if (idxOnFr > 0)
! title += " (" + DodicoLib.getString(idxOnFr + 1) + ")";
_receiver.setTitle(title);
H2dPoint p= getGrid().getPt(_idx[0]);
--- 45,56 ----
_receiver.put(
TrResource.getS("Nombre de points séléctionnés"),
! CtuluLib.getString(n));
return;
}
String title=
! TrResource.getS("Point n° {0}", CtuluLib.getString(_idx[0] + 1));
int idxOnFr= getGrid().getFrontiers().getIdxOnFrontier(_idx[0]);
if (idxOnFr > 0)
! title += " (" + CtuluLib.getString(idxOnFr + 1) + ")";
_receiver.setTitle(title);
H2dPoint p= getGrid().getPt(_idx[0]);
***************
*** 67,75 ****
_receiver.put(
TrResource.getS("Nombre d'éléments séléctionnés"),
! DodicoLib.getString(n));
return;
}
_receiver.setTitle(
! TrResource.getS("Element n° {0}", DodicoLib.getString(_idx[0] + 1)));
H2dGrid g= getGrid();
H2dElement el= g.getElement(_idx[0]);
--- 70,78 ----
_receiver.put(
TrResource.getS("Nombre d'éléments séléctionnés"),
! CtuluLib.getString(n));
return;
}
_receiver.setTitle(
! TrResource.getS("Element n° {0}", CtuluLib.getString(_idx[0] + 1)));
H2dGrid g= getGrid();
H2dElement el= g.getElement(_idx[0]);
***************
*** 79,98 ****
indice= el.getPtIndex(i);
H2dPoint p= getGrid().getPt(indice);
! String idx= DodicoLib.getString(i + 1);
int idxOnFr= getGrid().getFrontiers().getIdxOnFrontier(indice);
_receiver.put(
TrResource.getS("Point n° {0}", idx),
! DodicoLib.getString(el.getPtIndex(i) + 1)
+ (idxOnFr >= 0
! ? " (" + DodicoLib.getString(idxOnFr + 1) + ")"
! : DodicoLib.EMPTY_STRING));
_receiver.put(
TrResource.getS("Point n° {0}", idx) + " x,y,z",
! TrFilleVisu.TWO_DIGITS_FORMAT.format(p.getX())
+ ", "
+ TrFilleVisu.TWO_DIGITS_FORMAT.format(p.getY())
+ ", "
! + TrFilleVisu.TWO_DIGITS_FORMAT.format(p.getZ())
! );
}
}
--- 82,100 ----
indice= el.getPtIndex(i);
H2dPoint p= getGrid().getPt(indice);
! String idx= CtuluLib.getString(i + 1);
int idxOnFr= getGrid().getFrontiers().getIdxOnFrontier(indice);
_receiver.put(
TrResource.getS("Point n° {0}", idx),
! CtuluLib.getString(el.getPtIndex(i) + 1)
+ (idxOnFr >= 0
! ? " (" + CtuluLib.getString(idxOnFr + 1) + ")"
! : CtuluLib.EMPTY_STRING));
_receiver.put(
TrResource.getS("Point n° {0}", idx) + " x,y,z",
! TrFilleVisu.TWO_DIGITS_FORMAT.format(p.getX())
+ ", "
+ TrFilleVisu.TWO_DIGITS_FORMAT.format(p.getY())
+ ", "
! + TrFilleVisu.TWO_DIGITS_FORMAT.format(p.getZ()));
}
}
Index: TrPointNumberLayer.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/data/TrPointNumberLayer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TrPointNumberLayer.java 11 Dec 2003 12:50:55 -0000 1.1
--- TrPointNumberLayer.java 12 Dec 2003 11:29:41 -0000 1.2
***************
*** 8,11 ****
--- 8,14 ----
*/
package org.fudaa.fudaa.tr.data;
+ import gnu.trove.TIntHashSet;
+ import gnu.trove.TIntIterator;
+
import java.awt.Color;
import java.awt.Font;
***************
*** 14,20 ****
import java.awt.Graphics2D;
import java.awt.geom.Rectangle2D;
- import java.util.Map;
! import org.fudaa.dodico.commun.DodicoLib;
import org.fudaa.ebli.calque.ZCalqueAffichageDonnees;
import org.fudaa.ebli.calque.ZModeleDonnees;
--- 17,23 ----
import java.awt.Graphics2D;
import java.awt.geom.Rectangle2D;
! import org.fudaa.ctulu.CtuluLib;
!
import org.fudaa.ebli.calque.ZCalqueAffichageDonnees;
import org.fudaa.ebli.calque.ZModeleDonnees;
***************
*** 24,34 ****
import org.fudaa.ebli.geometrie.GrPoint;
import org.fudaa.ebli.geometrie.GrPolygone;
- import org.fudaa.fudaa.tr.TrResource;
- import org.fudaa.fudaa.tr.data.TrPanelInfo.InfoData;
! import gnu.trove.TIntArrayList;
! import gnu.trove.TIntHashSet;
! import gnu.trove.TIntIntHashMap;
! import gnu.trove.TIntIterator;
/**
* @author deniger
--- 27,32 ----
import org.fudaa.ebli.geometrie.GrPoint;
import org.fudaa.ebli.geometrie.GrPolygone;
! import org.fudaa.fudaa.tr.TrResource;
/**
* @author deniger
***************
*** 152,160 ****
int idxFr= model_.getIdxFrontier(idx);
if (idxFr >= 0) {
! s= DodicoLib.getString(idx + 1) + "( " + (idxFr + 1) + " )";
} else
! s= DodicoLib.getString(idx + 1);
} else {
! s= DodicoLib.getString(idx + 1);
}
Rectangle2D rec= fm.getStringBounds(s, g);
--- 150,158 ----
int idxFr= model_.getIdxFrontier(idx);
if (idxFr >= 0) {
! s= CtuluLib.getString(idx + 1) + "( " + (idxFr + 1) + " )";
} else
! s= CtuluLib.getString(idx + 1);
} else {
! s= CtuluLib.getString(idx + 1);
}
Rectangle2D rec= fm.getStringBounds(s, g);
***************
*** 179,187 ****
int idxFr= model_.getIdxFrontier(idx);
if (idxFr >= 0) {
! s= DodicoLib.getString(idx + 1) + "( " + (idxFr + 1) + " )";
} else
! s= DodicoLib.getString(idx + 1);
} else {
! s= DodicoLib.getString(idx + 1);
}
Rectangle2D rec= fm.getStringBounds(s, g);
--- 177,185 ----
int idxFr= model_.getIdxFrontier(idx);
if (idxFr >= 0) {
! s= CtuluLib.getString(idx + 1) + "( " + (idxFr + 1) + " )";
} else
! s= CtuluLib.getString(idx + 1);
} else {
! s= CtuluLib.getString(idx + 1);
}
Rectangle2D rec= fm.getStringBounds(s, g);
|
|
From: <de...@us...> - 2003-12-12 11:29:45
|
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr
In directory sc8-pr-cvs1:/tmp/cvs-serv29179/org/fudaa/fudaa/tr
Modified Files:
Tr.java TrCodePanel.java TrExport.java TrImplHelper.java
TrImplementation.java TrLib.java
TrProjectDispatcherListener.java tr_en.fr_txt
Added Files:
TrGrapheFille.java
Log Message:
Maj general
--- NEW FILE: TrGrapheFille.java ---
(This appears to be a binary file; contents omitted.)
Index: Tr.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/Tr.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Tr.java 11 Dec 2003 12:50:55 -0000 1.8
--- Tr.java 12 Dec 2003 11:29:41 -0000 1.9
***************
*** 8,31 ****
*/
package org.fudaa.fudaa.tr;
- import java.awt.Dimension;
- import java.awt.Frame;
- import java.awt.Point;
- import java.awt.Toolkit;
import java.io.File;
import java.util.Locale;
! import javax.swing.JFrame;
import com.memoire.bu.BuApplication;
- import com.memoire.bu.BuGlassPaneStop;
import com.memoire.bu.BuInformationsSoftware;
- import com.memoire.bu.BuLanguagePreferencesPanel;
- import com.memoire.bu.BuLib;
import com.memoire.bu.BuPreferences;
! import org.fudaa.dodico.commun.DodicoLib;
import org.fudaa.fudaa.commun.FudaaCommandLineParser;
import org.fudaa.fudaa.commun.FudaaLib;
import org.fudaa.fudaa.commun.FudaaSplashScreen;
import org.fudaa.fudaa.commun.FudaaTee;
- import org.fudaa.fudaa.dico.*;
import org.fudaa.fudaa.ressource.FudaaResource;
/**
--- 8,24 ----
*/
package org.fudaa.fudaa.tr;
import java.io.File;
import java.util.Locale;
!
! import org.fudaa.ctulu.CtuluLib;
import com.memoire.bu.BuApplication;
import com.memoire.bu.BuInformationsSoftware;
import com.memoire.bu.BuPreferences;
!
import org.fudaa.fudaa.commun.FudaaCommandLineParser;
import org.fudaa.fudaa.commun.FudaaLib;
import org.fudaa.fudaa.commun.FudaaSplashScreen;
import org.fudaa.fudaa.commun.FudaaTee;
import org.fudaa.fudaa.ressource.FudaaResource;
/**
***************
*** 47,58 ****
"locale.language",
Locale.getDefault().getLanguage());
! if (FudaaLib.DEBUG) {
! FudaaLib.debug("language set= " + buLanguage);
! FudaaLib.debug("language origin= " + localLanguage);
}
if (!(localLanguage.equals(buLanguage)))
Locale.setDefault(new Locale(buLanguage, ""));
! if (FudaaLib.DEBUG)
! FudaaLib.debug("DEBUG MODE");
Thread.currentThread().setName("tr_main_thread");
/* Thread.currentThread().setName("Prert main thread");
--- 40,51 ----
"locale.language",
Locale.getDefault().getLanguage());
! if (CtuluLib.DEBUG) {
! CtuluLib.debug("language set= " + buLanguage);
! CtuluLib.debug("language origin= " + localLanguage);
}
if (!(localLanguage.equals(buLanguage)))
Locale.setDefault(new Locale(buLanguage, ""));
! if (CtuluLib.DEBUG)
! CtuluLib.debug("DEBUG MODE");
Thread.currentThread().setName("tr_main_thread");
/* Thread.currentThread().setName("Prert main thread");
Index: TrCodePanel.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/TrCodePanel.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** TrCodePanel.java 25 Nov 2003 10:14:29 -0000 1.4
--- TrCodePanel.java 12 Dec 2003 11:29:41 -0000 1.5
***************
*** 12,15 ****
--- 12,16 ----
import java.util.ArrayList;
import java.util.StringTokenizer;
+
import javax.swing.JButton;
import javax.swing.JComboBox;
***************
*** 17,20 ****
--- 18,24 ----
import javax.swing.JPanel;
import javax.swing.JTextField;
+
+ import org.fudaa.ctulu.CtuluLib;
+
import com.memoire.bu.BuBorderLayout;
import com.memoire.bu.BuButton;
***************
*** 24,32 ****
import com.memoire.bu.BuGridLayout;
import com.memoire.bu.BuPanel;
import org.fudaa.dodico.commun.DodicoLib;
import org.fudaa.dodico.commun.DodicoPreferences;
import org.fudaa.dodico.fichiers.FileFormatSoftware;
import org.fudaa.ebli.dialog.EbliSimpleDialogPanel;
! import org.fudaa.fudaa.commun.FudaaLib;
import org.fudaa.fudaa.commun.exec.FudaaExec;
import org.fudaa.fudaa.commun.exec.FudaaExecCellRenderer;
--- 28,38 ----
import com.memoire.bu.BuGridLayout;
import com.memoire.bu.BuPanel;
+
import org.fudaa.dodico.commun.DodicoLib;
import org.fudaa.dodico.commun.DodicoPreferences;
import org.fudaa.dodico.fichiers.FileFormatSoftware;
+
import org.fudaa.ebli.dialog.EbliSimpleDialogPanel;
!
import org.fudaa.fudaa.commun.exec.FudaaExec;
import org.fudaa.fudaa.commun.exec.FudaaExecCellRenderer;
***************
*** 91,95 ****
true));
cbCode_.setSelectedItem(mng_.getDefaultServeur());
! txtOption_.setText(DodicoLib.EMPTY_STRING);
}
public String[] launchParams() {
--- 97,101 ----
true));
cbCode_.setSelectedItem(mng_.getDefaultServeur());
! txtOption_.setText(CtuluLib.EMPTY_STRING);
}
public String[] launchParams() {
***************
*** 110,114 ****
l.add(fParams_.getAbsolutePath());
String[] r= DodicoLib.enTableau(l);
! if (FudaaLib.DEBUG)
DodicoLib.printStringArray(r);
return r;
--- 116,120 ----
l.add(fParams_.getAbsolutePath());
String[] r= DodicoLib.enTableau(l);
! if (CtuluLib.DEBUG)
DodicoLib.printStringArray(r);
return r;
Index: TrExport.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/TrExport.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** TrExport.java 11 Dec 2003 12:50:55 -0000 1.9
--- TrExport.java 12 Dec 2003 11:29:41 -0000 1.10
***************
*** 10,13 ****
--- 10,14 ----
import java.io.File;
import java.lang.reflect.Method;
+
import javax.swing.ButtonGroup;
import javax.swing.JFileChooser;
***************
*** 15,38 ****
import javax.swing.JRadioButton;
import javax.swing.JTextField;
import com.memoire.bu.BuGridLayout;
import com.memoire.bu.BuRadioButton;
import com.memoire.bu.BuTaskOperation;
import com.memoire.bu.BuVerticalLayout;
import org.fudaa.dodico.commun.DodicoLib;
- import org.fudaa.dodico.commun.ProgressionBuAdapter;
import org.fudaa.dodico.commun.ProgressionInterface;
import org.fudaa.dodico.dunes.io.DunesFileFormat;
import org.fudaa.dodico.h2d.H2dFileFormatMaillageVersion;
import org.fudaa.dodico.h2d.H2dGrid;
- import org.fudaa.dodico.h2d.H2dParameters;
import org.fudaa.dodico.h2d.type.H2dElementType;
import org.fudaa.dodico.reflux.io.CorEleBthFileFormat;
import org.fudaa.dodico.telemac.io.SerafinFileFormat;
import org.fudaa.ebli.dialog.EbliSimpleDialogPanel;
import org.fudaa.fudaa.commun.FudaaCommonImplementation;
import org.fudaa.fudaa.commun.FudaaLib;
import org.fudaa.fudaa.commun.FudaaUI;
- import org.fudaa.fudaa.commun.fileChooser.FudaaFileChooser;
- import org.fudaa.fudaa.dico.*;
/**
* Gere l'export des projets reflux et telemac.
--- 16,42 ----
import javax.swing.JRadioButton;
import javax.swing.JTextField;
+
+ import org.fudaa.ctulu.CtuluLib;
+
import com.memoire.bu.BuGridLayout;
import com.memoire.bu.BuRadioButton;
import com.memoire.bu.BuTaskOperation;
import com.memoire.bu.BuVerticalLayout;
+
import org.fudaa.dodico.commun.DodicoLib;
import org.fudaa.dodico.commun.ProgressionInterface;
import org.fudaa.dodico.dunes.io.DunesFileFormat;
import org.fudaa.dodico.h2d.H2dFileFormatMaillageVersion;
import org.fudaa.dodico.h2d.H2dGrid;
import org.fudaa.dodico.h2d.type.H2dElementType;
import org.fudaa.dodico.reflux.io.CorEleBthFileFormat;
import org.fudaa.dodico.telemac.io.SerafinFileFormat;
+
import org.fudaa.ebli.dialog.EbliSimpleDialogPanel;
+ import org.fudaa.ebli.filechooser.EbliFileChooser;
+
import org.fudaa.fudaa.commun.FudaaCommonImplementation;
import org.fudaa.fudaa.commun.FudaaLib;
import org.fudaa.fudaa.commun.FudaaUI;
/**
* Gere l'export des projets reflux et telemac.
***************
*** 59,64 ****
public void export(String _s) {
String f= _s.substring(EXPORT_PREF.length());
! if (FudaaLib.DEBUG)
! FudaaLib.debug("export " + f);
try {
final Method m= getClass().getMethod("export" + f, null);
--- 63,68 ----
public void export(String _s) {
String f= _s.substring(EXPORT_PREF.length());
! if (CtuluLib.DEBUG)
! CtuluLib.debug("export " + f);
try {
final Method m= getClass().getMethod("export" + f, null);
***************
*** 71,75 ****
TrResource.getS("Erreur interne"),
TrResource.getS("Accès methode export impossible")
! + DodicoLib.EMPTY_STRING
+ f);
}
--- 75,79 ----
TrResource.getS("Erreur interne"),
TrResource.getS("Accès methode export impossible")
! + CtuluLib.EMPTY_STRING
+ f);
}
***************
*** 77,81 ****
} catch (NoSuchMethodException _ex) {
ui_.error(
! TrResource.getS("Type d'export non supporté") + DodicoLib.ESPACE + f);
}
}
--- 81,85 ----
} catch (NoSuchMethodException _ex) {
ui_.error(
! TrResource.getS("Type d'export non supporté") + CtuluLib.ESPACE + f);
}
}
***************
*** 94,98 ****
*/
public JFileChooser createFileChooser() {
! return new FudaaFileChooser();
}
/**
--- 98,102 ----
*/
public JFileChooser createFileChooser() {
! return new EbliFileChooser();
}
/**
***************
*** 173,177 ****
ui_.getFrame(),
TrResource.getS("Export")
! + DodicoLib.ESPACE
+ _ftMaillage.getName()))) {
File f= dialog.getFileExport();
--- 177,181 ----
ui_.getFrame(),
TrResource.getS("Export")
! + CtuluLib.ESPACE
+ _ftMaillage.getName()))) {
File f= dialog.getFileExport();
***************
*** 205,209 ****
if (fs[i].exists()) {
if (b.length() > 0)
! b.append(DodicoLib.LINE_SEP);
b.append(fs[i].getAbsolutePath());
}
--- 209,213 ----
if (fs[i].exists()) {
if (b.length() > 0)
! b.append(CtuluLib.LINE_SEP);
b.append(fs[i].getAbsolutePath());
}
***************
*** 215,221 ****
TrResource.getS("Les fichiers suivants vont être effacés")
+ ":"
! + DodicoLib.LINE_SEP
+ b.toString()
! + DodicoLib.LINE_SEP
+ TrResource.getS("Voulez-vous continuer ?"))) {
ui_.unsetMainMessage();
--- 219,225 ----
TrResource.getS("Les fichiers suivants vont être effacés")
+ ":"
! + CtuluLib.LINE_SEP
+ b.toString()
! + CtuluLib.LINE_SEP
+ TrResource.getS("Voulez-vous continuer ?"))) {
ui_.unsetMainMessage();
Index: TrImplHelper.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/TrImplHelper.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** TrImplHelper.java 11 Dec 2003 12:50:55 -0000 1.10
--- TrImplHelper.java 12 Dec 2003 11:29:41 -0000 1.11
***************
*** 9,19 ****
package org.fudaa.fudaa.tr;
import java.io.File;
import com.memoire.bu.BuIcon;
import com.memoire.bu.BuMenuItem;
import com.memoire.bu.BuTask;
- import org.fudaa.dodico.commun.DodicoLib;
import org.fudaa.dodico.commun.ProgressionInterface;
import org.fudaa.dodico.fichiers.FileFormatSoftware;
import org.fudaa.fudaa.ressource.FudaaResource;
import org.fudaa.fudaa.tr.reflux.TrRefluxImplHelper;
--- 9,22 ----
package org.fudaa.fudaa.tr;
import java.io.File;
+
+ import org.fudaa.ctulu.CtuluLib;
+
import com.memoire.bu.BuIcon;
import com.memoire.bu.BuMenuItem;
import com.memoire.bu.BuTask;
import org.fudaa.dodico.commun.ProgressionInterface;
import org.fudaa.dodico.fichiers.FileFormatSoftware;
+
import org.fudaa.fudaa.ressource.FudaaResource;
import org.fudaa.fudaa.tr.reflux.TrRefluxImplHelper;
***************
*** 30,34 ****
public void active() {
impl_.getFrame().setTitle(
! TrResource.getS("préprocesseur") + DodicoLib.ESPACE + getSoftwareID());
impl_.getFrame().setIconImage(
FudaaResource.FUDAA.getIcon("appli/" + getSoftwareID()).getImage());
--- 33,37 ----
public void active() {
impl_.getFrame().setTitle(
! TrResource.getS("préprocesseur") + CtuluLib.ESPACE + getSoftwareID());
impl_.getFrame().setIconImage(
FudaaResource.FUDAA.getIcon("appli/" + getSoftwareID()).getImage());
Index: TrImplementation.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/TrImplementation.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** TrImplementation.java 11 Dec 2003 12:50:55 -0000 1.16
--- TrImplementation.java 12 Dec 2003 11:29:41 -0000 1.17
***************
*** 9,12 ****
--- 9,13 ----
package org.fudaa.fudaa.tr;
import ghm.followgui.FollowApp;
+
import java.awt.Component;
import java.awt.Dimension;
***************
*** 22,29 ****
import javax.swing.JMenu;
import javax.swing.JScrollPane;
import com.memoire.bu.BuColumn;
import com.memoire.bu.BuDialogChoice;
import com.memoire.bu.BuDynamicMenu;
- import com.memoire.bu.BuExplorer;
import com.memoire.bu.BuGlassPaneStop;
import com.memoire.bu.BuInformationsDocument;
--- 23,32 ----
import javax.swing.JMenu;
import javax.swing.JScrollPane;
+
+ import org.fudaa.ctulu.CtuluLib;
+
import com.memoire.bu.BuColumn;
import com.memoire.bu.BuDialogChoice;
import com.memoire.bu.BuDynamicMenu;
import com.memoire.bu.BuGlassPaneStop;
import com.memoire.bu.BuInformationsDocument;
***************
*** 40,52 ****
import com.memoire.bu.BuTaskOperation;
import com.memoire.bu.BuTaskView;
! import com.memoire.fu.FuFile;
! import com.memoire.fu.FuLib;
! import org.fudaa.dodico.commun.DodicoLib;
import org.fudaa.dodico.commun.ProgressionInterface;
import org.fudaa.dodico.fichiers.FileFormatSoftware;
import org.fudaa.dodico.telemac.io.TelemacDicoFileFormat;
import org.fudaa.ebli.calque.BArbreCalque;
import org.fudaa.ebli.commun.EbliPreferences;
import org.fudaa.ebli.ressource.EbliResource;
import org.fudaa.fudaa.commun.FudaaCommonImplementation;
import org.fudaa.fudaa.commun.FudaaLib;
--- 43,56 ----
import com.memoire.bu.BuTaskOperation;
import com.memoire.bu.BuTaskView;
!
import org.fudaa.dodico.commun.ProgressionInterface;
import org.fudaa.dodico.fichiers.FileFormatSoftware;
import org.fudaa.dodico.telemac.io.TelemacDicoFileFormat;
+
import org.fudaa.ebli.calque.BArbreCalque;
import org.fudaa.ebli.commun.EbliPreferences;
+ import org.fudaa.ebli.filechooser.EbliFavoriteFiles;
import org.fudaa.ebli.ressource.EbliResource;
+
import org.fudaa.fudaa.commun.FudaaCommonImplementation;
import org.fudaa.fudaa.commun.FudaaLib;
***************
*** 54,59 ****
import org.fudaa.fudaa.commun.aide.FudaaAidePreferencesPanel;
import org.fudaa.fudaa.commun.exec.FudaaAppliExecManager;
! import org.fudaa.fudaa.commun.fileChooser.FudaaFavoriteFiles;
! import org.fudaa.fudaa.dico.*;
import org.fudaa.fudaa.ressource.FudaaResource;
import org.fudaa.fudaa.tr.telemac.TrTelemacImplHelper;
--- 58,62 ----
import org.fudaa.fudaa.commun.aide.FudaaAidePreferencesPanel;
import org.fudaa.fudaa.commun.exec.FudaaAppliExecManager;
! import org.fudaa.fudaa.dico.FDicoPreferences;
import org.fudaa.fudaa.ressource.FudaaResource;
import org.fudaa.fudaa.tr.telemac.TrTelemacImplHelper;
***************
*** 98,106 ****
BuTaskView taches_;
protected void ouvrir() {
! new BuTaskOperation(null, DodicoLib.EMPTY_STRING) {
public void act() {
setGlassPaneStop();
ProgressionInterface prog= createProgressionInterface(this);
! initTaskView(this);
TrProjet pr= implHelper_.ouvrir(prog, this);
if (pr != null) {
--- 101,109 ----
BuTaskView taches_;
protected void ouvrir() {
! new BuTaskOperation(null, CtuluLib.EMPTY_STRING) {
public void act() {
setGlassPaneStop();
ProgressionInterface prog= createProgressionInterface(this);
! //initTaskView(this);
TrProjet pr= implHelper_.ouvrir(prog, this);
if (pr != null) {
***************
*** 165,170 ****
String id= dialc.getValue();
if (!id.equals(getCurrentImplHelper().getSoftwareID())) {
! if (FudaaLib.DEBUG)
! FudaaLib.debug("choix " + id);
TrPreferences.TR.putStringProperty("tr.code.id", id);
TrPreferences.TR.writeIniFile();
--- 168,173 ----
String id= dialc.getValue();
if (!id.equals(getCurrentImplHelper().getSoftwareID())) {
! if (CtuluLib.DEBUG)
! CtuluLib.debug("choix " + id);
TrPreferences.TR.putStringProperty("tr.code.id", id);
TrPreferences.TR.writeIniFile();
***************
*** 186,190 ****
TrResource.getS("Erreur interne"),
TrResource.getS("Impossible de trouver l'implantation telemac"));
! new BuTaskOperation(null, DodicoLib.EMPTY_STRING) {
public void act() {
setGlassPaneStop();
--- 189,193 ----
TrResource.getS("Erreur interne"),
TrResource.getS("Impossible de trouver l'implantation telemac"));
! new BuTaskOperation(null, CtuluLib.EMPTY_STRING) {
public void act() {
setGlassPaneStop();
***************
*** 208,212 ****
TrResource.getS("Impossible de trouver l'implantation"));
else
! new BuTaskOperation(null, DodicoLib.EMPTY_STRING) {
public void act() {
setGlassPaneStop();
--- 211,215 ----
TrResource.getS("Impossible de trouver l'implantation"));
else
! new BuTaskOperation(null, CtuluLib.EMPTY_STRING) {
public void act() {
setGlassPaneStop();
***************
*** 226,230 ****
}
! protected void setGlassPaneStop() {
if (glassPaneStop_ == null) {
glassPaneStop_= new BuGlassPaneStop();
--- 229,233 ----
}
! public void setGlassPaneStop() {
if (glassPaneStop_ == null) {
glassPaneStop_= new BuGlassPaneStop();
***************
*** 239,249 ****
glassPaneStop_.setVisible(true);
}
protected void ouvrir(final File _f) {
! new BuTaskOperation(null, DodicoLib.EMPTY_STRING) {
public void act() {
setGlassPaneStop();
ProgressionInterface inter= createProgressionInterface(this);
- initTaskView(this);
TrProjet pr= implHelper_.ouvrir(inter, _f, this);
if (pr == null) {
--- 242,257 ----
glassPaneStop_.setVisible(true);
}
+
+ public void unsetGlassPaneStop() {
+ if(glassPaneStop_!=null) glassPaneStop_.setVisible(false);
+ }
+
+
protected void ouvrir(final File _f) {
! new BuTaskOperation(null, CtuluLib.EMPTY_STRING) {
public void act() {
setGlassPaneStop();
ProgressionInterface inter= createProgressionInterface(this);
TrProjet pr= implHelper_.ouvrir(inter, _f, this);
if (pr == null) {
***************
*** 274,290 ****
if (action == null)
return;
! if (FudaaLib.DEBUG)
! FudaaLib.debug("ACTION=" + action);
if ("OUVRIR".equals(action)) {
ouvrir();
} else if (action.startsWith(PREF_OUVRIR)) {
String id= action.substring(PREF_OUVRIR.length());
! if (FudaaLib.DEBUG)
! FudaaLib.debug("id= " + id);
ouvrirId(id);
} else if ("CREER".equals(action)) {
creer();
} else if ("ENREGISTRER".equals(action)) {
! new BuTaskOperation(this, DodicoLib.EMPTY_STRING) {
public void act() {
projetCourant().save(createProgressionInterface(this));
--- 282,298 ----
if (action == null)
return;
! if (CtuluLib.DEBUG)
! CtuluLib.debug("ACTION=" + action);
if ("OUVRIR".equals(action)) {
ouvrir();
} else if (action.startsWith(PREF_OUVRIR)) {
String id= action.substring(PREF_OUVRIR.length());
! if (CtuluLib.DEBUG)
! CtuluLib.debug("id= " + id);
ouvrirId(id);
} else if ("CREER".equals(action)) {
creer();
} else if ("ENREGISTRER".equals(action)) {
! new BuTaskOperation(this, CtuluLib.EMPTY_STRING) {
public void act() {
projetCourant().save(createProgressionInterface(this));
***************
*** 293,297 ****
.start();
} else if ("ENREGISTRERSOUS".equals(action)) {
! new BuTaskOperation(this, DodicoLib.EMPTY_STRING) {
public void act() {
projetCourant().saveAs(createProgressionInterface(this));
--- 301,305 ----
.start();
} else if ("ENREGISTRERSOUS".equals(action)) {
! new BuTaskOperation(this, CtuluLib.EMPTY_STRING) {
public void act() {
projetCourant().saveAs(createProgressionInterface(this));
***************
*** 300,304 ****
.start();
} else if ("ENREGISTRERCOPIE".equals(action)) {
! new BuTaskOperation(this, DodicoLib.EMPTY_STRING) {
public void act() {
projetCourant().saveCopy(createProgressionInterface(this));
--- 308,312 ----
.start();
} else if ("ENREGISTRERCOPIE".equals(action)) {
! new BuTaskOperation(this, CtuluLib.EMPTY_STRING) {
public void act() {
projetCourant().saveCopy(createProgressionInterface(this));
***************
*** 307,311 ****
.start();
} else if ("FERMER".equals(action)) {
! new BuTaskOperation(this, DodicoLib.EMPTY_STRING) {
public void act() {
saveAndCloseProjet(createProgressionInterface(this), this);
--- 315,319 ----
.start();
} else if ("FERMER".equals(action)) {
! new BuTaskOperation(this, CtuluLib.EMPTY_STRING) {
public void act() {
saveAndCloseProjet(createProgressionInterface(this), this);
***************
*** 327,331 ****
}
private void creer() {
! new BuTaskOperation(null, DodicoLib.EMPTY_STRING) {
public void act() {
setGlassPaneStop();
--- 335,339 ----
}
private void creer() {
! new BuTaskOperation(null, CtuluLib.EMPTY_STRING) {
public void act() {
setGlassPaneStop();
***************
*** 443,448 ****
currentProject_.close();
} else {
! if (FudaaLib.DEBUG)
! FudaaLib.debug("unmodified data");
currentProject_.close();
}
--- 451,456 ----
currentProject_.close();
} else {
! if (CtuluLib.DEBUG)
! CtuluLib.debug("unmodified data");
currentProject_.close();
}
***************
*** 507,512 ****
c.activate();
id= c.getValue();
! if (FudaaLib.DEBUG)
! FudaaLib.debug("choix " + id);
TrPreferences.TR.putStringProperty("tr.code.id", id);
TrPreferences.TR.writeIniFile();
--- 515,520 ----
c.activate();
id= c.getValue();
! if (CtuluLib.DEBUG)
! CtuluLib.debug("choix " + id);
TrPreferences.TR.putStringProperty("tr.code.id", id);
TrPreferences.TR.writeIniFile();
***************
*** 583,587 ****
if ((currentProject_ != null)) {
if (currentProject_.isModified()) {
! new BuTaskOperation(this, DodicoLib.EMPTY_STRING) {
public void act() {
saveAndCloseProjet(createProgressionInterface(this), this);
--- 591,595 ----
if ((currentProject_ != null)) {
if (currentProject_.isModified()) {
! new BuTaskOperation(this, CtuluLib.EMPTY_STRING) {
public void act() {
saveAndCloseProjet(createProgressionInterface(this), this);
***************
*** 602,606 ****
TrLib.saveFrameDimensionInPref((JFrame)getFrame());
TrPreferences.TR.writeIniFile();
! FudaaFavoriteFiles.INSTANCE.saveFavorites();
FudaaPreferences.FUDAA.writeIniFile();
FDicoPreferences.FD.writeIniFile();
--- 610,614 ----
TrLib.saveFrameDimensionInPref((JFrame)getFrame());
TrPreferences.TR.writeIniFile();
! EbliFavoriteFiles.INSTANCE.saveFavorites();
FudaaPreferences.FUDAA.writeIniFile();
FDicoPreferences.FD.writeIniFile();
Index: TrLib.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/TrLib.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** TrLib.java 11 Dec 2003 12:50:55 -0000 1.5
--- TrLib.java 12 Dec 2003 11:29:41 -0000 1.6
***************
*** 16,19 ****
--- 16,21 ----
import javax.swing.JInternalFrame;
+ import com.memoire.bu.BuCommonImplementation;
+ import com.memoire.bu.BuInternalFrame;
import com.memoire.bu.BuLib;
import com.memoire.bu.BuPreferences;
***************
*** 54,57 ****
--- 56,70 ----
}
}
+ public static void closeInternalFrame(BuCommonImplementation _impl,BuInternalFrame _f){
+ closeInternalFrame(_impl, _f, null);
+ }
+ public static void closeInternalFrame(BuCommonImplementation _impl,BuInternalFrame _f,String _nameToSave){
+ if (_f != null) {
+ if(_nameToSave!=null)
+ TrLib.saveFrameDimensionInPref(_f, _nameToSave);
+ _impl.removeInternalFrame(_f);
+ _f.setVisible(false);
+ }
+ }
public static void saveFrameDimensionInPref(
***************
*** 62,66 ****
TrPreferences.TR.putBooleanProperty(pref + "maximize", true);
} else {
- System.out.println("remove "+pref + "maximize");
TrPreferences.TR.removeProperty(pref + "maximize");
Point p= _frame.getLocation();
--- 75,78 ----
Index: TrProjectDispatcherListener.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/TrProjectDispatcherListener.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** TrProjectDispatcherListener.java 11 Dec 2003 12:50:55 -0000 1.4
--- TrProjectDispatcherListener.java 12 Dec 2003 11:29:41 -0000 1.5
***************
*** 10,14 ****
import java.util.HashSet;
import java.util.Set;
! import org.fudaa.dodico.commun.DodicoLib;
import org.fudaa.dodico.dico.DicoEntite;
import org.fudaa.dodico.dico.DicoParams;
--- 10,16 ----
import java.util.HashSet;
import java.util.Set;
!
! import org.fudaa.ctulu.CtuluLib;
!
import org.fudaa.dodico.dico.DicoEntite;
import org.fudaa.dodico.dico.DicoParams;
***************
*** 20,23 ****
--- 22,26 ----
import org.fudaa.dodico.h2d.type.H2dBoundaryType;
import org.fudaa.dodico.h2d.type.H2dVariableType;
+
import org.fudaa.fudaa.commun.FudaaLib;
/**
***************
*** 100,107 ****
FudaaLib.info(
"CHANGE: BOUNDARY TYPE"
! + (_b != null ? "( BOUNDARY " + _b + ")" : DodicoLib.EMPTY_STRING)
+ (_t != null
? "( PARAMETER " + _t.getNom() + ")"
! : DodicoLib.EMPTY_STRING));
}
/**
--- 103,110 ----
FudaaLib.info(
"CHANGE: BOUNDARY TYPE"
! + (_b != null ? "( BOUNDARY " + _b + ")" : CtuluLib.EMPTY_STRING)
+ (_t != null
? "( PARAMETER " + _t.getNom() + ")"
! : CtuluLib.EMPTY_STRING));
}
/**
***************
*** 113,117 ****
+ (_t != null
? "( PARAMETER " + _t.getNom() + ")"
! : DodicoLib.EMPTY_STRING));
}
/**
--- 116,120 ----
+ (_t != null
? "( PARAMETER " + _t.getNom() + ")"
! : CtuluLib.EMPTY_STRING));
}
/**
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.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** tr_en.fr_txt 11 Dec 2003 12:50:55 -0000 1.10
--- tr_en.fr_txt 12 Dec 2003 11:29:41 -0000 1.11
***************
*** 187,189 ****
Fichier contenant le maillage=File containing grid
optimisation maillage=Grid optimization
! Le fichier {0} n'existe pas=The file {0} doesn't exist
\ No newline at end of file
--- 187,190 ----
Fichier contenant le maillage=File containing grid
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
|
|
From: <de...@us...> - 2003-12-12 11:29:44
|
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/navmer
In directory sc8-pr-cvs1:/tmp/cvs-serv29179/org/fudaa/fudaa/navmer
Modified Files:
NavmerFilleTableauResultats.java NavmerImplementation.java
Log Message:
Maj general
Index: NavmerFilleTableauResultats.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/navmer/NavmerFilleTableauResultats.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** NavmerFilleTableauResultats.java 25 Nov 2003 10:13:59 -0000 1.5
--- NavmerFilleTableauResultats.java 12 Dec 2003 11:29:40 -0000 1.6
***************
*** 20,23 ****
--- 20,24 ----
import org.fudaa.ebli.graphe.*;
import org.fudaa.ebli.geometrie.*;
+ import org.fudaa.ebli.tableau.*;
import org.fudaa.ebli.calque.*;
/**
***************
*** 28,32 ****
* @author Nicolas Maillot
*/
! public class NavmerFilleTableauResultats extends FudaaFilleTableau {
NavmerImplementation imp_;
BuButton btOptions_= null;
--- 29,33 ----
* @author Nicolas Maillot
*/
! public class NavmerFilleTableauResultats extends EbliFilleTableau {
NavmerImplementation imp_;
BuButton btOptions_= null;
Index: NavmerImplementation.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/navmer/NavmerImplementation.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** NavmerImplementation.java 25 Nov 2003 10:13:59 -0000 1.6
--- NavmerImplementation.java 12 Dec 2003 11:29:40 -0000 1.7
***************
*** 19,22 ****
--- 19,23 ----
import org.fudaa.ebli.geometrie.*;
import org.fudaa.ebli.ressource.*;
+ import org.fudaa.ebli.tableau.*;
import org.fudaa.ebli.trace.*;
import org.fudaa.dodico.navmer.*;
***************
*** 1253,1257 ****
} else
tab= (boolean[])projet_.getParam("colonnesres");
! FudaaFilleTableau ff=
new NavmerFilleTableauResultats(
this,
--- 1254,1258 ----
} else
tab= (boolean[])projet_.getParam("colonnesres");
! EbliFilleTableau ff=
new NavmerFilleTableauResultats(
this,
***************
*** 1260,1264 ****
}
public void cmdTableauOrdres() {
! FudaaFilleTableau ff= new FudaaFilleTableau();
ff.setUtiliseFormules(false);
SParametresINI ini= (SParametresINI)projet_.getParam("ficini");
--- 1261,1265 ----
}
public void cmdTableauOrdres() {
! EbliFilleTableau ff= new EbliFilleTableau();
ff.setUtiliseFormules(false);
SParametresINI ini= (SParametresINI)projet_.getParam("ficini");
|
|
From: <de...@us...> - 2003-12-12 11:29:44
|
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/oscar
In directory sc8-pr-cvs1:/tmp/cvs-serv29179/org/fudaa/fudaa/oscar
Modified Files:
OscarFilleNoteDeCalculs.java
Log Message:
Maj general
Index: OscarFilleNoteDeCalculs.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/oscar/OscarFilleNoteDeCalculs.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** OscarFilleNoteDeCalculs.java 25 Nov 2003 10:14:00 -0000 1.7
--- OscarFilleNoteDeCalculs.java 12 Dec 2003 11:29:41 -0000 1.8
***************
*** 28,31 ****
--- 28,34 ----
import javax.swing.JScrollPane;
import javax.swing.border.EmptyBorder;
+
+ import org.fudaa.ctulu.CtuluLib;
+
import org.fudaa.fudaa.commun.FudaaLib;
import org.fudaa.fudaa.commun.projet.FudaaProjet;
***************
*** 599,603 ****
appli_.getImplementation().displayURL(file.toURL().toString());
} catch (MalformedURLException e) {
! if (FudaaLib.DEBUG)
e.printStackTrace();
WSpy.Error(
--- 602,606 ----
appli_.getImplementation().displayURL(file.toURL().toString());
} catch (MalformedURLException e) {
! if (CtuluLib.DEBUG)
e.printStackTrace();
WSpy.Error(
|
|
From: <de...@us...> - 2003-12-12 11:29:44
|
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/visu
In directory sc8-pr-cvs1:/tmp/cvs-serv29179/org/fudaa/fudaa/lido/visu
Modified Files:
LidoVisuLignedeau.java
Log Message:
Maj general
Index: LidoVisuLignedeau.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/visu/LidoVisuLignedeau.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** LidoVisuLignedeau.java 25 Nov 2003 10:13:55 -0000 1.7
--- LidoVisuLignedeau.java 12 Dec 2003 11:29:40 -0000 1.8
***************
*** 8,32 ****
*/
package org.fudaa.fudaa.lido.visu;
! import org.fudaa.dodico.lido.*;
! import org.fudaa.dodico.corba.lido.*;
! import com.memoire.bu.*;
! import org.fudaa.ebli.graphe.*;
! import org.fudaa.fudaa.commun.*;
! import org.fudaa.fudaa.commun.projet.*;
! import org.fudaa.ebli.dialog.*;
! import org.fudaa.fudaa.lido.*;
! import org.fudaa.fudaa.lido.graphe.*;
! import org.fudaa.dodico.corba.lido.*;
! import javax.swing.*;
! import javax.swing.event.*;
! import javax.swing.border.*;
! import javax.swing.filechooser.*;
! import java.awt.*;
! import java.awt.event.*;
import java.awt.print.PageFormat;
import java.awt.print.Printable;
! import java.util.*;
import java.io.File;
! import java.beans.*;
/**
* @version $Revision$ $Date$ by $Author$
--- 8,60 ----
*/
package org.fudaa.fudaa.lido.visu;
! import java.awt.BorderLayout;
! import java.awt.Container;
! import java.awt.Graphics;
! import java.awt.event.ActionEvent;
! import java.awt.event.ActionListener;
! import java.awt.event.KeyListener;
import java.awt.print.PageFormat;
import java.awt.print.Printable;
! import java.beans.PropertyChangeEvent;
! import java.beans.PropertyChangeListener;
import java.io.File;
! import java.util.Vector;
!
! import javax.swing.JCheckBox;
! import javax.swing.border.EtchedBorder;
!
! import org.fudaa.ctulu.CtuluLib;
!
! import com.memoire.bu.BuButton;
! import com.memoire.bu.BuCommonInterface;
! import com.memoire.bu.BuDialogError;
! import com.memoire.bu.BuGridLayout;
! import com.memoire.bu.BuHorizontalLayout;
! import com.memoire.bu.BuInformationsDocument;
! import com.memoire.bu.BuLabel;
! import com.memoire.bu.BuPanel;
! import com.memoire.bu.BuResource;
! import com.memoire.bu.BuVerticalLayout;
!
! import org.fudaa.dodico.corba.lido.SParametresBiefBlocPRO;
! import org.fudaa.dodico.corba.lido.SParametresBiefSituLigneRZO;
! import org.fudaa.dodico.corba.lido.SParametresEXT;
! import org.fudaa.dodico.corba.lido.SParametresLIG;
! import org.fudaa.dodico.corba.lido.SResultatsBiefRSN;
! import org.fudaa.dodico.corba.lido.SResultatsRSN;
!
! import org.fudaa.dodico.lido.DParametresLido;
!
! import org.fudaa.ebli.dialog.BDialogContent;
! import org.fudaa.ebli.dialog.BDialogContentImprimable;
! import org.fudaa.ebli.graphe.BGrapheEditeurAxes;
! import org.fudaa.ebli.graphe.BGraphePersonnaliseur;
!
! import org.fudaa.fudaa.commun.projet.FudaaProjet;
! import org.fudaa.fudaa.lido.LidoApplication;
! import org.fudaa.fudaa.lido.LidoImport;
! import org.fudaa.fudaa.lido.LidoPreferences;
! import org.fudaa.fudaa.lido.LidoResource;
! import org.fudaa.fudaa.lido.graphe.LidoGrapheLignedeau;
/**
* @version $Revision$ $Date$ by $Author$
***************
*** 426,430 ****
private void updateVisu() {
if (isBuildMode()) {
! if (FudaaLib.DEBUG)
System.out.println("mode construction");
return;
--- 454,458 ----
private void updateVisu() {
if (isBuildMode()) {
! if (CtuluLib.DEBUG)
System.out.println("mode construction");
return;
|
|
From: <de...@us...> - 2003-12-12 11:29:43
|
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/graphe
In directory sc8-pr-cvs1:/tmp/cvs-serv29179/org/fudaa/fudaa/lido/graphe
Modified Files:
LidoGrapheLignedeau.java LidoGrapheProfil.java
Log Message:
Maj general
Index: LidoGrapheLignedeau.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/graphe/LidoGrapheLignedeau.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** LidoGrapheLignedeau.java 11 Dec 2003 12:50:54 -0000 1.9
--- LidoGrapheLignedeau.java 12 Dec 2003 11:29:40 -0000 1.10
***************
*** 13,16 ****
--- 13,19 ----
import java.util.Hashtable;
import java.util.Vector;
+
+ import org.fudaa.ctulu.CtuluLib;
+
import org.fudaa.dodico.corba.lido.SParametresBiefBlocPRO;
import org.fudaa.dodico.corba.lido.SParametresBiefSituLigneRZO;
***************
*** 18,21 ****
--- 21,25 ----
import org.fudaa.dodico.corba.lido.SResultatsBiefRSN;
import org.fudaa.dodico.corba.lido.SResultatsRSN;
+
import org.fudaa.ebli.graphe.Aspect;
import org.fudaa.ebli.graphe.Axe;
***************
*** 26,30 ****
import org.fudaa.ebli.graphe.Marges;
import org.fudaa.ebli.graphe.Valeur;
! import org.fudaa.fudaa.commun.FudaaLib;
import org.fudaa.fudaa.lido.LidoResource;
/**
--- 30,34 ----
import org.fudaa.ebli.graphe.Marges;
import org.fudaa.ebli.graphe.Valeur;
!
import org.fudaa.fudaa.lido.LidoResource;
/**
***************
*** 137,141 ****
if ((crbRiveDr.length > 0) && crbRiveDr[0].visible)
r= r | DROITE;
! if (FudaaLib.DEBUG)
if ((crbRiveGa.length > 0) && crbRiveGa[0].visible)
r= r | GAUCHE;
--- 141,145 ----
if ((crbRiveDr.length > 0) && crbRiveDr[0].visible)
r= r | DROITE;
! if (CtuluLib.DEBUG)
if ((crbRiveGa.length > 0) && crbRiveGa[0].visible)
r= r | GAUCHE;
***************
*** 177,181 ****
fullRepaint();
} catch (NullPointerException e) {
! if (FudaaLib.DEBUG)
e.printStackTrace();
System.err.println("data not committed?");
--- 181,185 ----
fullRepaint();
} catch (NullPointerException e) {
! if (CtuluLib.DEBUG)
e.printStackTrace();
System.err.println("data not committed?");
***************
*** 193,197 ****
res= false;
} catch (NullPointerException e) {
! if (FudaaLib.DEBUG)
e.printStackTrace();
System.err.println("data not committed?");
--- 197,201 ----
res= false;
} catch (NullPointerException e) {
! if (CtuluLib.DEBUG)
e.printStackTrace();
System.err.println("data not committed?");
***************
*** 216,220 ****
fullRepaint();
} catch (NullPointerException e) {
! if (FudaaLib.DEBUG)
e.printStackTrace();
System.err.println("data not committed?");
--- 220,224 ----
fullRepaint();
} catch (NullPointerException e) {
! if (CtuluLib.DEBUG)
e.printStackTrace();
System.err.println("data not committed?");
***************
*** 226,230 ****
res= (crbFond.length == 0) ? false : crbFond[0].visible;
} catch (NullPointerException e) {
! if (FudaaLib.DEBUG)
e.printStackTrace();
System.err.println("data not committed?");
--- 230,234 ----
res= (crbFond.length == 0) ? false : crbFond[0].visible;
} catch (NullPointerException e) {
! if (CtuluLib.DEBUG)
e.printStackTrace();
System.err.println("data not committed?");
***************
*** 237,241 ****
fullRepaint();
} catch (NullPointerException e) {
! if (FudaaLib.DEBUG)
e.printStackTrace();
System.err.println("data not committed?");
--- 241,245 ----
fullRepaint();
} catch (NullPointerException e) {
! if (CtuluLib.DEBUG)
e.printStackTrace();
System.err.println("data not committed?");
***************
*** 248,252 ****
} catch (NullPointerException e) {
System.err.println("data not committed?");
! if (FudaaLib.DEBUG)
e.printStackTrace();
}
--- 252,256 ----
} catch (NullPointerException e) {
System.err.println("data not committed?");
! if (CtuluLib.DEBUG)
e.printStackTrace();
}
***************
*** 262,266 ****
} catch (NullPointerException e) {
System.err.println("data not committed?");
! if (FudaaLib.DEBUG)
e.printStackTrace();
}
--- 266,270 ----
} catch (NullPointerException e) {
System.err.println("data not committed?");
! if (CtuluLib.DEBUG)
e.printStackTrace();
}
***************
*** 275,279 ****
} catch (NullPointerException e) {
System.err.println("data not committed?");
! if (FudaaLib.DEBUG)
e.printStackTrace();
}
--- 279,283 ----
} catch (NullPointerException e) {
System.err.println("data not committed?");
! if (CtuluLib.DEBUG)
e.printStackTrace();
}
***************
*** 291,295 ****
} catch (NullPointerException e) {
System.err.println("data not committed?");
! if (FudaaLib.DEBUG)
e.printStackTrace();
}
--- 295,299 ----
} catch (NullPointerException e) {
System.err.println("data not committed?");
! if (CtuluLib.DEBUG)
e.printStackTrace();
}
***************
*** 304,308 ****
} catch (NullPointerException e) {
System.err.println("data not committed?");
! if (FudaaLib.DEBUG)
e.printStackTrace();
}
--- 308,312 ----
} catch (NullPointerException e) {
System.err.println("data not committed?");
! if (CtuluLib.DEBUG)
e.printStackTrace();
}
Index: LidoGrapheProfil.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/graphe/LidoGrapheProfil.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** LidoGrapheProfil.java 11 Dec 2003 12:50:54 -0000 1.11
--- LidoGrapheProfil.java 12 Dec 2003 11:29:40 -0000 1.12
***************
*** 8,20 ****
*/
package org.fudaa.fudaa.lido.graphe;
! import java.awt.*;
! import org.fudaa.ebli.graphe.*;
! import org.fudaa.fudaa.commun.FudaaLib;
import org.fudaa.fudaa.lido.LidoResource;
- import org.fudaa.dodico.corba.lido.*;
- import java.text.*;
- import java.util.*;
- import java.io.*;
- import java.beans.*;
/**
* Un composant pour afficher les profils.
--- 8,34 ----
*/
package org.fudaa.fudaa.lido.graphe;
! import java.awt.Color;
! import java.awt.Dimension;
! import java.beans.PropertyChangeEvent;
! import java.beans.PropertyChangeListener;
! import java.text.NumberFormat;
! import java.util.ArrayList;
! import java.util.Locale;
! import java.util.Vector;
!
! import org.fudaa.ctulu.CtuluLib;
!
! import org.fudaa.dodico.corba.lido.SParametresBiefBlocPRO;
!
! import org.fudaa.ebli.graphe.Aspect;
! import org.fudaa.ebli.graphe.Axe;
! import org.fudaa.ebli.graphe.BGraphe;
! import org.fudaa.ebli.graphe.Contrainte;
! import org.fudaa.ebli.graphe.CourbeDefault;
! import org.fudaa.ebli.graphe.Graphe;
! import org.fudaa.ebli.graphe.Marges;
! import org.fudaa.ebli.graphe.Valeur;
!
import org.fudaa.fudaa.lido.LidoResource;
/**
* Un composant pour afficher les profils.
***************
*** 104,108 ****
}
public void setYAjuste(boolean v) {
! if (FudaaLib.DEBUG)
System.out.println("setYajust");
if (yAjuste_ == v)
--- 118,122 ----
}
public void setYAjuste(boolean v) {
! if (CtuluLib.DEBUG)
System.out.println("setYajust");
if (yAjuste_ == v)
***************
*** 136,140 ****
}
public void setEauVisible(boolean v) {
! if (FudaaLib.DEBUG)
System.out.println("setVisible " + v);
if (ctrEau_.visible == v)
--- 150,154 ----
}
public void setEauVisible(boolean v) {
! if (CtuluLib.DEBUG)
System.out.println("setVisible " + v);
if (ctrEau_.visible == v)
***************
*** 167,171 ****
if (ctrEau_.v == n)
return;
! if (FudaaLib.DEBUG)
System.out.println("niveau eau " + n);
ctrEau_.v= n;
--- 181,185 ----
if (ctrEau_.v == n)
return;
! if (CtuluLib.DEBUG)
System.out.println("niveau eau " + n);
ctrEau_.v= n;
***************
*** 185,189 ****
}
public void setAxes(Double[] x, Double[] z) {
! if (FudaaLib.DEBUG)
System.out.println("update graphe set Axes");
if ((x == null) || (x.length < 2) || (z == null) || (z.length < 2)) {
--- 199,203 ----
}
public void setAxes(Double[] x, Double[] z) {
! if (CtuluLib.DEBUG)
System.out.println("update graphe set Axes");
if ((x == null) || (x.length < 2) || (z == null) || (z.length < 2)) {
|
|
From: <de...@us...> - 2003-12-12 11:29:43
|
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/tableau
In directory sc8-pr-cvs1:/tmp/cvs-serv29179/org/fudaa/fudaa/lido/tableau
Modified Files:
LidoTableauLimites.java
Log Message:
Maj general
Index: LidoTableauLimites.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/tableau/LidoTableauLimites.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** LidoTableauLimites.java 25 Nov 2003 10:13:54 -0000 1.8
--- LidoTableauLimites.java 12 Dec 2003 11:29:40 -0000 1.9
***************
*** 20,23 ****
--- 20,26 ----
import javax.swing.event.*;
import javax.swing.table.*;
+
+ import org.fudaa.ctulu.CtuluLib;
+
import java.util.*;
import java.text.*;
***************
*** 39,43 ****
}
private void init() {
! if (FudaaLib.DEBUG)
System.out.println("LidoTableauLimites");
setModel(new LidoTableauLimitesModel(new SParametresBiefLimLigneRZO[0]));
--- 42,46 ----
}
private void init() {
! if (CtuluLib.DEBUG)
System.out.println("LidoTableauLimites");
setModel(new LidoTableauLimitesModel(new SParametresBiefLimLigneRZO[0]));
|
|
From: <de...@us...> - 2003-12-12 11:01:44
|
Update of /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli In directory sc8-pr-cvs1:/tmp/cvs-serv26111 Modified Files: package.html Log Message: Commentaire pour les nouveaux packages tableaux et filechooser Index: package.html =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/package.html,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** package.html 5 Aug 2003 16:15:12 -0000 1.1 --- package.html 12 Dec 2003 11:01:41 -0000 1.2 *************** *** 15,18 **** --- 15,19 ---- <tr> <td>controle</td><td>widgets simples : molette, boutons à 3 états, ...</td> </tr> <tr><td>dialog</td><td>Boites de dialogue génériques.</td> </tr> + <tr><td>filechooser</td><td> Un FileChooser qui gère des favoris.</td> </tr> <tr> <td>geometrie</td><td>Eléments géométriques basiques tels que les points, polylignes,...</td> </tr> <tr> <td>graphe</td><td>Affichage 1D interactif. Ce package contient des *************** *** 27,30 **** --- 28,32 ---- <tr> <td>repere</td><td>Evènements de changement de repère, listeners, widgets, ...</td> </tr> <tr> <td>ressource</td><td>Images et futures traductions.</td> </tr> + <tr> <td>tableau</td><td>Une internal Frame gerant les tableaux. Des renderers et editor basique pour les JTable.</td> </tr> <tr> <td>test</td><td>Package (à organiser) fournissant des tests unitaires (junit).</td> </tr> <tr> <td>trace</td><td>Contient les classes traçant les éléménts géométriques.</td> </tr> |