[Fudaa-svn-commit] SF.net SVN: fudaa:[9073] trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa /fudaa/tr/post

[<de...@us...>]

Revision: 9073
          http://sourceforge.net/p/fudaa/svn/9073
Author:   deniger
Date:     2015-03-16 21:31:52 +0000 (Mon, 16 Mar 2015)
Log Message:
-----------
dev

Modified Paths:
--------------
    trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostSourceAbstract.java

Added Paths:
-----------
    trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/data/TrPostDataCreatedPtX.java
    trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/data/TrPostDataCreatedPtY.java

Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostSourceAbstract.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostSourceAbstract.java	2015-03-16 21:26:46 UTC (rev 9072)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostSourceAbstract.java	2015-03-16 21:31:52 UTC (rev 9073)
@@ -81,6 +81,8 @@
 import org.fudaa.fudaa.tr.post.data.TrPostDataCreatedMoins;
 import org.fudaa.fudaa.tr.post.data.TrPostDataCreatedMultiply;
 import org.fudaa.fudaa.tr.post.data.TrPostDataCreatedPlus;
+import org.fudaa.fudaa.tr.post.data.TrPostDataCreatedPtX;
+import org.fudaa.fudaa.tr.post.data.TrPostDataCreatedPtY;
 import org.fudaa.fudaa.tr.post.data.TrPostDataHelper;
 import org.fudaa.fudaa.tr.post.data.TrPostDataInfoDoc;
 import org.fudaa.fudaa.tr.post.data.TrPostDataListener;
@@ -414,7 +416,9 @@
   protected void buildDefaultVectors() {
     final Map nameFleche = new HashMap();
     varCreateData_ = new HashMap();
-    // par defaut vitesse et debit
+    //x et y :
+    varCreateData_.put(H2dVariableType.POINT_X, new TrPostDataCreatedPtX(this));    // par defaut vitesse et debit
+    varCreateData_.put(H2dVariableType.POINT_Y, new TrPostDataCreatedPtY(this));    // par defaut vitesse et debit
     if (isInitVar(H2dVariableType.VITESSE_U)) {
       if (isInitVar(H2dVariableType.VITESSE_V)) {
         final TrPostFlecheContent vec = createSimpleVecteurContent(H2dVariableType.VITESSE, H2dVariableType.VITESSE_U,
@@ -637,7 +641,7 @@
           try {
             _m.put(variable_[i].getName(),
                     CtuluLib.DEFAULT_NUMBER_FORMAT.format(interpolator.interpolate(_element, _x,
-                    _y, variable_[i], _time)));
+                                    _y, variable_[i], _time)));
           } catch (final IOException _evt) {
             FuLog.error(_evt);
             _m.put(variable_[i].getName(), "ERROR");
@@ -1371,7 +1375,6 @@
 
     // c'est la premiere fois que l'on ouvre le fichier de post.
     // on enregistre les infos
-
     return true;
   }
 
@@ -1619,4 +1622,4 @@
   public List<TrPostSource> getUsedSources() {
     return Collections.emptyList();
   }
-}
\ No newline at end of file
+}

Copied: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/data/TrPostDataCreatedPtX.java (from rev 9071, trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/data/TrPostDataCreatedRubarBathy.java)
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/data/TrPostDataCreatedPtX.java	                        (rev 0)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/data/TrPostDataCreatedPtX.java	2015-03-16 21:31:52 UTC (rev 9073)
@@ -0,0 +1,46 @@
+/*
+ *  @creation     3 mai 2005
+ *  @modification $Date: 2007-04-16 16:35:31 $
+ *  @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.data;
+
+import java.util.Set;
+import org.fudaa.dodico.ef.EfData;
+import org.fudaa.dodico.ef.EfDataNode;
+import org.fudaa.dodico.ef.EfGridInterface;
+import org.fudaa.fudaa.tr.post.TrPostSource;
+
+public final class TrPostDataCreatedPtX extends TrPostDataCreatedDefault {
+
+  public TrPostDataCreatedPtX(final TrPostSource _src) {
+    super(_src);
+  }
+
+  @Override
+  public double buildDataFor(final int _idxTime, final int _idxObject) {
+    final EfGridInterface grid = src_.getGrid();
+    return grid.getPtX(_idxObject);
+  }
+
+  @Override
+  public void fillWhithAllUsedVar(final Set _res) {
+  }
+
+  @Override
+  public String getDescription() {
+    return "X";
+  }
+
+  @Override
+  public EfData buildDataFor(final int _idxTime) {
+    final EfGridInterface grid = src_.getGrid();
+    final double[] bathy = new double[grid.getPtsNb()];
+    for (int i = bathy.length - 1; i >= 0; i--) {
+      bathy[i] = grid.getPtX(i);
+    }
+    return new EfDataNode(bathy);
+  }
+}

Copied: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/data/TrPostDataCreatedPtY.java (from rev 9071, trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/data/TrPostDataCreatedRubarBathy.java)
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/data/TrPostDataCreatedPtY.java	                        (rev 0)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/data/TrPostDataCreatedPtY.java	2015-03-16 21:31:52 UTC (rev 9073)
@@ -0,0 +1,46 @@
+/*
+ *  @creation     3 mai 2005
+ *  @modification $Date: 2007-04-16 16:35:31 $
+ *  @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.data;
+
+import java.util.Set;
+import org.fudaa.dodico.ef.EfData;
+import org.fudaa.dodico.ef.EfDataNode;
+import org.fudaa.dodico.ef.EfGridInterface;
+import org.fudaa.fudaa.tr.post.TrPostSource;
+
+public final class TrPostDataCreatedPtY extends TrPostDataCreatedDefault {
+
+  public TrPostDataCreatedPtY(final TrPostSource _src) {
+    super(_src);
+  }
+
+  @Override
+  public double buildDataFor(final int _idxTime, final int _idxObject) {
+    final EfGridInterface grid = src_.getGrid();
+    return grid.getPtY(_idxObject);
+  }
+
+  @Override
+  public void fillWhithAllUsedVar(final Set _res) {
+  }
+
+  @Override
+  public String getDescription() {
+    return "Y";
+  }
+
+  @Override
+  public EfData buildDataFor(final int _idxTime) {
+    final EfGridInterface grid = src_.getGrid();
+    final double[] bathy = new double[grid.getPtsNb()];
+    for (int i = bathy.length - 1; i >= 0; i--) {
+      bathy[i] = grid.getPtY(i);
+    }
+    return new EfDataNode(bathy);
+  }
+}

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.