[Fudaa-svn-commit] SF.net SVN: fudaa:[4465] branches/FudaaModeleur_TC1Bis/fudaa_devel

[<emm...@us...>]

Revision: 4465
          http://fudaa.svn.sourceforge.net/fudaa/?rev=4465&view=rev
Author:   emmanuel_martin
Date:     2009-02-13 13:56:30 +0000 (Fri, 13 Feb 2009)

Log Message:
-----------
Modeleur 1d : lors de l'export un message indique le nombre de profil non export?\195?\169.

Modified Paths:
--------------
    branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/mascaret/io/MascaretWriter.java
    branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/controller/Controller1d.java

Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/mascaret/io/MascaretWriter.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/mascaret/io/MascaretWriter.java	2009-02-13 13:45:11 UTC (rev 4464)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/mascaret/io/MascaretWriter.java	2009-02-13 13:56:30 UTC (rev 4465)
@@ -24,6 +24,7 @@
 import org.fudaa.ctulu.gis.GISPoint;
 import org.fudaa.ctulu.gis.GISPolyligne;
 import org.fudaa.ctulu.gis.GISZoneCollection;
+import org.fudaa.dodico.commun.DodicoLib;
 
 import com.vividsolutions.jts.geom.Coordinate;
 import com.vividsolutions.jts.geom.CoordinateSequence;
@@ -174,15 +175,21 @@
     // Recherche des profils \\
     List<GISZoneCollection> profils=new ArrayList<GISZoneCollection>();
     List<Integer> indexProfils=new ArrayList<Integer>();
+    int nbProfilNotKeep=0;
     for (int i=0; i<_zones.length; i++) {
       int idxAttNature=_zones[i].getIndiceOf(GISAttributeConstants.NATURE);
       if (idxAttNature!=-1)
         for (int j=0; j<_zones[i].getNbGeometries(); j++)
-          if (_zones[i].getValue(idxAttNature, j)==GISAttributeConstants.ATT_NATURE_PF&&_selectorProfil.exportProfil(_zones[i], i)) {
-            profils.add(_zones[i]);
-            indexProfils.add(j);
+          if (_zones[i].getValue(idxAttNature, j)==GISAttributeConstants.ATT_NATURE_PF) {
+            if(_selectorProfil.exportProfil(_zones[i], j)) {
+              profils.add(_zones[i]);
+              indexProfils.add(j);
+            }
+            else
+              nbProfilNotKeep++;
           }
     }
+    analyze_.addWarn(DodicoLib.getS(nbProfilNotKeep+" profils sur "+(indexProfils.size()+nbProfilNotKeep)+" non \xE9crit car non conformes."), -1);
     
     // G\xE9n\xE9ration des MascaretProfilAbstractRepresentations \\
     profils_=new MascaretProfilAbstractRepresentation[profils.size()];

Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/controller/Controller1d.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/controller/Controller1d.java	2009-02-13 13:45:11 UTC (rev 4464)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/controller/Controller1d.java	2009-02-13 13:56:30 UTC (rev 4465)
@@ -395,9 +395,12 @@
       appli_.error(message);
     }
     if (result.containsMessages()) {
-      for (int i=0; i<result.getAnalyze().getInfos().length; i++)
-        message+=result.getAnalyze().getInfos()[i].getMessage()+'\n';
-      
+      if(result.getAnalyze().containsInfos())
+        for (int i=0; i<result.getAnalyze().getInfos().length; i++)
+          message+=result.getAnalyze().getInfos()[i].getMessage()+'\n';
+      if(result.getAnalyze().containsWarnings())
+        for (int i=0; i<result.getAnalyze().getWarnings().length; i++)
+          message+=result.getAnalyze().getWarnings()[i].getMessage()+'\n';
     }
     if(result.containsFatalError())
       appli_.error(FudaaLib.getS("Exportation"), message);


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