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

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

Revision: 7240
          http://fudaa.svn.sourceforge.net/fudaa/?rev=7240&view=rev
Author:   deniger
Date:     2012-05-25 23:19:29 +0000 (Fri, 25 May 2012)
Log Message:
-----------


Modified Paths:
--------------
    trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostFlecheContentDefaut.java
    trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostFlecheContentExpr.java
    trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostRubarEnvFlecheContent.java
    trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostRubarLoader.java
    trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/data/TrPostDataCreatedExpr.java
    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/TrPostDataCreatedStatistic.java
    trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/data/TrPostDataVecteur.java
    trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/profile/MVProfileCourbeModel.java

Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostFlecheContentDefaut.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostFlecheContentDefaut.java	2012-05-25 23:13:01 UTC (rev 7239)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostFlecheContentDefaut.java	2012-05-25 23:19:29 UTC (rev 7240)
@@ -120,7 +120,7 @@
   public TrPostDataVecteur getValues(final int _tIdx) {
     if (_tIdx != lastTime_) {
       lastTime_ = _tIdx;
-      val_ = new TrPostDataVecteur(src_.getData(varVx_, lastTime_), src_.getData(varVy_, lastTime_));
+      val_ = new TrPostDataVecteur(src_.getData(varVx_, lastTime_), src_.getData(varVy_, lastTime_),src_.getGrid());
     }
     return val_;
 

Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostFlecheContentExpr.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostFlecheContentExpr.java	2012-05-25 23:13:01 UTC (rev 7239)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostFlecheContentExpr.java	2012-05-25 23:19:29 UTC (rev 7240)
@@ -15,177 +15,169 @@
 import org.nfunk.jep.Variable;
 
 /**
- * @author denf01a
- * @creation 27 janv. 2009
+ * @author denf01a @creation 27 janv. 2009
  * @version
  *
  */
 public class TrPostFlecheContentExpr implements TrPostFlecheContent {
 
-    H2dVariableType varName_;
+  H2dVariableType varName_;
+  TrPostDataCreatedExpr vx_;
+  TrPostDataCreatedExpr vy_;
+  private TrPostDataVecteur lastValue_;
+  boolean isElementData_;
+  private int lastTime_;
 
-    TrPostDataCreatedExpr vx_;
-    TrPostDataCreatedExpr vy_;
+  protected TrPostFlecheContentExpr(boolean _isElementData, H2dVariableType varName_, TrPostDataCreatedExpr vx_,
+                                    TrPostDataCreatedExpr vy_) {
+    super();
+    this.varName_ = varName_;
+    this.vx_ = vx_;
+    this.vy_ = vy_;
+    isElementData_ = _isElementData;
+  }
 
-    private TrPostDataVecteur lastValue_;
-    boolean isElementData_;
-
-    private int lastTime_;
-
-    protected TrPostFlecheContentExpr(boolean _isElementData, H2dVariableType varName_, TrPostDataCreatedExpr vx_,
-            TrPostDataCreatedExpr vy_) {
-        super();
-        this.varName_ = varName_;
-        this.vx_ = vx_;
-        this.vy_ = vy_;
-        isElementData_ = _isElementData;
-    }
-
-    /**
-     *
-     */
+  /**
+   *
+   */
   @Override
-    public TrPostFlecheContent changeVar(H2dVariableType _name) {
-        return new TrPostFlecheContentExpr(isElementData_, _name, vx_, vy_);
-    }
-    
-    
+  public TrPostFlecheContent changeVar(H2dVariableType _name) {
+    return new TrPostFlecheContentExpr(isElementData_, _name, vx_, vy_);
+  }
 
-
   @Override
-    public void clearCache() {
-        vx_.clearCache();
-        vy_.clearCache();
-    }
-    
-    @Override
-    public void restore() {
-    }
+  public void clearCache() {
+    vx_.clearCache();
+    vy_.clearCache();
+  }
 
   @Override
-    public TrPostDataCreatedSaver createSaver() {
-        return null;
-    }
+  public void restore() {
+  }
 
   @Override
-    public TrPostFlecheContent duplicate(TrPostSource _src) {
-        return new TrPostFlecheContentExpr(isElementData_, varName_, vx_.createCopy(_src), vy_.createCopy(_src));
-    }
+  public TrPostDataCreatedSaver createSaver() {
+    return null;
+  }
 
   @Override
-    public TrPostFlecheContent duplicate(TrPostSource _src, H2dVariableType name) {
-        return new TrPostFlecheContentExpr(isElementData_, name, vx_.createCopy(_src), vy_.createCopy(_src));
-    }
+  public TrPostFlecheContent duplicate(TrPostSource _src) {
+    return new TrPostFlecheContentExpr(isElementData_, varName_, vx_.createCopy(_src), vy_.createCopy(_src));
+  }
 
   @Override
-    public void fillWhithAllUsedVar(Set _res) {
-        vx_.fillWhithAllUsedVar(_res);
-        vy_.fillWhithAllUsedVar(_res);
-    }
+  public TrPostFlecheContent duplicate(TrPostSource _src, H2dVariableType name) {
+    return new TrPostFlecheContentExpr(isElementData_, name, vx_.createCopy(_src), vy_.createCopy(_src));
+  }
 
-    /**
-     *
-     */
   @Override
-    public EfData getDataFor(int time) {
-        return getValues(time);
-    }
+  public void fillWhithAllUsedVar(Set _res) {
+    vx_.fillWhithAllUsedVar(_res);
+    vy_.fillWhithAllUsedVar(_res);
+  }
 
+  /**
+   *
+   */
   @Override
-    public String getDescription() {
-        return varName_.getName();
-    }
+  public EfData getDataFor(int time) {
+    return getValues(time);
+  }
 
-    /**
-     *
-     */
   @Override
-    public double getValue(int time, int object) {
-        return Math.hypot(vx_.getValue(time, object), vy_.getValue(time, object));
-    }
+  public String getDescription() {
+    return varName_.getName();
+  }
 
-    /**
-     *
-     */
+  /**
+   *
+   */
   @Override
-    public TrPostDataVecteur getValues(int _tIdx) {
-        if (_tIdx != lastTime_) {
-            lastTime_ = _tIdx;
-            lastValue_ = new TrPostDataVecteur(vx_.getDataFor(_tIdx), vy_.getDataFor(_tIdx));
-        }
-        return lastValue_;
-    }
+  public double getValue(int time, int object) {
+    return Math.hypot(vx_.getValue(time, object), vy_.getValue(time, object));
+  }
 
-    /**
-     *
-     */
+  /**
+   *
+   */
   @Override
-    public H2dVariableType getVar() {
-        return varName_;
+  public TrPostDataVecteur getValues(int _tIdx) {
+    if (_tIdx != lastTime_) {
+      lastTime_ = _tIdx;
+      lastValue_ = new TrPostDataVecteur(vx_.getDataFor(_tIdx), vy_.getDataFor(_tIdx), vx_.getSrc().getGrid());
     }
+    return lastValue_;
+  }
 
-    /**
-     *
-     */
+  /**
+   *
+   */
   @Override
-    public H2dVariableType getVx() {
-        return null;
-    }
+  public H2dVariableType getVar() {
+    return varName_;
+  }
 
-    /**
-     *
-     */
+  /**
+   *
+   */
   @Override
-    public String getVxDesc() {
-        return getDescription() + " X";
-    }
+  public H2dVariableType getVx() {
+    return null;
+  }
 
-    /**
-     *
-     */
+  /**
+   *
+   */
   @Override
-    public H2dVariableType getVy() {
-        return null;
-    }
+  public String getVxDesc() {
+    return getDescription() + " X";
+  }
 
-    /**
-     *
-     */
+  /**
+   *
+   */
   @Override
-    public String getVyDesc() {
-        return getDescription() + " Y";
-    }
+  public H2dVariableType getVy() {
+    return null;
+  }
 
-    /**
-     *
-     */
+  /**
+   *
+   */
   @Override
-    public boolean isEditable() {
-        return true;
-    }
+  public String getVyDesc() {
+    return getDescription() + " Y";
+  }
 
-    /**
-     *
-     */
+  /**
+   *
+   */
   @Override
-    public boolean isExpr() {
-        return true;
-    }
+  public boolean isEditable() {
+    return true;
+  }
 
-    /**
-     *
-     */
+  /**
+   *
+   */
   @Override
-    public TrPostFlecheContent isFleche() {
-        return this;
-    }
+  public boolean isExpr() {
+    return true;
+  }
 
-    /**
-     *
-     */
+  /**
+   *
+   */
   @Override
-    public boolean updateConstantVar(Variable _var) {
-        return vx_.updateConstantVar(_var) | vy_.updateConstantVar(_var);
-    }
+  public TrPostFlecheContent isFleche() {
+    return this;
+  }
 
+  /**
+   *
+   */
+  @Override
+  public boolean updateConstantVar(Variable _var) {
+    return vx_.updateConstantVar(_var) | vy_.updateConstantVar(_var);
+  }
 }

Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostRubarEnvFlecheContent.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostRubarEnvFlecheContent.java	2012-05-25 23:13:01 UTC (rev 7239)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostRubarEnvFlecheContent.java	2012-05-25 23:19:29 UTC (rev 7240)
@@ -34,7 +34,7 @@
    * @param _idxY
    */
   public TrPostRubarEnvFlecheContent(final TrPostSourceRubar _src, final H2dVariableType _name,
-          final H2dVariableType _idxX, final H2dVariableType _idxY) {
+                                     final H2dVariableType _idxX, final H2dVariableType _idxY) {
     src_ = _src;
     varVx_ = _idxX;
     varVy_ = _idxY;
@@ -105,7 +105,7 @@
   @Override
   public TrPostDataVecteur getValues(final int _tIdx) {
     if (val_ == null) {
-      val_ = new TrPostDataVecteur(src_.getEnveloppData(varVx_), src_.getEnveloppData(varVy_));
+      val_ = new TrPostDataVecteur(src_.getEnveloppData(varVx_), src_.getEnveloppData(varVy_), src_.getGrid());
     }
     return val_;
   }

Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostRubarLoader.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostRubarLoader.java	2012-05-25 23:13:01 UTC (rev 7239)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostRubarLoader.java	2012-05-25 23:19:29 UTC (rev 7240)
@@ -343,7 +343,7 @@
     varEnveloppData.put(H2dVariableType.VITESSE_U, qx);
     final EfDataElement qy = new EfDataElement(qvMax);
     varEnveloppData.put(H2dVariableType.VITESSE_V, qy);
-    varEnveloppData.put(H2dVariableType.VITESSE, new TrPostDataVecteur(qx, qy));
+    varEnveloppData.put(H2dVariableType.VITESSE, new TrPostDataVecteur(qx, qy, getSrc().getGrid()));
     src_.setEnvResultats(varEnveloppData);
     src_.setEnvTime(envReader.getTfinal());
     checkEnvTime();
@@ -629,11 +629,13 @@
       src_.sedimentVariable.put(h2dRubarSedimentVariableType, new TrPostRubarSedimentVariable(src_, h2dRubarSedimentVariableType,
                                                                                               result));
       idx++;
-      TrPostRubarSedimentFondVariable value = new TrPostRubarSedimentFondVariable(src_, h2dRubarSedimentVariableType, result);
-      H2dVariableTypeCreated variableFond = new H2dVariableTypeCreated(value.getDescription(), src_.getShortNameCreateVar());
-      src_.sedimentVariable.put(variableFond, value);
-      varInitIDx_.put(variableFond, SED_START_IDX + idx);
-      idx++;
+      if (h2dRubarSedimentVariableType.getParentVariable().equals(H2dVariableTransType.EPAISSEUR)) {
+        TrPostRubarSedimentFondVariable value = new TrPostRubarSedimentFondVariable(src_, h2dRubarSedimentVariableType, result);
+        H2dVariableTypeCreated variableFond = new H2dVariableTypeCreated(value.getDescription(), src_.getShortNameCreateVar());
+        src_.sedimentVariable.put(variableFond, value);
+        varInitIDx_.put(variableFond, SED_START_IDX + idx);
+        idx++;
+      }
     }
 
     //TODO Mettre result dans bon container.

Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/data/TrPostDataCreatedExpr.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/data/TrPostDataCreatedExpr.java	2012-05-25 23:13:01 UTC (rev 7239)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/data/TrPostDataCreatedExpr.java	2012-05-25 23:19:29 UTC (rev 7240)
@@ -70,6 +70,10 @@
     }
   }
 
