Menu
▾
▴
[Fudaa-svn-commit] SF.net SVN: fudaa:[6225] trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa /fudaa/tr
|
From: <de...@us...> - 2011-04-21 22:56:01
|
Revision: 6225
http://fudaa.svn.sourceforge.net/fudaa/?rev=6225&view=rev
Author: deniger
Date: 2011-04-21 22:55:54 +0000 (Thu, 21 Apr 2011)
Log Message:
-----------
Modified Paths:
--------------
trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/TrLauncherDefault.java
trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostCourbeModel.java
trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostCourbeTreeModel.java
trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/profile/MVProfileCourbeCoordinate.java
trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/profile/MVProfileCourbeModel.java
trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/profile/MvProfileBuilder.java
trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/profile/MvProfileCoordinatesModel.java
trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/profile/MvProfileCourbeCoordinatePersistBuilder.java
trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/profile/MvProfileCourbePersistBuilder.java
trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/profile/MvProfileCourbeTimePersistBuilder.java
Added Paths:
-----------
trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostCourbe.java
trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostCourbePersistBuilder.java
Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/TrLauncherDefault.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/TrLauncherDefault.java 2011-04-21 22:54:59 UTC (rev 6224)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/TrLauncherDefault.java 2011-04-21 22:55:54 UTC (rev 6225)
@@ -111,8 +111,8 @@
infoSoft = new BuInformationsSoftware();
infoSoft.name = "prepro";
- infoSoft.version = "1.1RC21";
- infoSoft.date = "2011-03-28";
+ infoSoft.version = "1.1RC24";
+ infoSoft.date = "2011-04-21";
infoSoft.rights = TrResource.getS("Tous droits r\xE9serv\xE9s") + ". CETMEF (c)2003-2009";
infoSoft.contact = "fre...@fu...";
infoSoft.license = "GPL2";
Added: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostCourbe.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostCourbe.java (rev 0)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostCourbe.java 2011-04-21 22:55:54 UTC (rev 6225)
@@ -0,0 +1,25 @@
+package org.fudaa.fudaa.tr.post;
+
+import org.fudaa.ebli.courbe.EGCourbePersistBuilder;
+import org.fudaa.ebli.courbe.EGGroup;
+import org.fudaa.ebli.courbe.EGModel;
+import org.fudaa.fudaa.commun.courbe.FudaaCourbeTime;
+import org.fudaa.fudaa.commun.courbe.FudaaCourbeTimeListModel;
+
+public class TrPostCourbe extends FudaaCourbeTime {
+
+ /**
+ * @param m
+ * @param model
+ * @param timeModel
+ */
+ public TrPostCourbe(EGGroup m, EGModel model, FudaaCourbeTimeListModel timeModel) {
+ super(m, model, timeModel);
+ }
+
+ @Override
+ protected EGCourbePersistBuilder<FudaaCourbeTime> createPersistBuilder() {
+ return new TrPostCourbePersistBuilder();
+ }
+
+}
Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostCourbeModel.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostCourbeModel.java 2011-04-21 22:54:59 UTC (rev 6224)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostCourbeModel.java 2011-04-21 22:55:54 UTC (rev 6225)
@@ -29,7 +29,6 @@
import org.fudaa.dodico.ef.EfLib;
import org.fudaa.dodico.ef.operation.EfIndexHelper;
import org.fudaa.dodico.h2d.type.H2dVariableType;
-import org.fudaa.ebli.commun.EbliLib;
import org.fudaa.ebli.courbe.EGCourbeChild;
import org.fudaa.ebli.courbe.EGGroup;
import org.fudaa.ebli.courbe.EGModel;
@@ -256,7 +255,7 @@
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());
+ final EGCourbeChild courbe = new TrPostCourbe(_group, model, _src.getNewTimeListModel());
_group.addEGComponent(courbe);
String title = courbe.getModel().getTitle() + CtuluLibString.ESPACE;
if (_var.getCommonUnitString() != null) title += "(" + _var.getCommonUnitString() + ")" + CtuluLibString.ESPACE;
@@ -283,7 +282,7 @@
if (idxPt >= 0) { return buildCourbeModel(_var, idxPt, _group, _src); }
}
final TrPostCourbeModel model = new TrPostCourbeModel.Interpolated(_src, _idxPt, _var);
- final EGCourbeChild courbe = new FudaaCourbeTime(_group, model, _src.getNewTimeListModel());
+ final EGCourbeChild courbe = new TrPostCourbe(_group, model, _src.getNewTimeListModel());
_group.addEGComponent(courbe);
String unit = _var.getCommonUnitString();
if (unit != null) {
@@ -495,7 +494,7 @@
}
Object point = liste.get(2);
if (point != null) setSelectionPoint(point);
-
+ super.setTime(src.getTime().getTimeListModel().getTimesInSec());
try {
this.updateY();
} catch (Exception e) {
Added: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostCourbePersistBuilder.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostCourbePersistBuilder.java (rev 0)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostCourbePersistBuilder.java 2011-04-21 22:55:54 UTC (rev 6225)
@@ -0,0 +1,40 @@
+package org.fudaa.fudaa.tr.post;
+
+import java.util.Map;
+
+import org.fudaa.ctulu.CtuluAnalyze;
+import org.fudaa.ebli.courbe.EGCourbePersist;
+import org.fudaa.ebli.courbe.EGGroup;
+import org.fudaa.ebli.courbe.EGModel;
+import org.fudaa.fudaa.commun.FudaaLib;
+import org.fudaa.fudaa.commun.courbe.FudaaCourbeTime;
+import org.fudaa.fudaa.commun.courbe.FudaaCourbeTimeListModel;
+import org.fudaa.fudaa.commun.courbe.FudaaCourbeTimePersistBuilder;
+
+
+/**
+ * @author deniger
+ *
+ */
+public class TrPostCourbePersistBuilder extends FudaaCourbeTimePersistBuilder {
+
+
+ @Override
+ public boolean saveXY() {
+ return false;
+ }
+
+
+ @Override
+ protected FudaaCourbeTime createEGObject(EGCourbePersist target, Map params, CtuluAnalyze log) {
+ EGGroup parent = getGroup(params);
+ EGModel createModel = createModel(target, params);
+ FudaaCourbeTimeListModel timeModel = (FudaaCourbeTimeListModel) params.get(TIME_MODEL);
+ if (timeModel == null) {
+ log.addError(FudaaLib.getS("Le temps n'a pas \xE9t\xE9 trouv\xE9 pour la courbe {0}", target.getTitle()));
+ return null;
+ }
+ return new TrPostCourbe(parent, createModel, timeModel);
+ }
+
+}
Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostCourbeTreeModel.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostCourbeTreeModel.java 2011-04-21 22:54:59 UTC (rev 6224)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostCourbeTreeModel.java 2011-04-21 22:55:54 UTC (rev 6225)
@@ -15,22 +15,45 @@
import java.awt.EventQueue;
import java.lang.reflect.InvocationTargetException;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
import com.memoire.bu.BuDialogChoice;
import com.memoire.bu.BuLib;
import com.memoire.fu.FuComparator;
import com.memoire.fu.FuEmptyArrays;
-import org.fudaa.ctulu.*;
+import org.fudaa.ctulu.CtuluCommand;
+import org.fudaa.ctulu.CtuluCommandComposite;
+import org.fudaa.ctulu.CtuluCommandContainer;
+import org.fudaa.ctulu.CtuluCommandManager;
+import org.fudaa.ctulu.CtuluLibArray;
+import org.fudaa.ctulu.CtuluUI;
+import org.fudaa.ctulu.ProgressionInterface;
+import org.fudaa.ctulu.ProgressionUpdater;
import org.fudaa.ctulu.gis.GISPrecision;
import org.fudaa.dodico.h2d.type.H2dVariableType;
import org.fudaa.dodico.mesure.EvolutionReguliere;
import org.fudaa.dodico.mesure.EvolutionReguliereInterface;
import org.fudaa.ebli.commun.EbliActionInterface;
-import org.fudaa.ebli.courbe.*;
+import org.fudaa.ebli.courbe.EGActionReplayDataCourbe;
+import org.fudaa.ebli.courbe.EGAxeHorizontal;
+import org.fudaa.ebli.courbe.EGAxeVertical;
+import org.fudaa.ebli.courbe.EGCourbe;
+import org.fudaa.ebli.courbe.EGCourbeChild;
+import org.fudaa.ebli.courbe.EGGraphe;
+import org.fudaa.ebli.courbe.EGGrapheDuplicator;
+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.ebli.visuallibrary.EbliWidget;
import org.fudaa.fudaa.commun.courbe.FudaaCourbeModel;
import org.fudaa.fudaa.commun.impl.FudaaCommonImplementation;
import org.fudaa.fudaa.tr.common.TrCourbeModel;
@@ -46,11 +69,9 @@
Set intepolPt_;
- // private final boolean isAllTimeStep_;
int[] objIdx_;
- // private int[] tidx_;
TrPostProjet projet_;
@@ -79,6 +100,7 @@
this(_vars, _projet);
intepolPt_.add(_interpol);
}
+
/**
* Constructeur permettant de creer un treemodel avec plusieurs point interpol\xE9s
Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/profile/MVProfileCourbeCoordinate.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/profile/MVProfileCourbeCoordinate.java 2011-04-21 22:54:59 UTC (rev 6224)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/profile/MVProfileCourbeCoordinate.java 2011-04-21 22:55:54 UTC (rev 6225)
@@ -8,6 +8,7 @@
package org.fudaa.fudaa.tr.post.profile;
import org.fudaa.ebli.courbe.EGCourbeChild;
+import org.fudaa.ebli.courbe.EGCourbePersistBuilder;
import org.fudaa.ebli.courbe.EGGroup;
/**
@@ -23,5 +24,10 @@
public MvProfileCourbeModelInterface getProfileModel() {
return (MvProfileCourbeModelInterface) getModel();
}
+
+ @Override
+ protected EGCourbePersistBuilder<? extends EGCourbeChild> createPersistBuilder() {
+ return new MvProfileCourbeCoordinatePersistBuilder();
+ }
}
Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/profile/MVProfileCourbeModel.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/profile/MVProfileCourbeModel.java 2011-04-21 22:54:59 UTC (rev 6224)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/profile/MVProfileCourbeModel.java 2011-04-21 22:55:54 UTC (rev 6225)
@@ -406,27 +406,29 @@
// -- EfLineIntersectionsResultsBuilder --//
this.builder_ = new EfLineIntersectionsResultsBuilder(polyligne, this.res_, new MvProfileCoteTester());
+
+ reupdateY();
+//
+// // -- rejouer les donn\xE9es --//
+//
+// // -- on recopie les y du fichier xml --//
+// if (infos.get("DEFAULTY") == null) return;
+// double[] classicalValues = (double[]) infos.get("DEFAULTY");
+// y_ = new TDoubleArrayList(classicalValues);
+//
+// if (y_ == null || y_.size() == 0) return;
+//
+// double min = y_.get(0);
+// double max = y_.get(0);
+//
+// for (int k = 1; k < y_.size(); k++) {
+// if (min > y_.get(k)) min = y_.get(k);
+// if (max < y_.get(k)) max = y_.get(k);
+//
+// }
+// yMax_ = max;
+// yMin_ = min;
- // -- rejouer les donn\xE9es --//
-
- // -- on recopie les y du fichier xml --//
- if (infos.get("DEFAULTY") == null) return;
- double[] classicalValues = (double[]) infos.get("DEFAULTY");
- y_ = new TDoubleArrayList(classicalValues);
-
- if (y_ == null || y_.size() == 0) return;
-
- double min = y_.get(0);
- double max = y_.get(0);
-
- for (int k = 1; k < y_.size(); k++) {
- if (min > y_.get(k)) min = y_.get(k);
- if (max < y_.get(k)) max = y_.get(k);
-
- }
- yMax_ = max;
- yMin_ = min;
-
infos.put(FudaaCourbeTimePersistBuilder.TIME_MODEL, src.getNewTimeListModel());
}
Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/profile/MvProfileBuilder.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/profile/MvProfileBuilder.java 2011-04-21 22:54:59 UTC (rev 6224)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/profile/MvProfileBuilder.java 2011-04-21 22:55:54 UTC (rev 6225)
@@ -147,10 +147,10 @@
grCoord.setAxeY(yCoordonnees);
final String sep = " - ";
if (addXYForNode) {
- final EGCourbeChild courbeChild = new MVProfileCourbeCoordinate(grCoord, new MvProfileCoordinatesModel(
- getNodeResultsMng(_prog).getDefaultRes(), true));
- final EGCourbeChild courbeChild2 = new MVProfileCourbeCoordinate(grCoord, new MvProfileCoordinatesModel(
- getNodeResultsMng(_prog).getDefaultRes(), false));
+ final EGCourbeChild courbeChild = new MVProfileCourbeCoordinate(grCoord, new MvProfileCoordinatesModel(data_.getData(),
+ initLine_, getNodeResultsMng(_prog).getDefaultRes(), true,true));
+ final EGCourbeChild courbeChild2 = new MVProfileCourbeCoordinate(grCoord, new MvProfileCoordinatesModel(data_.getData(),
+ initLine_, getNodeResultsMng(_prog).getDefaultRes(), false,true));
if (addXYForNode && addXYForMesh) {
courbeChild.setTitle(courbeChild.getTitle() + sep + MvResource.getS("Noeuds"));
courbeChild2.setTitle(courbeChild2.getTitle() + sep + MvResource.getS("Noeuds"));
@@ -161,10 +161,10 @@
}
if (addXYForMesh) {
- final EGCourbeChild courbeChild = new MVProfileCourbeCoordinate(grCoord, new MvProfileCoordinatesModel(
- getMeshResultsMng(_prog).getDefaultRes(), true));
- final EGCourbeChild courbeChild2 = new MVProfileCourbeCoordinate(grCoord, new MvProfileCoordinatesModel(
- getMeshResultsMng(_prog).getDefaultRes(), false));
+ final EGCourbeChild courbeChild = new MVProfileCourbeCoordinate(grCoord, new MvProfileCoordinatesModel(data_.getData(),
+ initLine_, getMeshResultsMng(_prog).getDefaultRes(), true,false));
+ final EGCourbeChild courbeChild2 = new MVProfileCourbeCoordinate(grCoord, new MvProfileCoordinatesModel(data_.getData(),
+ initLine_, getMeshResultsMng(_prog).getDefaultRes(), false,false));
if (addXYForNode && addXYForMesh) {
courbeChild.setTitle(courbeChild.getTitle() + sep + MvResource.getS("El\xE9ments"));
courbeChild2.setTitle(courbeChild2.getTitle() + sep + MvResource.getS("El\xE9ments"));
@@ -302,10 +302,10 @@
grCoord.setAxeY(yCoordonnees);
final String sep = " - ";
if (addXYForNode) {
- final EGCourbeChild courbeChild = new MVProfileCourbeCoordinate(grCoord, new MvProfileCoordinatesModel(
- getNodeResultsMng(_prog).getDefaultRes(), true));
- final EGCourbeChild courbeChild2 = new MVProfileCourbeCoordinate(grCoord, new MvProfileCoordinatesModel(
- getNodeResultsMng(_prog).getDefaultRes(), false));
+ final EGCourbeChild courbeChild = new MVProfileCourbeCoordinate(grCoord, new MvProfileCoordinatesModel(data_.getData(),
+ initLine_,getNodeResultsMng(_prog).getDefaultRes(), true,true));
+ final EGCourbeChild courbeChild2 = new MVProfileCourbeCoordinate(grCoord, new MvProfileCoordinatesModel(data_.getData(),
+ initLine_,getNodeResultsMng(_prog).getDefaultRes(), false,true));
if (addXYForNode && addXYForMesh) {
courbeChild.setTitle(courbeChild.getTitle() + sep + MvResource.getS("Noeuds"));
courbeChild2.setTitle(courbeChild2.getTitle() + sep + MvResource.getS("Noeuds"));
@@ -316,10 +316,10 @@
}
if (addXYForMesh) {
- final EGCourbeChild courbeChild = new MVProfileCourbeCoordinate(grCoord, new MvProfileCoordinatesModel(
- getMeshResultsMng(_prog).getDefaultRes(), true));
- final EGCourbeChild courbeChild2 = new MVProfileCourbeCoordinate(grCoord, new MvProfileCoordinatesModel(
- getMeshResultsMng(_prog).getDefaultRes(), false));
+ final EGCourbeChild courbeChild = new MVProfileCourbeCoordinate(grCoord, new MvProfileCoordinatesModel(data_.getData(),
+ initLine_,getMeshResultsMng(_prog).getDefaultRes(), true,false));
+ final EGCourbeChild courbeChild2 = new MVProfileCourbeCoordinate(grCoord, new MvProfileCoordinatesModel(data_.getData(),
+ initLine_,getMeshResultsMng(_prog).getDefaultRes(), false,false));
if (addXYForNode && addXYForMesh) {
courbeChild.setTitle(courbeChild.getTitle() + sep + MvResource.getS("Elements"));
courbeChild2.setTitle(courbeChild2.getTitle() + sep + MvResource.getS("Elements"));
Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/profile/MvProfileCoordinatesModel.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/profile/MvProfileCoordinatesModel.java 2011-04-21 22:54:59 UTC (rev 6224)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/profile/MvProfileCoordinatesModel.java 2011-04-21 22:55:54 UTC (rev 6225)
@@ -13,10 +13,13 @@
import java.util.Map;
+import com.vividsolutions.jts.geom.LineString;
+
import org.fudaa.ctulu.CtuluCommandContainer;
import org.fudaa.ctulu.CtuluListSelectionInterface;
import org.fudaa.ctulu.CtuluUI;
import org.fudaa.ctulu.ProgressionInterface;
+import org.fudaa.dodico.ef.EfGridData;
import org.fudaa.dodico.ef.operation.EfLineIntersectionsResultsBuilder;
import org.fudaa.dodico.ef.operation.EfLineIntersectionsResultsI;
import org.fudaa.ebli.courbe.EGGrapheTreeModel;
@@ -30,20 +33,30 @@
*/
public class MvProfileCoordinatesModel implements MvProfileCourbeModelInterface {
- final boolean isX_;
+ boolean isX_;
EfLineIntersectionsResultsI res_;
-
+ LineString initLine;
+ EfGridData data_;
String title_;
double ymax_;
double ymin_;
+ boolean isNodeResult;
- public MvProfileCoordinatesModel(final EfLineIntersectionsResultsI _res, final boolean _isX) {
+ public MvProfileCoordinatesModel(final EfGridData data, final LineString initLine,
+ final EfLineIntersectionsResultsI _res, final boolean _isX,boolean isNodeResult) {
super();
+ this.data_ = data;
+ this.initLine = initLine;
res_ = _res;
+ setIsX(_isX);
+ updateRes();
+ this.isNodeResult=isNodeResult;
+ }
+
+ private void setIsX(final boolean _isX) {
isX_ = _isX;
title_ = isX_ ? "X" : "Y";
- updateRes();
}
public String getSourceName() {
@@ -175,6 +188,7 @@
}
public boolean setTitle(final String _newName) {
+
if (_newName != null && _newName != title_) {
title_ = _newName;
return true;
@@ -194,7 +208,7 @@
public EGModel duplicate() {
- final MvProfileCoordinatesModel duplic = new MvProfileCoordinatesModel(this.res_, isX_);
+ final MvProfileCoordinatesModel duplic = new MvProfileCoordinatesModel(data_, initLine, this.res_, isX_,isNodeResult);
duplic.title_ = this.title_;
duplic.ymax_ = this.ymax_;
duplic.ymin_ = this.ymin_;
@@ -206,11 +220,11 @@
public Object savePersistSpecificDatas() {
return null;
}
- @Override
- public void restoreFromSpecificDatas(Object data, Map infos) {}
-
public void viewGenerationSource(Map infos, CtuluUI impl) {
}
+
+ @Override
+ public void restoreFromSpecificDatas(Object data, Map infos) {}
}
Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/profile/MvProfileCourbeCoordinatePersistBuilder.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/profile/MvProfileCourbeCoordinatePersistBuilder.java 2011-04-21 22:54:59 UTC (rev 6224)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/profile/MvProfileCourbeCoordinatePersistBuilder.java 2011-04-21 22:55:54 UTC (rev 6225)
@@ -1,17 +1,68 @@
package org.fudaa.fudaa.tr.post.profile;
+import java.util.List;
import java.util.Map;
+import com.vividsolutions.jts.geom.LineString;
+
import org.fudaa.ctulu.CtuluAnalyze;
+import org.fudaa.dodico.ef.operation.EfLineIntersectionsResultsI;
import org.fudaa.ebli.courbe.EGCourbePersist;
import org.fudaa.ebli.courbe.EGCourbePersistBuilder;
+import org.fudaa.ebli.courbe.EGGraphe;
+import org.fudaa.fudaa.tr.post.TrPostProjet;
+import org.fudaa.fudaa.tr.post.TrPostSource;
+import org.fudaa.fudaa.tr.post.actions.TrPostProfileAction;
public class MvProfileCourbeCoordinatePersistBuilder extends EGCourbePersistBuilder<MVProfileCourbeCoordinate> {
@Override
protected MVProfileCourbeCoordinate createEGObject(EGCourbePersist target, Map params, CtuluAnalyze log) {
- return new MVProfileCourbeCoordinate(getGroup(params), (MvProfileCoordinatesModel) super
- .createModel(target, params));
+ return new MVProfileCourbeCoordinate(getGroup(params), createModel(target, params));
}
+
+ protected MvProfileCoordinatesModel createModel(EGCourbePersist persist, Map _infos) {
+ boolean isX = persist.getSpecificBooleanValue("isX");
+ LineString line = (LineString) persist.getSpecificValue("initLine");
+ TrPostProjet projet = (TrPostProjet) _infos.get("TrPostProjet");
+ String idSource = persist.getSpecificStringValue("dataId");
+ TrPostSource src = projet.getSources().findSourceById(idSource);
+ if (src == null) {
+ ((List<String>) _infos.get("errorMsg"))
+ .add("Erreur, la frame graphe ne trouve pas le fichier r\xE9sultat qui correspond \xE0 l'ID " + idSource);
+ return null;
+ }
+ MvProfileTarget target = new TrPostProfileAction.ProfileAdapter(src, projet);
+ MvProfileBuilder builder = new MvProfileBuilderFromLine(target, projet.impl_, line, new MvProfileCoteTester());
+ boolean isNode = persist.getSpecificBooleanValue("isNode");
+ EfLineIntersectionsResultsI res;
+ if (isNode) {
+ res = builder.getNodeResultsMng(null).getDefaultRes();
+ } else {
+ res = builder.getMeshResultsMng(null).getDefaultRes();
+ }
+ // -- intersectionResultI --//
+
+ return new MvProfileCoordinatesModel(src, line, res, isX, isNode);
+ }
+
+ @Override
+ protected void postCreatePersist(EGCourbePersist res, MVProfileCourbeCoordinate courbe, EGGraphe graphe) {
+ super.postCreatePersist(res, courbe, graphe);
+ MvProfileCoordinatesModel model = (MvProfileCoordinatesModel) courbe.getModel();
+ res.saveSpecificData("isX", model.isX_);
+ res.saveSpecificData("isNode", model.isNodeResult);
+ res.saveSpecificData("initLine", model.initLine);
+ // -- ajout des datas --//
+ if (model.data_ instanceof TrPostSource) {
+ res.saveSpecificData("dataId", ((TrPostSource) model.data_).getId());
+ }
+ }
+
+ @Override
+ public boolean saveXY() {
+ return false;
+ }
+
}
Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/profile/MvProfileCourbePersistBuilder.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/profile/MvProfileCourbePersistBuilder.java 2011-04-21 22:54:59 UTC (rev 6224)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/profile/MvProfileCourbePersistBuilder.java 2011-04-21 22:55:54 UTC (rev 6225)
@@ -13,5 +13,10 @@
return new MvProfileCourbe((MvProfileCourbeGroup) getGroup(params), (MVProfileCourbeModel) super.createModel(
target, params));
}
+
+
+ public boolean saveXY(){
+ return false;
+ }
}
Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/profile/MvProfileCourbeTimePersistBuilder.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/profile/MvProfileCourbeTimePersistBuilder.java 2011-04-21 22:54:59 UTC (rev 6224)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/profile/MvProfileCourbeTimePersistBuilder.java 2011-04-21 22:55:54 UTC (rev 6225)
@@ -24,6 +24,11 @@
}
return new MvProfileCourbeTime((MvProfileCourbeGroup) getGroup(params), createModel, timeModel);
}
+
+ @Override
+ public boolean saveXY() {
+ return false;
+ }
private int findTime(MvProfileCourbeTime courbeTime, double valueToFind, double eps) {
int nbTimeStep = courbeTime.getTimeListModel().getSize();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
