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

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

Revision: 7893
          http://fudaa.svn.sourceforge.net/fudaa/?rev=7893&view=rev
Author:   deniger
Date:     2012-11-16 15:56:37 +0000 (Fri, 16 Nov 2012)
Log Message:
-----------


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

Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrIsoLineAdder.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrIsoLineAdder.java	2012-11-16 14:48:29 UTC (rev 7892)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrIsoLineAdder.java	2012-11-16 15:56:37 UTC (rev 7893)
@@ -22,6 +22,7 @@
 import org.fudaa.ctulu.CtuluTaskDelegate;
 import org.fudaa.ctulu.ProgressionInterface;
 import org.fudaa.ctulu.collection.CtuluArrayDouble;
+import org.fudaa.ctulu.gis.GISAttributeDouble;
 import org.fudaa.ctulu.gis.GISAttributeInterface;
 import org.fudaa.ctulu.gis.GISZoneCollectionLigneBrisee;
 import org.fudaa.ctulu.interpolation.InterpolationVectorContainer;
@@ -56,15 +57,12 @@
   final double prec_;
   final TrPostSource src_;
   final int[] ts_;
-
   boolean useOnValueByLayer_;
-
   final CtuluArrayDouble values_;
-
   final H2dVariableType var_;
 
   public TrIsoLineAdder(final TrPostSource _src, final TrPostVisuPanel _pn, final double[] _values, final int[] _ts,
-      final H2dVariableType _var, final double _prec) {
+          final H2dVariableType _var, final double _prec) {
     super();
     src_ = _src;
     pn_ = _pn;
@@ -76,7 +74,6 @@
 
   private void afficheRes(final EfIsoResultDefault _res, final int _tidx, final double _v) {
     BuLib.invokeLater(new Runnable() {
-
       @Override
       public void run() {
 
@@ -85,9 +82,16 @@
           titre += CtuluLibString.ESPACE + _v;
         }
         final GISZoneCollectionLigneBrisee lb = new GISZoneCollectionLigneBrisee();
+
         getDestGroup();
-        if (grVar_ == null) { return; }
+        if (grVar_ == null) {
+          return;
+        }
         lb.setAttributes(grVar_.getAttributes(), null);
+        if (var_ == H2dVariableType.BATHYMETRIE) {
+          GISAttributeInterface att = grVar_.getAtt().getAttribute(var_.getName());
+          lb.setAttributeIsZ((GISAttributeDouble) att);
+        }
         lb.addAll(_res, null, false);
         final ZCalqueLigneBrisee cq = getDestGroup().addLigneBriseeLayerAct(titre, lb);
         // on n'affiche pas les sommets: plus joli
@@ -96,7 +100,6 @@
           cq.setIconModel(i, model);
         }
       }
-
     });
 
   }
@@ -107,7 +110,9 @@
     if (cq != null) {
       for (int i = 0; i < cq.length; i++) {
         final Object o = cq[i].getClientProperty("iso.type");
-        if (o == var_ && cq[i] instanceof FSigLayerGroup) { return (FSigLayerGroup) cq[i]; }
+        if (o == var_ && cq[i] instanceof FSigLayerGroup) {
+          return (FSigLayerGroup) cq[i];
+        }
       }
     }
     return null;
@@ -134,7 +139,7 @@
       }
 
       grVar_ = gr.addGroupAct(TrResource.getS("isolignes pour {0}", var_.toString()), gr, true,
-          new GISAttributeInterface[] { att });
+              new GISAttributeInterface[]{att});
       grVar_.putClientProperty("iso.type", var_);
     }
     return grVar_;
@@ -163,7 +168,9 @@
         EfData data = src.getData(var_, tidx);
         final EfGridDataInterpolationValuesAdapter values = new EfGridDataInterpolationValuesAdapter(src, tidx);
         final EfIsoActivitySearcher searcher = act.search(var_, data, _prog, an, values);
-        if (searcher == null) return;
+        if (searcher == null) {
+          return;
+        }
         for (int v = 0; v < nbValues; v++) {
           final double value = values_.getValue(v);
           searcher.search(value, res, _prog, an);
@@ -193,12 +200,10 @@
   public void go() {
     final CtuluTaskDelegate task = pn_.getImpl().createTask(TrLib.getString("Rechercher les isolignes"));
     task.start(new Runnable() {
-
       @Override
       public void run() {
         goAct(task.getStateReceiver());
       }
-
     });
 
   }

Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/actions/TrIsoLineAction.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/actions/TrIsoLineAction.java	2012-11-16 14:48:29 UTC (rev 7892)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/actions/TrIsoLineAction.java	2012-11-16 15:56:37 UTC (rev 7893)
@@ -10,7 +10,6 @@
 import java.awt.event.ActionEvent;
 
 import org.fudaa.ebli.commun.EbliActionSimple;
-import org.fudaa.ebli.commun.EbliLib;
 import org.fudaa.ebli.ressource.EbliResource;
 import org.fudaa.fudaa.tr.common.TrResource;
 import org.fudaa.fudaa.tr.post.TrIsoLineWizard;

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