+  public TrPostSource getSrc() {
+    return src_;
+  }
+
   @Override
   public void restore() {
   }

Modified: 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/TrPostDataCreatedRubarBathy.java	2012-05-25 23:13:01 UTC (rev 7239)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/data/TrPostDataCreatedRubarBathy.java	2012-05-25 23:19:29 UTC (rev 7240)
@@ -10,9 +10,7 @@
 import java.util.Set;
 
 import org.fudaa.dodico.ef.EfData;
-import org.fudaa.dodico.ef.EfDataElement;
 import org.fudaa.dodico.ef.EfDataNode;
-import org.fudaa.dodico.ef.EfElement;
 import org.fudaa.dodico.ef.EfGridInterface;
 import org.fudaa.dodico.h2d.type.H2dVariableType;
 import org.fudaa.fudaa.tr.post.TrPostSource;

Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/data/TrPostDataCreatedStatistic.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/data/TrPostDataCreatedStatistic.java	2012-05-25 23:13:01 UTC (rev 7239)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/data/TrPostDataCreatedStatistic.java	2012-05-25 23:19:29 UTC (rev 7240)
@@ -14,7 +14,6 @@
 import java.io.IOException;
 import java.util.Map;
 import java.util.Set;
-import java.util.concurrent.ExecutorService;
 
 import com.memoire.fu.FuLog;
 

Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/data/TrPostDataVecteur.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/data/TrPostDataVecteur.java	2012-05-25 23:13:01 UTC (rev 7239)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/data/TrPostDataVecteur.java	2012-05-25 23:19:29 UTC (rev 7240)
@@ -11,6 +11,7 @@
 import org.fudaa.ctulu.interpolation.InterpolationVectorContainer;
 import org.fudaa.dodico.ef.EfData;
 import org.fudaa.dodico.ef.EfGridInterface;
