Menu
▾
▴
fudaa-cvs-commit
|
From: <de...@us...> - 2003-08-19 07:48:44
|
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/reflux
In directory sc8-pr-cvs1:/tmp/cvs-serv10343/tr/reflux
Modified Files:
TrRefluxParametres.java TrRefluxProjet.java
Log Message:
Gestion de l'export pour le projet tr
Index: TrRefluxParametres.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/reflux/TrRefluxParametres.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TrRefluxParametres.java 18 Aug 2003 11:54:43 -0000 1.2
--- TrRefluxParametres.java 19 Aug 2003 07:48:40 -0000 1.3
***************
*** 15,18 ****
--- 15,20 ----
import org.fudaa.dodico.dico.DicoParams;
import org.fudaa.dodico.fichiers.FileOperationSynthese;
+ import org.fudaa.dodico.h2d.H2dMaillage;
+ import org.fudaa.dodico.h2d.H2dParametres;
import org.fudaa.dodico.reflux.io.INPFileFormat;
import org.fudaa.dodico.reflux.io.INPInterface;
***************
*** 24,28 ****
* @version $Id$
*/
! public class TrRefluxParametres
{
--- 26,30 ----
* @version $Id$
*/
! public class TrRefluxParametres implements H2dParametres
{
***************
*** 31,42 ****
FudaaUI ui_;
DicoParams dicoParam_;
/**
*
*/
! public TrRefluxParametres(INPInterface _inter,FudaaUI _ui)
{
super();
! ui_ = _ui;
}
--- 33,45 ----
FudaaUI ui_;
DicoParams dicoParam_;
+ H2dMaillage maillage_;
/**
*
*/
! private TrRefluxParametres()
{
super();
!
}
***************
*** 52,56 ****
if(_ui!=null) _ui.manageErrorOperation(synt);
if(inter==null) return null;
! TrRefluxParametres r = new TrRefluxParametres(inter,_ui);
r.fINP_ = _f;
String s = _f.getName();
--- 55,60 ----
if(_ui!=null) _ui.manageErrorOperation(synt);
if(inter==null) return null;
! TrRefluxParametres r = new TrRefluxParametres();
! r.ui_ = _ui;
r.fINP_ = _f;
String s = _f.getName();
***************
*** 59,64 ****
s = s.substring(0, i);
r.title_ = s;
-
r.dicoParam_=new DicoParams(inter.getEntiteValue(),_ft);
return r;
}
--- 63,71 ----
s = s.substring(0, i);
r.title_ = s;
r.dicoParam_=new DicoParams(inter.getEntiteValue(),_ft);
+ H2dMaillage maillage=inter.getMaillage();
+ maillage.computeBordV2(_progress);
+ r.maillage_=maillage;
+
return r;
}
***************
*** 126,129 ****
--- 133,143 ----
{
return dicoParam_;
+ }
+
+ /**
+ *
+ */
+ public H2dMaillage getMaillage() {
+ return maillage_;
}
Index: TrRefluxProjet.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/reflux/TrRefluxProjet.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TrRefluxProjet.java 18 Aug 2003 11:54:43 -0000 1.2
--- TrRefluxProjet.java 19 Aug 2003 07:48:40 -0000 1.3
***************
*** 17,21 ****
import org.fudaa.dodico.commun.ProgressionInterface;
import org.fudaa.dodico.fichiers.FileFormatSoftware;
- import org.fudaa.dodico.h2d.H2dParametres;
import org.fudaa.dodico.reflux.RefluxExec;
import org.fudaa.dodico.reflux.io.INPFileFormat;
--- 17,20 ----
***************
*** 24,27 ****
--- 23,27 ----
import org.fudaa.fudaa.commun.calcul.FudaaCalculAction;
import org.fudaa.fudaa.commun.calcul.FudaaCalculOp;
+ import org.fudaa.fudaa.tr.TrExport;
import org.fudaa.fudaa.tr.TrImplementation;
import org.fudaa.fudaa.tr.TrProjet;
***************
*** 31,36 ****
* @version $Id$
*/
! public class TrRefluxProjet implements TrProjet
! {
BuInformationsDocument infos_;
--- 31,35 ----
* @version $Id$
*/
! public class TrRefluxProjet implements TrProjet {
BuInformationsDocument infos_;
***************
*** 43,82 ****
*
*/
! public TrRefluxProjet(TrImplementation _impl,TrRefluxParametres _params)
! {
! impl_ = _impl;
! params_=_params;
! calculActions_=new FudaaCalculAction(this,true);
}
!
public static TrRefluxProjet init(
File _file,
INPFileFormat.INPVersion _fileFormat,
! ProgressionInterface _progress,TrImplementation _ui)
! {
//TODO: gerer si param deja present
! TrRefluxParametres params_=TrRefluxParametres.init(_file, _fileFormat, _progress, _ui);
! if(params_!=null) return new TrRefluxProjet(_ui,params_);
! else return null;
}
! public TrRefluxParametres getRefluxParametres()
! {
return params_;
}
!
! public void save()
! {
!
! }
!
/**
*
*/
! public BuInformationsDocument getInformationsDocument()
! {
if (infos_ == null)
! infos_ = new BuInformationsDocument();
return infos_;
}
--- 42,77 ----
*
*/
! public TrRefluxProjet(TrImplementation _impl, TrRefluxParametres _params) {
! impl_= _impl;
! params_= _params;
! calculActions_= new FudaaCalculAction(this, true);
}
!
public static TrRefluxProjet init(
File _file,
INPFileFormat.INPVersion _fileFormat,
! ProgressionInterface _progress,
! TrImplementation _ui) {
//TODO: gerer si param deja present
! TrRefluxParametres params_=
! TrRefluxParametres.init(_file, _fileFormat, _progress, _ui);
! if (params_ != null)
! return new TrRefluxProjet(_ui, params_);
! else
! return null;
}
! public TrRefluxParametres getRefluxParametres() {
return params_;
}
!
! public void save() {}
/**
*
*/
! public BuInformationsDocument getInformationsDocument() {
if (infos_ == null)
! infos_= new BuInformationsDocument();
return infos_;
}
***************
*** 85,103 ****
*
*/
! public H2dParametres getParametres()
! {
! return null;
! }
!
! /**
! *
! */
! public void enregistrerParametres()
! {
! }
!
! public File enregistrerParametresUniqueSousRep(File _d)
! {
return params_.enregistrerUniqueSousRepertoire(_d);
}
--- 80,86 ----
*
*/
! public void enregistrerParametres() {}
! public File enregistrerParametresUniqueSousRep(File _d) {
return params_.enregistrerUniqueSousRepertoire(_d);
}
***************
*** 106,111 ****
*
*/
! public TrImplementation getImpl()
! {
return impl_;
}
--- 89,93 ----
*
*/
! public TrImplementation getImpl() {
return impl_;
}
***************
*** 114,131 ****
*
*/
! public void setImpl(TrImplementation _impl)
! {
!
! }
/**
*
*/
! public void active()
! {
! if (fille_ == null)
! {
! fille_ = new TrRefluxFilleProjet(this);
! Dimension dim = impl_.getMainPanel().getDesktop().getSize();
fille_.setSize(
(int) (dim.getWidth() * 0.8),
--- 96,108 ----
*
*/
! public void setImpl(TrImplementation _impl) {}
/**
*
*/
! public void active() {
! if (fille_ == null) {
! fille_= new TrRefluxFilleProjet(this);
! Dimension dim= impl_.getMainPanel().getDesktop().getSize();
fille_.setSize(
(int) (dim.getWidth() * 0.8),
***************
*** 136,141 ****
}
! public void close()
! {
// if (isModified())
// {
--- 113,117 ----
}
! public void close() {
// if (isModified())
// {
***************
*** 152,156 ****
// }
fille_.dispose();
! fille_ = null;
impl_.closeProjet(this);
}
--- 128,132 ----
// }
fille_.dispose();
! fille_= null;
impl_.closeProjet(this);
}
***************
*** 159,164 ****
*
*/
! public String getTitle()
! {
return params_.getTitle();
}
--- 135,139 ----
*
*/
! public String getTitle() {
return params_.getTitle();
}
***************
*** 167,176 ****
*
*/
! public CalculLauncher actionCalcul()
! {
! FudaaCalculOp op=new FudaaCalculOp(new RefluxExec())
! {
! public File proceedParamFile(ProgressionInterface _inter)
! {
return params_.getFile();
}
--- 142,148 ----
*
*/
! public CalculLauncher actionCalcul() {
! FudaaCalculOp op= new FudaaCalculOp(new RefluxExec()) {
! public File proceedParamFile(ProgressionInterface _inter) {
return params_.getFile();
}
***************
*** 178,183 ****
* @return
*/
! protected String getTaskName()
! {
return "lancement reflux";
}
--- 150,154 ----
* @return
*/
! protected String getTaskName() {
return "lancement reflux";
}
***************
*** 186,206 ****
return op;
}
!
!
/**
*
*/
! public String getID()
! {
return FileFormatSoftware.REFLUX_IS.name;
}
-
-
/**
*
*/
! public File getParamsFile()
! {
return getRefluxParametres().getFile();
}
--- 157,172 ----
return op;
}
!
/**
*
*/
! public String getID() {
return FileFormatSoftware.REFLUX_IS.name;
}
/**
*
*/
! public File getParamsFile() {
return getRefluxParametres().getFile();
}
***************
*** 209,214 ****
*
*/
! public FudaaUI getUI()
! {
return impl_;
}
--- 175,179 ----
*
*/
! public FudaaUI getUI() {
return impl_;
}
***************
*** 217,222 ****
* @return
*/
! public FudaaCalculAction getCalculActions()
! {
return calculActions_;
}
--- 182,186 ----
* @return
*/
! public FudaaCalculAction getCalculActions() {
return calculActions_;
}
***************
*** 225,239 ****
*
*/
! public void saveAs()
! {
!
! }
/**
*
*/
! public void saveCopy()
! {
}
--- 189,204 ----
*
*/
! public void saveAs() {}
/**
*
*/
! public void saveCopy() {}
+ /**
+ *
+ */
+ public void export(String _actionCommand) {
+ new TrExport(params_).export(_actionCommand);
}
|
Thanks for helping keep SourceForge clean.
X