Menu
▾
▴
[Fudaa-cvs-commit] fudaa_devel/fudaa/src/org/fudaa/fudaa/tr Tr.java,1.9,1.10 TrFilleVisu.java,1.11,1.12 TrGrapheFille.java,1.2,1.3 TrImplementation.java,1.18,1.19 TrLib.java,1.7,1.8 TrProjet.java,1.13,1.14 tr_en.fr_txt,1.12,1.13
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
|