+import org.fudaa.dodico.ef.EfLib;
 import org.fudaa.dodico.ef.interpolation.EfGridDataInterpolator;
 import org.fudaa.ebli.geometrie.GrSegment;
 
@@ -20,18 +21,28 @@
  */
 public class TrPostDataVecteur extends CtuluCollectionDoubleAbstract implements EfData {
 
-  final EfData x_;
-  final EfData y_;
+  EfData x_;
+  EfData y_;
 
   /**
    * @param _x les valeurs selon x
    * @param _y les valeurs selon y
    */
-  public TrPostDataVecteur(final EfData _x, final EfData _y) {
+  public TrPostDataVecteur(final EfData _x, final EfData _y, EfGridInterface grid) {
     x_ = _x;
     y_ = _y;
-    if (isElementData() != y_.isElementData()) throw new IllegalArgumentException(
-        "x and y data must be in the same type");
+    if (x_.isElementData() != y_.isElementData()) {
+      if (!x_.isElementData()) {
+        x_ = EfLib.getElementDataDanger(_x, grid);
+      }
+      if (!y_.isElementData()) {
+        y_ = EfLib.getElementDataDanger(_y, grid);
+      }
+    }
+    if (isElementData() != y_.isElementData()) {
+      throw new IllegalArgumentException(
+              "x and y data must be in the same type");
+    }
   }
 
   @Override
@@ -40,7 +51,7 @@
   }
 
   public void interpolateValues(final GrSegment _target, final EfGridInterface _grid, final int _idxElt,
-      final double _x, final double _y) {
+                                final double _x, final double _y) {
     _target.o_.x_ = _x;
     _target.o_.y_ = _y;
     double vx = 0;
@@ -81,5 +92,4 @@
   public final double getVy(final int _ptIdx) {
     return y_.getValue(_ptIdx);
   }
-
 }

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	2012-05-25 23:13:01 UTC (rev 7239)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/profile/MVProfileCourbeModel.java	2012-05-25 23:19:29 UTC (rev 7240)
@@ -159,6 +159,7 @@
    *
    * @return the line used to build this profile
    */
+  @Override
   public LineString getInitLine() {
     return builder_ == null ? initialBuilder.selectedLine_ : builder_.getInitLine();
   }

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