Menu
▾
▴
[Fudaa-cvs-commit] fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/reflux TrRefluxFilleProjet.java,1.8,1.9 TrRefluxFilleVisu.java,1.11,1.12 TrRefluxImplHelper.java,1.9,1.10 TrRefluxInfoSenderDefault.java,1.1,1.2 TrRefluxParametres.java,1.14,1.15 TrRefluxProjectDispatcherListener.java,1.3,1.4 TrRefluxProjectFactory.java,1.5,1.6 TrRefluxProjet.java,1.14,1.15 TrRefluxTimeStepsEditor.java,1.1,1.2 TrRefluxValueEditorPanel.java,1.1,1.2
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)
|
