Menu
▾
▴
[Fudaa-cvs-commit] fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/reflux TrRefluxParametres.java,1.15,1.16 TrRefluxProjectDispatcherListener.java,1.4,1.5 TrRefluxProjet.java,1.15,1.16 TrRefluxTimeStepsEditor.java,1.2,1.3
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/reflux
In directory sc8-pr-cvs1:/tmp/cvs-serv28766/tr/reflux
Modified Files:
TrRefluxParametres.java TrRefluxProjectDispatcherListener.java
TrRefluxProjet.java TrRefluxTimeStepsEditor.java
Log Message:
General update for prepro
Index: TrRefluxParametres.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/reflux/TrRefluxParametres.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** TrRefluxParametres.java 12 Dec 2003 11:29:41 -0000 1.15
--- TrRefluxParametres.java 19 Dec 2003 12:10:55 -0000 1.16
***************
*** 121,125 ****
*/
public H2dProjetType getTypeProjet() {
! return H2dProjetType.COURANTOLOGIE_2D;
}
/**
--- 121,125 ----
*/
public H2dProjetType getTypeProjet() {
! return params_.getProjetType();
}
/**
***************
*** 141,144 ****
--- 141,151 ----
return false;
}
+ /**
+ *
+ */
+ public double getTimeBeginningForTrans() {
+ return params_.getBeginTimeForTrans();
+ }
+
}
private boolean fileIsProject_;
***************
*** 361,364 ****
--- 368,378 ----
if(infoSenderDelegate_==null) infoSenderDelegate_=new TrRefluxInfoSenderDefault(getH2dRefluxParametres());
return infoSenderDelegate_;
+ }
+
+ /**
+ *
+ */
+ public boolean canImportEvolution() {
+ return true;
}
Index: TrRefluxProjectDispatcherListener.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/reflux/TrRefluxProjectDispatcherListener.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** TrRefluxProjectDispatcherListener.java 12 Dec 2003 11:29:41 -0000 1.4
--- TrRefluxProjectDispatcherListener.java 19 Dec 2003 12:10:55 -0000 1.5
***************
*** 35,51 ****
proj_= proj;
}
private void changed() {
if (proj_.fille_ != null) {
proj_.fille_.updateState();
! String s= proj_.getImpl().getFrame().getTitle();
! if (proj_.isModified()) {
! if (!s.startsWith("*")) {
! proj_.getImpl().getFrame().setTitle("*" + s);
! }
! } else {
! if (s.startsWith("*")) {
! proj_.getImpl().getFrame().setTitle(s.substring(1));
! }
! }
}
}
--- 35,44 ----
proj_= proj;
}
+
+
private void changed() {
if (proj_.fille_ != null) {
proj_.fille_.updateState();
! changedMainFrameState(proj_.isModified(), proj_.getImpl().getFrame());
}
}
***************
*** 126,130 ****
*/
public void evolutionUsedChanged(H2dEvolution _e, int _old, int _new) {
! if(CtuluLib.DEBUG) super.evolutionUsedChanged(_e, _old, _new);
}
--- 119,124 ----
*/
public void evolutionUsedChanged(H2dEvolution _e, int _old, int _new) {
! if (CtuluLib.DEBUG)
! super.evolutionUsedChanged(_e, _old, _new);
}
Index: TrRefluxProjet.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/reflux/TrRefluxProjet.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** TrRefluxProjet.java 12 Dec 2003 11:29:41 -0000 1.15
--- TrRefluxProjet.java 19 Dec 2003 12:10:55 -0000 1.16
***************
*** 48,51 ****
--- 48,52 ----
import org.fudaa.fudaa.tr.TrImplementation;
import org.fudaa.fudaa.tr.TrLib;
+ import org.fudaa.fudaa.tr.TrParametres;
import org.fudaa.fudaa.tr.TrProjet;
import org.fudaa.fudaa.tr.TrResource;
***************
*** 90,110 ****
return params_.getH2dRefluxParametres().getElementPropMng();
}
!
! public H2dEvolutionManager getEvolMng(){
return params_.getH2dRefluxParametres().getEvolMng();
}
!
protected synchronized void activeGrapheFille() {
! if ((impl_ == null) || (getEvolMng() == null))
return;
if (this.courbeFille_ == null) {
! courbeFille_=new TrGrapheFille(getImpl(),getInformationsDocument(),getEvolMng());
courbeFille_.setVisible(true);
- visu_.pack();
- TrLib.initFrameDimensionWithPref(
- courbeFille_,
- "curve",
- getImpl().getMainPanel().getDesktop().getSize());
getImpl().addInternalFrame(courbeFille_);
} else if (courbeFille_.isClosed())
getImpl().addInternalFrame(courbeFille_);
--- 91,113 ----
return params_.getH2dRefluxParametres().getElementPropMng();
}
!
! public H2dEvolutionManager getEvolMng() {
return params_.getH2dRefluxParametres().getEvolMng();
}
!
protected synchronized void activeGrapheFille() {
! if ((impl_ == null) || (getEvolMng() == null))
return;
if (this.courbeFille_ == null) {
! courbeFille_=
! new TrGrapheFille(getImpl(), getInformationsDocument(), getEvolMng());
courbeFille_.setVisible(true);
getImpl().addInternalFrame(courbeFille_);
+ visu_.pack();
+ TrLib.initFrameDimensionWithPref(
+ courbeFille_,
+ "curve",
+ getImpl().getMainPanel().getDesktop().getSize());
+
} else if (courbeFille_.isClosed())
getImpl().addInternalFrame(courbeFille_);
***************
*** 153,157 ****
if (fille_ == null) {
fille_= new TrRefluxFilleProjet(this);
- fille_.pack();
getImpl().addInternalFrame(fille_);
TrLib.initFrameDimensionWithPref(
--- 156,159 ----
***************
*** 196,203 ****
fille_= null;
TrLib.closeInternalFrame(impl_, visu_, "layer");
! visu_= null;
! TrLib.closeInternalFrame(impl_,courbeFille_, "curve");
! courbeFille_= null;
! }
/**
--- 198,207 ----
fille_= null;
TrLib.closeInternalFrame(impl_, visu_, "layer");
! if(visu_!=null)
! impl_.getMainMenuBar().remove(visu_.getLayerMenu());
! visu_= null;
! TrLib.closeInternalFrame(impl_, courbeFille_, "curve");
! courbeFille_= null;
! }
/**
***************
*** 342,351 ****
return projectAction_;
}
!
public EbliActionInterface getCourbeFilleAction() {
! buildFilleActions();
! return courbeAction_;
! }
!
public EbliActionInterface getMainFilleAction() {
return visuAction_;
--- 346,355 ----
return projectAction_;
}
!
public EbliActionInterface getCourbeFilleAction() {
! buildFilleActions();
! return courbeAction_;
! }
!
public EbliActionInterface getMainFilleAction() {
return visuAction_;
***************
*** 356,361 ****
new EbliSimpleAction(
TrResource.getS("Paramètres généraux"),
! BuResource.BU.getToolIcon("maison")
! ,
"MAIN_PROJECT_VIEW") {
public void actionPerformed(ActionEvent _ae) {
--- 360,364 ----
new EbliSimpleAction(
TrResource.getS("Paramètres généraux"),
! BuResource.BU.getToolIcon("maison"),
"MAIN_PROJECT_VIEW") {
public void actionPerformed(ActionEvent _ae) {
***************
*** 371,375 ****
new EbliSimpleAction(
TrResource.getS("Vue du maillage"),
! BuResource.BU.getToolIcon("voir"),
"GRID_PROJECT_VIEW") {
public void actionPerformed(ActionEvent _ae) {
--- 374,378 ----
new EbliSimpleAction(
TrResource.getS("Vue du maillage"),
! BuResource.BU.getToolIcon("voir"),
"GRID_PROJECT_VIEW") {
public void actionPerformed(ActionEvent _ae) {
***************
*** 394,400 ****
Action.SHORT_DESCRIPTION,
TrResource.getS("Afficher la fenêtres des courbes temporelles"));
! courbeAction_.setEnabled((getH2dRefluxParametres().getEvolMng()!=null) && (getH2dRefluxParametres().getEvolMng().getNbEvol()>0));
}
!
}
/**
--- 397,405 ----
Action.SHORT_DESCRIPTION,
TrResource.getS("Afficher la fenêtres des courbes temporelles"));
! courbeAction_.setEnabled(
! (getH2dRefluxParametres().getEvolMng() != null)
! && (getH2dRefluxParametres().getEvolMng().getNbEvol() > 0));
}
!
}
/**
***************
*** 423,429 ****
}
protected void editTimeSteps() {
TrRefluxTimeStepsEditor editor=
new TrRefluxTimeStepsEditor(
! params_.getH2dRefluxParametres().getGroupePasTempsTab());
if (EbliSimpleDialogPanel
.isOkResponse(
--- 428,436 ----
}
protected void editTimeSteps() {
+ H2dRefluxParameters p= params_.getH2dRefluxParametres();
TrRefluxTimeStepsEditor editor=
new TrRefluxTimeStepsEditor(
! p.getGroupePasTempsTab(),
! p.getBeginTimeForTrans());
if (EbliSimpleDialogPanel
.isOkResponse(
***************
*** 431,436 ****
impl_.getFrame(),
TrResource.getS("Intégration en temps")))) {
! params_.getH2dRefluxParametres().setTimeGroups(editor.getTimeSteps());
! }
}
/**
--- 438,454 ----
impl_.getFrame(),
TrResource.getS("Intégration en temps")))) {
!
! 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]);
!
! }
}
/**
***************
*** 442,444 ****
--- 460,469 ----
}
}
+ /**
+ *
+ */
+ public TrParametres getTrParams() {
+ return params_;
+ }
+
}
Index: TrRefluxTimeStepsEditor.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/reflux/TrRefluxTimeStepsEditor.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TrRefluxTimeStepsEditor.java 12 Dec 2003 11:29:41 -0000 1.2
--- TrRefluxTimeStepsEditor.java 19 Dec 2003 12:10:55 -0000 1.3
***************
*** 57,69 ****
public class TrRefluxTimeStepsEditor
extends EbliSimpleDialogPanel
! implements ItemListener {
EbliPanelListEditor pnPrinc;
JRadioButton cbStationnaire;
TimeTableModelStationnaire statModel_;
TimeTableModelTransitoire transModel_;
/**
*
*/
! public TrRefluxTimeStepsEditor(H2dTimeStepGroup[] _t) {
boolean isStationnaire=
(_t[0].getSchema() == H2dResolutionSchemaType.STATIONNAIRE);
--- 57,70 ----
public class TrRefluxTimeStepsEditor
extends EbliSimpleDialogPanel
! implements ItemListener,CaretListener {
EbliPanelListEditor pnPrinc;
JRadioButton cbStationnaire;
TimeTableModelStationnaire statModel_;
TimeTableModelTransitoire transModel_;
+ JTextField txtTimeBeginning_;
/**
*
*/
! public TrRefluxTimeStepsEditor(H2dTimeStepGroup[] _t,double _timeBeginning) {
boolean isStationnaire=
(_t[0].getSchema() == H2dResolutionSchemaType.STATIONNAIRE);
***************
*** 78,81 ****
--- 79,83 ----
top.add(cbTrans);
gp.add(cbTrans);
+ txtTimeBeginning_=addLabelDoubleText(top, TrResource.getS("Début:"));
if (isStationnaire)
cbStationnaire.setSelected(true);
***************
*** 87,97 ****
--- 89,107 ----
statModel_= new TimeTableModelStationnaire(_t);
pnPrinc= new EbliPanelListEditor(statModel_, false, false, false, true);
+ txtTimeBeginning_.setEnabled(false);
} else {
+ txtTimeBeginning_.setText(Double.toString(_timeBeginning));
transModel_= new TimeTableModelTransitoire(_t);
pnPrinc= new EbliPanelListEditor(transModel_, true, true, true, true);
}
pnPrinc.setDoubleClickEdit(true);
+ txtTimeBeginning_.addCaretListener(this);
add(pnPrinc, BuBorderLayout.CENTER);
}
+
+ protected double getBeginning(){
+ String t=txtTimeBeginning_.getText();
+ return t.length()==0?0:Double.parseDouble(t);
+ }
protected H2dTimeStepGroup[] getTimeSteps() {
if (cbStationnaire.isSelected()) {
***************
*** 187,191 ****
}
public double getBeginTime(int _r) {
! double r= 0;
for (int i= _r - 1; i >= 0; i--) {
r += ((H2dTimeStepGroup)getValueAt(i)).getTimeLength();
--- 197,201 ----
}
public double getBeginTime(int _r) {
! double r= getBeginning();
for (int i= _r - 1; i >= 0; i--) {
r += ((H2dTimeStepGroup)getValueAt(i)).getTimeLength();
***************
*** 293,298 ****
--- 303,310 ----
if (e.getStateChange() == ItemEvent.SELECTED) {
changeToStat();
+ txtTimeBeginning_.setEnabled(false);
} else {
changeToTrans();
+ txtTimeBeginning_.setEnabled(true);
}
}
***************
*** 520,526 ****
*/
public void itemStateChanged(ItemEvent e) {
! if (e.getStateChange() == ItemEvent.SELECTED)
changeMethod();
}
}
}
--- 532,551 ----
*/
public void itemStateChanged(ItemEvent e) {
! if (e.getStateChange() == ItemEvent.SELECTED){
changeMethod();
+ }
+ }
+ }
+ /**
+ *
+ */
+ public void caretUpdate(CaretEvent e) {
+ if((statModel_!=null) && (cbStationnaire.isSelected())){
+ statModel_.fireTableDataChanged();
}
+ else if( transModel_!=null) transModel_.fireTableDataChanged();
+
+
}
+
}
|
