|
From: <de...@us...> - 2012-12-14 18:08:46
|
Revision: 8136
http://fudaa.svn.sourceforge.net/fudaa/?rev=8136&view=rev
Author: deniger
Date: 2012-12-14 18:08:39 +0000 (Fri, 14 Dec 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrIsoLayerDefault.java
trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrIsoModelAbstract.java
trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrIsoModelEltDataAdapter.java
trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostFlecheModel.java
Removed Paths:
-------------
trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostModelInterface.java
Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrIsoLayerDefault.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrIsoLayerDefault.java 2012-12-14 18:08:12 UTC (rev 8135)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrIsoLayerDefault.java 2012-12-14 18:08:39 UTC (rev 8136)
@@ -7,6 +7,7 @@
*/
package org.fudaa.fudaa.tr.post;
+import org.fudaa.fudaa.meshviewer.layer.MvIsoModelInterface;
import com.memoire.bu.BuMenuItem;
import com.memoire.bu.BuResource;
import com.memoire.fu.FuLog;
@@ -221,7 +222,7 @@
}
public static int selectionElement(final GrPoint _pt, final int _tolerance, final GrMorphisme _versReel,
- final TrPostModelInterface _model,
+ final MvIsoModelInterface _model,
final GrBoite _clipReel) {
GrBoite bClip = _model.getDomaine();
final double distanceReel = GrMorphisme.convertDistanceXY(_versReel, _tolerance);
@@ -252,7 +253,7 @@
* @param _model
* @return
*/
- public static int sondeSelection(final GrPoint _prReel, final TrPostModelInterface _model) {
+ public static int sondeSelection(final GrPoint _prReel, final MvIsoModelInterface _model) {
final EfGridInterface grid = _model.getGrid();
if (grid.getIndex() != null) {
return EfIndexHelper.getElementEnglobant(grid, _prReel.x_, _prReel.y_, null);
@@ -274,7 +275,7 @@
return -1;
}
- private static int sondeSelectionLong(final GrPoint _prReel, final TrPostModelInterface _model) {
+ private static int sondeSelectionLong(final GrPoint _prReel, final MvIsoModelInterface _model) {
final GrPolygone poly = new GrPolygone();
for (int i = _model.getNbElt() - 1; i >= 0; i--) {
_model.polygone(poly, i, true);
@@ -859,7 +860,7 @@
return;
}
boolean keepAntialias = false;
- TrPostModelInterface modelToUse = getIsoModelAbstract();
+ MvIsoModelInterface modelToUse = getIsoModelAbstract();
if (traceIsoLine_) {
isos = new TraceIsoLignesAvecPlages(paletteCouleur_, alpha_, ligneModel_);
keepAntialias = true;
Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrIsoModelAbstract.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrIsoModelAbstract.java 2012-12-14 18:08:12 UTC (rev 8135)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrIsoModelAbstract.java 2012-12-14 18:08:39 UTC (rev 8136)
@@ -7,6 +7,7 @@
*/
package org.fudaa.fudaa.tr.post;
+import org.fudaa.fudaa.meshviewer.layer.MvIsoModelInterface;
import com.memoire.bu.BuTable;
import com.memoire.fu.FuLog;
import javax.swing.ListModel;
@@ -36,7 +37,7 @@
* @author Fred Deniger
* @version $Id: TrIsoModelAbstract.java,v 1.24 2007-05-04 14:01:51 deniger Exp $
*/
-public abstract class TrIsoModelAbstract extends MvElementModelDefault implements MvNodeModel, TrPostModelInterface {
+public abstract class TrIsoModelAbstract extends MvElementModelDefault implements MvNodeModel, MvIsoModelInterface {
TrPostSource s_;
ListModel varModel_;
Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrIsoModelEltDataAdapter.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrIsoModelEltDataAdapter.java 2012-12-14 18:08:12 UTC (rev 8135)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrIsoModelEltDataAdapter.java 2012-12-14 18:08:39 UTC (rev 8136)
@@ -11,6 +11,7 @@
*/
package org.fudaa.fudaa.tr.post;
+import org.fudaa.fudaa.meshviewer.layer.MvIsoModelInterface;
import com.memoire.bu.BuTable;
import com.vividsolutions.jts.geom.Envelope;
import org.fudaa.ctulu.CtuluAnalyze;
@@ -30,7 +31,7 @@
* @author fred deniger
* @version $Id: TrIsoModelEltDataAdapter.java,v 1.4 2007-06-11 13:08:18 deniger Exp $
*/
-public class TrIsoModelEltDataAdapter implements TrPostModelInterface {
+public class TrIsoModelEltDataAdapter implements MvIsoModelInterface {
final EfIsoRestructuredGridResult res_;
EfData currentNodeData_;
Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostFlecheModel.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostFlecheModel.java 2012-12-14 18:08:12 UTC (rev 8135)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostFlecheModel.java 2012-12-14 18:08:39 UTC (rev 8136)
@@ -4,6 +4,7 @@
*/
package org.fudaa.fudaa.tr.post;
+import org.fudaa.fudaa.meshviewer.layer.MvIsoModelInterface;
import com.memoire.bu.BuTable;
import com.vividsolutions.jts.geom.Coordinate;
import com.vividsolutions.jts.geom.Envelope;
@@ -38,7 +39,7 @@
* @author Fred Deniger
* @version $Id: TrPostFlecheModel.java,v 1.32 2007-06-20 12:23:40 deniger Exp $
*/
-public class TrPostFlecheModel implements ZModeleFleche, TrPostModelInterface {
+public class TrPostFlecheModel implements ZModeleFleche, MvIsoModelInterface {
TrPostFilterLayer cond_;
TrPostFlecheContent current_;
Deleted: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostModelInterface.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostModelInterface.java 2012-12-14 18:08:12 UTC (rev 8135)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostModelInterface.java 2012-12-14 18:08:39 UTC (rev 8136)
@@ -1,65 +0,0 @@
-/**
- * @creation 21 d\xE9c. 2004
- * @modification $Date: 2007-06-05 09:01:14 $
- * @license GNU General Public License 2
- * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
- * @mail fud...@li...
- */
-package org.fudaa.fudaa.tr.post;
-
-import com.vividsolutions.jts.geom.Envelope;
-import org.fudaa.dodico.ef.EfGridInterface;
-import org.fudaa.ebli.calque.ZModelePolygone;
-
-/**
- * @author Fred Deniger
- * @version $Id: TrPostModelInterface.java,v 1.4 2007-06-05 09:01:14 deniger Exp $
- */
-public interface TrPostModelInterface extends ZModelePolygone {
- /**
- * @return le nombre d'element
- */
- int getNbElt();
-
- EfGridInterface getGrid();
-
- public Envelope getEnvelopeForElement(int idxElt) ;
-
- /**
- *
- * @param idxElt
- * @return
- */
- int getNbPt(int idxElt);
-
- /**
- *
- * @param idxElt
- * @param idxPtInElt
- * @return x value
- */
- double getX(int idxElt,int idxPtInElt);
- /**
- *
- * @param idxElt
- * @param idxPtInElt
- * @return
- */
- double getY(int idxElt,int idxPtInElt);
- /**
- *
- * @param idxElt
- * @return true if the element must be painted
- */
- @Override
- boolean isPainted(int idxElt);
-
- double[] fillWithData(final int _idxElement, final double[] _l);
-/**
- *
- * @param idxElt
- * @param idxPtOnElt the index in the mesh.
- * @return the value
- */
- public double getDatatFor(int idxElt, int idxPtOnElt);
-}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|