Menu
▾
▴
[Fudaa-svn-commit] SF.net SVN: fudaa:[5735] trunk/soft/fudaa-crue
|
From: <de...@us...> - 2010-03-30 21:27:33
|
Revision: 5735
http://fudaa.svn.sourceforge.net/fudaa/?rev=5735&view=rev
Author: deniger
Date: 2010-03-30 21:27:25 +0000 (Tue, 30 Mar 2010)
Log Message:
-----------
Modified Paths:
--------------
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/FCBReader.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/FCBSequentialReader.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/FCBValueObject.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/STRFactory.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/STRReader.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/STRSequentialReader.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/OrdResBrancheOrifice.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/OrdResCasierProfil.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/OrdResSectionIdem.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/OrdResSectionInterpolee.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/OrdResSectionProfil.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/OrdResSectionSansGeometrie.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/ResPrtGeoSection.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/projet/ScenarioLoader.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/projet/ScenarioLoaderCrue9.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/property/CrueProperties.java
trunk/soft/fudaa-crue/dodico/src/main/resources/default.ores.xml
trunk/soft/fudaa-crue/dodico/src/main/resources/org/fudaa/dodico/crue/common/commonMessages.properties
trunk/soft/fudaa-crue/dodico/src/main/resources/xsd/frag-ores-1.0.0.xsd
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/io/TestCrueFCB.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/builder/EMHManagerBuilder.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/explorer/CrueLauncher.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/view/CrueFilleEMH.java
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/FCBReader.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/FCBReader.java 2010-03-28 20:51:07 UTC (rev 5734)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/FCBReader.java 2010-03-30 21:27:25 UTC (rev 5735)
@@ -134,9 +134,9 @@
final int nbNd = bf.getInt();
- final List<FCBValueObject.EnteteNoeud> nds = new ArrayList<FCBValueObject.EnteteNoeud>(nbNd);
+ final List<FCBValueObject.EnteteCasier> nds = new ArrayList<FCBValueObject.EnteteCasier>(nbNd);
for (int i = 0; i < nbNd; i++) {
- final FCBValueObject.EnteteNoeud nd = new FCBValueObject.EnteteNoeud();
+ final FCBValueObject.EnteteCasier nd = new FCBValueObject.EnteteCasier();
nd.setNom(helper.getStingFromBuffer(16).trim());
nd.setNumProfil(bf.getInt() - 1);
nds.add(nd);
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/FCBSequentialReader.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/FCBSequentialReader.java 2010-03-28 20:51:07 UTC (rev 5734)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/FCBSequentialReader.java 2010-03-30 21:27:25 UTC (rev 5735)
@@ -254,10 +254,10 @@
}
- private class ResBuilderNoeud implements ResBuilder<FCBValueObject.ResNoeud> {
+ private class ResBuilderNoeud implements ResBuilder<FCBValueObject.ResCasier> {
- public FCBValueObject.ResNoeud createRes() {
- return new FCBValueObject.ResNoeud();
+ public FCBValueObject.ResCasier createRes() {
+ return new FCBValueObject.ResCasier();
}
public int getOffset(final int idxEnr) {
@@ -394,7 +394,7 @@
private EnteteContainer<FCBValueObject.EnteteBranche, FCBValueObject.ResBranche> containerBranches = EMPTY;
- private EnteteContainer<FCBValueObject.EnteteNoeud, FCBValueObject.ResNoeud> containerNoeuds = EMPTY;
+ private EnteteContainer<FCBValueObject.EnteteCasier, FCBValueObject.ResCasier> containerCasiers = EMPTY;
private ByteOrder order;
@@ -441,8 +441,8 @@
/**
* @return le container des noeuds.
*/
- public EnteteContainer<FCBValueObject.EnteteNoeud, FCBValueObject.ResNoeud> getContainerNoeuds() {
- return containerNoeuds;
+ public EnteteContainer<FCBValueObject.EnteteCasier, FCBValueObject.ResCasier> getContainerCasiers() {
+ return containerCasiers;
}
/**
@@ -463,7 +463,7 @@
* @return le nombre de noeuds
*/
public Object getNbNoeuds() {
- return containerNoeuds.getNbData();
+ return containerCasiers.getNbData();
}
/**
@@ -534,9 +534,9 @@
* @return le resultat. inout si non null
* @throws IOException si erreur de lecture
*/
- public FCBValueObject.ResNoeud getResultatNoeud(final int idxPdt, final String nomNoeud,
- final FCBValueObject.ResNoeud inout) throws IOException {
- return getResultat(idxPdt, nomNoeud, inout, containerNoeuds);
+ public FCBValueObject.ResCasier getResultatNoeud(final int idxPdt, final String nomNoeud,
+ final FCBValueObject.ResCasier inout) throws IOException {
+ return getResultat(idxPdt, nomNoeud, inout, containerCasiers);
}
@@ -572,9 +572,9 @@
* @return le resultat. inout si non null
* @throws IOException si erreur de lecture
*/
- public FCBValueObject.ResNoeud getResultatNoeud(final int idxPdt, final int nomNoeud,
- final FCBValueObject.ResNoeud inout) throws IOException {
- return getResultat(idxPdt, nomNoeud, inout, containerNoeuds);
+ public FCBValueObject.ResCasier getResultatNoeud(final int idxPdt, final int nomNoeud,
+ final FCBValueObject.ResCasier inout) throws IOException {
+ return getResultat(idxPdt, nomNoeud, inout, containerCasiers);
}
@@ -638,8 +638,8 @@
new ResBuilderBranche());
}
- protected void setNoeuds(final List<FCBValueObject.EnteteNoeud> noeuds) {
- this.containerNoeuds = new EnteteContainer<FCBValueObject.EnteteNoeud, FCBValueObject.ResNoeud>(noeuds,
+ protected void setNoeuds(final List<FCBValueObject.EnteteCasier> noeuds) {
+ this.containerCasiers = new EnteteContainer<FCBValueObject.EnteteCasier, FCBValueObject.ResCasier>(noeuds,
new ResBuilderNoeud());
}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/FCBValueObject.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/FCBValueObject.java 2010-03-28 20:51:07 UTC (rev 5734)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/FCBValueObject.java 2010-03-30 21:27:25 UTC (rev 5735)
@@ -152,7 +152,7 @@
res.setSplanMin(su1bra);
res.setSplanMaj(su2bra);
res.setSplanSto(su4bra);
- res.setVol(volbra);
+ res.setVol(volbra * 1E6);
return res;
}
@@ -194,7 +194,7 @@
* @creation 27 mai 2009
* @version
*/
- public static class ResNoeud extends AbstractRes {
+ public static class ResCasier extends AbstractRes {
/**
* débit résultant du casier ip
@@ -428,7 +428,7 @@
*
* @author Adrien Hadoux
*/
- public static class EnteteNoeud extends AbstractEntete {
+ public static class EnteteCasier extends AbstractEntete {
private int numProfil;
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/STRFactory.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/STRFactory.java 2010-03-28 20:51:07 UTC (rev 5734)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/STRFactory.java 2010-03-30 21:27:25 UTC (rev 5735)
@@ -109,8 +109,8 @@
// Calcul des abscisses z
final int nbHaut = donneesSection.getNbHaut();
- final float zmin = donneesSection.getZFond();
final float dzpro = donneesSection.getDZpro();
+ final float zmin = donneesSection.getZFond() + dzpro;
final float[] abscissesZ = new float[nbHaut];
for (int i = 0; i < nbHaut; i++) {
@@ -154,7 +154,7 @@
// Alimentation loi LsupDeLit
rptgSection.setLitLsup(getDataDeLitRPTG(sectionAutreBranche.getListeLargHaut(), nom, EnumTypeLoi.LstLitLsup));
// Alimentation loi KsupDeLit
- rptgSection.setLitKsup(getDataDeLitRPTG(sectionAutreBranche.getListeStriHaut(), nom, EnumTypeLoi.LstLitKsup));
+ rptgSection.setLstLitKsup(getDataDeLitRPTG(sectionAutreBranche.getListeStriHaut(), nom, EnumTypeLoi.LstLitKsup));
// Alimentation loi LinfDeLit
rptgSection.setLitLinf(getDataDeLitRPTG(sectionAutreBranche.getListeLargFond(), nom, EnumTypeLoi.LstLitLinf));
// Alimentation loi SsupDeLit
@@ -177,7 +177,7 @@
// }
}
litPos.setPositions(enums);
- rptgSection.setLitPos(litPos);
+ rptgSection.setLstLitPos(litPos);
}
}
return rptgSection;
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/STRReader.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/STRReader.java 2010-03-28 20:51:07 UTC (rev 5734)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/STRReader.java 2010-03-30 21:27:25 UTC (rev 5735)
@@ -5,7 +5,6 @@
import gnu.trove.TObjectIntHashMap;
-import java.io.FileInputStream;
import java.io.IOException;
import java.nio.ByteBuffer;
import java.util.ArrayList;
@@ -50,7 +49,7 @@
data.nbLitMax = paramsGen.getNblitmax();
data.nbHaut = paramsGen.getNbhaut();
data.file = file;
-
+ // 49 + 2*Npo + (17 + 2*NbStr)*NbLitMax + 9*NbHaut
int longueurEnregistrement = 49 + 2 * data.npo + (17 + 2 * data.nbStr) * data.nbLitMax + 9 * data.nbHaut;
longueurEnregistrement = longueurEnregistrement * 4;
final int longueurEnregistrementSTO = dimension.getLReclProf() * 4;
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/STRSequentialReader.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/STRSequentialReader.java 2010-03-28 20:51:07 UTC (rev 5734)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/STRSequentialReader.java 2010-03-30 21:27:25 UTC (rev 5735)
@@ -159,32 +159,22 @@
final DonneesSectionOuProfil donneesSection = new DonneesSectionOuProfil();
donneesSection.setNom(getStringFromBuffer(bf, 16).trim());
- // System.out.print("Nom = " + donneesSection.getNom() + " | ");
donneesSection.setType(getStringFromBuffer(bf, 8).trim());
- // System.out.print("Type = " + donneesSection.getType() + " | ");
final int nTypBra = bf.getInt();
donneesSection.setNTypBra(nTypBra);
- // System.out.print("NTypBra = " + donneesSection.getNTypBra() + " | ");
-
donneesSection.setProfRef(getStringFromBuffer(bf, 16).trim());
- // System.out.print("ProfRef = " + donneesSection.getProfRef() + " | ");
donneesSection.setDZref(bf.getFloat());
- // System.out.print("DZref = " + donneesSection.getDZref() + " | ");
donneesSection.setNomCasier(getStringFromBuffer(bf, 16).trim());
- // System.out.print("NomCasier = " + donneesSection.getNomCasier() + " | ");
donneesSection.setDistAppliProfCasier(bf.getFloat());
- // System.out.print("DistAppliProfCasier = " + donneesSection.getDistAppliProfCasier() + " | ");
final int nbLit = bf.getInt();
donneesSection.setNbLit(nbLit);
- // System.out.print("NbLit = " + donneesSection.getNbLit() + " | ");
final String[] typesLits = new String[nbLit];
for (int j = 0; j < nbLit; j++) {
typesLits[j] = getStringFromBuffer(bf, 8).trim();
- // System.out.print("typesLits[j] = " + typesLits[j] + " | ");
}
donneesSection.setTypesLits(typesLits);
// on ne lit pas le reste...
@@ -192,9 +182,7 @@
final String[] nomsLits = new String[nbLit];
for (int j = 0; j < nbLit; j++) {
-
nomsLits[j] = getStringFromBuffer(bf, 16).trim();
- // System.out.print("nomsLits[j] = " + nomsLits[j] + " | ");
}
donneesSection.setNomsLits(nomsLits);
// on ne lit pas le reste...
@@ -202,12 +190,9 @@
final float[] fondsLits = new float[nbLit];
for (int j = 0; j < nbLit; j++) {
-
fondsLits[j] = bf.getFloat();
- // System.out.print("fondsLits[j] = " + fondsLits[j] + " | ");
}
donneesSection.setZFondsLits(fondsLits);
- // on ne lit pas le reste...
skip(bf, 4 * (nbLitMax - nbLit));
final List<DonneesStricklerPourLitSection> stricklers = new ArrayList<DonneesStricklerPourLitSection>(nbLit);
@@ -216,19 +201,14 @@
final DonneesStricklerPourLitSection strickler = new DonneesStricklerPourLitSection();
strickler.setNom(getStringFromBuffer(bf, 16));
- // System.out.print("Strickler_Nom = " + strickler.getNom() + " | ");
strickler.setType(getStringFromBuffer(bf, 8));
- // System.out.print("Strickler_Type = " + strickler.getType() + " | ");
strickler.setValeurConstante(bf.getFloat());
- // System.out.print("Strickler_ValeurConstante = " + strickler.getValeurConstante() + " | ");
final int nbPtLoiStrickler = bf.getInt();
strickler.setNbPtLoi(nbPtLoiStrickler);
- // System.out.print("Strickler_NbPtLoi = " + strickler.getNbPtLoi() + " | ");
final float[] zs = new float[nbPtLoiStrickler];
for (int j2 = 0; j2 < nbPtLoiStrickler; j2++) {
zs[j2] = bf.getFloat();
- // System.out.print("Strickler_zs[j2] = " + zs[j2] + " | ");
}
strickler.setZs(zs);
// on ne lit pas le reste...
@@ -237,7 +217,6 @@
final float[] ks = new float[nbPtLoiStrickler];
for (int j2 = 0; j2 < nbPtLoiStrickler; j2++) {
ks[j2] = bf.getFloat();
- // System.out.print("Strickler_ks[j2] = " + ks[j2] + " | ");
}
strickler.setKs(ks);
// on ne lit pas le reste...
@@ -252,21 +231,17 @@
final float[] params = new float[5];
for (int j = 0; j < 5; j++) {
-
params[j] = bf.getFloat();
- // System.out.print("params[j] = " + params[j] + " | ");
}
donneesSection.setParams(params);
final int nbPtProfil = bf.getInt();
donneesSection.setNbPtProfil(nbPtProfil);
- // System.out.print("nbPtProfil = " + nbPtProfil + " | ");
final float[] xsTravers = new float[nbPtProfil];
for (int j = 0; j < nbPtProfil; j++) {
xsTravers[j] = bf.getFloat();
- // System.out.print("xsTravers[j] = " + xsTravers[j] + " | ");
}
donneesSection.setXsTravers(xsTravers);
// on ne lit pas le reste...
@@ -276,7 +251,6 @@
for (int j = 0; j < nbPtProfil; j++) {
zsTravers[j] = bf.getFloat();
- // System.out.print("zsTravers[j] = " + zsTravers[j] + " | ");
}
donneesSection.setZsTravers(zsTravers);
// on ne lit pas le reste...
@@ -286,32 +260,21 @@
for (int j = 0; j < 2; j++) {
fentes[j] = bf.getFloat();
- // System.out.print("fentes[j] = " + fentes[j] + " | ");
}
donneesSection.setFentes(fentes);
donneesSection.setZDevers(bf.getFloat());
- // System.out.print("ZDevers = " + donneesSection.getZDevers() + " | ");
donneesSection.setHDevers(bf.getFloat());
- // System.out.print("HDevers = " + donneesSection.getHDevers() + " | ");
donneesSection.setZDigueG(bf.getFloat());
- // System.out.print("ZDigueG = " + donneesSection.getZDigueG() + " | ");
donneesSection.setZDigueD(bf.getFloat());
- // System.out.print("ZDigueD = " + donneesSection.getZDigueD() + " | ");
donneesSection.setCDigueG(bf.getFloat());
- // System.out.print("CDigueG = " + donneesSection.getCDigueG() + " | ");
donneesSection.setCDigueD(bf.getFloat());
- // System.out.print("CDigueD = " + donneesSection.getCDigueD() + " | ");
donneesSection.setZFond(bf.getFloat());
- // System.out.print("ZFond = " + donneesSection.getZFond() + " | ");
donneesSection.setZHaut(bf.getFloat());
- // System.out.print("ZHaut = " + donneesSection.getZHaut() + " | ");
donneesSection.setDZpro(bf.getFloat());
- // System.out.print("DZpro = " + donneesSection.getDZpro() + " | ");
final String typeLimLit = getStringFromBuffer(bf, 8);
donneesSection.setTypeLimLit(typeLimLit);
- // System.out.print("typeLimLit = " + typeLimLit + " | ");
if (typeLimLit != null && typeLimLit.length() > 0) {
DonneesLimites limites = null;
@@ -324,7 +287,8 @@
}
DonneesSectionPourBranche donneesBranche = null;
- if (nTypBra == 0 || nTypBra == 9) {
+ // 0, 2, 6, 9 ou 15
+ if (nTypBra == 0 || nTypBra == 2 || nTypBra == 6 || nTypBra == 9 || nTypBra == 15) {
donneesBranche = getBranche0Ou9(bf);
} else {
donneesBranche = getAutreBranche(bf, nbLit);
@@ -334,8 +298,6 @@
// points z sur cette hauteur pour l'affection des loisFF
donneesSection.setNbHaut(nbHaut);
- // System.out.println();
-
return donneesSection;
}
@@ -371,7 +333,6 @@
for (int j = 0; j < nbLit; j++) {
limsDeb[j] = bf.getInt();
- // System.out.print("limsDeb[j] = " + limsDeb[j] + " | ");
}
limites.setJLimsDeb(limsDeb);
skip(bf, 4 * (nbLitMax - nbLit));
@@ -380,7 +341,6 @@
for (int j = 0; j < nbLit; j++) {
limsFin[j] = bf.getInt();
- // System.out.print("limsFin[j] = " + limsFin[j] + " | ");
}
limites.setJLimsFin(limsFin);
skip(bf, 4 * (nbLitMax - nbLit));
@@ -401,9 +361,7 @@
final float[] limsDeb = new float[nbLit];
for (int j = 0; j < nbLit; j++) {
-
limsDeb[j] = bf.getFloat();
- // System.out.print("limsDeb[j] = " + limsDeb[j] + " | ");
}
limites.setXLimsDeb(limsDeb);
skip(bf, 4 * (nbLitMax - nbLit));
@@ -412,7 +370,6 @@
for (int j = 0; j < nbLit; j++) {
limsFin[j] = bf.getFloat();
- // System.out.print("limsFin[j] = " + limsFin[j] + " | ");
}
limites.setXLimsFin(limsFin);
skip(bf, 4 * (nbLitMax - nbLit));
@@ -431,35 +388,22 @@
final SectionPourBranche0Ou9 donneesBranche = new SectionPourBranche0Ou9();
donneesBranche.setUlm1(bf.getFloat());
- // System.out.print("Ulm1 = " + donneesBranche.getUlm1() + " | ");
donneesBranche.setUlm2(bf.getFloat());
- // System.out.print("Ulm2 = " + donneesBranche.getUlm2() + " | ");
donneesBranche.setUlm3(bf.getFloat());
- // System.out.print("Ulm3 = " + donneesBranche.getUlm3() + " | ");
donneesBranche.setDZg11(bf.getFloat());
- // System.out.print("DZg11 = " + donneesBranche.getDZg11() + " | ");
donneesBranche.setDZg12(bf.getFloat());
- // System.out.print("DZg12 = " + donneesBranche.getDZg12() + " | ");
donneesBranche.setDZg13(bf.getFloat());
- // System.out.print("DZg13 = " + donneesBranche.getDZg13() + " | ");
donneesBranche.setDZd11(bf.getFloat());
- // System.out.print("DZd11 = " + donneesBranche.getDZd11() + " | ");
donneesBranche.setDZd12(bf.getFloat());
- // System.out.print("DZd12 = " + donneesBranche.getDZd12() + " | ");
donneesBranche.setDZd13(bf.getFloat());
- // System.out.print("DZd13 = " + donneesBranche.getDZd13() + " | ");
donneesBranche.setISec2(bf.getInt());
- // System.out.print("ISec2 = " + donneesBranche.getISec2() + " | ");
donneesBranche.setIular4(bf.getInt());
- // System.out.print("Iular4 = " + donneesBranche.getIular4() + " | ");
donneesBranche.setStric(bf.getFloat());
- // System.out.print("Stric = " + donneesBranche.getStric() + " | ");
final float[] listeSec1 = new float[nbHaut];
for (int j = 0; j < nbHaut; j++) {
listeSec1[j] = bf.getFloat();
- // System.out.print("listeSec1[j] = " + listeSec1[j] + " | ");
}
donneesBranche.setListeSec1(listeSec1);
@@ -467,7 +411,6 @@
for (int j = 0; j < nbHaut; j++) {
listePer1[j] = bf.getFloat();
- // System.out.print("listePer1[j] = " + listePer1[j] + " | ");
}
donneesBranche.setListePer1(listePer1);
@@ -475,7 +418,6 @@
for (int j = 0; j < nbHaut; j++) {
listeUlar1[j] = bf.getFloat();
- // System.out.print("listeUlar1[j] = " + listeUlar1[j] + " | ");
}
donneesBranche.setListeUlar1(listeUlar1);
@@ -483,7 +425,6 @@
for (int j = 0; j < nbHaut; j++) {
listeSec2[j] = bf.getFloat();
- // System.out.print("listeSec2[j] = " + listeSec2[j] + " | ");
}
donneesBranche.setListeSec2(listeSec2);
@@ -491,7 +432,6 @@
for (int j = 0; j < nbHaut; j++) {
listePer2[j] = bf.getFloat();
- // System.out.print("listePer2[j] = " + listePer2[j] + " | ");
}
donneesBranche.setListePer2(listePer2);
@@ -499,7 +439,6 @@
for (int j = 0; j < nbHaut; j++) {
listeUlar2[j] = bf.getFloat();
- // System.out.print("listeUlar2[j] = " + listeUlar2[j] + " | ");
}
donneesBranche.setListeUlar2(listeUlar2);
@@ -507,7 +446,6 @@
for (int j = 0; j < nbHaut; j++) {
listeUlar4[j] = bf.getFloat();
- // System.out.print("listeUlar4[j] = " + listeUlar4[j] + " | ");
}
donneesBranche.setListeUlar4(listeUlar4);
@@ -515,7 +453,6 @@
for (int j = 0; j < nbHaut; j++) {
listeCoefW1[j] = bf.getFloat();
- // System.out.print("listeCoefW1[j] = " + listeCoefW1[j] + " | ");
}
donneesBranche.setListeCoefW1(listeCoefW1);
@@ -523,7 +460,6 @@
for (int j = 0; j < nbHaut; j++) {
listeCoefW2[j] = bf.getFloat();
- // System.out.print("listeCoefW2[j] = " + listeCoefW2[j] + " | ");
}
donneesBranche.setListeCoefW2(listeCoefW2);
@@ -543,41 +479,31 @@
final float[] listeSLitActif = new float[nbHaut];
for (int j = 0; j < nbHaut; j++) {
-
listeSLitActif[j] = bf.getFloat();
- // System.out.print("listeSLitActif[j] = " + listeSLitActif[j] + " | ");
}
donneesBranche.setListeSLitActif(listeSLitActif);
final float[] listeLargLitActif = new float[nbHaut];
for (int j = 0; j < nbHaut; j++) {
-
listeLargLitActif[j] = bf.getFloat();
- // System.out.print("listeLargLitActif[j] = " + listeLargLitActif[j] + " | ");
}
donneesBranche.setListeLargLitActif(listeLargLitActif);
final float[] listeDebLitActif = new float[nbHaut];
for (int j = 0; j < nbHaut; j++) {
-
listeDebLitActif[j] = bf.getFloat();
- // System.out.print("listeDebLitActif[j] = " + listeDebLitActif[j] + " | ");
}
donneesBranche.setListeDebLitActif(listeDebLitActif);
final float[] listeLargCont = new float[nbHaut];
for (int j = 0; j < nbHaut; j++) {
-
listeLargCont[j] = bf.getFloat();
- // System.out.print("listeLargCont[j] = " + listeLargCont[j] + " | ");
}
donneesBranche.setListeLargCont(listeLargCont);
final float[] listeBeta = new float[nbHaut];
for (int j = 0; j < nbHaut; j++) {
-
listeBeta[j] = bf.getFloat();
- // System.out.print("listeBeta[j] = " + listeBeta[j] + " | ");
}
donneesBranche.setListeBeta(listeBeta);
@@ -585,7 +511,6 @@
for (int j = 0; j < nbHaut; j++) {
listeLargSto[j] = bf.getFloat();
- // System.out.print("listeLargSto[j] = " + listeLargSto[j] + " | ");
}
donneesBranche.setListeLargSto(listeLargSto);
@@ -593,7 +518,6 @@
for (int j = 0; j < nbLit; j++) {
listeSurfHaut[j] = bf.getFloat();
- // System.out.print("listeSurfHaut[j] = " + listeSurfHaut[j] + " | ");
}
donneesBranche.setListeSurfHaut(listeSurfHaut);
skip(bf, 4 * (nbLitMax - nbLit));
@@ -602,7 +526,6 @@
for (int j = 0; j < nbLit; j++) {
listePerHaut[j] = bf.getFloat();
- // System.out.print("listePerHaut[j] = " + listePerHaut[j] + " | ");
}
donneesBranche.setListePerHaut(listePerHaut);
skip(bf, 4 * (nbLitMax - nbLit));
@@ -611,7 +534,6 @@
for (int j = 0; j < nbLit; j++) {
listeLargHaut[j] = bf.getFloat();
- // System.out.print("listeLargHaut[j] = " + listeLargHaut[j] + " | ");
}
donneesBranche.setListeLargHaut(listeLargHaut);
skip(bf, 4 * (nbLitMax - nbLit));
@@ -620,7 +542,6 @@
for (int j = 0; j < nbLit; j++) {
listeStriHaut[j] = bf.getFloat();
- // System.out.print("listeStriHaut[j] = " + listeStriHaut[j] + " | ");
}
donneesBranche.setListeStriHaut(listeStriHaut);
skip(bf, 4 * (nbLitMax - nbLit));
@@ -629,7 +550,6 @@
for (int j = 0; j < nbLit; j++) {
listeLargFond[j] = bf.getFloat();
- // System.out.print("listeLargFond[j] = " + listeLargFond[j] + " | ");
}
donneesBranche.setListeLargFond(listeLargFond);
skip(bf, 4 * (nbLitMax - nbLit));
@@ -638,20 +558,14 @@
for (int j = 0; j < nbLit; j++) {
listeLitExtreme[j] = bf.getInt();
- // System.out.print("listeLitExtreme[j] = " + listeLitExtreme[j] + " | ");
}
- // System.out.println();
donneesBranche.setListeLitExtreme(listeLitExtreme);
skip(bf, 4 * (nbLitMax - nbLit));
donneesBranche.setRecAm(bf.getInt());
- // System.out.print("RecAm = " + donneesBranche.getRecAm() + " | ");
donneesBranche.setRecAv(bf.getInt());
- // System.out.print("RecAv = " + donneesBranche.getRecAv() + " | ");
donneesBranche.setDistAm(bf.getFloat());
- // System.out.print("DistAm = " + donneesBranche.getDistAm() + " | ");
donneesBranche.setDistAv(bf.getFloat());
- // System.out.print("DistAv = " + donneesBranche.getDistAv() + " | ");
return donneesBranche;
}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/OrdResBrancheOrifice.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/OrdResBrancheOrifice.java 2010-03-28 20:51:07 UTC (rev 5734)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/OrdResBrancheOrifice.java 2010-03-30 21:27:25 UTC (rev 5735)
@@ -21,13 +21,6 @@
return ddeCoefCtr;
}
- // /**
- // * @return the ddeOuv
- // */
- // public boolean getDdeOuv() {
- // return ddeOuv;
- // }
-
/**
* @return the ddeRegime
*/
@@ -42,13 +35,6 @@
this.ddeCoefCtr = ddeCoefCtr;
}
- // /**
- // * @param ddeOuv the ddeOuv to set
- // */
- // public void setDdeOuv(final boolean ddeOuv) {
- // this.ddeOuv = ddeOuv;
- // }
-
/**
* @param ddeRegime the ddeRegime to set
*/
@@ -58,7 +44,7 @@
@Override
public String toString() {
- return "OrdResBrancheOrifice [ddeCoefCtr=" + ddeCoefCtr + ", ddeRegime=" + ddeRegime + "...]";
+ return "OrdResBrancheOrifice [ddeCoefCtr=" + ddeCoefCtr + ", ddeRegime=" + ddeRegime + "]";
}
}
\ No newline at end of file
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/OrdResCasierProfil.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/OrdResCasierProfil.java 2010-03-28 20:51:07 UTC (rev 5734)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/OrdResCasierProfil.java 2010-03-30 21:27:25 UTC (rev 5735)
@@ -7,9 +7,9 @@
// WARN: l'ordre des champs est important car utilise par l'ecriture/lecture de ORES
/** @pdOid 01ffbfed-95f5-4a76-b0f5-9c52ca9c745e */
public class OrdResCasierProfil extends OrdRes {
+ private boolean ddeQech;
/** @pdOid 82809ac1-081a-48a5-86bb-5e66e55226d4 */
private boolean ddeSplan;
- private boolean ddeQech;
/** @pdOid 7c1dbf13-c9b2-4ce1-baaf-11be633338af */
private boolean ddeVol;
@@ -55,7 +55,7 @@
@Override
public String toString() {
- return "OrdResCasierProfil [ddeSplan=" + ddeSplan + ", ddeVol=" + ddeVol + "]";
+ return "OrdResCasierProfil [ddeQech=" + ddeQech + ", ddeSplan=" + ddeSplan + ", ddeVol=" + ddeVol + "]";
}
}
\ No newline at end of file
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/OrdResSectionIdem.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/OrdResSectionIdem.java 2010-03-28 20:51:07 UTC (rev 5734)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/OrdResSectionIdem.java 2010-03-30 21:27:25 UTC (rev 5735)
@@ -313,7 +313,13 @@
@Override
public String toString() {
- return "OrdResSectionIdem [ddeQ=" + ddeQ + ", ddeZ=" + ddeZ + "...]";
+ // private boolean ddeDact;
+ // private boolean ddeDtot;
+ // private boolean ddeFr;
+ // private boolean ddeH;
+ // private boolean ddeHs;
+ return "OrdResSectionIdem [ddeDact=" + ddeDact + ", ddeDtot=" + ddeDtot + ", ddeFr=" + ddeFr + ", ddeH=" + ddeH
+ + ", ddeHs=" + ddeHs + ",...]";
}
}
\ No newline at end of file
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/OrdResSectionInterpolee.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/OrdResSectionInterpolee.java 2010-03-28 20:51:07 UTC (rev 5734)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/OrdResSectionInterpolee.java 2010-03-30 21:27:25 UTC (rev 5735)
@@ -313,7 +313,9 @@
@Override
public String toString() {
- return "OrdResSectionInterpolee [ddeQ=" + ddeQ + ", ddeZ=" + ddeZ + "...]";
+ return "OrdResSectionInterpolee [ddeDact=" + ddeDact + ", ddeDtot=" + ddeDtot + ", ddeFr=" + ddeFr + ", ddeH="
+ + ddeH + ", ddeHs=" + ddeHs + ",...]";
+ // return "OrdResSectionInterpolee [ddeQ=" + ddeQ + ", ddeZ=" + ddeZ + "...]";
}
}
\ No newline at end of file
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/OrdResSectionProfil.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/OrdResSectionProfil.java 2010-03-28 20:51:07 UTC (rev 5734)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/OrdResSectionProfil.java 2010-03-30 21:27:25 UTC (rev 5735)
@@ -314,7 +314,8 @@
@Override
public String toString() {
- return "OrdResSectionProfil [ddeDact=" + ddeDact + ", ddeDtot=" + ddeDtot + ", ...]";
+ return "OrdResSectionProfil [ddeDact=" + ddeDact + ", ddeDtot=" + ddeDtot + ", ddeFr=" + ddeFr + ", ddeH=" + ddeH
+ + ", ddeHs=" + ddeHs + ",...]";
}
}
\ No newline at end of file
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/OrdResSectionSansGeometrie.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/OrdResSectionSansGeometrie.java 2010-03-28 20:51:07 UTC (rev 5734)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/OrdResSectionSansGeometrie.java 2010-03-30 21:27:25 UTC (rev 5735)
@@ -327,7 +327,9 @@
@Override
public String toString() {
- return "OrdResSectionSansGeometrie [ddeQ=" + ddeQ + ", ddeZ=" + ddeZ + "]";
+ // return "OrdResSectionSansGeometrie [ddeQ=" + ddeQ + ", ddeZ=" + ddeZ + "]";
+ return "OrdResSectionSansGeometrie [ddeDact=" + ddeDact + ", ddeDtot=" + ddeDtot + ", ddeFr=" + ddeFr + ", ddeH="
+ + ddeH + ", ddeHs=" + ddeHs + ",...]";
}
}
\ No newline at end of file
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/ResPrtGeoSection.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/ResPrtGeoSection.java 2010-03-28 20:51:07 UTC (rev 5734)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/ResPrtGeoSection.java 2010-03-30 21:27:25 UTC (rev 5735)
@@ -19,17 +19,17 @@
/** @pdOid 9314a711-1f69-42d0-8901-33f3184c8314 */
private double zHaut;
/** @pdOid 57047aee-0f0e-4d4b-9b63-ea78ef22ddf4 */
- private ResPrtData litKsup;
+ private ResPrtData lstLitKsup;
/** @pdOid e161bbff-84a1-4cc2-8eb7-b7ebbc07932f */
- private ResPrtData litLsup;
+ private ResPrtData lstLitLsup;
/** @pdOid daf5b8d2-0eca-4546-b430-bb797fe55914 */
- private ResPrtData litPsup;
+ private ResPrtData lstLitPsup;
/** @pdOid 54f43b06-81d5-42bc-bebe-df9726f2204f */
- private ResPrtData litSsup;
+ private ResPrtData lstLitSsup;
/** @pdOid 05c82f8e-3d68-4c8c-a035-cec4d9b2eaa5 */
- private ResPrtData litZf;
+ private ResPrtData lstLitZf;
/** @pdOid 5c96a040-e162-4215-bc33-908291ae98ac */
- private ResPrtData litLinf;
+ private ResPrtData lstLitLinf;
/** @pdOid e1da6865-1edd-46b0-9b4b-bb704e17db6d */
private ResPrtDataLitPos litPos;
/** @pdOid 39d10767-0c9e-4cc1-a195-94539fd76204 */
@@ -83,21 +83,21 @@
}
/** @pdOid 480a26bf-6069-4f53-9f16-a2eb96a215b8 */
- public final ResPrtData getLitKsup() {
- return litKsup;
+ public final ResPrtData getLstLitKsup() {
+ return lstLitKsup;
}
/**
* @param newLitKsup
* @pdOid 304a22c5-9c29-4679-a0cd-05cb8828ac3b
*/
- public final void setLitKsup(ResPrtData newLitKsup) {
- litKsup = newLitKsup;
+ public final void setLstLitKsup(ResPrtData newLitKsup) {
+ lstLitKsup = newLitKsup;
}
/** @pdOid 54ca8ced-f46f-4b60-9c71-2056b52e0913 */
- public final ResPrtData getLitLsup() {
- return litLsup;
+ public final ResPrtData getLstLitLsup() {
+ return lstLitLsup;
}
/**
@@ -105,12 +105,12 @@
* @pdOid c7601dcc-d71f-4339-96c1-8b294c196906
*/
public final void setLitLsup(ResPrtData newLitLsup) {
- litLsup = newLitLsup;
+ lstLitLsup = newLitLsup;
}
/** @pdOid e3ceb073-3c96-4cc4-a3f0-d153001ffac3 */
- public final ResPrtData getLitPsup() {
- return litPsup;
+ public final ResPrtData getLstLitPsup() {
+ return lstLitPsup;
}
/**
@@ -118,12 +118,12 @@
* @pdOid 459e6a7e-d448-401b-8093-ca13c6a20bb4
*/
public final void setLitPsup(ResPrtData newLitPsup) {
- litPsup = newLitPsup;
+ lstLitPsup = newLitPsup;
}
/** @pdOid ad294a73-1467-44f4-b490-593ffd124738 */
- public final ResPrtData getLitSsup() {
- return litSsup;
+ public final ResPrtData getLstLitSsup() {
+ return lstLitSsup;
}
/**
@@ -131,12 +131,12 @@
* @pdOid 77850a3b-edff-4795-aff9-cc84ae058a10
*/
public final void setLitSsup(ResPrtData newLitSsup) {
- litSsup = newLitSsup;
+ lstLitSsup = newLitSsup;
}
/** @pdOid 7036f134-9bbe-4aac-b1c2-98fd14314e23 */
- public final ResPrtData getLitZf() {
- return litZf;
+ public final ResPrtData getLstLitZf() {
+ return lstLitZf;
}
/**
@@ -144,12 +144,12 @@
* @pdOid 94863da0-35c2-4814-9b45-427ad41e0323
*/
public final void setLitZf(ResPrtData newLitZf) {
- litZf = newLitZf;
+ lstLitZf = newLitZf;
}
/** @pdOid 67a4af7b-5635-400d-b486-5f0be667cad8 */
- public final ResPrtData getLitLinf() {
- return litLinf;
+ public final ResPrtData getLstLitLinf() {
+ return lstLitLinf;
}
/**
@@ -157,11 +157,11 @@
* @pdOid c10b8c4f-b331-4056-a4c7-504cc969747f
*/
public final void setLitLinf(ResPrtData newLitLinf) {
- litLinf = newLitLinf;
+ lstLitLinf = newLitLinf;
}
/** @pdOid 1bcfe7c9-758e-45aa-9b2f-08d189bd3f78 */
- public final ResPrtDataLitPos getLitPos() {
+ public final ResPrtDataLitPos getLstLitPos() {
return litPos;
}
@@ -169,7 +169,7 @@
* @param newLitPos
* @pdOid 94d013e6-bc19-44fc-91c7-554e7fea6934
*/
- public final void setLitPos(ResPrtDataLitPos newLitPos) {
+ public final void setLstLitPos(ResPrtDataLitPos newLitPos) {
litPos = newLitPos;
}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/projet/ScenarioLoader.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/projet/ScenarioLoader.java 2010-03-28 20:51:07 UTC (rev 5734)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/projet/ScenarioLoader.java 2010-03-30 21:27:25 UTC (rev 5735)
@@ -16,10 +16,10 @@
import org.fudaa.dodico.crue.validation.CrueValidator;
import org.fudaa.dodico.crue.validation.ValidateConnectionModele;
import org.fudaa.dodico.crue.validation.ValidatorForCrue9Export;
-import org.fudaa.dodico.crue.validation.ValidatorHelper;
import org.fudaa.dodico.crue.validation.ValidatorForIDCrue10;
import org.fudaa.dodico.crue.validation.ValidatorForIDCrue9;
import org.fudaa.dodico.crue.validation.ValidatorForValuesAndContents;
+import org.fudaa.dodico.crue.validation.ValidatorHelper;
/**
* Classe qui se charge de charger en memoire un scénario donné.
@@ -142,7 +142,7 @@
fileNotExist.setDefaultResourceBundle(CommonMessages.RESOURCE_BUNDLE);
fileNotExist.setDesc(CommonMessages.RESOURCE_BUNDLE.getString(title));
}
- fileNotExist.addError("loader.fichier.notExist.error", f.toString());
+ fileNotExist.addFatalError("loader.fichier.notExist.error", f.toString());
}
}
return valid;
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/projet/ScenarioLoaderCrue9.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/projet/ScenarioLoaderCrue9.java 2010-03-28 20:51:07 UTC (rev 5734)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/projet/ScenarioLoaderCrue9.java 2010-03-30 21:27:25 UTC (rev 5735)
@@ -28,7 +28,7 @@
import org.fudaa.dodico.crue.io.neuf.STRSequentialReader;
import org.fudaa.dodico.crue.io.neuf.FCBSequentialReader.ResultatCalculPasDeTemps;
import org.fudaa.dodico.crue.io.neuf.FCBValueObject.EnteteBranche;
-import org.fudaa.dodico.crue.io.neuf.FCBValueObject.EnteteNoeud;
+import org.fudaa.dodico.crue.io.neuf.FCBValueObject.EnteteCasier;
import org.fudaa.dodico.crue.io.neuf.FCBValueObject.EnteteProfil;
import org.fudaa.dodico.crue.metier.ManagerEMHModeleBase;
import org.fudaa.dodico.crue.metier.ManagerEMHScenario;
@@ -153,18 +153,18 @@
if (foundBranche == null) {
analyze.addError("res.branche.notFound", id);
error = true;
- } else {
+ } else if ("EMHBrancheSaintVenant".equals(foundBranche.getType())) {
foundBranche.addInfosEMH(res.getContainerBranches().createInfoEMH(foundBranche));
}
}
- for (final EnteteNoeud nd : res.getContainerNoeuds().getListData()) {
+ for (final EnteteCasier nd : res.getContainerCasiers().getListData()) {
final String id = nd.getNom().toUpperCase();
final CatEMHNoeud foundNoeud = data.findNoeudByReference(id);
if (foundNoeud == null) {
analyze.addError("res.noeud.notFound", id);
error = true;
- } else {
- foundNoeud.addInfosEMH(res.getContainerNoeuds().createInfoEMH(foundNoeud));
+ } else if (foundNoeud.getCasier() != null) {
+ foundNoeud.getCasier().addInfosEMH(res.getContainerCasiers().createInfoEMH(foundNoeud));
}
}
for (final EnteteProfil prof : res.getContainerProfil().getListData()) {
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/property/CrueProperties.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/property/CrueProperties.java 2010-03-28 20:51:07 UTC (rev 5734)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/property/CrueProperties.java 2010-03-30 21:27:25 UTC (rev 5735)
@@ -1,11 +1,15 @@
package org.fudaa.dodico.crue.property;
+import java.text.DecimalFormat;
+import java.text.DecimalFormatSymbols;
+import java.text.NumberFormat;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
+import java.util.Locale;
import java.util.Map;
import java.util.Set;
@@ -21,6 +25,7 @@
Map<EnumTypeLoi, ConfigLoi> confLoi = Collections.emptyMap();
Map<String, EnumTypeLoi> idConfLoi = Collections.emptyMap();
final Map<String, PropertyNature> propNature;
+ private final Map<Integer, DecimalFormat> nbDecFormat = new HashMap<Integer, DecimalFormat>();
/**
* Utile ?
@@ -68,6 +73,28 @@
return prop == null ? 0 : prop.getEpsilon();
}
+ public NumberFormat getFormatter(String propName) {
+ final PropertyDefinition prop = getProperty(propName);
+ return getFormatter(prop);
+ }
+
+ public NumberFormat getFormatter(final PropertyDefinition prop) {
+ if (prop == null) { return null; }
+ String natureNom = prop.getNature().getNom();
+ if (prop.getNature() == null || "date".equals(prop.getNature().getUnite()) || "date".equalsIgnoreCase(natureNom)
+ || "nbr".equalsIgnoreCase(natureNom) || "num".equalsIgnoreCase(natureNom)) { return null; }
+ int nbDec = Math.abs((int) Math.log10(prop.getEpsilon()));
+ DecimalFormat numberFormat = this.nbDecFormat.get(nbDec);
+ if (numberFormat == null) {
+ numberFormat = new DecimalFormat();
+ numberFormat.setGroupingUsed(false);
+ numberFormat.setDecimalFormatSymbols(new DecimalFormatSymbols(Locale.US));
+ numberFormat.setMaximumFractionDigits(nbDec);
+ nbDecFormat.put(nbDec, numberFormat);
+ }
+ return numberFormat;
+ }
+
public double getEpsilon(final String propName) {
final PropertyDefinition prop = getProperty(propName);
return getEpsilon(prop);
@@ -185,4 +212,9 @@
this.propDefinition = Collections.unmodifiableMap(propDefinition);
}
+ public static void main(String[] args) {
+ double d = 1e-5;
+ System.err.println(Math.log10(d));
+ }
+
}
Modified: trunk/soft/fudaa-crue/dodico/src/main/resources/default.ores.xml
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/resources/default.ores.xml 2010-03-28 20:51:07 UTC (rev 5734)
+++ trunk/soft/fudaa-crue/dodico/src/main/resources/default.ores.xml 2010-03-30 21:27:25 UTC (rev 5735)
@@ -23,8 +23,8 @@
</OrdResCasierMNT>
-->
<OrdResCasierProfil>
+ <DdeQech>true</DdeQech>
<DdeSplan>true</DdeSplan>
- <DdeQech>true</DdeQech>
<DdeVol>true</DdeVol>
</OrdResCasierProfil>
</OrdResCasiers>
Modified: trunk/soft/fudaa-crue/dodico/src/main/resources/org/fudaa/dodico/crue/common/commonMessages.properties
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/resources/org/fudaa/dodico/crue/common/commonMessages.properties 2010-03-28 20:51:07 UTC (rev 5734)
+++ trunk/soft/fudaa-crue/dodico/src/main/resources/org/fudaa/dodico/crue/common/commonMessages.properties 2010-03-30 21:27:25 UTC (rev 5735)
@@ -63,6 +63,7 @@
res.branche.notFound = Un r\u00E9sultat est d\u00E9finie sur la branche {0} qui n''existe pas dans l''\u00E9tude
res.noeud.notFound = Un r\u00E9sultat est d\u00E9finie sur le noeud {0} qui n''existe pas dans l''\u00E9tude
+res.casier.notFound = Un r\u00E9sultat est d\u00E9finie sur le noeud {0} qui n''a pas de casier
res.section.notFound = Un r\u00E9sultat est d\u00E9finie sur la section {0} qui n''existe pas dans l''\u00E9tude
rptg.NoeudForCasier.notFound = Les r\u00E9sultats de pr\u00E9traitement contiennent un r\u00E9sultat pour le casier du noeud {0} mais ce casier n'existe pas
Modified: trunk/soft/fudaa-crue/dodico/src/main/resources/xsd/frag-ores-1.0.0.xsd
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/resources/xsd/frag-ores-1.0.0.xsd 2010-03-28 20:51:07 UTC (rev 5734)
+++ trunk/soft/fudaa-crue/dodico/src/main/resources/xsd/frag-ores-1.0.0.xsd 2010-03-30 21:27:25 UTC (rev 5735)
@@ -28,9 +28,17 @@
<xs:element name="DdeHs" type="xs:boolean" />
<xs:element name="DdeVol" type="xs:boolean" />
<xs:element name="DdeYc" type="xs:boolean" />
+ <xs:element name="DdeRegime" type="xs:boolean" />
+ <xs:element name="DdeQ" type="xs:boolean" />
+ <xs:element name="DdeLtot" type="xs:boolean" />
+ <xs:element name="DdeZf" type="xs:boolean" />
+ <xs:element name="DdeZc" type="xs:boolean" />
+ <xs:element name="DdeDact" type="xs:boolean" />
+ <xs:element name="DdeQlat" type="xs:boolean" />
+ <xs:element name="DdeVc" type="xs:boolean" />
+ <xs:element name="DdeZn" type="xs:boolean" />
+ <xs:element name="DdeVact" type="xs:boolean" />
-
-
<xs:element name="OrdResSectionIdem">
<xs:complexType>
<xs:sequence>
@@ -143,10 +151,7 @@
</xs:complexType>
</xs:element>
- <xs:element name="DdeRegime" type="xs:string" />
- <xs:element name="DdeQ" type="xs:string" />
-
<xs:element name="OrdResCasiers">
<xs:complexType>
<xs:sequence>
@@ -187,7 +192,7 @@
<xs:element ref="DdeQ" />
<xs:element ref="DdeSact" />
<xs:element ref="DdeStot" />
- <xs:element name="DdeVact" type="xs:boolean" />
+ <xs:element ref="DdeVact" />
<xs:element ref="DdeVc" />
<xs:element ref="DdeVtot" />
<xs:element ref="DdeY" />
@@ -201,8 +206,8 @@
</xs:complexType>
</xs:element>
- <xs:element name="DdeLtot" type="xs:boolean" />
+
<xs:element name="OrdResBrancheSaintVenant">
<xs:complexType>
<xs:sequence>
@@ -213,8 +218,8 @@
</xs:complexType>
</xs:element>
- <xs:element name="DdeZc" type="xs:boolean" />
+
<xs:element name="OrdResNoeudNiveauContinu">
<xs:complexType>
<xs:sequence>
@@ -236,16 +241,8 @@
</xs:complexType>
</xs:element>
- <xs:element name="DdeZf" type="xs:boolean" />
+
- <xs:element name="DdeDact" type="xs:boolean" />
-
- <xs:element name="DdeQlat" type="xs:boolean" />
-
- <xs:element name="DdeVc" type="xs:boolean" />
-
- <xs:element name="DdeZn" type="xs:boolean" />
-
<xs:element name="OrdResBrancheOrifice">
<xs:complexType>
<xs:sequence>
@@ -268,8 +265,8 @@
<xs:element name="OrdResCasierProfil">
<xs:complexType>
<xs:sequence>
- <xs:element ref="DdeSplan" />
<xs:element ref="DdeQech" />
+ <xs:element ref="DdeSplan" />
<xs:element ref="DdeVol" />
</xs:sequence>
</xs:complexType>
@@ -311,7 +308,6 @@
</xs:complexType>
</xs:element>
- <!--<xs:element name="Ouv" type="xs:string" />
-->
<xs:element name="ORES">
Modified: trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/io/TestCrueFCB.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/io/TestCrueFCB.java 2010-03-28 20:51:07 UTC (rev 5734)
+++ trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/io/TestCrueFCB.java 2010-03-30 21:27:25 UTC (rev 5735)
@@ -6,9 +6,9 @@
import org.fudaa.dodico.crue.io.neuf.FCBSequentialReader;
import org.fudaa.dodico.crue.io.neuf.FCBSequentialReader.EnteteContainer;
import org.fudaa.dodico.crue.io.neuf.FCBValueObject.EnteteBranche;
-import org.fudaa.dodico.crue.io.neuf.FCBValueObject.EnteteNoeud;
+import org.fudaa.dodico.crue.io.neuf.FCBValueObject.EnteteCasier;
import org.fudaa.dodico.crue.io.neuf.FCBValueObject.ResBranche;
-import org.fudaa.dodico.crue.io.neuf.FCBValueObject.ResNoeud;
+import org.fudaa.dodico.crue.io.neuf.FCBValueObject.ResCasier;
/**
* Test FCB
@@ -36,7 +36,7 @@
System.err.println(name);
assertFalse(StringUtils.isBlank(name));
}
- EnteteContainer<EnteteNoeud, ResNoeud> containerNoeud = infos.getContainerNoeuds();
+ EnteteContainer<EnteteCasier, ResCasier> containerNoeud = infos.getContainerCasiers();
for (int i = 0; i < containerNoeud.getNbData(); i++) {
String name = containerNoeud.getDataName(i);
assertFalse(StringUtils.isBlank(name));
Modified: trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/builder/EMHManagerBuilder.java
===================================================================
--- trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/builder/EMHManagerBuilder.java 2010-03-28 20:51:07 UTC (rev 5734)
+++ trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/builder/EMHManagerBuilder.java 2010-03-30 21:27:25 UTC (rev 5735)
@@ -1,5 +1,6 @@
package org.fudaa.fudaa.crue.builder;
+import java.text.NumberFormat;
import java.util.Collection;
import java.util.Iterator;
import java.util.List;
@@ -32,9 +33,10 @@
import org.fudaa.dodico.crue.metier.emh.LitNomme;
import org.fudaa.dodico.crue.metier.emh.LitNumerote;
import org.fudaa.dodico.crue.metier.emh.Loi;
+import org.fudaa.dodico.crue.metier.emh.ObjetNomme;
import org.fudaa.dodico.crue.metier.emh.ObjetWithID;
-import org.fudaa.dodico.crue.metier.emh.ObjetNomme;
import org.fudaa.dodico.crue.metier.emh.OrdCalc;
+import org.fudaa.dodico.crue.metier.emh.PdtCst;
import org.fudaa.dodico.crue.metier.emh.PdtVar;
import org.fudaa.dodico.crue.metier.emh.Regle;
import org.fudaa.dodico.crue.metier.emh.RelationEMH;
@@ -42,6 +44,7 @@
import org.fudaa.dodico.crue.metier.emh.ResPrtDataLitPos;
import org.fudaa.dodico.crue.metier.emh.ResPrtGeo;
import org.fudaa.dodico.crue.metier.emh.ValParam;
+import org.fudaa.dodico.crue.property.CrueProperties;
import org.jdesktop.swingx.treetable.AbstractMutableTreeTableNode;
import org.jdesktop.swingx.treetable.DefaultMutableTreeTableNode;
import org.jdesktop.swingx.treetable.DefaultTreeTableModel;
@@ -57,8 +60,9 @@
public class EMHManagerBuilder {
private final static Logger LOGGER = LoggerFactory.getLogger(EMHManagerBuilder.class);
+ private CrueProperties propertyDefinitionContainer;
- private static void addDescribeNode(final Object parent, final DefaultMutableTreeTableNode parentNode,
+ private void addDescribeNode(final Object parent, final DefaultMutableTreeTableNode parentNode,
final String propToAvoid, final Map<String, AbstractTreeNode> ref) {
try {
final TreeMap describe = new TreeMap(PropertyUtils.describe(parent));
@@ -127,7 +131,7 @@
} else if (isAcceptedList) {
value = ((Collection) entryValue).size() + " Valeurs";
} else {
- value = objectToString(entryValue);
+ value = objectToString(name, entryValue);
}
final TreeNodeCleValeur child = new TreeNodeCleValeur(name, value);
@@ -208,7 +212,8 @@
if (isRegle) {
final List<Regle> col = (List<Regle>) entryValue;
for (final Regle object : col) {
- String toString = objectToString(object.getValParam() == null ? "" : object.getValParam().getValeurObjet());
+ String toString = objectToString(name, object.getValParam() == null ? "" : object.getValParam()
+ .getValeurObjet());
if (!object.isActive()) {
toString = toString + " (non active)";
}
@@ -219,8 +224,8 @@
final Collection col = (Collection) entryValue;
int i = 1;
for (final Object object : col) {
- child.add(new TreeNodeCleValeur(object.getClass().getSimpleName() + "[" + (i++) + "]",
- objectToString(object)));
+ child.add(new TreeNodeCleValeur(object.getClass().getSimpleName() + "[" + (i++) + "]", objectToString(name,
+ object)));
}
}
@@ -232,12 +237,12 @@
}
}
- private static void addNodesForEMH(final DefaultMutableTreeTableNode rootNodes, final EMH emh,
+ private void addNodesForEMH(final DefaultMutableTreeTableNode rootNodes, final EMH emh,
final Map<String, AbstractTreeNode> ref) {
addNodesForEMH(rootNodes, emh, ref, null);
}
- private static void addNodesForEMH(final DefaultMutableTreeTableNode rootNodes, final EMH emh,
+ private void addNodesForEMH(final DefaultMutableTreeTableNode rootNodes, final EMH emh,
final Map<String, AbstractTreeNode> ref, CommentaireContainer comments) {
final TreeNodeEMH nodeEMH = new TreeNodeEMH(emh);
nodeEMH.setIcon(CrueTreeProject.getIcon(emh));
@@ -319,7 +324,7 @@
* @param listData
* @return parent le parametre parent
*/
- private static TreeNodeString addResNodes(final TreeNodeString parent, final List<? extends AbstractEntete> listData,
+ private TreeNodeString addResNodes(final TreeNodeString parent, final List<? extends AbstractEntete> listData,
final Map<String, AbstractTreeNode> ref) {
for (final AbstractEntete enteteBranche : listData) {
final TreeNodeString resBranche = new TreeNodeString(enteteBranche.getNom());
@@ -335,9 +340,8 @@
* @param baseScenarios
* @return modele du tree.
*/
- public static DefaultTreeTableModel buildTreeScenario(final EMHScenario data, final Map<String, AbstractTreeNode> ref) {
- // TODO Traduire les différents textes des noeuds.
-
+ public DefaultTreeTableModel buildTreeScenario(final EMHScenario data, final Map<String, AbstractTreeNode> ref) {
+ propertyDefinitionContainer = data.getPropertyDefinitionContainer();
final TreeNodeString root = new TreeNodeString("root");
addNodesForEMH(root, data, ref, data);
@@ -394,11 +398,33 @@
return valueObject instanceof Iterator || valueObject instanceof Collection;
}
- private static String objectToString(final Object entryValue) {
+ private String durationToString(String key, Duration d) {
+ double sec = (d.getMillis()) / 1000d;
+ NumberFormat formatter = this.propertyDefinitionContainer.getFormatter(key);
+ if (formatter == null) { return Double.toString(sec); }
+ return formatter.format(sec) + " s";
+
+ }
+
+ private String objectToString(final String key, final Object entryValue) {
+ if (entryValue instanceof Duration) { return durationToString(key, ((Duration) entryValue)); }
String value = ObjectUtils.toString(entryValue, "null");
- if (entryValue instanceof Duration) { return (((Duration) entryValue).toStandardSeconds()) + " s"; }
+ NumberFormat formatter = this.propertyDefinitionContainer.getFormatter(key);
if (entryValue != null) {
- value = StringUtils.removeStart((value).trim(), entryValue.getClass().getSimpleName());
+ value = StringUtils.removeStart(value.trim(), entryValue.getClass().getSimpleName());
+ if (formatter != null) {
+ try {
+ if (entryValue instanceof PdtCst) {
+ PdtCst cst = (PdtCst) entryValue;
+ value = durationToString(key, cst.getPdtCst());
+ } else {
+ value = formatter.format(entryValue);
+ }
+ } catch (Exception e) {
+ // FIXME Auto-generated catch block
+ e.printStackTrace();
+ }
+ }
}
return value;
}
Modified: trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/explorer/CrueLauncher.java
===================================================================
--- trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/explorer/CrueLauncher.java 2010-03-28 20:51:07 UTC (rev 5734)
+++ trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/explorer/CrueLauncher.java 2010-03-30 21:27:25 UTC (rev 5735)
@@ -76,8 +76,8 @@
infoCrue_.banner = new BuIcon(pathLogo);
// infoCrue_.logo = new BuIcon(pathLogo);
infoCrue_.name = "Fudaa-Crue";
- infoCrue_.version = "0.22";
- infoCrue_.date = "16-Mars-2010";
+ infoCrue_.version = "0.23";
+ infoCrue_.date = "30-Mars-2010";
infoCrue_.rights = "";
infoCrue_.contact = "fu...@ge...";
infoCrue_.license = "GPL2";
Modified: trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/view/CrueFilleEMH.java
===================================================================
--- trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/view/CrueFilleEMH.java 2010-03-28 20:51:07 UTC (rev 5734)
+++ trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/view/CrueFilleEMH.java 2010-03-30 21:27:25 UTC (rev 5735)
@@ -9,6 +9,7 @@
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import java.beans.PropertyVetoException;
+import java.text.NumberFormat;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
@@ -58,6 +59,7 @@
import org.fudaa.dodico.crue.metier.emh.PtEvolutionFF;
import org.fudaa.dodico.crue.metier.emh.PtProfil;
import org.fudaa.dodico.crue.metier.emh.ResCalcul;
+import org.fudaa.dodico.crue.property.ConfigLoi;
import org.fudaa.dodico.crue.property.CrueProperties;
import org.fudaa.fudaa.crue.builder.AbstractTreeNode;
import org.fudaa.fudaa.crue.builder.EMHManagerBuilder;
@@ -132,6 +134,8 @@
final Loi loi;
final CrueProperties properties;
+ final NumberFormat fmtX;
+ final NumberFormat fmtY;
/**
* @param loi
@@ -141,6 +145,9 @@
super();
this.loi = loi;
this.properties = properties;
+ final ConfigLoi configLoi = properties.getConfLoi().get(loi.getType());
+ fmtX = properties.getFormatter(configLoi.getVarAbscisse());
+ fmtY = properties.getFormatter(configLoi.getVarOrdonnee());
}
public int getColumnCount() {
@@ -159,9 +166,17 @@
public Object getValueAt(final int rowIndex, final int columnIndex) {
final PtEvolutionFF pt = loi.getEvolutionFF().getPtEvolutionFF().get(rowIndex);
- return columnIndex == 0 ? pt.getX() : pt.getY();
+ return columnIndex == 0 ? getXValue(pt) : getYValue(pt);
}
+ private Object getYValue(final PtEvolutionFF pt) {
+ return fmtY == null ? pt.getY() : fmtY.format(pt.getY());
+ }
+
+ private Object getXValue(final PtEvolutionFF pt) {
+ return fmtX == null ? pt.getX() : fmtX.format(pt.getX());
+ }
+
@Override
public boolean isCellEditable(final int rowIndex, final int columnIndex) {
return false;
@@ -173,6 +188,7 @@
final ResultatCalculPasDeTemps pdt;
final CrueProperties properties;
+ final NumberFormat fmtPdt;
/**
* @param loi
@@ -182,6 +198,7 @@
super();
this.pdt = loi;
this.properties = properties;
+ fmtPdt = properties.getFormatter("pdt");
}
public int getColumnCount() {
@@ -201,7 +218,10 @@
public Object getValueAt(final int rowIndex, final int columnIndex) {
if (columnIndex == 0) { return Integer.valueOf(rowIndex + 1); }
- if (columnIndex == 1) { return Double.valueOf(pdt.getPdt(rowIndex)); }
+ if (columnIndex == 1) {
+ final double number = pdt.getPdt(rowIndex);
+ return fmtPdt == null ? Double.valueOf(number) : fmtPdt.format(number);
+ }
if (pdt.containsRui(rowIndex)) { return Double.valueOf(pdt.getRuinou(rowIndex)); }
return StringUtils.EMPTY;
@@ -218,6 +238,8 @@
final List<PtProfil> loi;
final CrueProperties properties;
+ final NumberFormat fmtX;
+ final NumberFormat fmtY;
/**
* @param loi
@@ -227,6 +249,8 @@
super();
this.loi = loi;
this.properties = properties;
+ fmtX = properties.getFormatter("yp");
+ fmtY = properties.getFormatter("z");
}
public int getColumnCount() {
@@ -246,9 +270,17 @@
public Object getValueAt(final int rowIndex, final int columnIndex) {
final PtProfil pt = loi.get(rowIndex);
- return columnIndex == 0 ? pt.getAbscisse() : pt.getOrdonnee();
+ return columnIndex == 0 ? getX(pt) : getY(pt);
}
+ private Object getY(final PtProfil pt) {
+ return fmtY == null ? pt.getOrdonnee() : fmtY.format(pt.getOrdonnee());
+ }
+
+ private Object getX(final PtProfil pt) {
+ return fmtX == null ? pt.getAbscisse() : fmtX.format(pt.getAbscisse());
+ }
+
@Override
public boolean isCellEditable(final int rowIndex, final int columnIndex) {
return false;
@@ -322,20 +354,23 @@
private class PasDeTempsCellRenderer extends CtuluCellTextRenderer {
-...
[truncated message content] |
