Menu
▾
▴
[Fudaa-svn-commit] SF.net SVN: fudaa:[4349] branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/ fudaa
|
From: <had...@us...> - 2009-01-13 19:17:03
|
Revision: 4349
http://fudaa.svn.sourceforge.net/fudaa/?rev=4349&view=rev
Author: hadouxad
Date: 2009-01-13 19:16:54 +0000 (Tue, 13 Jan 2009)
Log Message:
-----------
fleches + persistance des donnees des courbes
Modified Paths:
--------------
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/commun/courbe/FudaaCourbeDefautModel.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/commun/courbe/FudaaCourbeTimeModel.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/meshviewer/profile/MVProfileCourbeModel.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/meshviewer/profile/MvProfileCoordinatesModel.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostCourbeModel.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostCourbeTreeModel.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostLayoutFille.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostLayoutPanelController.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostProjet.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/telemac/TrTelemacBoundaryCourbeModel.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/telemac/TrTelemacWeirCourbeModel.java
Modified: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/commun/courbe/FudaaCourbeDefautModel.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/commun/courbe/FudaaCourbeDefautModel.java 2009-01-13 19:15:33 UTC (rev 4348)
+++ branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/commun/courbe/FudaaCourbeDefautModel.java 2009-01-13 19:16:54 UTC (rev 4349)
@@ -7,6 +7,8 @@
*/
package org.fudaa.fudaa.commun.courbe;
+import java.util.Map;
+
import org.fudaa.ctulu.CtuluCommandContainer;
import org.fudaa.ctulu.CtuluLib;
import org.fudaa.ctulu.CtuluLibString;
@@ -159,4 +161,16 @@
public EGModel duplicate() {
return new FudaaCourbeDefautModel(this.e_.getCopy(this.e_.getListener()));
}
+
+@Override
+public Object getPersistSpecificDatas() {
+ // TODO Auto-generated method stub
+ return null;
+}
+
+@Override
+public void setPersistSpecificDatas(Object data, Map infos) {
+ // TODO Auto-generated method stub
+
+}
}
\ No newline at end of file
Modified: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/commun/courbe/FudaaCourbeTimeModel.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/commun/courbe/FudaaCourbeTimeModel.java 2009-01-13 19:15:33 UTC (rev 4348)
+++ branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/commun/courbe/FudaaCourbeTimeModel.java 2009-01-13 19:16:54 UTC (rev 4349)
@@ -7,6 +7,8 @@
*/
package org.fudaa.fudaa.commun.courbe;
+import java.util.Map;
+
import org.fudaa.ctulu.CtuluCommandContainer;
import org.fudaa.ctulu.CtuluLibArray;
import org.fudaa.ctulu.CtuluListSelectionInterface;
@@ -37,6 +39,13 @@
time_ = _timeIdx;
}
+ /**
+ * ACHTUNG!!!; constructeur utilis\xE9 uniquement pour la persistance des donnees!!!
+ */
+ public FudaaCourbeTimeModel(){
+
+ }
+
public void fillWithInfo(InfoData _table, CtuluListSelectionInterface _selectedPt) {}
protected void clearCache() {
@@ -209,4 +218,18 @@
return duplic;
}
+@Override
+public Object getPersistSpecificDatas() {
+ // TODO Auto-generated method stub
+ return null;
+}
+
+@Override
+public void setPersistSpecificDatas(Object data, Map infos) {
+ // TODO Auto-generated method stub
+
+}
+
+
+
}
\ No newline at end of file
Modified: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/meshviewer/profile/MVProfileCourbeModel.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/meshviewer/profile/MVProfileCourbeModel.java 2009-01-13 19:15:33 UTC (rev 4348)
+++ branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/meshviewer/profile/MVProfileCourbeModel.java 2009-01-13 19:16:54 UTC (rev 4349)
@@ -7,6 +7,8 @@
*/
package org.fudaa.fudaa.meshviewer.profile;
+import java.util.Map;
+
import gnu.trove.TDoubleArrayList;
import org.fudaa.ctulu.CtuluCommandContainer;
@@ -240,4 +242,16 @@
}
}
+@Override
+public Object getPersistSpecificDatas() {
+ // TODO Auto-generated method stub
+ return null;
}
+
+@Override
+public void setPersistSpecificDatas(Object data, Map infos) {
+ // TODO Auto-generated method stub
+
+}
+
+}
Modified: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/meshviewer/profile/MvProfileCoordinatesModel.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/meshviewer/profile/MvProfileCoordinatesModel.java 2009-01-13 19:15:33 UTC (rev 4348)
+++ branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/meshviewer/profile/MvProfileCoordinatesModel.java 2009-01-13 19:16:54 UTC (rev 4349)
@@ -7,6 +7,8 @@
*/
package org.fudaa.fudaa.meshviewer.profile;
+import java.util.Map;
+
import org.fudaa.ctulu.CtuluCommandContainer;
import org.fudaa.ctulu.CtuluListSelectionInterface;
import org.fudaa.ctulu.ProgressionInterface;
@@ -188,4 +190,16 @@
return duplic;
}
+@Override
+public Object getPersistSpecificDatas() {
+ // TODO Auto-generated method stub
+ return null;
}
+
+@Override
+public void setPersistSpecificDatas(Object data, Map infos) {
+ // TODO Auto-generated method stub
+
+}
+
+}
Modified: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostCourbeModel.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostCourbeModel.java 2009-01-13 19:15:33 UTC (rev 4348)
+++ branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostCourbeModel.java 2009-01-13 19:16:54 UTC (rev 4349)
@@ -8,6 +8,8 @@
package org.fudaa.fudaa.tr.post;
import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Map;
import java.util.Set;
import org.fudaa.ctulu.CtuluCommandContainer;
@@ -28,221 +30,321 @@
*/
public abstract class TrPostCourbeModel extends FudaaCourbeTimeModel {
- /**
- * @return the source
- */
- public TrPostSource getSource() {
- return source_;
- }
+ /**
+ * @return the source
+ */
+ public TrPostSource getSource() {
+ return source_;
+ }
- /**
- * source utilisee par la courbe
- */
- public TrPostSource source_;
+ /**
+ * source utilisee par la courbe
+ */
+ public TrPostSource source_;
- public final static class Interpolated extends TrPostCourbeModel {
+ public final static class Interpolated extends TrPostCourbeModel {
- final TrPostInterpolatePoint ptIdx_;
+ TrPostInterpolatePoint ptIdx_;
- /**
- * @param _ptIdx
- * @param _varIdx
- * @param _timeIdx
- */
- public Interpolated(final TrPostSource _src, final TrPostInterpolatePoint _ptIdx, final H2dVariableType _varIdx) {
- super(_src, _varIdx, _src.getTime().getTimeListModel().getTimesInSec());
- ptIdx_ = _ptIdx;
- }
+
+ /**
+ * ACHTUNG: constructeur utilis\xE9 uniquement pour la persistance des donn\xE9es!!!
+ */
+ public Interpolated(){
+ super();
+ }
+
+
+ /**
+ * @param _ptIdx
+ * @param _varIdx
+ * @param _timeIdx
+ */
+ public Interpolated(final TrPostSource _src, final TrPostInterpolatePoint _ptIdx, final H2dVariableType _varIdx) {
+ super(_src, _varIdx, _src.getTime().getTimeListModel().getTimesInSec());
+ ptIdx_ = _ptIdx;
+ }
- @Override
- public double getPtX() {
- return ptIdx_.getX();
- }
+ @Override
+ public double getPtX() {
+ return ptIdx_.getX();
+ }
- @Override
- public double getPtY() {
- return ptIdx_.getY();
- }
+ @Override
+ public double getPtY() {
+ return ptIdx_.getY();
+ }
- @Override
- protected void updateY() {
- createY();
- for (int i = 0; i < y_.length; i++) {
- final EfData data = source_.getData(var_, i);
- if (data == null) {
- FuLog.warning("TRP: data is null for " + var_);
- super.y_[i] = ptIdx_.getInterpolateValue(getVar(), data, i, source_);
- }
- }
- }
+ @Override
+ protected void updateY() {
+ createY();
+ for (int i = 0; i < y_.length; i++) {
+ final EfData data = source_.getData(var_, i);
+ if (data == null) {
+ FuLog.warning("TRP: data is null for " + var_);
+ super.y_[i] = ptIdx_.getInterpolateValue(getVar(), data, i, source_);
+ }
+ }
+ }
- public TrPostInterpolatePoint getInterpolatePt() {
- return ptIdx_;
- }
+ public TrPostInterpolatePoint getInterpolatePt() {
+ return ptIdx_;
+ }
- @Override
- public boolean isCourbeForInterpolation(final TrPostInterpolatePoint _int) {
- return ptIdx_.equals(_int);
- }
+ @Override
+ public boolean isCourbeForInterpolation(final TrPostInterpolatePoint _int) {
+ return ptIdx_.equals(_int);
+ }
- @Override
- public boolean isCourbeForObject(final int _idxObj) {
- return false;
- }
+ @Override
+ public boolean isCourbeForObject(final int _idxObj) {
+ return false;
+ }
- }
+ @Override
+ public Object getSelectionPoint() {
+ // TODO Auto-generated method stub
+ return ptIdx_;
+ }
- public final static class Node extends TrPostCourbeModel {
+ @Override
+ public void setSelectionPoint(Object point) {
+ // TODO Auto-generated method stub
+ if(point!=null && (point instanceof TrPostInterpolatePoint))
+ ptIdx_=(TrPostInterpolatePoint) point;
+ }
- final int ptIdx_;
+ }
- /**
- * @param _ptIdx
- * @param _varIdx
- * @param _timeIdx
- */
- public Node(final TrPostSource _src, final int _ptIdx, final H2dVariableType _varIdx, final double[] _timeIdx) {
- super(_src, _varIdx, _timeIdx);
- ptIdx_ = _ptIdx;
- }
+ public final static class Node extends TrPostCourbeModel {
- @Override
- protected void updateY() {
- createY();
- for (int i = 0; i < y_.length; i++) {
- // final EfData data = source_.getData(var_, i);
- // if (data == null) {
- // FuLog.warning("TRP: data is null for " + var_);
- try {
- super.y_[i] = source_.getData(var_, i, ptIdx_);
- } catch (final IOException e) {
- FuLog.error(e);
- }
- // }
- }
- // final EfData data = source_.getData(_var, _timeIdx);
- // if (data == null) {
- // FuLog.warning("TRP: data is null for " + _var);
- // }
- // super.y_[_timeIdx] = data.getValue(ptIdx_);
+ int ptIdx_;
- }
+ /**
+ * @param _ptIdx
+ * @param _varIdx
+ * @param _timeIdx
+ */
+ public Node(final TrPostSource _src, final int _ptIdx, final H2dVariableType _varIdx, final double[] _timeIdx) {
+ super(_src, _varIdx, _timeIdx);
+ ptIdx_ = _ptIdx;
+ }
- @Override
- public double getPtX() {
- // FIXME RUBAR
- return source_.isElementVar(getVar()) ? source_.getGrid().getCentreXElement(ptIdx_) : source_.getGrid().getPtX(
- ptIdx_);
- }
+
+ /**
+ * ACHTUNG: constructeur utilis\xE9 uniquement pour la persistance des donn\xE9es!!!
+ */
+ public Node(){
+ super();
+ }
+
+ @Override
+ protected void updateY() {
+ createY();
+ for (int i = 0; i < y_.length; i++) {
+ // final EfData data = source_.getData(var_, i);
+ // if (data == null) {
+ // FuLog.warning("TRP: data is null for " + var_);
+ try {
+ super.y_[i] = source_.getData(var_, i, ptIdx_);
+ } catch (final IOException e) {
+ FuLog.error(e);
+ }
+ // }
+ }
+ // final EfData data = source_.getData(_var, _timeIdx);
+ // if (data == null) {
+ // FuLog.warning("TRP: data is null for " + _var);
+ // }
+ // super.y_[_timeIdx] = data.getValue(ptIdx_);
- @Override
- public double getPtY() {
- return source_.isElementVar(getVar()) ? source_.getGrid().getCentreYElement(ptIdx_) : source_.getGrid().getPtY(
- ptIdx_);
- }
+ }
- public int getPtIdx() {
- return ptIdx_;
- }
+ @Override
+ public double getPtX() {
+ // FIXME RUBAR
+ return source_.isElementVar(getVar()) ? source_.getGrid().getCentreXElement(ptIdx_) : source_.getGrid().getPtX(
+ ptIdx_);
+ }
- @Override
- public boolean isCourbeForInterpolation(final TrPostInterpolatePoint _int) {
- return false;
- }
+ @Override
+ public double getPtY() {
+ return source_.isElementVar(getVar()) ? source_.getGrid().getCentreYElement(ptIdx_) : source_.getGrid().getPtY(
+ ptIdx_);
+ }
- @Override
- public boolean isCourbeForObject(final int _idxObj) {
- return _idxObj == ptIdx_;
- }
+ public int getPtIdx() {
+ return ptIdx_;
+ }
- }
+ @Override
+ public boolean isCourbeForInterpolation(final TrPostInterpolatePoint _int) {
+ return false;
+ }
- public static EGCourbeChild buildCourbeModel(final H2dVariableType _var, final int _idxPt, final EGGroup _group,
- final TrPostSource _src) {
- final TrPostCourbeModel model = new TrPostCourbeModel.Node(_src, _idxPt, _var, _src.getTime().getTimeListModel()
- .getTimesInSec());
- final EGCourbeChild courbe = new FudaaCourbeTime(_group, model, _src.getNewTimeListModel());
- _group.addEGComponent(courbe);
- String title=courbe.getModel().getTitle()+ CtuluLibString.ESPACE ;
- if(_var.getCommonUnitString()!=null)
- title+="("+_var.getCommonUnitString()+")"+CtuluLibString.ESPACE;
- Coordinate coor=_src.getGrid().getCoor(_idxPt);
- title+= _idxPt + ":" + " (" + _src.getPrecisionModel().round(coor.x) + ", "
- + _src.getPrecisionModel().round(coor.y) + ")";
- courbe.getModel().setTitle(title);
- return courbe;
- }
+ @Override
+ public boolean isCourbeForObject(final int _idxObj) {
+ return _idxObj == ptIdx_;
+ }
- public static EGCourbeChild buildCourbeModel(final H2dVariableType _var, final TrPostInterpolatePoint _idxPt,
- final EGGroup _group, final TrPostSource _src) {
- final TrPostCourbeModel model = new TrPostCourbeModel.Interpolated(_src, _idxPt, _var);
- final EGCourbeChild courbe = new FudaaCourbeTime(_group, model, _src.getNewTimeListModel());
- _group.addEGComponent(courbe);
- courbe.getModel().setTitle(
- courbe.getModel().getTitle()+"("+_var.getCommonUnitString()+")" + " (" + _src.getPrecisionModel().round(_idxPt.getX()) + ", "
- + _src.getPrecisionModel().round(_idxPt.getY()) + ')');
- return courbe;
- }
+ @Override
+ public Object getSelectionPoint() {
+ // TODO Auto-generated method stub
+ return new Integer(ptIdx_);
+ }
- H2dVariableType var_;
+ @Override
+ public void setSelectionPoint(Object point) {
+ // TODO Auto-generated method stub
+ if(point!=null && (point instanceof Integer))
+ ptIdx_=((Integer)point).intValue();
+ }
- public TrPostCourbeModel(final TrPostSource _src, final H2dVariableType _varIdx, final double[] _timeIdx) {
- super(_timeIdx);
- source_ = _src;
- var_ = _varIdx;
- }
+ }
- protected final void setVar(final H2dVariableType _t) {
- var_ = _t;
- }
+ public static EGCourbeChild buildCourbeModel(final H2dVariableType _var, final int _idxPt, final EGGroup _group,
+ final TrPostSource _src) {
+ final TrPostCourbeModel model = new TrPostCourbeModel.Node(_src, _idxPt, _var, _src.getTime().getTimeListModel()
+ .getTimesInSec());
+ final EGCourbeChild courbe = new FudaaCourbeTime(_group, model, _src.getNewTimeListModel());
+ _group.addEGComponent(courbe);
+ String title=courbe.getModel().getTitle()+ CtuluLibString.ESPACE ;
+ if(_var.getCommonUnitString()!=null)
+ title+="("+_var.getCommonUnitString()+")"+CtuluLibString.ESPACE;
+ Coordinate coor=_src.getGrid().getCoor(_idxPt);
+ title+= _idxPt + ":" + " (" + _src.getPrecisionModel().round(coor.x) + ", "
+ + _src.getPrecisionModel().round(coor.y) + ")";
+ courbe.getModel().setTitle(title);
+ return courbe;
+ }
- public boolean clearCache(final H2dVariableType _varChanged, final Set _varUsingModifiedVar) {
- if (var_ == _varChanged || (_varUsingModifiedVar != null) && _varUsingModifiedVar.contains(var_)) {
- clearCache();
- return true;
- }
- return false;
- }
+ public static EGCourbeChild buildCourbeModel(final H2dVariableType _var, final TrPostInterpolatePoint _idxPt,
+ final EGGroup _group, final TrPostSource _src) {
+ final TrPostCourbeModel model = new TrPostCourbeModel.Interpolated(_src, _idxPt, _var);
+ final EGCourbeChild courbe = new FudaaCourbeTime(_group, model, _src.getNewTimeListModel());
+ _group.addEGComponent(courbe);
+ courbe.getModel().setTitle(
+ courbe.getModel().getTitle()+"("+_var.getCommonUnitString()+")" + " (" + _src.getPrecisionModel().round(_idxPt.getX()) + ", "
+ + _src.getPrecisionModel().round(_idxPt.getY()) + ')');
+ return courbe;
+ }
- @Override
- public boolean deplace(final int[] _selectIdx, final double _deltaX, final double _deltaY,
- final CtuluCommandContainer _cmd) {
- return false;
- }
+ H2dVariableType var_;
- protected abstract void updateY();
+ public TrPostCourbeModel(final TrPostSource _src, final H2dVariableType _varIdx, final double[] _timeIdx) {
+ super(_timeIdx);
+ source_ = _src;
+ var_ = _varIdx;
+ }
+
+ /**
+ * ACTHUNG: constructeur utilis\xE9 uniquement pour la persistance des donn\xE9es!!!
+ */
+ public TrPostCourbeModel(){
+ super();
+ }
- @Override
- public String getTitle() {
- return nom_ == null ? var_.getName() : nom_;
- }
+ protected final void setVar(final H2dVariableType _t) {
+ var_ = _t;
+ }
- public final H2dVariableType getVar() {
- return var_;
- }
+ public boolean clearCache(final H2dVariableType _varChanged, final Set _varUsingModifiedVar) {
+ if (var_ == _varChanged || (_varUsingModifiedVar != null) && _varUsingModifiedVar.contains(var_)) {
+ clearCache();
+ return true;
+ }
+ return false;
+ }
- public abstract double getPtX();
+ @Override
+ public boolean deplace(final int[] _selectIdx, final double _deltaX, final double _deltaY,
+ final CtuluCommandContainer _cmd) {
+ return false;
+ }
- public abstract double getPtY();
+ protected abstract void updateY();
- public abstract boolean isCourbeForInterpolation(TrPostInterpolatePoint _int);
+ @Override
+ public String getTitle() {
+ return nom_ == null ? var_.getName() : nom_;
+ }
- public abstract boolean isCourbeForObject(int _idxObj);
+ public final H2dVariableType getVar() {
+ return var_;
+ }
- @Override
- public boolean isRemovable() {
- return true;
- }
+ public abstract double getPtX();
- @Override
- public boolean isDuplicatable() {
- return true;
- }
+ public abstract double getPtY();
- protected void createY() {
- if (y_ == null || y_.length != this.source_.getNbTimeStep()) {
- y_ = new double[source_.getNbTimeStep()];
- }
- }
+ public abstract boolean isCourbeForInterpolation(TrPostInterpolatePoint _int);
+ public abstract boolean isCourbeForObject(int _idxObj);
+
+ @Override
+ public boolean isRemovable() {
+ return true;
+ }
+
+ @Override
+ public boolean isDuplicatable() {
+ return true;
+ }
+
+ protected void createY() {
+ if (y_ == null || y_.length != this.source_.getNbTimeStep()) {
+ y_ = new double[source_.getNbTimeStep()];
+ }
+ }
+
+ @Override
+ public Object getPersistSpecificDatas() {
+
+ //-- retourne le quatuor point, pdt,variable et fichier source
+ ArrayList<Object> listeData=new ArrayList<Object>();
+ listeData.add(this.source_.getId());
+ listeData.add(this.getTime());
+ listeData.add(this.var_);
+ //-- recupere le noeud ou point interpol\xE9 --//
+ listeData.add(getSelectionPoint());
+ return listeData;
+ }
+
+ public abstract Object getSelectionPoint();
+ public abstract void setSelectionPoint(Object point);
+
+ @Override
+ public void setPersistSpecificDatas(Object data, Map infos) {
+
+ if(data ==null || !(data instanceof ArrayList))return;
+
+ ArrayList<Object> liste=(ArrayList<Object>)data;
+
+
+ String idSource=(String) liste.get(0);
+ TrPostProjet projet = (TrPostProjet) infos.get("TrPostProjet");
+
+ if (projet != null){
+ // -- etape 1: recherche du source qui contient le path donn\xE9 --//
+ TrPostSource src = projet.findSourceById(idSource);
+ if(src!=null)
+ this.source_=src;
+
+ }
+ // -- etape 2:times --//
+ double[] times=(double[]) liste.get(1);
+ if(times!=null)
+ this.setTime(times);
+
+ // -- etape 3:variable --//
+ H2dVariableType var=(H2dVariableType) liste.get(2);
+ if(var!=null)
+ this.var_=var;
+
+ Object point=liste.get(3);
+ if(point!=null)
+ setSelectionPoint(point);
+
+ }
+
}
\ No newline at end of file
Modified: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostCourbeTreeModel.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostCourbeTreeModel.java 2009-01-13 19:15:33 UTC (rev 4348)
+++ branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostCourbeTreeModel.java 2009-01-13 19:16:54 UTC (rev 4349)
@@ -39,6 +39,7 @@
import org.fudaa.ebli.courbe.EGGrapheModel;
import org.fudaa.ebli.courbe.EGGrapheTreeModel;
import org.fudaa.ebli.courbe.EGGroup;
+import org.fudaa.ebli.courbe.EGModel;
import org.fudaa.ebli.geometrie.GrPoint;
import org.fudaa.fudaa.commun.courbe.FudaaCourbeModel;
import org.fudaa.fudaa.commun.courbe.FudaaCourbeImporter.Target;
@@ -945,6 +946,26 @@
return duplic;
}
+
+ /**
+ * Methode qui affiche les infos principales de la courbe choisie
+ * @return
+ */
+ public String getSelectedSpecificCourbeInfos(){
+
+ if(this.getSelectedObject() instanceof EGCourbe){
+
+ EGModel model=((EGCourbe)this.getSelectedObject() ).getModel();
+
+ //-- on utilise les fillWithInfo pour preciser les infos de courbe entre les 2 tableaux des courbes.
+ //model.fillWithInfo(_table, _selectedPt);
+ return model.getPersistSpecificDatas().toString();
+
+ }
+ else return null;
+ }
+
+
@Override
public Object getSpecificPersitDatas(Map Params) {
// TODO Auto-generated method stub
@@ -956,7 +977,7 @@
}
@Override
- public void setSpecificPersitDatas(final Object specPersitData, Map params) {
+ public void setSpecificPersitDatas(final Object specPersitData, Map infos) {
// TODO Auto-generated method stub
TrPostCourbeTreeModelPersist data = (TrPostCourbeTreeModelPersist) specPersitData;
@@ -964,7 +985,7 @@
data.fillModelWith(this);
// -- recuperation du trpostprojet specifique au chargement --//
- TrPostProjet projet = (TrPostProjet) params.get("TrPostProjet");
+ TrPostProjet projet = (TrPostProjet) infos.get("TrPostProjet");
this.projet_ = projet;
this.impl_ = projet.impl_;
Modified: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostLayoutFille.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostLayoutFille.java 2009-01-13 19:15:33 UTC (rev 4348)
+++ branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostLayoutFille.java 2009-01-13 19:16:54 UTC (rev 4349)
@@ -44,6 +44,7 @@
import org.fudaa.ebli.visuallibrary.calque.CalqueLegendeWidgetAdapter;
import org.fudaa.ebli.visuallibrary.calque.EbliWidgetCreatorLegende;
import org.fudaa.ebli.visuallibrary.calque.EbliWidgetCreatorVueCalque;
+import org.fudaa.ebli.visuallibrary.creator.EbliWidgetCreatorArrowEditor;
import org.fudaa.ebli.visuallibrary.creator.EbliWidgetCreatorTextEditor;
import org.fudaa.ebli.visuallibrary.graphe.EbliWidgetCreatorGraphe;
import org.fudaa.fudaa.commun.courbe.FudaaCourbeImporter;
@@ -498,7 +499,19 @@
setTitle(previousTitleFrame);
}
+ //-- cas des fleches
+ else if (node.getCreator() instanceof EbliWidgetCreatorArrowEditor) {
+ FuLog.debug("arrow editor");
+
+ // -- etape 1: on fout eventuellement le tree des layouts --//
+ changeTree(getScene());
+ // -- etape 2: rechargement de la toolbar specifique dans this --//
+ changeToolbar(node.getWidget().getController());
+ setTitle(previousTitleFrame);
+ }
+
+
else {
// -- etape 1: on fout eventuellement le tree des layouts --//
changeTree(getScene());
Modified: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostLayoutPanelController.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostLayoutPanelController.java 2009-01-13 19:15:33 UTC (rev 4348)
+++ branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostLayoutPanelController.java 2009-01-13 19:16:54 UTC (rev 4349)
@@ -28,12 +28,14 @@
import org.fudaa.ebli.commun.EbliActionPaletteAbstract;
import org.fudaa.ebli.commun.EbliActionSimple;
import org.fudaa.ebli.commun.EbliComponentFactory;
+import org.fudaa.ebli.commun.EbliEditorArrow;
import org.fudaa.ebli.commun.EbliLib;
import org.fudaa.ebli.ressource.EbliResource;
import org.fudaa.ebli.visuallibrary.EbliNode;
import org.fudaa.ebli.visuallibrary.EbliNodeDefault;
import org.fudaa.ebli.visuallibrary.EbliScene;
import org.fudaa.ebli.visuallibrary.EbliWidget;
+import org.fudaa.ebli.visuallibrary.EbliWidgetArrowEditor;
import org.fudaa.ebli.visuallibrary.EbliWidgetBordureSingle;
import org.fudaa.ebli.visuallibrary.actions.CommandUndoRedoCreation;
import org.fudaa.ebli.visuallibrary.actions.EbliWidgetActionAlign;
@@ -52,6 +54,7 @@
import org.fudaa.ebli.visuallibrary.calque.CalqueLegendeWidgetAdapter;
import org.fudaa.ebli.visuallibrary.calque.EbliWidgetCreatorLegende;
import org.fudaa.ebli.visuallibrary.calque.EbliWidgetCreatorVueCalque;
+import org.fudaa.ebli.visuallibrary.creator.EbliWidgetCreatorArrowEditor;
import org.fudaa.ebli.visuallibrary.creator.EbliWidgetCreatorShape;
import org.fudaa.ebli.visuallibrary.creator.EbliWidgetCreatorTextLabel;
import org.fudaa.ebli.visuallibrary.creator.ShapeCreatorCircle;
@@ -331,13 +334,19 @@
// -- ajout du rectangle --//
final EbliNodeDefault nodeFleche = new EbliNodeDefault();
nodeFleche.setTitle("Fleche simple");
- nodeFleche.setCreator(new EbliWidgetCreatorShape(new ShapeCreatorFlecheSimple()));
- nodeFleche.setPreferedSize(new Dimension(100, 50));
+ //nodeFleche.setCreator(new EbliWidgetCreatorShape(new ShapeCreatorFlecheSimple()));
+
+ nodeFleche.setCreator(new EbliWidgetCreatorArrowEditor(new EbliEditorArrow()));
+
+ nodeFleche.setPreferedSize(new Dimension(200, 150));
nodeFleche.setPreferedLocation(new Point(350, 125));
// ajout du node au layout
addNode(nodeFleche);
+ //nodeFleche.getWidget().repaint();
+ //((EbliWidgetArrowEditor)nodeFleche.getWidget()).editor_.creationFlecheClassique();
+
return nodeFleche;
}
@@ -429,7 +438,7 @@
});
// -- palette fleche simple--//
- _l.add(new EbliActionSimple(EbliResource.EBLI.getString("Fleche"),
+ _l.add(new EbliActionSimple(EbliResource.EBLI.getString("Editeur Fleche"),
EbliResource.EBLI.getToolIcon("crystal_bu_link"), "WIDGETFLECHESIMPLE") {
@Override
public void actionPerformed(final ActionEvent _evt) {
Modified: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostProjet.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostProjet.java 2009-01-13 19:15:33 UTC (rev 4348)
+++ branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostProjet.java 2009-01-13 19:16:54 UTC (rev 4349)
@@ -103,6 +103,9 @@
*/
public class TrPostProjet implements ActionListener {
+
+ public final static boolean AMELIO_LOT_VISIBLE=true;
+
/**
* Manager de sauvegarder/charghement des donn\xE9es
*/
Modified: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/telemac/TrTelemacBoundaryCourbeModel.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/telemac/TrTelemacBoundaryCourbeModel.java 2009-01-13 19:15:33 UTC (rev 4348)
+++ branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/telemac/TrTelemacBoundaryCourbeModel.java 2009-01-13 19:16:54 UTC (rev 4349)
@@ -7,6 +7,8 @@
*/
package org.fudaa.fudaa.tr.telemac;
+import java.util.Map;
+
import org.fudaa.ctulu.CtuluCommandContainer;
import org.fudaa.ctulu.CtuluLibArray;
import org.fudaa.ctulu.CtuluListSelectionInterface;
@@ -244,4 +246,16 @@
}
+@Override
+public Object getPersistSpecificDatas() {
+ // TODO Auto-generated method stub
+ return null;
+}
+
+@Override
+public void setPersistSpecificDatas(Object data, Map infos) {
+ // TODO Auto-generated method stub
+
+}
+
}
\ No newline at end of file
Modified: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/telemac/TrTelemacWeirCourbeModel.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/telemac/TrTelemacWeirCourbeModel.java 2009-01-13 19:15:33 UTC (rev 4348)
+++ branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/telemac/TrTelemacWeirCourbeModel.java 2009-01-13 19:16:54 UTC (rev 4349)
@@ -7,6 +7,8 @@
*/
package org.fudaa.fudaa.tr.telemac;
+import java.util.Map;
+
import org.fudaa.ctulu.CtuluCommandContainer;
import org.fudaa.ctulu.CtuluLibArray;
import org.fudaa.ctulu.CtuluListSelectionInterface;
@@ -165,4 +167,16 @@
public EGModel duplicate() {
return new TrTelemacWeirCourbeModel(this.i_, this.mng_, this.cote_, CtuluLibArray.copy(this.x_));
}
+
+@Override
+public Object getPersistSpecificDatas() {
+ // TODO Auto-generated method stub
+ return null;
+}
+
+@Override
+public void setPersistSpecificDatas(Object data, Map infos) {
+ // TODO Auto-generated method stub
+
+}
}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
