[Fudaa-svn-commit] SF.net SVN: fudaa:[9153] trunk/business/fudaa-ef/core/src/main

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

Revision: 9153
          http://sourceforge.net/p/fudaa/svn/9153
Author:   deniger
Date:     2015-08-24 21:19:43 +0000 (Mon, 24 Aug 2015)
Log Message:
-----------
Message plus verbeux si ?\195?\169l?\195?\169ments mal orient?\195?\169s

Modified Paths:
--------------
    trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/EfLib.java
    trunk/business/fudaa-ef/core/src/main/resources/org/fudaa/dodico/ef/resource/ef_en.fr_txt

Modified: trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/EfLib.java
===================================================================
--- trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/EfLib.java	2015-08-24 21:04:23 UTC (rev 9152)
+++ trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/EfLib.java	2015-08-24 21:19:43 UTC (rev 9153)
@@ -11,6 +11,7 @@
 import gnu.trove.TIntHashSet;
 
 import com.vividsolutions.jts.geom.Coordinate;
+import org.apache.commons.lang.StringUtils;
 
 import org.fudaa.ctulu.*;
 import org.fudaa.ctulu.gis.CtuluLibGeometrie;
@@ -19,10 +20,11 @@
 import org.fudaa.ctulu.interpolation.InterpolationVectorContainer;
 
 import org.fudaa.dodico.commun.DodicoLib;
+import org.fudaa.dodico.ef.resource.EfResource;
 
 /**
  * Contient des routines de bases sur les maillages.
- * 
+ *
  * @author deniger
  * @version $Id: EfLib.java,v 1.29 2007-06-28 09:25:05 deniger Exp $
  */
@@ -37,7 +39,7 @@
   }
 
   public static EfDataElement getElementData(final CtuluVariable _var, final EfData _nodeData, final EfGridInterface _grid,
-      InterpolationSupportValuesMultiI _datas, InterpolationVectorContainer _vects) {
+          InterpolationSupportValuesMultiI _datas, InterpolationVectorContainer _vects) {
     if (_nodeData == null || _grid == null) {
       return null;
     }
@@ -134,8 +136,9 @@
     int nb = elt.getPtNb();
     for (int i = 0; i < nb; i++) {
       int idxGlobal = elt.getPtIndex(i);
-      if (prec.isSame(x, y, grid.getPtX(idxGlobal), grid.getPtY(idxGlobal)))
+      if (prec.isSame(x, y, grid.getPtX(idxGlobal), grid.getPtY(idxGlobal))) {
         return idxGlobal;
+      }
     }
     return -1;
 
@@ -303,7 +306,7 @@
 
   /**
    * Oriente tous les elements du maillage dans le sens trigo ou horaire.
-   * 
+   *
    * @param _grid le maillage a modifier
    * @param _progress la barre de progression
    * @param _trigo si true, orientation dans le sens trigo. Sens horaire sinon
@@ -317,14 +320,21 @@
     prog.majProgessionStateOnly(DodicoLib.getS("Orientation des \xE9l\xE9ments"));
     // le nombre d'\xE9l\xE9ments mal orient\xE9s
     int nbEltToOriente = 0;
+    TIntArrayList list = new TIntArrayList();
     for (int i = nbElt - 1; i >= 0; i--) {
       if (_grid.getElement(i).orienteDansSensTrigo(_grid, _trigo)) {
         nbEltToOriente++;
+        list.add(i + 1);
       }
       prog.majAvancement();
     }
     if ((_analyze != null) && (nbEltToOriente > 0) && nbEltToOriente != _grid.getEltNb()) {
+      list.sort();
       _analyze.addWarn(DodicoLib.getS("Nombre d''\xE9l\xE9ments mal orient\xE9s: {0}", CtuluLibString.getString(nbEltToOriente)), 0);
+      int[] elts = list.toNativeArray();
+      String eltsAsString = CtuluLibString.arrayToString(elts, "; ");
+      eltsAsString = StringUtils.abbreviate(eltsAsString, 100);
+      _analyze.addWarn(EfResource.getS("Les \xE9l\xE9ments mal orient\xE9s: {0}", eltsAsString), 0);
     }
   }
 
@@ -383,4 +393,4 @@
     return true;
   }
 
-}
\ No newline at end of file
+}

Modified: trunk/business/fudaa-ef/core/src/main/resources/org/fudaa/dodico/ef/resource/ef_en.fr_txt
===================================================================
--- trunk/business/fudaa-ef/core/src/main/resources/org/fudaa/dodico/ef/resource/ef_en.fr_txt	2015-08-24 21:04:23 UTC (rev 9152)
+++ trunk/business/fudaa-ef/core/src/main/resources/org/fudaa/dodico/ef/resource/ef_en.fr_txt	2015-08-24 21:19:43 UTC (rev 9153)
@@ -51,4 +51,6 @@
 Cr\xE9ation des \xE9l\xE9ments=Creating meshes
 L'\xE9l\xE9ment {0} contient des indices de noeuds erron\xE9s=The mesh {0} contains bad nodes indexes
 Le noeud {0} n'est pas utilis\xE9=The node {0} is not used
-Une seule enveloppe externe doit \xEAtre d\xE9finie=Only one convex hull must be defined
\ No newline at end of file
+Une seule enveloppe externe doit \xEAtre d\xE9finie=Only one convex hull must be defined
+Nombre d''\xE9l\xE9ments mal orient\xE9s\: {0}=Number of element oriented in wrong direction\: {0}
+Les \xE9l\xE9ments mal orient\xE9s\: {0}=Elements oriented in wrong direction are\: {0}
\ No newline at end of file

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