|
From: <bma...@us...> - 2011-05-04 13:30:54
|
Revision: 6242
http://fudaa.svn.sourceforge.net/fudaa/?rev=6242&view=rev
Author: bmarchan
Date: 2011-05-04 13:30:44 +0000 (Wed, 04 May 2011)
Log Message:
-----------
MOD : Ajout du nom du bief dans la lecture d'un fichier Mascaret geo r?\195?\169f?\195?\169renc?\195?\169.
Modified Paths:
--------------
trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/mascaret/io/MascaretBief.java
trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/mascaret/io/MascaretGEOReader.java
trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSigFileLoaderMascaret.java
Modified: trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/mascaret/io/MascaretBief.java
===================================================================
--- trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/mascaret/io/MascaretBief.java 2011-05-03 15:51:42 UTC (rev 6241)
+++ trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/mascaret/io/MascaretBief.java 2011-05-04 13:30:44 UTC (rev 6242)
@@ -41,6 +41,14 @@
}
/**
+ * @return Le nom du bief, ou null si aucun profil dans le bief.
+ */
+ public String getBiefName() {
+ if (profils_.size()>0) return profils_.get(0).nomBief;
+ return null;
+ }
+
+ /**
* @param _analyze Pour suivi du traitement.
* @param _progress La progression de lecture.
* @return Les 5 zones correspondant aux traces, profils, axe, rives, stockage
Modified: trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/mascaret/io/MascaretGEOReader.java
===================================================================
--- trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/mascaret/io/MascaretGEOReader.java 2011-05-03 15:51:42 UTC (rev 6241)
+++ trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/mascaret/io/MascaretGEOReader.java 2011-05-04 13:30:44 UTC (rev 6242)
@@ -108,11 +108,13 @@
}
/*
- * Lit les g\xE9om\xE9tries et les retourne sous forme de 5 collections distinctes.
- * 0: Traces, 1: Profils, 2:Axe, 3:Rives, 4:Stockage
+ * Lit les g\xE9om\xE9tries et les retourne sous forme d'un tableau d'objets contenant
+ * le nom du bief + 5 collections distinctes.<p>
+ * [0] : Nom du bief<br>
+ * [1] : Les 5 collections : 0: Traces, 1: Profils, 2:Axe, 3:Rives, 4:Stockage
*/
@Override
- protected GISZoneCollectionLigneBrisee[] internalRead() {
+ protected Object[] internalRead() {
try {
StringBuffer lineToken=nextLineToken();
if(lineToken==null)
@@ -165,7 +167,7 @@
// retour de celle-ci
if (progress_!=null)
progress_.setDesc(DodicoLib.getS("Lecture de ")+fileName_);
- return bief.buildZones(analyze_, progress_);
+ return new Object[]{bief.getBiefName(),bief.buildZones(analyze_, progress_)};
}
catch (ParseError _exc) {
analyze_.addFatalError(_exc.getMessage());
Modified: trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSigFileLoaderMascaret.java
===================================================================
--- trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSigFileLoaderMascaret.java 2011-05-03 15:51:42 UTC (rev 6241)
+++ trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSigFileLoaderMascaret.java 2011-05-04 13:30:44 UTC (rev 6242)
@@ -63,7 +63,7 @@
if(op.containsMessages()&&op.getAnalyze().containsFatalError())
return;
- GISZoneCollectionLigneBrisee[] lines=(GISZoneCollectionLigneBrisee[])op.getSource();
+ GISZoneCollectionLigneBrisee[] lines=(GISZoneCollectionLigneBrisee[])((Object[])op.getSource())[1];
for (GISZoneCollectionLigneBrisee zl : lines) {
_r.nbPointTotal_+=zl.getNumPoints();
_r.nbPolylignes_+=zl.getNumGeometries();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|