Menu
▾
▴
[Fudaa-svn-commit] SF.net SVN: fudaa:[4124] branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/ fudaa
|
From: <de...@us...> - 2008-10-30 17:11:13
|
Revision: 4124
http://fudaa.svn.sourceforge.net/fudaa/?rev=4124&view=rev
Author: deniger
Date: 2008-10-30 17:11:11 +0000 (Thu, 30 Oct 2008)
Log Message:
-----------
Modified Paths:
--------------
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/meshviewer/layer/MvElementLayer.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/meshviewer/layer/MvNodeLayer.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/meshviewer/layer/MvVisuPanel.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/common/TrPostActionLigneCourants.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/data/TrSiFlecheModel.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/data/TrSiProfileSplitter.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/data/TrSiZoneOperation.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/data/TrVisuPanelEditor.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/actions/TrPostProfileAction.java
Modified: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/meshviewer/layer/MvElementLayer.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/meshviewer/layer/MvElementLayer.java 2008-10-30 17:10:41 UTC (rev 4123)
+++ branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/meshviewer/layer/MvElementLayer.java 2008-10-30 17:11:11 UTC (rev 4124)
@@ -19,6 +19,7 @@
import org.fudaa.dodico.ef.EfElementVolume;
import org.fudaa.dodico.ef.EfGridInterface;
import org.fudaa.dodico.ef.EfGridVolumeInterface;
+import org.fudaa.dodico.ef.operation.EfIndexHelper;
import org.fudaa.dodico.ef.operation.EfIndexVisitorHashSet;
import org.fudaa.dodico.ef.operation.EfIndexVisitorNearestElt;
import org.fudaa.dodico.ef.operation.EfIndexVisitorNearestNode;
@@ -261,11 +262,11 @@
if (Fu.DEBUG && FuLog.isDebug()) {
FuLog.debug("FMV: layer select from index");
}
- final EfGridInterface grid = getGrid();
- final double toleranceReel = GrMorphisme.convertDistanceXY(getVersReel(), _tolerance);
- final EfIndexVisitorNearestElt visitor = new EfIndexVisitorNearestElt(grid, _pt.x_, _pt.y_, toleranceReel);
- grid.getIndex().query(EfIndexVisitorNearestNode.getEnvelope(_pt.x_, _pt.y_, toleranceReel), visitor);
- return visitor.getSelection();
+ return EfIndexHelper.getNearestElement(getGrid(), _pt.x_, _pt.y_, GrMorphisme.convertDistanceXY(getVersReel(),
+ _tolerance), null);
+// final EfIndexVisitorNearestElt visitor = new EfIndexVisitorNearestElt(grid, _pt.x_, _pt.y_, toleranceReel);
+// grid.getIndex().query(EfIndexVisitorNearestNode.getEnvelope(_pt.x_, _pt.y_, toleranceReel), visitor);
+// return visitor.getSelection();
}
@Override
Modified: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/meshviewer/layer/MvNodeLayer.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/meshviewer/layer/MvNodeLayer.java 2008-10-30 17:10:41 UTC (rev 4123)
+++ branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/meshviewer/layer/MvNodeLayer.java 2008-10-30 17:11:11 UTC (rev 4124)
@@ -15,6 +15,7 @@
import org.fudaa.ctulu.CtuluRange;
import org.fudaa.ctulu.gis.GISLib;
import org.fudaa.dodico.ef.EfGridInterface;
+import org.fudaa.dodico.ef.operation.EfIndexHelper;
import org.fudaa.dodico.ef.operation.EfIndexVisitorHashSetNode;
import org.fudaa.dodico.ef.operation.EfIndexVisitorNearestNode;
import org.fudaa.ebli.calque.ZCalquePoint;
@@ -135,12 +136,14 @@
if (Fu.DEBUG && FuLog.isDebug()) {
FuLog.debug("FMV: layer select from index");
}
- final double toleranceReel = GrMorphisme.convertDistanceXY(getVersReel(), _tolerance);
- final EfIndexVisitorNearestNode visitor = new EfIndexVisitorNearestNode(getNodeModel().getGrid(), _pt.x_, _pt.y_,
- toleranceReel);
- getNodeModel().getGrid().getIndex().query(EfIndexVisitorNearestNode.getEnvelope(_pt.x_, _pt.y_, toleranceReel),
- visitor);
- return visitor.getSelection();
+
+ return EfIndexHelper.getNearestNode(getNodeModel().getGrid(), _pt.x_, _pt.y_, GrMorphisme.convertDistanceXY(
+ getVersReel(), _tolerance), null);
+// final EfIndexVisitorNearestNode visitor = new EfIndexVisitorNearestNode(getNodeModel().getGrid(), _pt.x_, _pt.y_,
+// toleranceReel);
+// getNodeModel().getGrid().getIndex().query(EfIndexVisitorNearestNode.getEnvelope(_pt.x_, _pt.y_, toleranceReel),
+// visitor);
+// return visitor.getSelection();
}
/**
Modified: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/meshviewer/layer/MvVisuPanel.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/meshviewer/layer/MvVisuPanel.java 2008-10-30 17:10:41 UTC (rev 4123)
+++ branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/meshviewer/layer/MvVisuPanel.java 2008-10-30 17:11:11 UTC (rev 4124)
@@ -27,6 +27,7 @@
import org.fudaa.dodico.ef.EfGridInterface;
import org.fudaa.dodico.ef.EfGridVolumeInterface;
import org.fudaa.ebli.calque.BGroupeCalque;
+import org.fudaa.ebli.calque.ZCalqueAffichageDonneesInterface;
import org.fudaa.ebli.calque.edition.ZCalqueEditionGroup;
import org.fudaa.ebli.controle.BSelecteurReduitFonteNewVersion;
import org.fudaa.fudaa.commun.impl.FudaaCommonImplementation;
@@ -50,6 +51,7 @@
import com.memoire.bu.BuDynamicMenu;
import com.memoire.bu.BuMenu;
import com.memoire.bu.BuPopupMenu;
+import com.vividsolutions.jts.geom.LineString;
/**
* @author deniger
@@ -168,8 +170,6 @@
private BuMenu edgeDisplayTools_;
-
-
/**
* @param _impl l'implementation parente
*/
@@ -440,6 +440,15 @@
return getName();
}
+ /**
+ * @return la ligne selectionnee dans le calque selectionne ou null si aucune
+ */
+ public LineString getSelectedLine() {
+ // pas de calque s\xE9lectionn\xE9
+ if (!(getArbreCalqueModel().getSelectedCalque() instanceof ZCalqueAffichageDonneesInterface)) { return null; }
+ return ((ZCalqueAffichageDonneesInterface) getArbreCalqueModel().getSelectedCalque()).getSelectedLine();
+ }
+
public void setActive(final boolean _b) {}
/**
Modified: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/common/TrPostActionLigneCourants.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/common/TrPostActionLigneCourants.java 2008-10-30 17:10:41 UTC (rev 4123)
+++ branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/common/TrPostActionLigneCourants.java 2008-10-30 17:11:11 UTC (rev 4124)
@@ -4,29 +4,29 @@
import org.fudaa.ctulu.CtuluResource;
import org.fudaa.ebli.commun.EbliActionSimple;
+import org.fudaa.fudaa.commun.impl.FudaaPanelTask;
import org.fudaa.fudaa.meshviewer.MvResource;
-import org.fudaa.fudaa.tr.post.TrPostProjet;
import org.fudaa.fudaa.tr.post.TrPostVisuPanel;
import org.fudaa.fudaa.tr.post.dialogSpec.TrPostDialogLigneCourants;
+/**
+ * Permet d'afficher le dialogue pour les trajectoire/ligne de courant
+ */
public class TrPostActionLigneCourants extends EbliActionSimple {
// final MvProfileTarget src_;
- TrPostProjet projet_;
TrPostVisuPanel calque_;
- public TrPostActionLigneCourants(final TrPostProjet projet, final TrPostVisuPanel panel) {
- super(MvResource.getS("Calcul des lignes de courants/trajectoires"), CtuluResource.CTULU.getIcon("crystal_oscilloscope.png"), "BILAN");
- projet_ = projet;
+ public TrPostActionLigneCourants(final TrPostVisuPanel panel) {
+ super(MvResource.getS("Calcul des lignes de courants/trajectoires"), CtuluResource.CTULU
+ .getIcon("crystal_oscilloscope.png"), "TRAJ");
calque_ = panel;
}
@Override
public void actionPerformed(final ActionEvent _e) {
- // -- creation du wizard depusi le calque --//
-
- new TrPostDialogLigneCourants(projet_, projet_.getImpl(), calque_);
+ new FudaaPanelTask(calque_.getCtuluUI(), new TrPostDialogLigneCourants(calque_)).afficheDialog();
}
}
Modified: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/data/TrSiFlecheModel.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/data/TrSiFlecheModel.java 2008-10-30 17:10:41 UTC (rev 4123)
+++ branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/data/TrSiFlecheModel.java 2008-10-30 17:11:11 UTC (rev 4124)
@@ -14,7 +14,7 @@
import org.fudaa.dodico.ef.EfData;
import org.fudaa.dodico.ef.EfDataAdapter;
import org.fudaa.dodico.ef.EfGridInterface;
-import org.fudaa.dodico.ef.interpolation.EfInterpolator;
+import org.fudaa.dodico.ef.interpolation.EfGridDataInterpolator;
import org.fudaa.dodico.ef.operation.EfIndexVisitorNearestElt;
import org.fudaa.dodico.ef.operation.EfIndexVisitorNearestNode;
import org.fudaa.dodico.h2d.H2dSiSourceInterface;
@@ -81,8 +81,8 @@
final EfData vxData = new EfDataAdapter(new DoubleCollectionAdapter(_model, false), false);
final EfData vyData = new EfDataAdapter(new DoubleCollectionAdapter(_model, true), false);
// interpolation sur la norme et l'ange puis retransposition en vx,vy
- final double vx = EfInterpolator.interpolate(idxElt, _x, _y, vxData, vyData, true, _grid);
- final double vy = EfInterpolator.interpolate(idxElt, _x, _y, vxData, vyData, false, _grid);
+ final double vx = EfGridDataInterpolator.interpolate(idxElt, _x, _y, vxData, vyData, true, _grid);
+ final double vy = EfGridDataInterpolator.interpolate(idxElt, _x, _y, vxData, vyData, false, _grid);
_seg.e_.x_ = _x + vx;
_seg.e_.y_ = _y + vy;
return true;
@@ -93,7 +93,7 @@
public double getNorme(final int _i) {
final double vx = getVx(_i);
final double vy = getVy(_i);
- return Math.sqrt(vx * vx + vy * vy);
+ return Math.hypot(vx, vy);
}
public double getVx(final int _i) {
Modified: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/data/TrSiProfileSplitter.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/data/TrSiProfileSplitter.java 2008-10-30 17:10:41 UTC (rev 4123)
+++ branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/data/TrSiProfileSplitter.java 2008-10-30 17:11:11 UTC (rev 4124)
@@ -113,7 +113,7 @@
profil.getCoordinateSequence().getCoordinate(idxZone - 1, tmp1_);
double vx = -(xAval.y - tmp1_.y);
double vy = xAval.x - tmp1_.x;
- double norm1 = Math.sqrt(vx * vx + vy * vy);
+ double norm1 = Math.hypot(vx,vy );
tmp1_.x = xAval.x + (tmp1_.x - xAval.x) / norm1;
tmp1_.y = xAval.y + (tmp1_.y - xAval.y) / norm1;
pi.x = tmp1_.x + vx;
@@ -121,7 +121,7 @@
profil.getCoordinateSequence().getCoordinate(idxZone + 1, tmp2_);
vx = -(tmp2_.y - xAval.y);
vy = tmp2_.x - xAval.x;
- norm1 = Math.sqrt(vx * vx + vy * vy);
+ norm1 = Math.hypot(vx,vy );
tmp2_.x = xAval.x + (tmp2_.x - xAval.x) / norm1;
tmp2_.y = xAval.y + (tmp2_.y - xAval.y) / norm1;
pii.x = tmp2_.x + vx;
Modified: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/data/TrSiZoneOperation.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/data/TrSiZoneOperation.java 2008-10-30 17:10:41 UTC (rev 4123)
+++ branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/data/TrSiZoneOperation.java 2008-10-30 17:11:11 UTC (rev 4124)
@@ -159,7 +159,7 @@
_coteEau[_tabIdx] = px_ * (_x - xAmont_) + py_ * (_y - yAmont_) + zAmont_;
if (_vx != null || _vy != null) {
final double h = _coteEau[_tabIdx] - _fond.getValue(_tabIdx);
- final double sss = Math.sqrt(px_ * px_ + py_ * py_);
+ final double sss = Math.hypot(px_ ,py_);
if (_vx != null) {
if (h <= 0) {
_vx[_tabIdx] = 0;
Modified: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/data/TrVisuPanelEditor.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/data/TrVisuPanelEditor.java 2008-10-30 17:10:41 UTC (rev 4123)
+++ branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/data/TrVisuPanelEditor.java 2008-10-30 17:11:11 UTC (rev 4124)
@@ -27,7 +27,7 @@
import org.fudaa.ctulu.gui.CtuluValuesEditorPanel;
import org.fudaa.dodico.ef.EfGridData;
import org.fudaa.dodico.ef.EfGridInterface;
-import org.fudaa.dodico.ef.interpolation.EfInterpolator;
+import org.fudaa.dodico.ef.interpolation.EfGridDataInterpolator;
import org.fudaa.dodico.h2d.H2dParameters;
import org.fudaa.dodico.h2d.H2dSIListener;
import org.fudaa.dodico.h2d.H2dSiSourceInterface;
@@ -395,7 +395,7 @@
public class ProfileAdapter implements MvProfileTarget {
final EfGridData data_ = getParams().createGridDataAdapter();
- final EfInterpolator interpolator_ = new EfInterpolator(data_, getParams().getVectorContainer());
+ final EfGridDataInterpolator interpolator_ = new EfGridDataInterpolator(data_, getParams().getVectorContainer());
public EfGridData getData() {
return data_;
@@ -407,7 +407,7 @@
return null;
}
- public EfInterpolator getInterpolator() {
+ public EfGridDataInterpolator getInterpolator() {
return interpolator_;
}
Modified: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/actions/TrPostProfileAction.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/actions/TrPostProfileAction.java 2008-10-30 17:10:41 UTC (rev 4123)
+++ branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/actions/TrPostProfileAction.java 2008-10-30 17:11:11 UTC (rev 4124)
@@ -5,7 +5,7 @@
import org.fudaa.ctulu.CtuluVariable;
import org.fudaa.ctulu.ProgressionInterface;
import org.fudaa.dodico.ef.EfGridData;
-import org.fudaa.dodico.ef.interpolation.EfInterpolator;
+import org.fudaa.dodico.ef.interpolation.EfGridDataInterpolator;
import org.fudaa.ebli.calque.ZCalqueAffichageDonneesInterface;
import org.fudaa.ebli.commun.EbliActionSimple;
import org.fudaa.fudaa.commun.courbe.FudaaCourbeTimeListModel;
@@ -50,10 +50,10 @@
}
public TrPostSource getDataSource() {
- return src_;
- }
-
- public EfInterpolator getInterpolator() {
+ return src_;
+ }
+
+ public EfGridDataInterpolator getInterpolator() {
return src_.getInterpolator();
}
@@ -71,9 +71,9 @@
}
- public TrPostSource getSrc_() {
- return src_;
- }
+ public TrPostSource getSrc_() {
+ return src_;
+ }
}
@@ -114,14 +114,12 @@
public static final ProfileAdapter createProfileAdapter(final TrPostVisuPanel _visu) {
return new ProfileAdapter(_visu.getSource(), _visu.getProjet());
}
-
- public static final ProfileAdapter createProfileAdapter(TrPostSource src,TrPostProjet projet) {
- return new ProfileAdapter(src, projet);
- }
+ public static final ProfileAdapter createProfileAdapter(TrPostSource src, TrPostProjet projet) {
+ return new ProfileAdapter(src, projet);
+ }
+
protected LineString getSelectedLine() {
- // pas de calque s\xE9lectionn\xE9
- if (!(panel_.getArbreCalqueModel().getSelectedCalque() instanceof ZCalqueAffichageDonneesInterface)) { return null; }
- return ((ZCalqueAffichageDonneesInterface) panel_.getArbreCalqueModel().getSelectedCalque()).getSelectedLine();
+ return panel_.getSelectedLine();
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
