[Fudaa-svn-commit] SF.net SVN: fudaa:[8239] trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/ fudaa/piv/layer/PivResultsModel.java

[<bma...@us...>]

Revision: 8239
          http://fudaa.svn.sourceforge.net/fudaa/?rev=8239&view=rev
Author:   bmarchan
Date:     2013-01-22 15:37:43 +0000 (Tue, 22 Jan 2013)
Log Message:
-----------
Fix : Correspondance indice maillage/valeurs

Modified Paths:
--------------
    trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/layer/PivResultsModel.java

Modified: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/layer/PivResultsModel.java
===================================================================
--- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/layer/PivResultsModel.java	2013-01-22 14:42:29 UTC (rev 8238)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/layer/PivResultsModel.java	2013-01-22 15:37:43 UTC (rev 8239)
@@ -31,6 +31,7 @@
 import org.poly2tri.triangulation.point.TPoint;
 import org.poly2tri.triangulation.sets.PointSet;
 
+import com.memoire.fu.FuLog;
 import com.vividsolutions.jts.geom.Coordinate;
 
 /**
@@ -112,9 +113,14 @@
     if (_triangles.isEmpty()) {
       return null;
     }
+    // Remplissage de la table de correspondance des coordonn\xE9es -> indices 
+    TreeMap<Coordinate, Integer> map = new TreeMap<Coordinate, Integer>(new CoordinateComparator());
+    for (int i=0; i<results[0].getNbPoints(); i++) {
+      Coordinate c=new Coordinate(results[0].getX(i),results[0].getY(i));
+      map.put(c, i);
+    }
+    
     EfElement[] elts = new EfElement[_triangles.size()];
-    TreeMap<Coordinate, Integer> map = new TreeMap<Coordinate, Integer>(new CoordinateComparator());
-    int idx = 0;
     ProgressionUpdater updater = new ProgressionUpdater(_prog);
     updater.majProgessionStateOnly(PivResource.getS("Construction des \xE9l\xE9ments"));
     updater.setValue(10, _triangles.size());
@@ -126,8 +132,7 @@
         Coordinate c = new Coordinate(triangulationPoint.getX(), triangulationPoint.getY());
         Integer ptIdx = map.get(c);
         if (ptIdx == null) {
-          ptIdx = idx;
-          map.put(c, idx++);
+          FuLog.error(PivResource.getS("Correspondance impossible des indices de noeuds lors de la creation du maillage"));
         }
         elt[idxPt] = ptIdx;
       }

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