Menu
▾
▴
[Fudaa-cvs-commit] fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/telemac TrTelemac2dParametres.java,1.4,1.5 TrTelemacBoundaryEditor.java,1.1,1.2 TrTelemacCommunParametres.java,1.5,1.6 TrTelemacCommunProjectListener.java,1.5,1.6 TrTelemacCommunProjet.java,1.5,1.6 TrTelemacFilleVisu.java,1.7,1.8 TrTelemacImplHelper.java,1.11,1.12 TrTelemacInfoSenderDefault.java,1.1,1.2
|
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()) {
|
