Menu
▾
▴
[Fudaa-cvs-commit] fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/telemac TrDicoProjet.java,1.2,1.3 TrTelemacCodePrefDialogPanel.java,1.1,1.2 TrTelemacImplHelper.java,1.3,1.4 TrTelemacParametres.java,1.3,1.4 TrTelemacProjet.java,1.3,1.4
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/telemac
In directory sc8-pr-cvs1:/tmp/cvs-serv10343/tr/telemac
Modified Files:
TrDicoProjet.java TrTelemacCodePrefDialogPanel.java
TrTelemacImplHelper.java TrTelemacParametres.java
TrTelemacProjet.java
Log Message:
Gestion de l'export pour le projet tr
Index: TrDicoProjet.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/telemac/TrDicoProjet.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TrDicoProjet.java 18 Aug 2003 11:54:43 -0000 1.2
--- TrDicoProjet.java 19 Aug 2003 07:48:40 -0000 1.3
***************
*** 77,79 ****
--- 77,84 ----
}
+ /**
+ *
+ */
+ public void export(String _actionCommand) {impl_.error("Non implanté");}
+
}
Index: TrTelemacCodePrefDialogPanel.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/telemac/TrTelemacCodePrefDialogPanel.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TrTelemacCodePrefDialogPanel.java 4 Jul 2003 15:37:05 -0000 1.1
--- TrTelemacCodePrefDialogPanel.java 19 Aug 2003 07:48:40 -0000 1.2
***************
*** 9,38 ****
package org.fudaa.fudaa.tr.telemac;
- import java.awt.event.FocusEvent;
- import java.awt.event.FocusListener;
- import java.beans.PropertyChangeEvent;
- import java.beans.PropertyChangeListener;
- import java.io.File;
-
- import javax.swing.BorderFactory;
- import javax.swing.JFileChooser;
- import javax.swing.JPanel;
import javax.swing.JTextField;
- import javax.swing.event.CaretEvent;
- import javax.swing.event.CaretListener;
- import com.memoire.bu.BuBorderLayout;
- import com.memoire.bu.BuGridLayout;
- import com.memoire.bu.BuPanel;
-
- import org.fudaa.ebli.dialog.EbliSimpleDialogPanel;
- import org.fudaa.fudaa.commun.FudaaLib;
import org.fudaa.fudaa.commun.exec.FudaaExecManagerPanel;
import org.fudaa.fudaa.commun.exec.FudaaExecServerManager;
import org.fudaa.fudaa.commun.exec.FudaaExecServerManagerPanel;
- import org.fudaa.fudaa.commun.tableau.FudaaCellFileEditor;
- import org.fudaa.fudaa.commun.tableau.FudaaPanelListEditor;
- import org.fudaa.fudaa.commun.tableau.FudaaPanelListEditorModel;
- import org.fudaa.fudaa.tr.TrPreferences;
/**
--- 9,17 ----
Index: TrTelemacImplHelper.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/telemac/TrTelemacImplHelper.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TrTelemacImplHelper.java 18 Aug 2003 11:54:43 -0000 1.3
--- TrTelemacImplHelper.java 19 Aug 2003 07:48:40 -0000 1.4
***************
*** 11,19 ****
import java.io.File;
- import javax.swing.ComboBoxModel;
-
- import com.memoire.bu.BuComboBox;
- import com.memoire.bu.BuGridLayout;
- import com.memoire.bu.BuLabel;
import com.memoire.bu.BuMenuItem;
import com.memoire.bu.BuTaskOperation;
--- 11,14 ----
***************
*** 22,27 ****
import org.fudaa.dodico.dico.DicoCasFileFormat;
import org.fudaa.dodico.dico.DicoCasFileFormatVersion;
- import org.fudaa.dodico.dico.DicoLanguage;
- import org.fudaa.dodico.dico.DicoManager;
import org.fudaa.dodico.dico.DicoModelAbstract;
import org.fudaa.dodico.fichiers.FileFormatSoftware;
--- 17,20 ----
***************
*** 29,34 ****
import org.fudaa.dodico.telemac.io.Telemac2dFileFormat;
! import org.fudaa.ebli.dialog.EbliSimpleDialogPanel;
!
import org.fudaa.fudaa.ressource.FudaaResource;
import org.fudaa.fudaa.tr.TrImplHelper;
--- 22,26 ----
import org.fudaa.dodico.telemac.io.Telemac2dFileFormat;
! import org.fudaa.fudaa.dico.FDicoChooserPanel;
import org.fudaa.fudaa.ressource.FudaaResource;
import org.fudaa.fudaa.tr.TrImplHelper;
***************
*** 89,118 ****
public void ouvrirDico()
{
! EbliSimpleDialogPanel s = new EbliSimpleDialogPanel();
! s.setLayout(new BuGridLayout(2, 5, 5, false, false, false, false));
! s.add(new BuLabel("dico :"));
! BuComboBox cb = new BuComboBox();
! ComboBoxModel descModel =
! TelemacDicoManager.getINSTANCE().createDicoDescComboBoxModel();
! cb.setModel(descModel);
! cb.setRenderer(TelemacDicoManager.getINSTANCE().getDicoDescCellRenderer());
! s.add(cb);
! s.add(new BuLabel("Langage :"));
! cb = new BuComboBox();
! DicoLanguage.LanguageComboBoxModel langModel =
! new DicoLanguage.LanguageComboBoxModel();
! cb.setModel(langModel);
! s.add(cb);
! int r = s.afficheModale(impl_.getFrame(), "Choix fichier dico");
! if (EbliSimpleDialogPanel.isOkResponse(r))
{
- final File fic = impl_.ouvrirFileChooser(null, "Fichier cas");
- if (fic != null)
- {
_ouvrir(
! fic,
! (DicoCasFileFormat) descModel.getSelectedItem(),
! langModel.getSelectedLanguage());
! }
}
--- 81,93 ----
public void ouvrirDico()
{
! FDicoChooserPanel s=new FDicoChooserPanel(TelemacDicoManager.getINSTANCE());
! int r = s.afficheModale(impl_.getFrame(), "Choix fichier dico");
! if (s.isOkResponse(r))
{
_ouvrir(
! s.getSelectedFile(),
! s.getFileFormatSelected(),
! s.getVersionSelected(),
! s.getLanguageSelected());
}
***************
*** 123,126 ****
--- 98,102 ----
final File _fic,
final DicoCasFileFormat _ft,
+ final String _v,
final int _language)
{
***************
*** 131,135 ****
public void act()
{
! DicoCasFileFormatVersion version=_ft.getLastVersionImpl(_language);
DicoModelAbstract m =_ft.getLastVersionImpl().getDico();
--- 107,111 ----
public void act()
{
! DicoCasFileFormatVersion version=_ft.getVersionImpl(_v,_language);
DicoModelAbstract m =_ft.getLastVersionImpl().getDico();
Index: TrTelemacParametres.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/telemac/TrTelemacParametres.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TrTelemacParametres.java 18 Aug 2003 11:54:43 -0000 1.3
--- TrTelemacParametres.java 19 Aug 2003 07:48:40 -0000 1.4
***************
*** 9,30 ****
package org.fudaa.fudaa.tr.telemac;
- import gnu.trove.TObjectLongHashMap;
-
import java.io.File;
import java.util.Map;
import org.fudaa.dodico.commun.ProgressionInterface;
- import org.fudaa.dodico.dico.DicoCasFileFormat;
import org.fudaa.dodico.dico.DicoCasFileFormatVersion;
import org.fudaa.dodico.dico.DicoCasInterface;
import org.fudaa.dodico.dico.DicoEntiteFile;
import org.fudaa.dodico.fichiers.FileOperationSynthese;
- import org.fudaa.dodico.h2d.H2dLib;
import org.fudaa.dodico.h2d.H2dMaillage;
import org.fudaa.dodico.reflux.io.CorEleBthInterface;
- import org.fudaa.dodico.telemac.io.TelemacLib;
import org.fudaa.dodico.telemac.io.SerafinInterface;
- import org.fudaa.dodico.telemac.io.TelemacCLInterface;
import org.fudaa.dodico.telemac.io.Telemac2dFileFormat;
import org.fudaa.dodico.telemac.io.TelemacLiquideInterface;
--- 9,28 ----
package org.fudaa.fudaa.tr.telemac;
import java.io.File;
import java.util.Map;
import org.fudaa.dodico.commun.ProgressionInterface;
import org.fudaa.dodico.dico.DicoCasFileFormatVersion;
import org.fudaa.dodico.dico.DicoCasInterface;
import org.fudaa.dodico.dico.DicoEntiteFile;
+ import org.fudaa.dodico.dunes.io.DunesInterface;
import org.fudaa.dodico.fichiers.FileOperationSynthese;
import org.fudaa.dodico.h2d.H2dMaillage;
+ import org.fudaa.dodico.h2d.H2dParametres;
import org.fudaa.dodico.reflux.io.CorEleBthInterface;
import org.fudaa.dodico.telemac.io.SerafinInterface;
import org.fudaa.dodico.telemac.io.Telemac2dFileFormat;
+ import org.fudaa.dodico.telemac.io.TelemacCLInterface;
+ import org.fudaa.dodico.telemac.io.TelemacLib;
import org.fudaa.dodico.telemac.io.TelemacLiquideInterface;
***************
*** 37,41 ****
* @version $Id$
*/
! public class TrTelemacParametres extends FDicoParams {
H2dMaillage maillage_;
--- 35,39 ----
* @version $Id$
*/
! public class TrTelemacParametres extends FDicoParams implements H2dParametres{
H2dMaillage maillage_;
***************
*** 73,77 ****
}
-
public CorEleBthInterface createCorEleBthInterface(ProgressionInterface _prog) {
CorEleBthInterface r= null;
--- 71,74 ----
***************
*** 107,111 ****
}
! DicoEntiteFile entFile=dicoParams_.getFileEntite(getTelemacFileFormatVersion().getMaillageEntiteFile());
if (entFile == null) {
ui_.error(
--- 104,110 ----
}
! DicoEntiteFile entFile=
! dicoParams_.getFileEntite(
! getTelemacFileFormatVersion().getMaillageEntiteFile());
if (entFile == null) {
ui_.error(
***************
*** 147,151 ****
public boolean loadConditionsLimite(ProgressionInterface _prg) {
DicoEntiteFile entFile=
! dicoParams_.getFileEntite(getTelemacFileFormatVersion().getCLEntiteFile());
if (entFile == null) {
ui_.error(
--- 146,151 ----
public boolean loadConditionsLimite(ProgressionInterface _prg) {
DicoEntiteFile entFile=
! dicoParams_.getFileEntite(
! getTelemacFileFormatVersion().getCLEntiteFile());
if (entFile == null) {
ui_.error(
***************
*** 182,186 ****
public boolean loadConditionsLimiteLiquide(ProgressionInterface _prg) {
DicoEntiteFile entFile=
! dicoParams_.getFileEntite(getTelemacFileFormatVersion().getCLLiquideEntiteFile());
if (entFile == null) {
ui_.error(
--- 182,187 ----
public boolean loadConditionsLimiteLiquide(ProgressionInterface _prg) {
DicoEntiteFile entFile=
! dicoParams_.getFileEntite(
! getTelemacFileFormatVersion().getCLLiquideEntiteFile());
if (entFile == null) {
ui_.error(
***************
*** 212,272 ****
return getMainFile();
}
! // public TableModel getEntiteTableModel()
! // {
! // return new AbstractTableModel()
! // {
! // public int getRowCount()
! // {
! // return 1;
! // }
! //
! // public int getColumnCount()
! // {
! // return 2;
! // }
! //
! // public Object getValueAt(int _r, int _c)
! // {
! // return null;
! // }
! //
! // };
! //
! // }
!
! // /**
! // *
! // */
! // public void init(
! // File _fichierPrinc,
! // DicoCasFileFormat _ft,
! // Map _initialSetValues,
! // long _timeloaded,
! // boolean _launchEvent)
! // {
! // if(_ft instanceof TelemacCasFileFormat)
! // {
! // init(_fichierPrinc, (TelemacCasFileFormat)_ft, _initialSetValues, _timeloaded, _launchEvent);
! // }
! // else
! //
! // ui_.error("Format telemac 2d uniquement");
! // }
! //
! // public void init(
! // File _fichierPrinc,
! // TelemacCasFileFormat _ft,
! // Map _initialSetValues,
! // long _timeloaded,
! // boolean _launchEvent)
! // {
! // super.init(
! // _fichierPrinc,
! // _ft,
! // _initialSetValues,
! // _timeloaded,
! // _launchEvent);
! // }
}
--- 213,226 ----
return getMainFile();
}
+
+
! /**
! * Renvoie le maillage. Si nul, il est necessaire de charger
! * le maillage avec {@link #loadGeometrie(ProgressionInterface) loadGeometrie}
! */
! public H2dMaillage getMaillage() {
! return maillage_;
! }
}
Index: TrTelemacProjet.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/telemac/TrTelemacProjet.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TrTelemacProjet.java 18 Aug 2003 11:54:43 -0000 1.3
--- TrTelemacProjet.java 19 Aug 2003 07:48:40 -0000 1.4
***************
*** 12,15 ****
--- 12,16 ----
import org.fudaa.dodico.commun.ProgressionInterface;
+ import org.fudaa.dodico.dunes.io.DunesInterface;
import org.fudaa.dodico.fichiers.FileFormatSoftware;
import org.fudaa.dodico.telemac.io.Telemac2dFileFormat;
***************
*** 18,21 ****
--- 19,23 ----
import org.fudaa.fudaa.dico.FDicoParams;
import org.fudaa.fudaa.dico.FDicoProjetAbstract;
+ import org.fudaa.fudaa.tr.TrExport;
import org.fudaa.fudaa.tr.TrImplementation;
import org.fudaa.fudaa.tr.TrProjet;
***************
*** 70,73 ****
--- 72,80 ----
return params_.getFDicoParams();
}
+
+ /**
+ *
+ */
+ public void export(String _actionCommand) {new TrExport(params_).export(_actionCommand);}
}
|
