Menu
▾
▴
fudaa-cvs-commit — Mailing list for CVS commit messages
You can subscribe to this list here.
| 2003 |
Jan
|
Feb
(89) |
Mar
(219) |
Apr
(82) |
May
(33) |
Jun
(11) |
Jul
(129) |
Aug
(357) |
Sep
(34) |
Oct
(37) |
Nov
(42) |
Dec
(182) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
(59) |
Feb
(74) |
Mar
(196) |
Apr
(205) |
May
(109) |
Jun
(268) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <de...@us...> - 2004-02-12 15:15:59
|
Update of /cvsroot/fudaa/fudaa_devel/aide/src/prepro/src_devel In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16638/src_devel Log Message: Directory /cvsroot/fudaa/fudaa_devel/aide/src/prepro/src_devel added to the repository |
|
From: <de...@us...> - 2004-02-12 15:15:59
|
Update of /cvsroot/fudaa/fudaa_devel/aide/src/prepro/src_web/images In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16638/src_web/images Log Message: Directory /cvsroot/fudaa/fudaa_devel/aide/src/prepro/src_web/images added to the repository |
|
From: <de...@us...> - 2004-01-21 17:21:44
|
Update of /cvsroot/fudaa/fudaa_devel/aide/src/prepro In directory sc8-pr-cvs1:/tmp/cvs-serv26949 Added Files: readme.txt Log Message: Un fichier qui explique le fonctionnement de la doc du prepro --- NEW FILE: readme.txt --- (This appears to be a binary file; contents omitted.) |
|
From: <de...@us...> - 2004-01-21 12:26:38
|
Update of /cvsroot/fudaa/fudaa_devel/fudaa
In directory sc8-pr-cvs1:/tmp/cvs-serv29158
Modified Files:
distribution.xml
Log Message:
Maj generateur jar pour le prepro
Index: distribution.xml
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/distribution.xml,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** distribution.xml 12 Jan 2004 14:55:29 -0000 1.15
--- distribution.xml 21 Jan 2004 12:26:32 -0000 1.16
***************
*** 468,485 ****
<resource>
<fileset dir="${fudaa.dist.classes.dir}">
! <patternset refid="ressources.fic"/>
! <include name="org/fudaa/dodico/commun/"/>
! <include name="com/memoire/bu/"/>
! <include name="org/fudaa/dodico/h2d/"/>
! <include name="org/fudaa/ebli/ressource/"/>
! <include name="org/fudaa/fudaa/ressource/"/>
! <include name="org/fudaa/fudaa/tr/"/>
! <include name="org/fudaa/fudaa/dico/"/>
</fileset>
</resource>
-
-
</genjar>
-
</target>
--- 468,483 ----
<resource>
<fileset dir="${fudaa.dist.classes.dir}">
! <patternset refid="ressources.fic"/>
! <include name="org/fudaa/dodico/commun/"/>
! <include name="com/memoire/bu/"/>
! <include name="org/fudaa/dodico/h2d/"/>
! <include name="org/fudaa/ebli/ressource/"/>
! <include name="org/fudaa/fudaa/ressource/"/>
! <include name="org/fudaa/fudaa/tr/"/>
! <include name="org/fudaa/fudaa/dico/"/>
! <include name="ghm/followgui/"/>
</fileset>
</resource>
</genjar>
</target>
|
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/telemac
In directory sc8-pr-cvs1:/tmp/cvs-serv16044/tr/telemac
Modified Files:
TrTelemacCommunParametres.java TrTelemacCommunProjet.java
TrTelemacFilleVisu.java
Log Message:
Maj version prepro 0.04
Index: TrTelemacCommunParametres.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/telemac/TrTelemacCommunParametres.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** TrTelemacCommunParametres.java 19 Dec 2003 12:10:56 -0000 1.7
--- TrTelemacCommunParametres.java 21 Jan 2004 11:07:29 -0000 1.8
***************
*** 185,190 ****
DicoEntite entFile= getDicoFileFormatVersion().getCLEntiteFile();
if (entFile == null) {
! getUI().error(
! TrResource.getS("Conditions limites"),
TrResource.getS(
"Définition du fichier de conditions limites non trouvée"));
--- 185,189 ----
DicoEntite entFile= getDicoFileFormatVersion().getCLEntiteFile();
if (entFile == null) {
! FudaaLib.info(
TrResource.getS(
"Définition du fichier de conditions limites non trouvée"));
Index: TrTelemacCommunProjet.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/telemac/TrTelemacCommunProjet.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** TrTelemacCommunProjet.java 19 Dec 2003 12:10:56 -0000 1.7
--- TrTelemacCommunProjet.java 21 Jan 2004 11:07:29 -0000 1.8
***************
*** 11,24 ****
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import javax.swing.Action;
import javax.swing.BorderFactory;
import javax.swing.JPanel;
import javax.swing.SwingUtilities;
- import com.memoire.bu.BuButton;
import com.memoire.bu.BuCommonImplementation;
import com.memoire.bu.BuDynamicMenu;
import com.memoire.bu.BuGridLayout;
import com.memoire.bu.BuMenu;
import com.memoire.bu.BuResource;
--- 11,26 ----
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
+ import java.awt.event.KeyEvent;
import javax.swing.Action;
import javax.swing.BorderFactory;
import javax.swing.JPanel;
+ import javax.swing.KeyStroke;
import javax.swing.SwingUtilities;
import com.memoire.bu.BuCommonImplementation;
import com.memoire.bu.BuDynamicMenu;
import com.memoire.bu.BuGridLayout;
+ import com.memoire.bu.BuInternalFrame;
import com.memoire.bu.BuMenu;
import com.memoire.bu.BuResource;
***************
*** 26,31 ****
import com.memoire.bu.BuToolButton;
- import org.fudaa.dodico.commun.DodicoCmdMngListener;
import org.fudaa.dodico.commun.DodicoCommandComposite;
import org.fudaa.dodico.dico.DicoEntite;
import org.fudaa.dodico.fichiers.FileFormatSoftware;
--- 28,33 ----
import com.memoire.bu.BuToolButton;
import org.fudaa.dodico.commun.DodicoCommandComposite;
+ import org.fudaa.dodico.commun.ProgressionInterface;
import org.fudaa.dodico.dico.DicoEntite;
import org.fudaa.dodico.fichiers.FileFormatSoftware;
***************
*** 80,83 ****
--- 82,89 ----
actions_.setEnableCalcul(true);
}
+
+ public String getSoftwareID() {
+ return FileFormatSoftware.TELEMAC_IS.name;
+ }
public boolean isTransientAvailable() {
***************
*** 134,137 ****
--- 140,146 ----
change= true;
super.active(_impl);
+ if(change){
+ _impl.installContextHelp(entiteFille_.getRootPane(), "telemac/p-telemac-general.html");
+ }
_impl.addMenu(getProjectMenu(), _impl.getNbMenuInMenuBar() - 2);
if (change) {
***************
*** 194,198 ****
* Ajoute ou affiche la fenetre contenant les courbes temporelles.
*/
! protected synchronized void activeGrapheFille() {
if ((getImpl() == null)
|| (!isTransientAvailable())
--- 203,207 ----
* Ajoute ou affiche la fenetre contenant les courbes temporelles.
*/
! public synchronized void activeGrapheFille() {
if ((getImpl() == null)
|| (!isTransientAvailable())
***************
*** 202,205 ****
--- 211,215 ----
courbeFille_=
new TrGrapheFille(getImpl(), getInformationsDocument(), getEvolMng());
+ getImpl().installContextHelp(courbeFille_.getRootPane(), "telemac/p-telemac-time-curves.html");
getImpl().addInternalFrame(courbeFille_);
TrLib.initFrameDimensionWithPref(
***************
*** 221,224 ****
--- 231,235 ----
//initialization for the boundaries layer
impl.addInternalFrame(visu_);
+ impl.installContextHelp(visu_.getRootPane(), "telemac/p-telemac-editeur2D.html");
if (impl instanceof TrImplementation)
visu_.refreshArbreCalque(((TrImplementation)impl).getArbreCalque());
***************
*** 282,292 ****
*/
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;
}
--- 293,315 ----
*/
public void close() {
! final BuCommonImplementation impl= getImpl();
! Runnable runnable= new Runnable() {
! public void run() {
! impl.getMainMenuBar().removeMenu(getProjectMenu());
! TrLib.closeInternalFrame(impl, entiteFille_, "general");
! entiteFille_= null;
! if (visu_ != null)
! impl.getMainMenuBar().remove(visu_.getLayerMenu());
! TrLib.closeInternalFrame(impl, visu_, "layer");
! visu_= null;
! TrLib.closeInternalFrame(impl, courbeFille_, "curve");
! courbeFille_= null;
! }
! };
!
! if (!SwingUtilities.isEventDispatchThread())
! SwingUtilities.invokeLater(runnable);
! else
! runnable.run();
}
***************
*** 310,318 ****
Action.SHORT_DESCRIPTION,
TrResource.getS("Paramètres généraux"));
}
if (visuAction_ == null) {
visuAction_=
new EbliSimpleAction(
! TrResource.getS("Vue du maillage"),
BuResource.BU.getToolIcon("voir"),
"GRID_PROJECT_VIEW") {
--- 333,346 ----
Action.SHORT_DESCRIPTION,
TrResource.getS("Paramètres généraux"));
+ projectAction_.putValue(
+ Action.ACCELERATOR_KEY,
+ KeyStroke.getKeyStroke(
+ KeyEvent.VK_G,
+ KeyEvent.ALT_MASK + KeyEvent.CTRL_MASK));
}
if (visuAction_ == null) {
visuAction_=
new EbliSimpleAction(
! TrResource.getS("Editeur 2D"),
BuResource.BU.getToolIcon("voir"),
"GRID_PROJECT_VIEW") {
***************
*** 324,327 ****
--- 352,360 ----
Action.SHORT_DESCRIPTION,
TrResource.getS("Vue du maillage"));
+ visuAction_.putValue(
+ Action.ACCELERATOR_KEY,
+ KeyStroke.getKeyStroke(
+ KeyEvent.VK_V,
+ KeyEvent.ALT_MASK + KeyEvent.CTRL_MASK));
}
if (loadAction_ == null) {
***************
*** 354,357 ****
--- 387,395 ----
TrResource.getS("Afficher la fenêtres des courbes temporelles"));
courbeAction_.setEnabled(false);
+ courbeAction_.putValue(
+ Action.ACCELERATOR_KEY,
+ KeyStroke.getKeyStroke(
+ KeyEvent.VK_C,
+ KeyEvent.ALT_MASK + KeyEvent.CTRL_MASK));
}
}
***************
*** 456,458 ****
--- 494,503 ----
}
+ /**
+ *
+ */
+ public void loadAll(ProgressionInterface _inter) {
+ getTrTelemacParams().loadAll(_inter);
+ }
+
}
\ No newline at end of file
Index: TrTelemacFilleVisu.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/telemac/TrTelemacFilleVisu.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** TrTelemacFilleVisu.java 12 Dec 2003 11:29:42 -0000 1.8
--- TrTelemacFilleVisu.java 21 Jan 2004 11:07:29 -0000 1.9
***************
*** 14,17 ****
--- 14,18 ----
import org.fudaa.ctulu.CtuluLib;
+ import org.fudaa.dodico.commun.DodicoAnalyze;
import org.fudaa.dodico.commun.DodicoCommand;
import org.fudaa.dodico.commun.DodicoCommandComposite;
***************
*** 367,371 ****
return;
if (getBcMng() == null) {
! p.setNoCL();
p.getDicoParams().setLoaded(e, null, true);
addBcLayerIfNot();
--- 368,374 ----
return;
if (getBcMng() == null) {
! DodicoAnalyze.Editor a=new DodicoAnalyze.Editor();
! p.setNoCL(a);
! getImpl().manageAnalyzeAndIsFatal(a.toAnalyze());
p.getDicoParams().setLoaded(e, null, true);
addBcLayerIfNot();
|
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr
In directory sc8-pr-cvs1:/tmp/cvs-serv16044/tr
Modified Files:
Tr.java TrFilleVisu.java TrGrapheFille.java
TrImplementation.java TrLib.java TrProjet.java tr_en.fr_txt
Log Message:
Maj version prepro 0.04
Index: Tr.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/Tr.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** Tr.java 12 Dec 2003 11:29:41 -0000 1.9
--- Tr.java 21 Jan 2004 11:07:28 -0000 1.10
***************
*** 61,84 ****
if (!flags.no_log) {
FudaaTee t= new FudaaTee(true);
if (buLanguage.equals("fr")) {
String s=
! " ******************************************************************************\n"
! + " * Bienvenue\n"
! + " * ---------\n"
! + " * Ce fichier contient les messages systemes générés par le préprocesseur.\n"
! + " * En cas d'erreur, joignez ce fichier au mail de notification de\n"
! + " * bogue.\n"
! + " *\n"
! + " ******************************************************************************\n";
t.addToFile(s);
} else {
String s=
! " ******************************************************************************\n"
! + " *Welcome\n"
! + " *---------\n"
! + " * This file contains the preprocessor sytem messages.\n"
! + " * If an error occurs, please, send this file with your bug report.\n"
! + " *\n"
! + " ******************************************************************************\n";
t.addToFile(s);
}
--- 61,85 ----
if (!flags.no_log) {
FudaaTee t= new FudaaTee(true);
+ String ls=CtuluLib.LINE_SEP;
if (buLanguage.equals("fr")) {
String s=
! " ******************************************************************************"+ls
! + " * Bienvenue"+ls
! + " * ---------"+ls
! + " * Ce fichier contient les messages systemes générés par le préprocesseur."+ls
! + " * En cas d'erreur, joignez ce fichier au mail de notification de"+ls
! + " * bogue."+ls
! + " *"+ls
! + " ******************************************************************************"+ls;
t.addToFile(s);
} else {
String s=
! " ******************************************************************************"+ls
! + " *Welcome"+ls
! + " *---------"+ls
! + " * This file contains the preprocessor sytem messages."+ls
! + " * If an error occurs, please, send this file with your bug report."+ls
! + " *"+ls
! + " ******************************************************************************"+ls;
t.addToFile(s);
}
Index: TrFilleVisu.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/TrFilleVisu.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** TrFilleVisu.java 11 Dec 2003 12:50:55 -0000 1.11
--- TrFilleVisu.java 21 Jan 2004 11:07:28 -0000 1.12
***************
*** 14,21 ****
import java.beans.PropertyVetoException;
import java.text.DecimalFormat;
- import java.text.NumberFormat;
import java.util.Iterator;
import java.util.Map;
import java.util.TreeMap;
import javax.swing.Action;
import javax.swing.ActionMap;
--- 14,21 ----
import java.beans.PropertyVetoException;
import java.text.DecimalFormat;
import java.util.Iterator;
import java.util.Map;
import java.util.TreeMap;
+
import javax.swing.Action;
import javax.swing.ActionMap;
***************
*** 29,32 ****
--- 29,33 ----
import javax.swing.KeyStroke;
import javax.swing.event.TreeSelectionEvent;
+
import com.memoire.bu.BuDialogMessage;
import com.memoire.bu.BuDynamicMenu;
***************
*** 36,41 ****
--- 37,44 ----
import com.memoire.bu.BuSelectFindReplaceInterface;
import com.memoire.bu.BuUndoRedoInterface;
+
import org.fudaa.dodico.commun.DodicoCommandManager;
import org.fudaa.dodico.h2d.H2dGrid;
+
import org.fudaa.ebli.calque.BArbreCalque;
import org.fudaa.ebli.calque.BArbreCalqueModel;
***************
*** 48,51 ****
--- 51,55 ----
import org.fudaa.ebli.calque.action.EbliPaletteAction;
import org.fudaa.ebli.palette.BSelecteurReduitFonteNewVersion;
+
import org.fudaa.fudaa.commun.FudaaCommonImplementation;
import org.fudaa.fudaa.tr.data.TrBcBoundaryLayerAbstract;
***************
*** 84,87 ****
--- 88,92 ----
public TrFilleVisu(FudaaCommonImplementation _impl,TrPanelInfoSender _sender) {
super(null, _impl, null, true, true, true);
+ setTitle(TrResource.getS("Editeur 2D"));
impl_= _impl;
mng_= new DodicoCommandManager();
Index: TrGrapheFille.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/TrGrapheFille.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TrGrapheFille.java 19 Dec 2003 12:10:55 -0000 1.2
--- TrGrapheFille.java 21 Jan 2004 11:07:28 -0000 1.3
***************
*** 10,18 ****
import java.awt.Color;
- import java.awt.Container;
import java.util.List;
- import java.util.Random;
- import com.memoire.bu.BuBorderLayout;
import com.memoire.bu.BuCommonInterface;
import com.memoire.bu.BuInformationsDocument;
--- 10,15 ----
***************
*** 25,33 ****
import org.fudaa.ebli.graphe.Axe;
- import org.fudaa.ebli.graphe.BGraphe;
import org.fudaa.ebli.graphe.CourbeModelAbstract;
- import org.fudaa.ebli.graphe.EbliFilleGraphe;
import org.fudaa.ebli.graphe.EbliFilleGrapheController;
- import org.fudaa.ebli.graphe.Graphe;
/**
--- 22,27 ----
***************
*** 141,144 ****
--- 135,147 ----
titre= evol_.getNom();
}
+
+ public boolean getMinMax(double[] r){
+ r[0]=evol_.getMinX();
+ r[1]=evol_.getMaxX();
+ r[2]=evol_.getMinY();
+ r[3]=evol_.getMaxY();
+ return true;
+ }
+
/**
Index: TrImplementation.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/TrImplementation.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** TrImplementation.java 19 Dec 2003 12:10:55 -0000 1.18
--- TrImplementation.java 21 Jan 2004 11:07:28 -0000 1.19
***************
*** 19,31 ****
--- 19,37 ----
import java.io.IOException;
import java.lang.reflect.InvocationTargetException;
+ import java.util.ArrayList;
+ import java.util.Map;
+ import javax.swing.AbstractButton;
import javax.swing.JFrame;
import javax.swing.JMenu;
import javax.swing.JMenuItem;
import javax.swing.JScrollPane;
+ import javax.swing.SwingUtilities;
import org.fudaa.ctulu.CtuluLib;
+ import com.memoire.bu.BuBrowserPreferencesPanel;
import com.memoire.bu.BuColumn;
+ import com.memoire.bu.BuDesktopPreferencesPanel;
import com.memoire.bu.BuDialogChoice;
import com.memoire.bu.BuDynamicMenu;
***************
*** 33,36 ****
--- 39,44 ----
import com.memoire.bu.BuInformationsDocument;
import com.memoire.bu.BuInformationsSoftware;
+ import com.memoire.bu.BuLanguagePreferencesPanel;
+ import com.memoire.bu.BuLookPreferencesPanel;
import com.memoire.bu.BuMainPanel;
import com.memoire.bu.BuMenu;
***************
*** 38,41 ****
--- 46,50 ----
import com.memoire.bu.BuMenuItem;
import com.memoire.bu.BuPreferences;
+ import com.memoire.bu.BuPreferencesFrame;
import com.memoire.bu.BuResource;
import com.memoire.bu.BuScrollPane;
***************
*** 44,47 ****
--- 53,57 ----
import com.memoire.bu.BuTaskOperation;
import com.memoire.bu.BuTaskView;
+ import com.memoire.bu.BuUserPreferencesPanel;
import org.fudaa.dodico.commun.ProgressionInterface;
***************
*** 58,68 ****
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;
import org.fudaa.fudaa.commun.FudaaPreferences;
- import org.fudaa.fudaa.commun.aide.FudaaAidePreferencesPanel;
import org.fudaa.fudaa.commun.exec.FudaaAppliExecManager;
import org.fudaa.fudaa.dico.FDicoPreferences;
--- 68,80 ----
import org.fudaa.ebli.calque.BArbreCalque;
import org.fudaa.ebli.commun.EbliPreferences;
+ import org.fudaa.ebli.dialog.EbliSimpleDialogPanel;
import org.fudaa.ebli.filechooser.EbliFavoriteFiles;
+ import org.fudaa.ebli.impression.EbliMiseEnPagePreferencesPanel;
import org.fudaa.ebli.ressource.EbliResource;
import org.fudaa.fudaa.commun.FudaaCommonImplementation;
+ import org.fudaa.fudaa.commun.FudaaImportCsvPanel;
import org.fudaa.fudaa.commun.FudaaLib;
import org.fudaa.fudaa.commun.FudaaPreferences;
import org.fudaa.fudaa.commun.exec.FudaaAppliExecManager;
import org.fudaa.fudaa.dico.FDicoPreferences;
***************
*** 83,98 ****
new BuInformationsSoftware();
static {
! isRt_.name= "Prepro";
isRt_.version= "0.04";
! isRt_.date= "2003-12-18";
! isRt_.rights= TrResource.getS("Tous droits réservés") + ". CETMEF (c)2003-2004";
! isRt_.contact= "fre...@eq...";
isRt_.license= "GPL2";
isRt_.languages= "fr,en";
isRt_.logo= TrResource.TR.getIcon("prepro");
isRt_.banner= TrResource.TR.getIcon("banner");
! isRt_.http= "http://fudaa.sourceforge.net";
isRt_.update= "";
! isRt_.man= FudaaAidePreferencesPanel.getHelpUrl(TrPreferences.TR);
isRt_.authors= new String[] { "Frédéric Deniger" };
isRt_.contributors= new String[] { "Equipes Dodico, Ebli et Fudaa" };
--- 95,111 ----
new BuInformationsSoftware();
static {
! isRt_.name= "prepro";
isRt_.version= "0.04";
! isRt_.date= "2004-01-20";
! isRt_.rights=
! TrResource.getS("Tous droits réservés") + ". CETMEF (c)2003-2004";
! isRt_.contact= "de...@us...";
isRt_.license= "GPL2";
isRt_.languages= "fr,en";
isRt_.logo= TrResource.TR.getIcon("prepro");
isRt_.banner= TrResource.TR.getIcon("banner");
! isRt_.http= "http://fudaa.sourceforge.net/prepro/";
isRt_.update= "";
! isRt_.man= LOCAL_MAN + "prepro/html/";
isRt_.authors= new String[] { "Frédéric Deniger" };
isRt_.contributors= new String[] { "Equipes Dodico, Ebli et Fudaa" };
***************
*** 100,104 ****
isRt_.testers= new String[] { "Frédéric Deniger" };
isRt_.citation= "";
- // idTr_.logo = EbliResource.EBLI.getIcon("minlogo.gif");
}
protected BArbreCalque arbre_;
--- 113,116 ----
***************
*** 136,152 ****
new BuTaskOperation(this, TrResource.getS("Console")) {
public void act() {
! try {
! tailFrame_=
! FollowApp.openFollowApp(
! new String[] { new File("ts.log").getAbsolutePath()},
! _show);
! tailFrame_.setCloseFrameExitJvm(false);
! } catch (IOException e) {
! e.printStackTrace();
! } catch (InterruptedException e) {
! e.printStackTrace();
! } catch (InvocationTargetException e) {
! e.printStackTrace();
! }
}
}
--- 148,152 ----
new BuTaskOperation(this, TrResource.getS("Console")) {
public void act() {
! openLogFrameAction(_show);
}
}
***************
*** 154,161 ****
}
}
public FollowApp getTailFrame() {
if (tailFrame_ == null)
! openLogFrame(false);
return tailFrame_;
}
--- 154,182 ----
}
}
+
+ protected void openLogFrameAction(final boolean _show) {
+ if (tailFrame_ != null) {
+ tailFrame_.getFrame().show();
+ } else {
+ try {
+ tailFrame_=
+ FollowApp.openFollowApp(
+ new String[] { new File("ts.log").getAbsolutePath()},
+ _show);
+ tailFrame_.setCloseFrameExitJvm(false);
+ } catch (IOException e) {
+ e.printStackTrace();
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ } catch (InvocationTargetException e) {
+ e.printStackTrace();
+ }
+ }
+ }
+
public FollowApp getTailFrame() {
if (tailFrame_ == null)
! openLogFrameAction(false);
return tailFrame_;
}
***************
*** 332,336 ****
} else if ("CONSOLE".equals(action)) {
openLogFrame();
! } else if (action.startsWith(TrFileFormatManager.EXPORT_PREF)) {
projetCourant().export(action);
} else if (action.startsWith(TrFileFormatManager.IMPORT_PREF)) {
--- 353,363 ----
} else if ("CONSOLE".equals(action)) {
openLogFrame();
! } else if (action.equals("AIDE") || (action.startsWith("AIDE_CONTEXTUELLE")))
! displayURL(getCurrentProjectHelp() + "index.html");
! else if (action.equals("AIDE_INDEX") )
! displayURL(isRt_.man + "index.html");
! else if (action.equals("INDEX_ALPHA"))
! displayURL(getCurrentProjectHelp() + "alphabetique.html");
! else if (action.startsWith(TrFileFormatManager.EXPORT_PREF)) {
projetCourant().export(action);
} else if (action.startsWith(TrFileFormatManager.IMPORT_PREF)) {
***************
*** 341,381 ****
}
/**
* Methode s'occupant d'importer les fichiers demandes. Methode appelee par actionPerformed.
*/
! private void importAction(String _id){
! if(CtuluLib.DEBUG) CtuluLib.debug("import "+_id);
! FileFormat ft=fileFormatMng_.getFileFormatWithID(_id);
! if(ft==null) return;
! if(ft.getType()==H2dFileFormatType.COURBE_TRANSITOIRE.getId()){
! importCurvesAction((H2dFileFormatEvolutionVersion)ft.getLastVersionInstance());
}
}
!
/**
* Importer des courbes a partir du format _v.
*/
! private void importCurvesAction(final H2dFileFormatEvolutionVersion _v){
! if(currentProject_==null) return;
! final H2dEvolutionManager mng=currentProject_.getEvolMng();
! FileFormat ft=_v.getFileFormat();
! if(mng==null) return;
! if(ft.getID()==H2dCSVFileFormat.getInstance().getID()){
}
! else{
! final File f=ouvrirFileChooser(ft.getExtensions(), ft.getDescription());
! if(f!=null){
! new BuTaskOperation(this,TrResource.getS("Import")+CtuluLib.ESPACE+ft.getName()){
! public void act(){
! FileOperationSynthese s=_v.readEvolutions(f, createProgressionInterface(this));
! if(!manageErrorOperationAndIsFatal(s)){
! mng.add((H2dEvolution[])s.getSource());
}
}
! }.start();
}
}
}
protected void connecter() {
System.out.println("pas de connexion");
--- 368,456 ----
}
+ protected String getCurrentProjectHelp(){
+ return
+ isRt_.man+((projetCourant()==null)?(implHelper_.getSoftwareID()):(projetCourant().getSoftwareID()))+"/";
+ }
+
/**
* Methode s'occupant d'importer les fichiers demandes. Methode appelee par actionPerformed.
*/
! private void importAction(String _id) {
! if (CtuluLib.DEBUG)
! CtuluLib.debug("import " + _id);
! FileFormat ft= fileFormatMng_.getFileFormatWithID(_id);
! if (ft == null)
! return;
! if (ft.getType() == H2dFileFormatType.COURBE_TRANSITOIRE.getId()) {
! importCurvesAction(
! (H2dFileFormatEvolutionVersion)ft.getLastVersionInstance());
}
}
!
/**
* Importer des courbes a partir du format _v.
*/
! private void importCurvesAction(final H2dFileFormatEvolutionVersion _v) {
! if (currentProject_ == null)
! return;
! FileFormat ft= _v.getFileFormat();
! File f= null;
! Map m= null;
!
! if (ft.getID() == H2dCSVFileFormat.getInstance().getID()) {
! final FudaaImportCsvPanel pn= new FudaaImportCsvPanel();
! if (EbliSimpleDialogPanel
! .isOkResponse(
! pn.afficheModale(
! getFrame(),
! TrResource.getS("Importer des courbes depuis fichier csv")))) {
! f= pn.getFile();
! m= H2dCSVFileFormat.getInstance().buildOptionSep(pn.getSepString());
!
! }
! } else {
! f= ouvrirFileChooser(ft.getExtensions(), ft.getDescription());
}
! if (f != null) {
! final File fFinal= f;
! final Map options= m;
! new BuTaskOperation(
! this,
! TrResource.getS("Import")
! + CtuluLib.ESPACE
! + H2dCSVFileFormat.getInstance().getName()) {
! public void act() {
! ProgressionInterface prog= createProgressionInterface(this);
! setMainMessage(TrResource.getS("Chargement des fichiers du projets"));
! currentProject_.loadAll(prog);
! setMainProgression(50);
! H2dEvolutionManager mng= currentProject_.getEvolMng();
! if (mng != null) {
! setMainMessage(
! TrResource.getS("Lecture")
! + CtuluLib.ESPACE
! + fFinal.getAbsolutePath());
! FileOperationSynthese op= _v.readEvolutions(fFinal, prog, options);
! if (!manageErrorOperationAndIsFatal(op)) {
! setMainProgression(70);
! setMainMessage(TrResource.getS("Mise à jour..."));
! mng.add((H2dEvolution[])op.getSource());
! SwingUtilities.invokeLater(new Runnable() {
! public void run() {
! currentProject_.activeGrapheFille();
! }
! });
}
}
! unsetMainMessage();
! unsetMainProgression();
+ }
}
+ .start();
+
}
}
+
protected void connecter() {
System.out.println("pas de connexion");
***************
*** 414,418 ****
BuMenuBar mb= getApp().getMainMenuBar();
JMenu menuFile= mb.getMenu("MENU_FICHIER");
! BuMenuItem it= new BuMenuItem(TrResource.getS("Changer chaîne de calcul"));
it.setActionCommand("MODIFIER_CHAINE");
it.addActionListener(TrImplementation.this);
--- 489,493 ----
BuMenuBar mb= getApp().getMainMenuBar();
JMenu menuFile= mb.getMenu("MENU_FICHIER");
! JMenuItem it= new BuMenuItem(TrResource.getS("Changer chaîne de calcul"));
it.setActionCommand("MODIFIER_CHAINE");
it.addActionListener(TrImplementation.this);
***************
*** 423,429 ****
it= new BuMenuItem(TrResource.getS("Enregister une copie"));
it.setActionCommand("ENREGISTRERCOPIE");
! //it.addActionListener(this);
it.addActionListener(TrImplementation.this);
menuFile.add(it, indexInsert);
BuMainPanel mp= getMainPanel();
BuColumn lc= mp.getLeftColumn();
--- 498,528 ----
it= new BuMenuItem(TrResource.getS("Enregister une copie"));
it.setActionCommand("ENREGISTRERCOPIE");
! // it.addActionListener(this);
it.addActionListener(TrImplementation.this);
menuFile.add(it, indexInsert);
+
+ //Menu aide : on enleve le superflu
+ menuFile= mb.getMenu("MENU_AIDE");
+ Component c;
+ int n= menuFile.getMenuComponentCount();
+ ArrayList temp= new ArrayList(n);
+ for (int i= 0; i < n; i++) {
+ c= menuFile.getMenuComponent(i);
+ if (c instanceof AbstractButton) {
+ String com= ((AbstractButton)c).getActionCommand();
+ if (!("ASSISTANT".equals(com))
+ && (!"INDEX_THEMA".equals(com))
+ && (!"MAJ".equals(com))
+ && (!"ASTUCE".equals(com))) {
+ temp.add(c);
+ }
+ } else
+ temp.add(c);
+ }
+ menuFile.removeAll();
+ n= temp.size();
+ for (int i= 0; i < n; i++) {
+ menuFile.add((Component)temp.get(i));
+ }
BuMainPanel mp= getMainPanel();
BuColumn lc= mp.getLeftColumn();
***************
*** 502,506 ****
currentProject_.close();
}
- getMainMenuBar().removeMenu(currentProject_.getProjectMenu());
currentProject_= null;
setEnabledForAction("ENREGISTRER", false);
--- 601,604 ----
***************
*** 608,611 ****
--- 706,713 ----
initImplHelperFromPref();
addOuvrirAutre();
+ //pour utiliser le browser externe par defaut.
+ if(BuPreferences.BU.getIntegerProperty("browser.exec", -1)<0){
+ BuPreferences.BU.putIntegerProperty("browser.exec", 2);
+ }
} // arbre_ = new BArbreCalque();
// arbre_.setRootVisible(false);
***************
*** 618,621 ****
--- 720,734 ----
return isRt_;
}
+
+ protected void buildPreferences() {
+ preferences_= new BuPreferencesFrame();
+ preferences_.addTab(new BuUserPreferencesPanel(this));
+ preferences_.addTab(new BuLanguagePreferencesPanel(this));
+ preferences_.addTab(new BuDesktopPreferencesPanel(this));
+ preferences_.addTab(new BuLookPreferencesPanel(this));
+ preferences_.addTab(new BuBrowserPreferencesPanel(this));
+ preferences_.addTab(new EbliMiseEnPagePreferencesPanel());
+ }
+
public BArbreCalque getArbreCalque() {
if (arbre_ != null)
***************
*** 635,640 ****
return arbre_;
} /**
! *
! */
public void exit() {
--- 748,753 ----
return arbre_;
} /**
! *
! */
public void exit() {
Index: TrLib.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/TrLib.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** TrLib.java 19 Dec 2003 12:10:55 -0000 1.7
--- TrLib.java 21 Jan 2004 11:07:28 -0000 1.8
***************
*** 15,22 ****
import javax.swing.JFrame;
import javax.swing.JInternalFrame;
import com.memoire.bu.BuCommonImplementation;
import com.memoire.bu.BuInternalFrame;
- import com.memoire.bu.BuLib;
import com.memoire.bu.BuPreferences;
--- 15,22 ----
import javax.swing.JFrame;
import javax.swing.JInternalFrame;
+ import javax.swing.SwingUtilities;
import com.memoire.bu.BuCommonImplementation;
import com.memoire.bu.BuInternalFrame;
import com.memoire.bu.BuPreferences;
***************
*** 56,72 ****
}
}
! 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);
! _f.dispose();
! _impl.removeInternalFrame(_f);
! _f.setVisible(false);
}
}
public static void saveFrameDimensionInPref(
JInternalFrame _frame,
--- 56,81 ----
}
}
! 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);
! _f.setVisible(false);
! _impl.removeInternalFrame(_f);
! _f.dispose();
}
}
+ /**
+ * Ferme la fenetre interne et sauvegarde les dimensions dans les preferences
+ * grace au nom passé en parametres
+ */
public static void saveFrameDimensionInPref(
JInternalFrame _frame,
***************
*** 85,95 ****
}
-
-
public static void saveFrameDimensionInPref(JFrame _frame) {
! BuPreferences.BU.putIntegerProperty("window.size",2);
Point p= _frame.getLocation();
! BuPreferences.BU.putIntegerProperty("window.x",p.x);
! BuPreferences.BU.putIntegerProperty("window.y",p.y);
TrPreferences.TR.putIntegerProperty("window.w", _frame.getWidth());
TrPreferences.TR.putIntegerProperty("window.h", _frame.getHeight());
--- 94,102 ----
}
public static void saveFrameDimensionInPref(JFrame _frame) {
! BuPreferences.BU.putIntegerProperty("window.size", 2);
Point p= _frame.getLocation();
! BuPreferences.BU.putIntegerProperty("window.x", p.x);
! BuPreferences.BU.putIntegerProperty("window.y", p.y);
TrPreferences.TR.putIntegerProperty("window.w", _frame.getWidth());
TrPreferences.TR.putIntegerProperty("window.h", _frame.getHeight());
Index: TrProjet.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/TrProjet.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** TrProjet.java 19 Dec 2003 12:10:55 -0000 1.13
--- TrProjet.java 21 Jan 2004 11:07:28 -0000 1.14
***************
*** 29,32 ****
--- 29,33 ----
public void saveCopy(ProgressionInterface _prog);
public void close();
+ public String getSoftwareID();
public boolean isModified();
public void active(TrImplementation _impl);
***************
*** 40,42 ****
--- 41,45 ----
public TrParametres getTrParams();
public H2dEvolutionManager getEvolMng();
+ public void loadAll(ProgressionInterface _inter);
+ public void activeGrapheFille();
}
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.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** tr_en.fr_txt 19 Dec 2003 12:10:55 -0000 1.12
--- tr_en.fr_txt 21 Jan 2004 11:07:28 -0000 1.13
***************
*** 1,3 ****
--- 1,4 ----
#Modifier le fichier tr en.fr txt
+ Editeur 2D=Editor 2D
Ouvrir autre=Open another format
Configuration chaîne de calcul=Numerical modelling system configuration
***************
*** 152,156 ****
Mot-clés\: options=Keywords\: options
Mot-clés\: valeurs=Keywords\: values
! points de bords=boundary points
conditions limites=boundary conditions
Index des points=Points index
--- 153,157 ----
Mot-clés\: options=Keywords\: options
Mot-clés\: valeurs=Keywords\: values
! Points de bords=Boundary points
conditions limites=boundary conditions
Index des points=Points index
***************
*** 193,195 ****
Heures, minutes, secondes=Hours, minutes, seconds
Durée (sec)=Duration (sec)
! Certaines courbes temporelles ne sont pas assez étendues dans le temps( cela sera automatiquement corrigé)=Some time curves are not width enough (this will be automtically corrected)
\ No newline at end of file
--- 194,197 ----
Heures, minutes, secondes=Hours, minutes, seconds
Durée (sec)=Duration (sec)
! Certaines courbes temporelles ne sont pas assez étendues dans le temps( cela sera automatiquement corrigé)=Some time curves are not width enough (this will be automtically corrected)
! Importer des courbes depuis fichier csv=Import curves from a csv file
\ No newline at end of file
|
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/reflux
In directory sc8-pr-cvs1:/tmp/cvs-serv16044/tr/reflux
Modified Files:
TrRefluxFilleVisu.java TrRefluxInfoSenderDefault.java
TrRefluxProjet.java TrRefluxTimeStepsEditor.java
Log Message:
Maj version prepro 0.04
Index: TrRefluxFilleVisu.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/reflux/TrRefluxFilleVisu.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** TrRefluxFilleVisu.java 12 Dec 2003 11:29:41 -0000 1.12
--- TrRefluxFilleVisu.java 21 Jan 2004 11:07:29 -0000 1.13
***************
*** 159,162 ****
--- 159,163 ----
getBcMng().getRefluxMiddleFrontier(frontierIdx);
Set bdType= frontier.getSelectedBoundaryType(_midIdx);
+ if(bdType==null) return;
H2dBoundaryType[] bdTypeArray= new H2dBoundaryType[bdType.size()];
bdType.toArray(bdTypeArray);
Index: TrRefluxInfoSenderDefault.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/reflux/TrRefluxInfoSenderDefault.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TrRefluxInfoSenderDefault.java 12 Dec 2003 11:29:41 -0000 1.2
--- TrRefluxInfoSenderDefault.java 21 Jan 2004 11:07:29 -0000 1.3
***************
*** 93,97 ****
.getMiddleFrontier(
temp[0]);
! Set s= fr.getAvailablesVariables(ptIdx);
H2dVariableType[] t= new H2dVariableType[s.size()];
s.toArray(t);
--- 93,97 ----
.getMiddleFrontier(
temp[0]);
! Set s= fr.getAvailablesVariables(temp[1]);
H2dVariableType[] t= new H2dVariableType[s.size()];
s.toArray(t);
Index: TrRefluxProjet.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/reflux/TrRefluxProjet.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** TrRefluxProjet.java 19 Dec 2003 12:10:55 -0000 1.16
--- TrRefluxProjet.java 21 Jan 2004 11:07:29 -0000 1.17
***************
*** 12,18 ****
--- 12,20 ----
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
+ import java.awt.event.KeyEvent;
import java.io.File;
import javax.swing.Action;
+ import javax.swing.KeyStroke;
import javax.swing.SwingUtilities;
***************
*** 76,79 ****
--- 78,86 ----
calculActions_.setEnableCalcul(true);
}
+
+ public String getSoftwareID() {
+ return FileFormatSoftware.REFLUX_IS.name;
+ }
+
public FudaaCommonImplementation getImpl() {
return impl_;
***************
*** 96,100 ****
}
! protected synchronized void activeGrapheFille() {
if ((impl_ == null) || (getEvolMng() == null))
return;
--- 103,107 ----
}
! public synchronized void activeGrapheFille() {
if ((impl_ == null) || (getEvolMng() == null))
return;
***************
*** 103,106 ****
--- 110,114 ----
new TrGrapheFille(getImpl(), getInformationsDocument(), getEvolMng());
courbeFille_.setVisible(true);
+ getImpl().installContextHelp(courbeFille_.getRootPane(), "reflux/p-reflux-time-curves.html");
getImpl().addInternalFrame(courbeFille_);
visu_.pack();
***************
*** 156,159 ****
--- 164,168 ----
if (fille_ == null) {
fille_= new TrRefluxFilleProjet(this);
+ getImpl().installContextHelp(fille_.getRootPane(), "reflux/p-reflux-general.html");
getImpl().addInternalFrame(fille_);
TrLib.initFrameDimensionWithPref(
***************
*** 171,174 ****
--- 180,184 ----
if (visu_ == null) {
visu_= new TrRefluxFilleVisu(getImpl(), this);
+ getImpl().installContextHelp(visu_.getRootPane(), "reflux/p-reflux-editeur2D.html");
visu_.pack();
***************
*** 195,206 ****
}
public void close() {
! TrLib.closeInternalFrame(impl_, fille_, "general");
! fille_= null;
! TrLib.closeInternalFrame(impl_, visu_, "layer");
! if(visu_!=null)
! impl_.getMainMenuBar().remove(visu_.getLayerMenu());
! visu_= null;
! TrLib.closeInternalFrame(impl_, courbeFille_, "curve");
! courbeFille_= null;
}
--- 205,227 ----
}
public void close() {
! Runnable runnable= new Runnable() {
! public void run() {
! impl_.getMainMenuBar().removeMenu(getProjectMenu());
! TrLib.closeInternalFrame(impl_, fille_, "general");
! fille_= null;
! if (visu_ != null)
! impl_.getMainMenuBar().remove(visu_.getLayerMenu());
! TrLib.closeInternalFrame(impl_, visu_, "layer");
! visu_= null;
! TrLib.closeInternalFrame(impl_, courbeFille_, "curve");
! courbeFille_= null;
! }
! };
!
! if (!SwingUtilities.isEventDispatchThread())
! SwingUtilities.invokeLater(runnable);
! else
! runnable.run();
!
}
***************
*** 369,377 ****
Action.SHORT_DESCRIPTION,
TrResource.getS("Paramètres généraux"));
}
if (visuAction_ == null) {
visuAction_=
new EbliSimpleAction(
! TrResource.getS("Vue du maillage"),
BuResource.BU.getToolIcon("voir"),
"GRID_PROJECT_VIEW") {
--- 390,403 ----
Action.SHORT_DESCRIPTION,
TrResource.getS("Paramètres généraux"));
+ projectAction_.putValue(
+ Action.ACCELERATOR_KEY,
+ KeyStroke.getKeyStroke(
+ KeyEvent.VK_G,
+ KeyEvent.ALT_MASK + KeyEvent.CTRL_MASK));
}
if (visuAction_ == null) {
visuAction_=
new EbliSimpleAction(
! TrResource.getS("Editeur 2D"),
BuResource.BU.getToolIcon("voir"),
"GRID_PROJECT_VIEW") {
***************
*** 383,386 ****
--- 409,417 ----
Action.SHORT_DESCRIPTION,
TrResource.getS("Vue du maillage"));
+ visuAction_.putValue(
+ Action.ACCELERATOR_KEY,
+ KeyStroke.getKeyStroke(
+ KeyEvent.VK_V,
+ KeyEvent.ALT_MASK + KeyEvent.CTRL_MASK));
}
if (courbeAction_ == null) {
***************
*** 400,403 ****
--- 431,440 ----
(getH2dRefluxParametres().getEvolMng() != null)
&& (getH2dRefluxParametres().getEvolMng().getNbEvol() > 0));
+ courbeAction_.putValue(
+ Action.ACCELERATOR_KEY,
+ KeyStroke.getKeyStroke(
+ KeyEvent.VK_C,
+ KeyEvent.ALT_MASK + KeyEvent.CTRL_MASK));
+
}
***************
*** 441,454 ****
p.setTimeGroups(editor.getTimeSteps());
p.setBeginTimeForTrans(editor.getBeginning());
! //DEBUG TO REMOVE
! System.out.println(p.getMinTime());
! System.out.println(p.getMaxTime());
! double[] t=p.getTimeStep();
! for(int i=0;i<t.length-1;i++){
! System.out.print(t[i]+" ; ");
! }
! System.out.println(t[t.length-1]);
!
! }
}
/**
--- 478,482 ----
p.setTimeGroups(editor.getTimeSteps());
p.setBeginTimeForTrans(editor.getBeginning());
! }
}
/**
***************
*** 467,469 ****
--- 495,502 ----
}
+ /**
+ *
+ */
+ public void loadAll(ProgressionInterface _inter) {}
+
}
Index: TrRefluxTimeStepsEditor.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/reflux/TrRefluxTimeStepsEditor.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TrRefluxTimeStepsEditor.java 19 Dec 2003 12:10:55 -0000 1.3
--- TrRefluxTimeStepsEditor.java 21 Jan 2004 11:07:29 -0000 1.4
***************
*** 88,92 ****
if (isStationnaire) {
statModel_= new TimeTableModelStationnaire(_t);
! pnPrinc= new EbliPanelListEditor(statModel_, false, false, false, true);
txtTimeBeginning_.setEnabled(false);
} else {
--- 88,93 ----
if (isStationnaire) {
statModel_= new TimeTableModelStationnaire(_t);
! pnPrinc= new EbliPanelListEditor(statModel_, true, true, true, true);
! pnPrinc.setState(false, false, false, true);
txtTimeBeginning_.setEnabled(false);
} else {
|
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/data
In directory sc8-pr-cvs1:/tmp/cvs-serv16044/tr/data
Modified Files:
TrBcBoundaryLayerAbstract.java TrBcPointLayer.java
TrPanelInfo.java
Added Files:
TrLayerMulti.java
Log Message:
Maj version prepro 0.04
--- NEW FILE: TrLayerMulti.java ---
(This appears to be a binary file; contents omitted.)
Index: TrBcBoundaryLayerAbstract.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/data/TrBcBoundaryLayerAbstract.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TrBcBoundaryLayerAbstract.java 11 Dec 2003 12:50:55 -0000 1.3
--- TrBcBoundaryLayerAbstract.java 21 Jan 2004 11:07:29 -0000 1.4
***************
*** 19,23 ****
*/
public abstract class TrBcBoundaryLayerAbstract
! extends ZCalqueAffichageDonneesMultiSpecial implements TrLayer{
public class BordTraceLigneData {
HashMap bdTypeTlDataMap_;
--- 19,23 ----
*/
public abstract class TrBcBoundaryLayerAbstract
! extends TrLayerMulti implements TrLayer{
public class BordTraceLigneData {
HashMap bdTypeTlDataMap_;
***************
*** 70,72 ****
--- 70,73 ----
return bdTlData_.getTlData(_t);
}
+
}
Index: TrBcPointLayer.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/data/TrBcPointLayer.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TrBcPointLayer.java 11 Dec 2003 12:50:55 -0000 1.3
--- TrBcPointLayer.java 21 Jan 2004 11:07:29 -0000 1.4
***************
*** 36,47 ****
* @version $Id$
*/
! public class TrBcPointLayer
! extends ZCalqueAffichageDonneesMultiSpecial
! implements TrLayer {
private TrBcPointModel m_;
private boolean isT6_;
TraceIcone mid;
public TrBcPointLayer(TrBcPointModel _cl) {
! setTitle(TrResource.getS("points de bords"));
m_= _cl;
isT6_= m_.isT6();
--- 36,45 ----
* @version $Id$
*/
! public class TrBcPointLayer extends TrLayerMulti implements TrLayer {
private TrBcPointModel m_;
private boolean isT6_;
TraceIcone mid;
public TrBcPointLayer(TrBcPointModel _cl) {
! setTitle(TrResource.getS("Points de bords"));
m_= _cl;
isT6_= m_.isT6();
***************
*** 296,301 ****
*
*/
! public void fillWithInfo(TrPanelInfo.InfoData _m,TrPanelInfoSender _s) {
! _s.fillWithPointInfo(_m, getPtIdx());
}
--- 294,299 ----
*
*/
! public void fillWithInfo(TrPanelInfo.InfoData _m, TrPanelInfoSender _s) {
! _s.fillWithPointInfo(_m, getPtIdx());
}
Index: TrPanelInfo.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/data/TrPanelInfo.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TrPanelInfo.java 12 Dec 2003 11:29:41 -0000 1.2
--- TrPanelInfo.java 21 Jan 2004 11:07:29 -0000 1.3
***************
*** 37,40 ****
--- 37,41 ----
import org.fudaa.fudaa.tr.TrResource;
/**
+ * Un panel affichant les infos envoyes par TrPanelInfoSender
* @author deniger
* @version $Id$
|
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun
In directory sc8-pr-cvs1:/tmp/cvs-serv16044/commun
Modified Files:
FudaaBrowserControl.java FudaaCommonImplementation.java
FudaaImportCsvPanel.java FudaaLib.java
Log Message:
Maj version prepro 0.04
Index: FudaaBrowserControl.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/FudaaBrowserControl.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** FudaaBrowserControl.java 12 Dec 2003 10:58:40 -0000 1.7
--- FudaaBrowserControl.java 21 Jan 2004 11:07:28 -0000 1.8
***************
*** 39,48 ****
*/
public static void displayURL(String _url) {
! if (isWindowsPlatform())
! _url= getTempUrlWin(_url);
if ((_url == null)
|| (_url == CtuluLib.EMPTY_STRING)
|| (_url.length() == 0))
_url= FudaaImplementation.LOCAL_MAN;
BuBrowserControl.displayURL(_url);
}
--- 39,53 ----
*/
public static void displayURL(String _url) {
! // if (isWindowsPlatform())
! // _url= getTempUrlWin(_url);
!
if ((_url == null)
|| (_url == CtuluLib.EMPTY_STRING)
|| (_url.length() == 0))
_url= FudaaImplementation.LOCAL_MAN;
+ if(_url.startsWith("file://")){
+ _url=FudaaLib.pathToUrl(_url.substring(7));
+ }
+ if(CtuluLib.DEBUG) CtuluLib.debug("browse "+_url);
BuBrowserControl.displayURL(_url);
}
***************
*** 57,60 ****
--- 62,66 ----
* @return l'URL a afficher :soit l'URL du fichier temporaire soit l'URL
* initiale (si sans ancre).
+ * @deprecated inutile ...
*/
protected static String getTempUrlWin(String _urlInit) {
Index: FudaaCommonImplementation.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/FudaaCommonImplementation.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** FudaaCommonImplementation.java 12 Dec 2003 10:58:40 -0000 1.13
--- FudaaCommonImplementation.java 21 Jan 2004 11:07:28 -0000 1.14
***************
*** 12,15 ****
--- 12,16 ----
import java.awt.print.PrinterJob;
import java.io.File;
+ import java.io.IOException;
import java.net.MalformedURLException;
import java.net.URL;
***************
*** 38,41 ****
--- 39,43 ----
import com.memoire.bu.BuTaskOperation;
import com.memoire.bu.BuUserPreferencesPanel;
+ import com.memoire.fu.FuLib;
import org.fudaa.dodico.commun.DodicoAnalyze;
***************
*** 72,81 ****
*/
protected BuHelpFrame aide_;
! public final static String LOCAL_MAN= getUserDirUrl() + "/aide/";
public final static String REMOTE_MAN=
"http://www.utc.fr/fudaa/aide/aide_html/";
! public static String getUserDirUrl() {
return FudaaLib.pathToUrl(System.getProperty("user.dir"));
}
public FudaaUndoCmdMngListener getUndoCmdListener() {
if (cmdListener_ == null)
--- 74,90 ----
*/
protected BuHelpFrame aide_;
! public final static String LOCAL_MAN="file://"+System.getProperty("user.dir")+"/aide/";
public final static String REMOTE_MAN=
"http://www.utc.fr/fudaa/aide/aide_html/";
! /**
! * Return le chemin de la propriete user.dir dans le format
! * file://....
! */
! public static final String getUserDirUrl() {
return FudaaLib.pathToUrl(System.getProperty("user.dir"));
}
+
+
+
public FudaaUndoCmdMngListener getUndoCmdListener() {
if (cmdListener_ == null)
Index: FudaaImportCsvPanel.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/FudaaImportCsvPanel.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** FudaaImportCsvPanel.java 19 Dec 2003 12:10:55 -0000 1.1
--- FudaaImportCsvPanel.java 21 Jan 2004 11:07:28 -0000 1.2
***************
*** 9,22 ****
package org.fudaa.fudaa.commun;
import java.io.File;
import javax.swing.JTextField;
import javax.swing.event.DocumentEvent;
import javax.swing.event.DocumentListener;
import javax.swing.table.AbstractTableModel;
import com.memoire.bu.BuVerticalLayout;
! import org.fudaa.dodico.h2d.H2dEvolution;
import org.fudaa.ebli.dialog.EbliSimpleDialogPanel;
--- 9,44 ----
package org.fudaa.fudaa.commun;
+ import java.awt.Dimension;
+ import java.awt.event.ActionEvent;
+ import java.awt.event.ActionListener;
import java.io.File;
+ import java.io.FileReader;
+ import java.io.IOException;
+ import java.io.LineNumberReader;
+ import javax.swing.BorderFactory;
+ import javax.swing.ButtonGroup;
+ import javax.swing.JFileChooser;
+ import javax.swing.JScrollPane;
+ import javax.swing.JTable;
import javax.swing.JTextField;
import javax.swing.event.DocumentEvent;
import javax.swing.event.DocumentListener;
import javax.swing.table.AbstractTableModel;
+ import javax.swing.text.Document;
+ import org.fudaa.ctulu.CtuluLib;
+
+ import com.memoire.bu.BuFileFilter;
+ import com.memoire.bu.BuGridLayout;
+ import com.memoire.bu.BuPanel;
+ import com.memoire.bu.BuRadioButton;
+ import com.memoire.bu.BuScrollPane;
+ import com.memoire.bu.BuTable;
+ import com.memoire.bu.BuTextArea;
import com.memoire.bu.BuVerticalLayout;
! import org.fudaa.dodico.commun.DodicoLib;
! import org.fudaa.dodico.mesure.EvolutionReader;
import org.fudaa.ebli.dialog.EbliSimpleDialogPanel;
***************
*** 28,52 ****
* @version $Id$
*/
! public class FudaaImportCsvPanel extends EbliSimpleDialogPanel implements DocumentListener{
! File f_;
! H2dEvolution[] evols_;
JTextField txtFile_;
JTextField txtSep_;
String[][] preview_;
! public FudaaImportCsvPanel(){
! setLayout(new BuVerticalLayout());
! txtFile_=addLabelFileChooserPanel(FudaaResource.getS("Fichier csv"));
txtFile_.getDocument().addDocumentListener(this);
! txtSep_=addLabelStringText(FudaaResource.getS("Séparateur"));
}
!
! private class PreviewTableModel extends AbstractTableModel{
!
! /**
! *
! */
public int getColumnCount() {
! return 0;
}
--- 50,150 ----
* @version $Id$
*/
! public class FudaaImportCsvPanel
! extends EbliSimpleDialogPanel
! implements DocumentListener {
JTextField txtFile_;
JTextField txtSep_;
String[][] preview_;
+ PreviewTableModel model_;
+ BuTextArea txtArea_;
+ EvolutionReader reader_;
+ String sep_;
! public FudaaImportCsvPanel() {
! setLayout(new BuVerticalLayout(10, true, false));
! txtFile_= addLabelFileChooserPanel(FudaaResource.getS("Fichier csv"));
txtFile_.getDocument().addDocumentListener(this);
! BuPanel pn= new BuPanel();
! pn.setLayout(new BuGridLayout(3, 10, 10));
! ButtonGroup group= new ButtonGroup();
! ActionListener l= new ActionListener() {
! public void actionPerformed(ActionEvent e) {
! if ("OTHER".equals(e.getActionCommand())) {
! txtSep_.setEnabled(true);
! setSep(txtSep_.getText());
!
! } else {
! setSep(e.getActionCommand());
! txtSep_.setEnabled(false);
! }
! }
! };
! BuRadioButton br= new BuRadioButton(FudaaResource.getS("Espace"));
! group.add(br);
! br.setActionCommand(CtuluLib.ESPACE);
! br.addActionListener(l);
! pn.add(br);
! br.setSelected(true);
! sep_= CtuluLib.ESPACE;
! br= new BuRadioButton(FudaaResource.getS("Point-virgule"));
! group.add(br);
! br.setActionCommand(";");
! br.addActionListener(l);
! pn.add(br);
! br= new BuRadioButton(FudaaResource.getS("Virgule"));
! group.add(br);
! br.setActionCommand(",");
! br.addActionListener(l);
! pn.add(br);
! br= new BuRadioButton(FudaaResource.getS("Autre"));
! group.add(br);
! br.setActionCommand("OTHER");
! br.addActionListener(l);
! pn.add(br);
! txtSep_= addStringText(pn, ";");
! txtSep_.setEnabled(false);
! txtSep_.getDocument().addDocumentListener(this);
! add(pn);
! preview_= new String[0][0];
! model_= new PreviewTableModel();
! txtArea_= new BuTextArea(10, 40);
! JScrollPane sp=
! new JScrollPane(
! txtArea_,
! BuScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED,
! JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED);
! pn= new BuPanel();
! pn.setBorder(
! BorderFactory.createTitledBorder(
! BorderFactory.createEtchedBorder(),
! FudaaResource.getS("Contenu du fichier")));
! pn.add(sp);
! add(pn);
! sp=
! new JScrollPane(
! new BuTable(model_),
! BuScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED,
! JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED);
! sp.setPreferredSize(txtArea_.getPreferredSize());
! pn= new BuPanel();
! pn.setBorder(
! BorderFactory.createTitledBorder(
! BorderFactory.createEtchedBorder(),
! FudaaResource.getS("Prévisualisation")));
! pn.add(sp);
! add(pn);
}
!
! public String getSepString() {
! return sep_;
! }
!
! private class PreviewTableModel extends AbstractTableModel {
!
! /**
! *
! */
public int getColumnCount() {
! return preview_.length > 0 ? preview_[0].length : 0;
}
***************
*** 55,59 ****
*/
public int getRowCount() {
! return 0;
}
--- 153,157 ----
*/
public int getRowCount() {
! return preview_.length > 0 ? preview_.length - 1 : 0;
}
***************
*** 61,85 ****
*
*/
! public Object getValueAt(int arg0, int arg1) {
! return null;
}
! }
/**
*
*/
! public void changedUpdate(DocumentEvent e) {}
/**
*
*/
! public void insertUpdate(DocumentEvent e) {}
/**
*
*/
! public void removeUpdate(DocumentEvent e) {}
}
--- 159,292 ----
*
*/
! public Object getValueAt(int row, int col) {
! return preview_[row + 1][col];
}
! public String getColumnName(int column) {
! return preview_.length > 0 ? preview_[0][column] : CtuluLib.EMPTY_STRING;
! }
!
! public boolean isCellEditable(int rowIndex, int columnIndex) {
! return false;
! }
+ }
+
+ public File getFile() {
+ String txt= txtFile_.getText();
+ if (txt.length() != 0) {
+ File f= new File(txt);
+ return f.exists() ? f : null;
+ }
+ return null;
+ }
+
+ private void updateFile() {
+ File f= getFile();
+ if (f != null) {
+ if (reader_ == null) {
+ reader_= new EvolutionReader();
+ reader_.setSepChar(sep_);
+ } else if (f.equals(reader_.getFile()))
+ return;
+ reader_.setFile(f);
+ preview_= reader_.getPreview();
+ DodicoLib._printObject(preview_, true);
+ model_.fireTableStructureChanged();
+ updateFileContent();
+ }
+ }
+
+ private void updateFileContent() {
+ if (CtuluLib.DEBUG)
+ CtuluLib.debug(" UPDATE FILE CONTENT");
+ File f= getFile();
+ if (f == null)
+ txtArea_.setText(CtuluLib.EMPTY_STRING);
+ else {
+ try {
+ LineNumberReader in= new LineNumberReader(new FileReader(f));
+ String line= in.readLine();
+ StringBuffer r= new StringBuffer(line.length() * 4);
+ for (int i= 4;(i > 0) && (line != null); i--) {
+ r.append(line).append(CtuluLib.LINE_SEP);
+ line= in.readLine();
+ }
+ txtArea_.setText(r.toString());
+ } catch (IOException e) {
+ txtArea_.setText(CtuluLib.EMPTY_STRING);
+ }
+ }
+ }
+
+ protected void setSep(String _s) {
+ if (_s.length() == 0)
+ return;
+ if (sep_.equals(_s))
+ return;
+ sep_= _s;
+ if (reader_ != null) {
+ reader_.setSepChar(_s);
+ preview_= reader_.getPreview();
+ DodicoLib._printObject(preview_, true);
+ model_.fireTableStructureChanged();
+ }
+
+ }
+
+ private void updateFromDocument(Document _d) {
+ if (_d == txtFile_.getDocument())
+ updateFile();
+ else if (_d == txtSep_.getDocument())
+ setSep(txtSep_.getText());
+ }
/**
*
*/
! public void changedUpdate(DocumentEvent e) {
! updateFromDocument(e.getDocument());
! }
/**
*
*/
! public void insertUpdate(DocumentEvent e) {
! updateFromDocument(e.getDocument());
! }
/**
*
*/
! public void removeUpdate(DocumentEvent e) {
! updateFromDocument(e.getDocument());
! }
!
! /**
! *
! */
! public JFileChooser createFileChooser() {
! JFileChooser f= super.createFileChooser();
! f.setFileFilter(
! new BuFileFilter(
! new String[] { "txt", "csv" },
! FudaaResource.getS("Fichier csv")));
! return f;
!
! }
!
! /**
! *
! */
! public EvolutionReader getReader() {
! return reader_;
! }
!
! /**
! *
! */
! public void setReader(EvolutionReader _reader) {
! reader_= _reader;
! }
}
Index: FudaaLib.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/FudaaLib.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** FudaaLib.java 12 Dec 2003 10:58:40 -0000 1.14
--- FudaaLib.java 21 Jan 2004 11:07:28 -0000 1.15
***************
*** 21,24 ****
--- 21,25 ----
import com.memoire.bu.BuDialogWarning;
import com.memoire.bu.BuIcon;
+ import com.memoire.fu.FuLib;
import org.fudaa.fudaa.ressource.FudaaResource;
***************
*** 134,156 ****
* url locale valide. Par exemple:<br>
* <code>C:\path\to\my\fic.html<\code> devient<br>
! * <code>file://C:/path/to/my/fic.html</code>.<br>
* Normalement pour une URL correcte, les ":" apres le C doivent etre
* remplaces par "|" mais cela pose des problemes sous Windows.
*/
public static String pathToUrl(String _file) {
! int premSigneSpeciale= indexOfSpecialCar(_file);
! String urlFinale= "";
! if (premSigneSpeciale > 0) {
! urlFinale= _file.substring(premSigneSpeciale);
! _file= _file.substring(0, premSigneSpeciale);
! }
! //ne marche pas sous windows...
! //_file=_file.replace(':','|');
! _file= _file.replace('\\', '/');
! if (_file.startsWith("file://"))
! return _file + urlFinale;
! else
! return "file://" + _file + urlFinale;
}
public static String urlToPath(String _url) {
if (_url.startsWith("file://"))
--- 135,153 ----
* url locale valide. Par exemple:<br>
* <code>C:\path\to\my\fic.html<\code> devient<br>
! * <code>file://C:\\path\\to\\my\\fic.html</code>.<br>
* Normalement pour une URL correcte, les ":" apres le C doivent etre
* remplaces par "|" mais cela pose des problemes sous Windows.
*/
public static String pathToUrl(String _file) {
! if((!_file.startsWith("/")) && (_file.indexOf('\\')>0)){
! String s1=FuLib.replace(_file, "\\", "\\\\");
! return "file://"+FuLib.replace(s1, "/", "\\\\");
! }
! else
! return "file://"+_file;
}
+
+
+
public static String urlToPath(String _url) {
if (_url.startsWith("file://"))
***************
*** 239,244 ****
public static void main(String[] args) {
! System.out.println(
! new File(new File("/toto/titi"), "/ttt").getAbsolutePath());
}
/**
--- 236,240 ----
public static void main(String[] args) {
! System.out.println(pathToUrl("C:\\dede"));
}
/**
|
|
From: <de...@us...> - 2004-01-21 11:07:31
|
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/test/tr
In directory sc8-pr-cvs1:/tmp/cvs-serv16044/test/tr
Modified Files:
TestExec.java
Log Message:
Maj version prepro 0.04
Index: TestExec.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/test/tr/TestExec.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TestExec.java 11 Dec 2003 12:50:55 -0000 1.1
--- TestExec.java 21 Jan 2004 11:07:28 -0000 1.2
***************
*** 16,19 ****
--- 16,25 ----
*/
public class TestExec {
+ // The default system browser under windows.
+ private static final String WIN_PATH = "rundll32";
+
+ // The flag to display a url.
+ private static final String WIN_FLAG = "url.dll,FileProtocolHandler";
+
/**
*
***************
*** 24,30 ****
public static void main(String[] args) {
! String[] com=new String[] {"command.com","/C","c:\\temp\\toto.bat"};
try{
! Runtime.getRuntime().exec(com);
} catch (Exception e){
--- 30,36 ----
public static void main(String[] args) {
! String cmd=WIN_PATH+" "+WIN_FLAG+" "+args[0];
try{
! Runtime.getRuntime().exec(cmd);
} catch (Exception e){
|
|
From: <de...@us...> - 2004-01-21 11:07:31
|
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/ressource In directory sc8-pr-cvs1:/tmp/cvs-serv16044/ressource Modified Files: fudaa_en.fr_txt Log Message: Maj version prepro 0.04 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.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** fudaa_en.fr_txt 12 Dec 2003 11:29:41 -0000 1.10 --- fudaa_en.fr_txt 21 Jan 2004 11:07:28 -0000 1.11 *************** *** 182,184 **** Fin=End Méthode=Method ! Si vous répondez non, toutes vos modifications seront perdues=If no, your modifications will be lost \ No newline at end of file --- 182,190 ---- Fin=End Méthode=Method ! Si vous répondez non, toutes vos modifications seront perdues=If no, your modifications will be lost ! Contenu du fichier=File content ! Virgule=Comma ! Point-virgule=Semicolon ! Fichier csv:File csv ! Mise à jour=Update ! Editer le contenu du fichier=Edit the file \ No newline at end of file |
|
From: <de...@us...> - 2004-01-21 11:07:31
|
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/dico
In directory sc8-pr-cvs1:/tmp/cvs-serv16044/dico
Modified Files:
FDicoNewProjectPanel.java FDicoProjectPanel.java
Log Message:
Maj version prepro 0.04
Index: FDicoNewProjectPanel.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/dico/FDicoNewProjectPanel.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** FDicoNewProjectPanel.java 14 Nov 2003 08:24:06 -0000 1.1
--- FDicoNewProjectPanel.java 21 Jan 2004 11:07:28 -0000 1.2
***************
*** 10,25 ****
import java.awt.Color;
import java.io.File;
import javax.swing.BorderFactory;
- import javax.swing.JTextField;
import javax.swing.event.CaretEvent;
import javax.swing.event.CaretListener;
import com.memoire.bu.BuBorderLayout;
- import com.memoire.bu.BuLabel;
import com.memoire.bu.BuLabelMultiLine;
! import com.memoire.bu.BuMultiLabel;
! import com.memoire.bu.BuPanel;
! import com.memoire.bu.BuVerticalLayout;
! import org.fudaa.dodico.commun.DodicoLib;
import org.fudaa.dodico.dico.DicoManager;
import org.fudaa.ebli.dialog.EbliSimpleDialogPanel;
/**
--- 10,23 ----
import java.awt.Color;
import java.io.File;
+
import javax.swing.BorderFactory;
import javax.swing.event.CaretEvent;
import javax.swing.event.CaretListener;
+
import com.memoire.bu.BuBorderLayout;
import com.memoire.bu.BuLabelMultiLine;
!
import org.fudaa.dodico.dico.DicoManager;
+
import org.fudaa.ebli.dialog.EbliSimpleDialogPanel;
/**
***************
*** 56,60 ****
lbWarn= new BuLabelMultiLine();
lbWarn.setWrapMode(BuLabelMultiLine.WORD);
! lbWarn.setForeground(Color.orange);
lbWarn.setBorder(BorderFactory.createEtchedBorder());
add(lbWarn, BuBorderLayout.SOUTH);
--- 54,58 ----
lbWarn= new BuLabelMultiLine();
lbWarn.setWrapMode(BuLabelMultiLine.WORD);
! lbWarn.setForeground(Color.red);
lbWarn.setBorder(BorderFactory.createEtchedBorder());
add(lbWarn, BuBorderLayout.SOUTH);
Index: FDicoProjectPanel.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/dico/FDicoProjectPanel.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** FDicoProjectPanel.java 19 Dec 2003 12:10:55 -0000 1.11
--- FDicoProjectPanel.java 21 Jan 2004 11:07:28 -0000 1.12
***************
*** 359,363 ****
//xe = 20 - menu.getSize().width;
//ye -= 5;
! BuMenuItem item= new BuMenuItem(BuResource.BU.getString("Editer"));
item.setActionCommand("EDITER");
item.addActionListener(this);
--- 359,363 ----
//xe = 20 - menu.getSize().width;
//ye -= 5;
! BuMenuItem item= new BuMenuItem(FudaaResource.FUDAA.getString("Editer le contenu du fichier"));
item.setActionCommand("EDITER");
item.addActionListener(this);
|
|
From: <de...@us...> - 2004-01-21 11:02:23
|
Update of /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/graphe
In directory sc8-pr-cvs1:/tmp/cvs-serv15000/graphe
Modified Files:
Courbe.java Graphe.java
Log Message:
Maj general
Index: Courbe.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/graphe/Courbe.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Courbe.java 19 Dec 2003 12:06:41 -0000 1.7
--- Courbe.java 21 Jan 2004 11:02:19 -0000 1.8
***************
*** 132,136 ****
r[3]= r[2];
double t;
! for (int i= n - 2; i >= 0; i--) {
t= getX(i);
if (t < r[0])
--- 132,136 ----
r[3]= r[2];
double t;
! for (int i= n - 1; i >= 0; i--) {
t= getX(i);
if (t < r[0])
Index: Graphe.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/graphe/Graphe.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** Graphe.java 19 Dec 2003 14:18:14 -0000 1.11
--- Graphe.java 21 Jan 2004 11:02:19 -0000 1.12
***************
*** 79,83 ****
public double[] getMinMaxXY() {
- int n= grComponents.size() - 1;
double[] minMax= new double[4];
boolean init= false;
--- 79,82 ----
***************
*** 86,90 ****
double ymin= 0;
double ymax= 0;
! for (int i= n; i >= 0; i--) {
if (getGrapheComponent(i).getMinMax(minMax)) {
if (!init) {
--- 85,89 ----
double ymin= 0;
double ymax= 0;
! for (int i= grComponents.size() - 1; i >= 0; i--) {
if (getGrapheComponent(i).getMinMax(minMax)) {
if (!init) {
***************
*** 108,113 ****
}
}
! n= courbes.size() - 1;
! for (int i= n; i >= 0; i--) {
if (((Courbe)courbes.get(i)).getMinMax(minMax)) {
if (!init) {
--- 107,111 ----
}
}
! for (int i= courbes.size() - 1; i >= 0; i--) {
if (((Courbe)courbes.get(i)).getMinMax(minMax)) {
if (!init) {
|
|
From: <de...@us...> - 2004-01-21 11:02:22
|
Update of /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/ressource In directory sc8-pr-cvs1:/tmp/cvs-serv15000/ressource Modified Files: ebli_en.fr_txt Log Message: Maj general Index: ebli_en.fr_txt =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/ressource/ebli_en.fr_txt,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** ebli_en.fr_txt 19 Dec 2003 12:06:42 -0000 1.8 --- ebli_en.fr_txt 21 Jan 2004 11:02:19 -0000 1.9 *************** *** 110,112 **** Formule=Formula Couleur du tracé=Foreground color ! Modifier la couleur de tracé des courbes sélectionnées=Modify the foreground color for the selected curves \ No newline at end of file --- 110,113 ---- Formule=Formula Couleur du tracé=Foreground color ! Modifier la couleur de tracé des courbes sélectionnées=Modify the foreground color for the selected curves ! Modifier la barre d'outils=Modify the toolbar \ No newline at end of file |
|
From: <de...@us...> - 2004-01-21 11:02:22
|
Update of /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/dialog
In directory sc8-pr-cvs1:/tmp/cvs-serv15000/dialog
Modified Files:
EbliSimpleDialogPanel.java
Log Message:
Maj general
Index: EbliSimpleDialogPanel.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/dialog/EbliSimpleDialogPanel.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** EbliSimpleDialogPanel.java 19 Dec 2003 12:06:41 -0000 1.12
--- EbliSimpleDialogPanel.java 21 Jan 2004 11:02:19 -0000 1.13
***************
*** 56,59 ****
--- 56,60 ----
import com.memoire.fu.FuLib;
+ import org.fudaa.ebli.filechooser.EbliFileChooser;
import org.fudaa.ebli.ressource.EbliResource;
/**
***************
*** 383,387 ****
}
public JFileChooser createFileChooser() {
! return new BuFileChooser();
}
/**
--- 384,388 ----
}
public JFileChooser createFileChooser() {
! return new EbliFileChooser();
}
/**
***************
*** 499,502 ****
--- 500,508 ----
return addStringText();
}
+
+ public BuTextField addLabelStringText(Container _c,String _label) {
+ addLabel(_c,_label);
+ return addStringText(_c);
+ }
protected BuTextField addDoubleText() {
return addDoubleText(this);
|
|
From: <de...@us...> - 2004-01-21 11:02:22
|
Update of /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/test
In directory sc8-pr-cvs1:/tmp/cvs-serv15000/test
Modified Files:
TestGraphe.java
Log Message:
Maj general
Index: TestGraphe.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/test/TestGraphe.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** TestGraphe.java 19 Dec 2003 12:06:42 -0000 1.7
--- TestGraphe.java 21 Jan 2004 11:02:19 -0000 1.8
***************
*** 64,67 ****
--- 64,68 ----
bgraphe.setSize(w,h);
bgraphe.setSize(getSize());
+ graphe.titre="Courbe de de dzergfset sfdsg g fdsf sdf sdfsd sg qgq ";
bgraphe.setGraphe(graphe);
bgraphe.setInteractif(true);
|
Update of /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/calque
In directory sc8-pr-cvs1:/tmp/cvs-serv15000/calque
Modified Files:
EbliFilleCalques.java ZCalqueAffichageDonnees.java
ZCalqueAffichageDonneesAbstract.java
ZCalqueAffichageDonneesInterface.java
ZCalqueAffichageDonneesMultiSpecial.java ZCalquePoint.java
ZCalqueRepereInteraction.java ZCalqueSelectionInteraction.java
ZEbliFilleCalques.java
Log Message:
Maj general
Index: EbliFilleCalques.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/calque/EbliFilleCalques.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** EbliFilleCalques.java 25 Nov 2003 10:06:37 -0000 1.10
--- EbliFilleCalques.java 21 Jan 2004 11:02:17 -0000 1.11
***************
*** 27,30 ****
--- 27,31 ----
import java.util.Hashtable;
import java.util.Vector;
+
import javax.swing.AbstractButton;
import javax.swing.JColorChooser;
***************
*** 38,52 ****
import javax.swing.event.TreeSelectionEvent;
import javax.swing.event.TreeSelectionListener;
! import org.fudaa.ebli.geometrie.GrBoite;
! import org.fudaa.ebli.geometrie.VecteurGrContour;
! import org.fudaa.ebli.impression.EbliFilleImprimable;
! import org.fudaa.ebli.impression.EbliPrinter;
! import org.fudaa.ebli.palette.BSelecteurReduitFonte;
! import org.fudaa.ebli.palette.BSelecteurReduitPaletteCouleur;
! import org.fudaa.ebli.repere.BControleNavigation;
! import org.fudaa.ebli.repere.BControleRepereTexte;
! import org.fudaa.ebli.repere.RepereEvent;
! import org.fudaa.ebli.ressource.EbliResource;
! import org.fudaa.ebli.commun.EbliPreferences;
import com.memoire.bu.BuBorderLayout;
import com.memoire.bu.BuButton;
--- 39,43 ----
import javax.swing.event.TreeSelectionEvent;
import javax.swing.event.TreeSelectionListener;
!
import com.memoire.bu.BuBorderLayout;
import com.memoire.bu.BuButton;
***************
*** 61,64 ****
--- 52,66 ----
import com.memoire.bu.BuToolButton;
import com.memoire.bu.BuVerticalLayout;
+
+ import org.fudaa.ebli.commun.EbliPreferences;
+ import org.fudaa.ebli.geometrie.GrBoite;
+ import org.fudaa.ebli.geometrie.VecteurGrContour;
+ import org.fudaa.ebli.impression.EbliFilleImprimable;
+ import org.fudaa.ebli.impression.EbliPrinter;
+ import org.fudaa.ebli.palette.BSelecteurReduitFonte;
+ import org.fudaa.ebli.palette.BSelecteurReduitPaletteCouleur;
+ import org.fudaa.ebli.repere.BControleNavigation;
+ import org.fudaa.ebli.repere.BControleRepereTexte;
+ import org.fudaa.ebli.ressource.EbliResource;
/**
* Fenetre d'affichage de calques contenant des services de base.
Index: ZCalqueAffichageDonnees.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueAffichageDonnees.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** ZCalqueAffichageDonnees.java 11 Dec 2003 12:41:51 -0000 1.9
--- ZCalqueAffichageDonnees.java 21 Jan 2004 11:02:18 -0000 1.10
***************
*** 45,53 ****
}
}
!
! public void setSelection(int[] _idx){
! if(selection_==null) selection_=creeSelection();
! else selection_.clear();
! for(int i=_idx.length-1;i>=0;i--){
selection_.add(_idx[i]);
}
--- 45,55 ----
}
}
!
! public void setSelection(int[] _idx) {
! if (selection_ == null)
! selection_= creeSelection();
! else
! selection_.clear();
! for (int i= _idx.length - 1; i >= 0; i--) {
selection_.add(_idx[i]);
}
Index: ZCalqueAffichageDonneesAbstract.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueAffichageDonneesAbstract.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ZCalqueAffichageDonneesAbstract.java 11 Dec 2003 12:41:51 -0000 1.3
--- ZCalqueAffichageDonneesAbstract.java 21 Jan 2004 11:02:18 -0000 1.4
***************
*** 166,168 ****
--- 166,175 ----
}
+ /**
+ *
+ */
+ public boolean isSpecialSelectionAllowed() {
+ return false;
+ }
+
}
Index: ZCalqueAffichageDonneesInterface.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueAffichageDonneesInterface.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ZCalqueAffichageDonneesInterface.java 11 Dec 2003 12:41:51 -0000 1.4
--- ZCalqueAffichageDonneesInterface.java 21 Jan 2004 11:02:18 -0000 1.5
***************
*** 23,25 ****
--- 23,26 ----
public void removeSelectionListener(ZSelectionListener _l);
public String getName();
+ public boolean isSpecialSelectionAllowed();
}
Index: ZCalqueAffichageDonneesMultiSpecial.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueAffichageDonneesMultiSpecial.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ZCalqueAffichageDonneesMultiSpecial.java 25 Nov 2003 10:06:38 -0000 1.1
--- ZCalqueAffichageDonneesMultiSpecial.java 21 Jan 2004 11:02:18 -0000 1.2
***************
*** 46,49 ****
--- 46,53 ----
}
}
+
+ public boolean isSpecialSelectionAllowed() {
+ return true;
+ }
/**
*
***************
*** 53,74 ****
int _tolerancePixel,
int _action) {
! if (_action != ZCalqueSelectionInteraction.ACTION_SPECIAL)
return super.changeSelection(_p, _tolerancePixel, _action);
! int i= selection_.isSelectionInOneBloc();
! if (i >= 0) {
! EbliListeSelection s= selection_.get(i);
! int old= s.getMaxIndex();
! EbliListeSelectionMulti newS= selection(_p, _tolerancePixel);
! int newi= newS.isSelectionInOneBloc();
! if (i == newi) {
! select(i, old, newS.getSelection(i).getMaxIndex());
! fireSelectionEvent();
! return true;
}
}
- return super.changeSelection(
- _p,
- _tolerancePixel,
- ZCalqueSelectionInteraction.ACTION_REPLACE);
}
}
--- 57,86 ----
int _tolerancePixel,
int _action) {
! //DEBUG TO REMOVE
! if (_action != ZCalqueSelectionInteraction.ACTION_SPECIAL){
return super.changeSelection(_p, _tolerancePixel, _action);
! }
!
! else {
! int i= selection_.isSelectionInOneBloc();
! if (i >= 0) {
! EbliListeSelectionMulti newS= selection(_p, _tolerancePixel);
! if (newS == null)
! return false;
! EbliListeSelection s= selection_.get(i);
! int old= s.getMaxIndex();
! int newi= newS.isSelectionInOneBloc();
! if (i == newi) {
! select(i, old, newS.getSelection(i).getMaxIndex());
! fireSelectionEvent();
! return true;
! }
}
+ return super.changeSelection(
+ _p,
+ _tolerancePixel,
+ ZCalqueSelectionInteraction.ACTION_ADD);
}
}
+
}
Index: ZCalquePoint.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalquePoint.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** ZCalquePoint.java 11 Dec 2003 12:41:51 -0000 1.10
--- ZCalquePoint.java 21 Jan 2004 11:02:18 -0000 1.11
***************
*** 59,62 ****
--- 59,74 ----
return modele();
}
+
+ /**
+ * Si une couleur est spécifiée alors la palette est mise à nulle.
+ */
+ public void setForeground(Color c) {
+ super.setForeground(c);
+ if(c!=null) paletteCouleur_=null;
+ }
+
+
+
+
/**
* @param _g
***************
*** 79,87 ****
BPaletteIcone paletteIcone= getPaletteIcone();
Color foreground= getForeground();
- if (attenue)
- foreground= attenueCouleur(foreground);
Icon icone= getIcone();
! if (attenue)
icone= attenueIcone(icone);
GrPoint p= new GrPoint();
for (int i= nombre - 1; i >= 0; i--) {
--- 91,99 ----
BPaletteIcone paletteIcone= getPaletteIcone();
Color foreground= getForeground();
Icon icone= getIcone();
! if (attenue){
! foreground= attenueCouleur(foreground);
icone= attenueIcone(icone);
+ }
GrPoint p= new GrPoint();
for (int i= nombre - 1; i >= 0; i--) {
Index: ZCalqueRepereInteraction.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueRepereInteraction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ZCalqueRepereInteraction.java 12 Dec 2003 10:32:08 -0000 1.3
--- ZCalqueRepereInteraction.java 21 Jan 2004 11:02:18 -0000 1.4
***************
*** 171,175 ****
if (_b != zoomMoins_) {
zoomMoins_= _b;
! firePropertyChange("state", null, null);
}
}
--- 171,175 ----
if (_b != zoomMoins_) {
zoomMoins_= _b;
! firePropertyChange("state", zoomMoins_?Boolean.FALSE:Boolean.TRUE, zoomMoins_?Boolean.TRUE:Boolean.FALSE);
}
}
Index: ZCalqueSelectionInteraction.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueSelectionInteraction.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** ZCalqueSelectionInteraction.java 25 Nov 2003 10:06:38 -0000 1.7
--- ZCalqueSelectionInteraction.java 21 Jan 2004 11:02:18 -0000 1.8
***************
*** 205,211 ****
--- 205,214 ----
zcalquesActifs_.add(_calque);
}
+
+ boolean special_;
public void setCalqueActif(ZCalqueAffichageDonneesInterface _calque) {
clearCalquesActifs();
addCalqueActif(_calque);
+ special_=_calque.isSpecialSelectionAllowed();
}
/**
***************
*** 345,359 ****
if ((isGele() || EbliLib.isPopupMouseEvent(_evt)))
return;
! modificateur_= ACTION_REPLACE;
! if (_evt.isShiftDown())
! modificateur_ |= ACTION_ADD;
! if (_evt.isControlDown())
! modificateur_ |= ACTION_DEL;
! if (_evt.isAltDown()
! && _evt.isControlDown()
! && !_evt.isShiftDown()
! && mode_ == PONCTUEL) {
! modificateur_= ACTION_SPECIAL;
! }
GrPoint ptSo= new GrPoint((double)_evt.getX(), (double)_evt.getY(), 0.);
// Saisie d'un seul point
--- 348,363 ----
if ((isGele() || EbliLib.isPopupMouseEvent(_evt)))
return;
! majControleDesc(_evt);
! // modificateur_= ACTION_REPLACE;
! // if (_evt.isShiftDown())
! // modificateur_ |= ACTION_ADD;
! // if (_evt.isControlDown())
! // modificateur_ |= ACTION_DEL;
! // if (_evt.isAltDown()
! // && _evt.isControlDown()
! // && !_evt.isShiftDown()
! // && mode_ == PONCTUEL) {
! // modificateur_= ACTION_SPECIAL;
! // }
GrPoint ptSo= new GrPoint((double)_evt.getX(), (double)_evt.getY(), 0.);
// Saisie d'un seul point
***************
*** 525,541 ****
private String controleDesc_;
private void majControleDesc(KeyEvent e) {
if (e.isShiftDown()) {
if (e.isControlDown()) {
controleDesc_= " (xor)";
! } else
controleDesc_= " (+)";
} else if (e.isControlDown()) {
! if (e.isAltDown() && mode_ == PONCTUEL) {
controleDesc_= " (special)";
! } else
controleDesc_= " (-)";
! } else
controleDesc_= null;
! firePropertyChange(ZEbliFilleCalques.STATE, null, null);
}
/**
--- 529,581 ----
private String controleDesc_;
private void majControleDesc(KeyEvent e) {
+ String old=controleDesc_;
if (e.isShiftDown()) {
if (e.isControlDown()) {
controleDesc_= " (xor)";
! modificateur_= ACTION_XOR;
! } else {
controleDesc_= " (+)";
+ modificateur_= ACTION_ADD;
+ }
} else if (e.isControlDown()) {
! if (special_ && (e.isAltDown()) && mode_ == PONCTUEL) {
controleDesc_= " (special)";
! modificateur_= ACTION_SPECIAL;
! } else {
controleDesc_= " (-)";
! modificateur_= ACTION_DEL;
! }
!
! } else {
controleDesc_= null;
! modificateur_= ACTION_REPLACE;
! }
! firePropertyChange(ZEbliFilleCalques.STATE, old, controleDesc_);
! }
!
! private void majControleDesc(MouseEvent e) {
! String old=controleDesc_;
! if (e.isShiftDown()) {
! if (e.isControlDown()) {
! controleDesc_= " (xor)";
! modificateur_= ACTION_XOR;
! } else {
! controleDesc_= " (+)";
! modificateur_= ACTION_ADD;
! }
! } else if (e.isControlDown()) {
! if (special_ && (e.isAltDown()) && mode_ == PONCTUEL) {
! controleDesc_= " (special)";
! modificateur_= ACTION_SPECIAL;
! } else {
! controleDesc_= " (-)";
! modificateur_= ACTION_DEL;
! }
!
! } else {
! controleDesc_= null;
! modificateur_= ACTION_REPLACE;
! }
! firePropertyChange(ZEbliFilleCalques.STATE, old, controleDesc_);
}
/**
Index: ZEbliFilleCalques.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZEbliFilleCalques.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** ZEbliFilleCalques.java 12 Dec 2003 10:32:08 -0000 1.19
--- ZEbliFilleCalques.java 21 Jan 2004 11:02:18 -0000 1.20
***************
*** 566,570 ****
crt,
"CHANGE_REFERENCE");
- addVetoableChangeListener(plAction);
plAction.putValue(
Action.SHORT_DESCRIPTION,
--- 566,569 ----
***************
*** 582,586 ****
Action.SHORT_DESCRIPTION,
EbliResource.EBLI.getString("Outil de navigation"));
- addVetoableChangeListener(plAction);
navigationActionGroup_[i++]= plAction;
updateMapKeyStroke(navigationActionGroup_);
--- 581,584 ----
***************
*** 606,610 ****
"RECTANGLE_SELECTION",
ZCalqueSelectionInteraction.RECTANGLE);
! action.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke('r'));
selectedActionGroup_[i++]= action;
action=
--- 604,608 ----
"RECTANGLE_SELECTION",
ZCalqueSelectionInteraction.RECTANGLE);
! action.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke('u'));
selectedActionGroup_[i++]= action;
action=
***************
*** 718,722 ****
_m
.addMenuItem(
! EbliResource.getS("Modifier l'affichage"),
"MODIFY_TOOLS_BUTTON",
true)
--- 716,720 ----
_m
.addMenuItem(
! EbliResource.getS("Modifier la barre d'outils"),
"MODIFY_TOOLS_BUTTON",
true)
***************
*** 741,744 ****
--- 739,744 ----
if ((cqInteractionActif_ != null)
&& (evt.getSource() == cqInteractionActif_)) {
+ if(CtuluLib.DEBUG)
+ CtuluLib.debug("ZEbliFilleCalques : Property change");
mode_.setText(cqInteractionActif_.getDescription());
}
|
|
From: <de...@us...> - 2004-01-21 11:02:22
|
Update of /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/commun
In directory sc8-pr-cvs1:/tmp/cvs-serv15000/commun
Modified Files:
EbliListeSelectionMulti.java
Log Message:
Maj general
Index: EbliListeSelectionMulti.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/commun/EbliListeSelectionMulti.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** EbliListeSelectionMulti.java 11 Dec 2003 12:41:52 -0000 1.5
--- EbliListeSelectionMulti.java 21 Jan 2004 11:02:18 -0000 1.6
***************
*** 71,82 ****
int idx= it.key();
EbliListeSelection e= (EbliListeSelection)it.value();
! if (e == null) {
! e= new EbliListeSelection();
! idxListSelection_.put(idx, e);
! }
! r |= e.xor((EbliListeSelection)it.value());
! if (e.isEmpty()) {
! idxListSelection_.remove(idx);
! r= true;
}
}
--- 71,88 ----
int idx= it.key();
EbliListeSelection e= (EbliListeSelection)it.value();
! if (!e.isEmpty()) {
! EbliListeSelection thisSelection= get(idx);
! if (thisSelection == null) {
! thisSelection= new EbliListeSelection(e);
! idxListSelection_.put(idx, e);
! r= true;
! } else {
! if (thisSelection.xor((EbliListeSelection)it.value())) {
! r= true;
! if (thisSelection.isEmpty()) {
! idxListSelection_.remove(idx);
! }
! }
! }
}
}
***************
*** 93,105 ****
int idx= it.key();
EbliListeSelection e= (EbliListeSelection)it.value();
! if (e == null) {
! e= new EbliListeSelection();
! idxListSelection_.put(idx, e);
}
- r |= e.add((EbliListeSelection)it.value());
}
return r;
}
!
/**
* Return the total number of selected index.
--- 99,115 ----
int idx= it.key();
EbliListeSelection e= (EbliListeSelection)it.value();
! if (!e.isEmpty()) {
! EbliListeSelection thisSelection= get(idx);
! if (thisSelection == null) {
! thisSelection= new EbliListeSelection(e);
! idxListSelection_.put(idx, thisSelection);
! r= true;
! } else
! r |= thisSelection.add(e);
}
}
return r;
}
!
/**
* Return the total number of selected index.
***************
*** 123,131 ****
it.advance();
int idx= it.key();
! EbliListeSelection e= (EbliListeSelection)it.value();
! if (e != null) {
! r |= e.remove((EbliListeSelection)it.value());
! if (e.isEmpty())
! idxListSelection_.remove(idx);
}
}
--- 133,145 ----
it.advance();
int idx= it.key();
! EbliListeSelection thisSelection= get(idx);
! if (thisSelection != null) {
! if (thisSelection.remove((EbliListeSelection)it.value())) {
! r= true;
! if (thisSelection.isEmpty())
! idxListSelection_.remove(idx);
!
! }
!
}
}
***************
*** 139,145 ****
for (int i= _m.idxListSelection_.size(); i-- > 0;) {
it.advance();
! idxListSelection_.put(
! it.key(),
! new EbliListeSelection((EbliListeSelection)it.value()));
}
return true;
--- 153,162 ----
for (int i= _m.idxListSelection_.size(); i-- > 0;) {
it.advance();
! EbliListeSelection newS=
! new EbliListeSelection((EbliListeSelection)it.value());
! if (!newS.isEmpty()) {
! idxListSelection_.put(it.key(), newS);
! }
!
}
return true;
|
Update of /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/calque/action
In directory sc8-pr-cvs1:/tmp/cvs-serv15000/calque/action
Modified Files:
EbliChangeStateAction.java EbliComponentFactory.java
EbliPaletteAction.java EbliPaletteButton.java
Log Message:
Maj general
Index: EbliChangeStateAction.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/calque/action/EbliChangeStateAction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** EbliChangeStateAction.java 11 Dec 2003 12:41:51 -0000 1.3
--- EbliChangeStateAction.java 21 Jan 2004 11:02:18 -0000 1.4
***************
*** 58,62 ****
*
*/
! public final AbstractButton buildToolButton(EbliComponentFactory _f) {
return _f.buildToolButton(this);
}
--- 58,62 ----
*
*/
! public AbstractButton buildToolButton(EbliComponentFactory _f) {
return _f.buildToolButton(this);
}
Index: EbliComponentFactory.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/calque/action/EbliComponentFactory.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** EbliComponentFactory.java 25 Nov 2003 10:06:39 -0000 1.2
--- EbliComponentFactory.java 21 Jan 2004 11:02:18 -0000 1.3
***************
*** 58,61 ****
--- 58,69 ----
return r;
}
+
+ public AbstractButton buildToolButton(EbliPaletteAction a) {
+ AbstractButton r= new EbliPaletteButton(a);
+ decoreStateButton(r, a);
+ decoreToolBarButton(r);
+ return r;
+ }
+
public AbstractButton buildToolButton(EbliSimpleAction a) {
AbstractButton r= new BuToolButton();
Index: EbliPaletteAction.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/calque/action/EbliPaletteAction.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** EbliPaletteAction.java 19 Dec 2003 12:06:41 -0000 1.4
--- EbliPaletteAction.java 21 Jan 2004 11:02:18 -0000 1.5
***************
*** 33,38 ****
*/
public class EbliPaletteAction
! extends EbliChangeStateAction
! implements VetoableChangeListener {
protected BuPalette window_;
public EbliPaletteAction(
--- 33,37 ----
*/
public class EbliPaletteAction
! extends EbliChangeStateAction{
protected BuPalette window_;
public EbliPaletteAction(
***************
*** 104,107 ****
--- 103,107 ----
public void updateBeforeShow() {}
+
private void showWindow() {
if (loc_ == null) {
***************
*** 144,158 ****
}
}
/**
*
*/
! public void vetoableChange(PropertyChangeEvent evt)
! throws PropertyVetoException {
! if (evt.getPropertyName() == JInternalFrame.IS_SELECTED_PROPERTY) {
! if ((((Boolean)evt.getNewValue()).booleanValue()) && (isSelected()))
! showWindow();
! else
! hideWindow();
! }
}
}
--- 144,154 ----
}
}
+
/**
*
*/
! public AbstractButton buildToolButton(EbliComponentFactory _f) {
! return _f.buildToolButton(this);
}
+
}
Index: EbliPaletteButton.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/calque/action/EbliPaletteButton.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** EbliPaletteButton.java 25 Nov 2003 10:06:39 -0000 1.2
--- EbliPaletteButton.java 21 Jan 2004 11:02:18 -0000 1.3
***************
*** 26,31 ****
if (_b != isVisible()) {
ac_.setMainButtonVisible(_b);
}
! super.setVisible(_b);
}
public void setDesktop(BuDesktop _d) {
--- 26,32 ----
if (_b != isVisible()) {
ac_.setMainButtonVisible(_b);
+ super.setVisible(_b);
}
!
}
public void setDesktop(BuDesktop _d) {
|
|
From: <de...@us...> - 2004-01-21 10:59:16
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/mesure
In directory sc8-pr-cvs1:/tmp/cvs-serv14635/mesure
Modified Files:
EvolutionReader.java
Log Message:
Maj version 0.04
Index: EvolutionReader.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/mesure/EvolutionReader.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** EvolutionReader.java 19 Dec 2003 12:10:37 -0000 1.1
--- EvolutionReader.java 21 Jan 2004 10:59:10 -0000 1.2
***************
*** 14,17 ****
--- 14,18 ----
import java.io.IOException;
import java.io.LineNumberReader;
+ import java.util.ArrayList;
import java.util.StringTokenizer;
***************
*** 36,39 ****
--- 37,44 ----
ReaderDelegate reader_;
FileFormatVersion v_;
+
+ public EvolutionReader() {
+ this(null);
+ }
/**
*
***************
*** 48,89 ****
if ((file_ == null) || (!file_.exists()))
return new String[0][0];
! String[][] r= null;
try {
! reader_.init();
! int idx= 0;
if (reader_.readLine()) {
! if (reader_.name_ != null) {
! idx++;
! r= new String[4][reader_.vals_.length + 1];
! for(int i=r[0].length-1;i>=0;i--){
! r[0][i]=getName(i);
! }
! } else
! r= new String[3][reader_.vals_.length + 1];
! r[idx][0]= Double.toString(reader_.t_);
! for (int i= 0; i < reader_.vals_.length; i++) {
! r[idx][i + 1]= Double.toString(reader_.vals_[i]);
}
! idx++;
! }
!
! if (reader_.readLine()) {
! if (r == null)
! r= new String[2][reader_.vals_.length + 1];
! r[idx][0]= Double.toString(reader_.t_);
! for (int i= 0; i < reader_.vals_.length; i++) {
! r[idx][i + 1]= Double.toString(reader_.vals_[i]);
! idx++;
}
}
! if (reader_.readLine()) {
! if (r == null)
! r= new String[1][reader_.vals_.length + 1];
! r[idx][0]= Double.toString(reader_.t_);
! for (int i= 0; i < reader_.vals_.length; i++) {
! r[idx][i + 1]= Double.toString(reader_.vals_[i]);
}
- }
} catch (IOException _io) {} finally {
try {
--- 53,90 ----
if ((file_ == null) || (!file_.exists()))
return new String[0][0];
! ArrayList r= new ArrayList();
! int nbEvol= -1;
! String[] temp;
try {
! reader_.initReader();
if (reader_.readLine()) {
! nbEvol= reader_.vals_.length;
! temp= new String[nbEvol + 1];
! for (int i= nbEvol; i >= 0; i--) {
! temp[i]= getName(i);
}
! r.add(temp);
! temp= new String[nbEvol + 1];
! temp[0]= Double.toString(reader_.t_);
! for (int i= nbEvol-1; i >=0 ; i--) {
! temp[i + 1]= Double.toString(reader_.vals_[i]);
}
+ r.add(temp);
}
! for (int j= 3; j > 0; j--) {
! if (reader_.readLine()) {
! if (nbEvol < 0) {
! nbEvol= reader_.vals_.length;
! }
! temp= new String[nbEvol + 1];
!
! temp[0]= Double.toString(reader_.t_);
! for (int i= nbEvol - 1; i >= 0; i--) {
! temp[i + 1]= Double.toString(reader_.vals_[i]);
! }
! r.add(temp);
}
+ }
} catch (IOException _io) {} finally {
try {
***************
*** 93,113 ****
}
}
! return r == null ? new String[0][0] : r;
! }
!
! public String getName(int _idx){
! if((reader_.name_!=null) && (_idx<reader_.name_.length-1)){
! return reader_.name_[_idx+1];
}
else
! return DodicoLib.getSansExtension(file_.getName())
! + "-"
! + CtuluLib.getString(_idx + 1);
}
private EvolutionReguliere[] readEvolutions() {
EvolutionReguliere[] r= null;
try {
! reader_.init();
while (reader_.hasNext()) {
if (reader_.readLine()) {
--- 94,122 ----
}
}
! String[][] rf= new String[r.size()][];
! for(int i=r.size()-1;i>=0;i--){
! DodicoLib._printObject(r.get(i), true);
! temp=(String[])r.get(i);
! rf[i]=temp;
}
+ return rf;
+ }
+
+ public String getName(int _idx) {
+ if ((reader_.name_ != null) && (_idx < reader_.name_.length)) {
+ return reader_.name_[_idx];
+ } else if (_idx == 0)
+ return "t (sec)";
else
! return DodicoLib.getSansExtension(file_.getName())
! + "-"
! + CtuluLib.getString(_idx);
}
private EvolutionReguliere[] readEvolutions() {
+
EvolutionReguliere[] r= null;
try {
! reader_.initReader();
while (reader_.hasNext()) {
if (reader_.readLine()) {
***************
*** 115,120 ****
r= new EvolutionReguliere[reader_.vals_.length];
for (int i= reader_.vals_.length - 1; i >= 0; i--) {
! r[i]=
! new H2dEvolution(getName(i));
}
}
--- 124,128 ----
r= new EvolutionReguliere[reader_.vals_.length];
for (int i= reader_.vals_.length - 1; i >= 0; i--) {
! r[i]= new H2dEvolution(getName(i + 1));
}
}
***************
*** 153,157 ****
double[] vals_;
String[] name_;
! public abstract void init() throws IOException;
public abstract boolean readLine();
public abstract boolean hasNext();
--- 161,170 ----
double[] vals_;
String[] name_;
! public void initReader() throws IOException{
! vals_=null;
! name_=null;
! init();
! }
! protected abstract void init() throws IOException;
public abstract boolean readLine();
public abstract boolean hasNext();
***************
*** 171,176 ****
reader_= new LineNumberReader(new FileReader(file_));
line_= reader_.readLine();
! oneLineRead_=false;
}
public void close() throws IOException {
--- 184,191 ----
reader_= new LineNumberReader(new FileReader(file_));
line_= reader_.readLine();
! vals_=null;
! oneLineRead_= false;
}
+
public void close() throws IOException {
***************
*** 196,202 ****
validLine= false;
//on suppose que la ligne représente les noms des courbes
! if( (name_ == null) && (!oneLineRead_)){
! name_=
! new String[vals_ == null ? nbToken : vals_.length+1];
name_[0]= temp;
int nb= name_.length;
--- 211,216 ----
validLine= false;
//on suppose que la ligne représente les noms des courbes
! if ((name_ == null) && (!oneLineRead_)) {
! name_= new String[vals_ == null ? nbToken : vals_.length + 1];
name_[0]= temp;
int nb= name_.length;
***************
*** 205,208 ****
--- 219,223 ----
name_[idx++]= t.nextToken();
}
+ oneLineRead_=true;
return readLine();
}
***************
*** 228,232 ****
if (validLine) {
line_= reader_.readLine();
! oneLineRead_=true;
return true;
}
--- 243,247 ----
if (validLine) {
line_= reader_.readLine();
! oneLineRead_= true;
return true;
}
***************
*** 240,244 ****
else
line_= line_.trim();
-
}
} catch (IOException e) {
--- 255,258 ----
|
|
From: <de...@us...> - 2004-01-21 10:59:13
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/telemac/io
In directory sc8-pr-cvs1:/tmp/cvs-serv14635/telemac/io
Modified Files:
TelemacDicoFileFormatVersion.java
TelemacLiquideFileFormat.java
Log Message:
Maj version 0.04
Index: TelemacDicoFileFormatVersion.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/telemac/io/TelemacDicoFileFormatVersion.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** TelemacDicoFileFormatVersion.java 19 Dec 2003 12:10:37 -0000 1.9
--- TelemacDicoFileFormatVersion.java 21 Jan 2004 10:59:10 -0000 1.10
***************
*** 50,54 ****
_l.add(clEntite_);
if ((gridEntite_ != null) && (!_i.isValueSetFor(gridEntite_)))
! _l.add(clEntite_);
}
public DicoCasFileFormat getDicoFileFormat() {
--- 50,54 ----
_l.add(clEntite_);
if ((gridEntite_ != null) && (!_i.isValueSetFor(gridEntite_)))
! _l.add(gridEntite_);
}
public DicoCasFileFormat getDicoFileFormat() {
Index: TelemacLiquideFileFormat.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/telemac/io/TelemacLiquideFileFormat.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** TelemacLiquideFileFormat.java 19 Dec 2003 12:10:37 -0000 1.9
--- TelemacLiquideFileFormat.java 21 Jan 2004 10:59:10 -0000 1.10
***************
*** 9,12 ****
--- 9,13 ----
package org.fudaa.dodico.telemac.io;
import java.io.File;
+ import java.util.Map;
import org.fudaa.dodico.commun.ProgressionInterface;
***************
*** 36,42 ****
protected TelemacLiquideFileFormat() {
super(NB_FILE);
! extensions_= new String[] { "liq" };
ID_= "TELEMAC_FL";
! nom_= H2dResource.getS("Frontières Liquides (Télémac)");
description_=
H2dResource.getS(
--- 37,43 ----
protected TelemacLiquideFileFormat() {
super(NB_FILE);
! extensions_= new String[] { "liq","txt" };
ID_= "TELEMAC_FL";
! nom_= H2dResource.getS("Télémac frontières liquides");
description_=
H2dResource.getS(
***************
*** 94,98 ****
public FileOperationSynthese readEvolutions(
File _f,
! ProgressionInterface _prog) {
FileOperationSynthese op= read(_f, _prog);
TelemacLiquideInterface source= (TelemacLiquideInterface)op.getSource();
--- 95,99 ----
public FileOperationSynthese readEvolutions(
File _f,
! ProgressionInterface _prog,Map _options) {
FileOperationSynthese op= read(_f, _prog);
TelemacLiquideInterface source= (TelemacLiquideInterface)op.getSource();
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/reflux/io In directory sc8-pr-cvs1:/tmp/cvs-serv14635/reflux/io Modified Files: CLTransitoireFileFormat.java CorEleBthReader.java CorEleBthWriter.java CrbFileFormat.java INPWriter.java Log Message: Maj version 0.04 Index: CLTransitoireFileFormat.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/reflux/io/CLTransitoireFileFormat.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** CLTransitoireFileFormat.java 19 Dec 2003 12:10:37 -0000 1.6 --- CLTransitoireFileFormat.java 21 Jan 2004 10:59:10 -0000 1.7 *************** *** 9,12 **** --- 9,13 ---- package org.fudaa.dodico.reflux.io; import java.io.File; + import java.util.Map; import org.fudaa.dodico.commun.DodicoResource; *************** *** 37,41 **** private CLTransitoireFileFormat() { super(1); ! nom_= DodicoResource.getS("courbes transitoires (preflux, format binaire)"); extensions_= new String[] { "clv" }; ID_= "REFLUX_CLV"; --- 38,42 ---- private CLTransitoireFileFormat() { super(1); ! nom_= DodicoResource.getS("Reflux courbes transitoires (format binaire)"); extensions_= new String[] { "clv" }; ID_= "REFLUX_CLV"; *************** *** 95,99 **** public FileOperationSynthese readEvolutions( File _f, ! ProgressionInterface _prog) { return read(_f, _prog); } --- 96,100 ---- public FileOperationSynthese readEvolutions( File _f, ! ProgressionInterface _prog,Map _options) { return read(_f, _prog); } Index: CorEleBthReader.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/reflux/io/CorEleBthReader.java,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** CorEleBthReader.java 12 Dec 2003 10:30:54 -0000 1.12 --- CorEleBthReader.java 21 Jan 2004 10:59:10 -0000 1.13 *************** *** 289,293 **** } catch (EOFException _e) { if (CtuluLib.DEBUG) ! System.out.println("Reading end"); } catch (NumberFormatException fe) { DodicoAnalyze.manageException(fe, analyze_, eleIn_); --- 289,293 ---- } catch (EOFException _e) { if (CtuluLib.DEBUG) ! CtuluLib.debug("Reading end"); } catch (NumberFormatException fe) { DodicoAnalyze.manageException(fe, analyze_, eleIn_); *************** *** 380,384 **** } catch (EOFException e) { if (CtuluLib.DEBUG) ! System.out.println("Reading end"); } catch (NumberFormatException fe) { DodicoAnalyze.manageException(fe, analyze_, corIn_); --- 380,384 ---- } catch (EOFException e) { if (CtuluLib.DEBUG) ! CtuluLib.debug("Reading end"); } catch (NumberFormatException fe) { DodicoAnalyze.manageException(fe, analyze_, corIn_); *************** *** 441,445 **** } catch (EOFException e) { if (CtuluLib.DEBUG) ! System.out.println("Reading end"); } catch (NumberFormatException fe) { DodicoAnalyze.manageException(fe, analyze_, bthIn_); --- 441,445 ---- } catch (EOFException e) { if (CtuluLib.DEBUG) ! CtuluLib.debug("Reading end"); } catch (NumberFormatException fe) { DodicoAnalyze.manageException(fe, analyze_, bthIn_); Index: CorEleBthWriter.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/reflux/io/CorEleBthWriter.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** CorEleBthWriter.java 12 Dec 2003 10:30:54 -0000 1.11 --- CorEleBthWriter.java 21 Jan 2004 10:59:10 -0000 1.12 *************** *** 288,293 **** int pas= (int) (nbLigne / step); int pMax= pas; - //Le nombre de ligne entiere a ecrire. - System.out.println(nbLigne); int index= 0; for (int numLigne= 0; numLigne < nbLigne; numLigne++) { --- 288,291 ---- Index: CrbFileFormat.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/reflux/io/CrbFileFormat.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** CrbFileFormat.java 19 Dec 2003 12:10:37 -0000 1.1 --- CrbFileFormat.java 21 Jan 2004 10:59:10 -0000 1.2 *************** *** 9,12 **** --- 9,13 ---- package org.fudaa.dodico.reflux.io; import java.io.File; + import java.util.Map; import org.fudaa.dodico.commun.DodicoResource; *************** *** 38,42 **** private CrbFileFormat() { super(1); ! nom_= DodicoResource.getS("Fichier crb (preflux)"); extensions_= new String[] { "crb" }; ID_= "CRB"; --- 39,43 ---- private CrbFileFormat() { super(1); ! nom_= DodicoResource.getS("Reflux crb"); extensions_= new String[] { "crb" }; ID_= "CRB"; *************** *** 96,100 **** public FileOperationSynthese readEvolutions( File _f, ! ProgressionInterface _prog) { return read(_f, _prog); } --- 97,101 ---- public FileOperationSynthese readEvolutions( File _f, ! ProgressionInterface _prog,Map _options) { return read(_f, _prog); } Index: INPWriter.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/reflux/io/INPWriter.java,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** INPWriter.java 19 Dec 2003 12:10:37 -0000 1.12 --- INPWriter.java 21 Jan 2004 10:59:10 -0000 1.13 *************** *** 863,866 **** --- 863,868 ---- } } + //le groupe 0 pour les T3 non solide avec frottement + else grpIdx.add(0); } if (groupeBord.size() > 0) |
|
From: <de...@us...> - 2004-01-21 10:59:13
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/telemac
In directory sc8-pr-cvs1:/tmp/cvs-serv14635/h2d/telemac
Modified Files:
H2dTelemacParameters.java
Log Message:
Maj version 0.04
Index: H2dTelemacParameters.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/telemac/H2dTelemacParameters.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** H2dTelemacParameters.java 19 Dec 2003 12:10:36 -0000 1.4
--- H2dTelemacParameters.java 21 Jan 2004 10:59:09 -0000 1.5
***************
*** 152,157 ****
}
}
! public void setNoCL() {
setClManager(H2dTelemacBcManager.init(getMaillage()));
}
protected void setClManager(H2dTelemacBcManager _clMng) {
--- 152,158 ----
}
}
! public void setNoCL(DodicoAnalyze.Editor _analyze) {
setClManager(H2dTelemacBcManager.init(getMaillage()));
+ clMng_.setDicoParams(getDicoParams(),_analyze);
}
protected void setClManager(H2dTelemacBcManager _clMng) {
|
|
From: <de...@us...> - 2004-01-21 10:59:13
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/type
In directory sc8-pr-cvs1:/tmp/cvs-serv14635/h2d/type
Modified Files:
H2dFileFormatType.java
Log Message:
Maj version 0.04
Index: H2dFileFormatType.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/type/H2dFileFormatType.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** H2dFileFormatType.java 19 Dec 2003 12:10:36 -0000 1.6
--- H2dFileFormatType.java 21 Jan 2004 10:59:10 -0000 1.7
***************
*** 26,30 ****
// new H2dFileFormatType(3, H2dResource.getS("Conditions limites liquides"));
public static final H2dFileFormatType COURBE_TRANSITOIRE=
! new H2dFileFormatType(4, H2dResource.getS("Courbes transitoire"));
public static final H2dFileFormatType FOND=
new H2dFileFormatType(5, H2dResource.getS("Fond"));
--- 26,30 ----
// new H2dFileFormatType(3, H2dResource.getS("Conditions limites liquides"));
public static final H2dFileFormatType COURBE_TRANSITOIRE=
! new H2dFileFormatType(4, H2dResource.getS("Courbes temporelles"));
public static final H2dFileFormatType FOND=
new H2dFileFormatType(5, H2dResource.getS("Fond"));
|
|
From: <de...@us...> - 2004-01-21 10:59:12
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/h2d
In directory sc8-pr-cvs1:/tmp/cvs-serv14635/h2d
Modified Files:
H2dCSVFileFormat.java H2dFileFormatEvolutionVersion.java
h2d_en.fr_txt
Log Message:
Maj version 0.04
Index: H2dCSVFileFormat.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/H2dCSVFileFormat.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** H2dCSVFileFormat.java 19 Dec 2003 12:10:36 -0000 1.1
--- H2dCSVFileFormat.java 21 Jan 2004 10:59:09 -0000 1.2
***************
*** 10,13 ****
--- 10,15 ----
import java.io.File;
+ import java.util.HashMap;
+ import java.util.Map;
import org.fudaa.dodico.commun.DodicoResource;
***************
*** 47,50 ****
--- 49,58 ----
}
+ public Map buildOptionSep(String _s) {
+ Map r= new HashMap();
+ r.put("SEP", _s);
+ return r;
+ }
+
/**
*
***************
*** 67,74 ****
implements H2dFileFormatEvolutionVersion {
public CsvVersion() {
! super(getInstance(), "5.11");
}
-
-
/**
--- 75,80 ----
implements H2dFileFormatEvolutionVersion {
public CsvVersion() {
! super(getInstance(), "1.0");
}
/**
***************
*** 77,82 ****
public FileOperationSynthese readEvolutions(
File _f,
! ProgressionInterface _prog) {
! return new EvolutionReader(this).read(_f, _prog);
}
--- 83,103 ----
public FileOperationSynthese readEvolutions(
File _f,
! ProgressionInterface _prog,
! Map _options) {
! EvolutionReader r= new EvolutionReader(this);
! if ((_options != null) && (_options.containsKey("SEP"))) {
! r.setSepChar((String)_options.get("SEP"));
! }
! FileOperationSynthese s= r.read(_f, _prog);
! EvolutionReguliere[] evol= (EvolutionReguliere[])s.getSource();
! if (evol != null) {
! H2dEvolution[] h2dEvol= new H2dEvolution[evol.length];
! for (int i= evol.length - 1; i >= 0; i--) {
! h2dEvol[i]= new H2dEvolution(evol[i]);
! }
! s.setSource(h2dEvol);
! }
!
! return s;
}
Index: H2dFileFormatEvolutionVersion.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/H2dFileFormatEvolutionVersion.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** H2dFileFormatEvolutionVersion.java 19 Dec 2003 12:10:36 -0000 1.1
--- H2dFileFormatEvolutionVersion.java 21 Jan 2004 10:59:09 -0000 1.2
***************
*** 10,17 ****
--- 10,19 ----
import java.io.File;
+ import java.util.Map;
import org.fudaa.dodico.commun.ProgressionInterface;
import org.fudaa.dodico.fichiers.FileFormat;
import org.fudaa.dodico.fichiers.FileOperationSynthese;
+ import org.fudaa.dodico.fichiers.FileReadOperationAbstract;
/**
***************
*** 22,28 ****
public String getName();
public FileFormat getFileFormat();
//must return a file operation with a H2dEvolution[] as source
! public FileOperationSynthese readEvolutions(File _f, ProgressionInterface _prog);
}
--- 24,31 ----
public String getName();
public FileFormat getFileFormat();
+ public FileReadOperationAbstract createReader();
//must return a file operation with a H2dEvolution[] as source
! public FileOperationSynthese readEvolutions(File _f, ProgressionInterface _prog,Map _options);
}
Index: h2d_en.fr_txt
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/h2d_en.fr_txt,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** h2d_en.fr_txt 19 Dec 2003 12:10:36 -0000 1.9
--- h2d_en.fr_txt 21 Jan 2004 10:59:09 -0000 1.10
***************
*** 98,103 ****
Conditions limites=Boundary conditions
Conditions limites liquides=Liquid boundary conditions
- Courbes transitoire=Transient curves
Courbes transitoires=Transient curves
Fond=Bottom
Recherche des arêtes de contour=Boundary edges search
--- 98,103 ----
Conditions limites=Boundary conditions
Conditions limites liquides=Liquid boundary conditions
Courbes transitoires=Transient curves
+ Courbes temporelles=Time curves
Fond=Bottom
Recherche des arêtes de contour=Boundary edges search
***************
*** 195,199 ****
Frontières Liquides transitoire=Transient liquid boundaries
Ce fichier contient les valeurs dépendantes du temps pour les frontières liquides=This file contains the time-dependent boundary conditions
! Frontières Liquides (Télémac)=Liquid boundary conditions (Telemac)
L'unité du temps est traitée en tant que seconde=The time is supposed to be in second
Les valeurs du temps doivent être croissantes=The time values must be in ascending order
--- 195,199 ----
Frontières Liquides transitoire=Transient liquid boundaries
Ce fichier contient les valeurs dépendantes du temps pour les frontières liquides=This file contains the time-dependent boundary conditions
! Télémac frontières liquides=Telemac Liquid boundary conditions
L'unité du temps est traitée en tant que seconde=The time is supposed to be in second
Les valeurs du temps doivent être croissantes=The time values must be in ascending order
|
