Menu
▾
▴
[Fudaa-svn-commit] SF.net SVN: fudaa:[4860] trunk/soft/fudaa-crue
|
From: <car...@us...> - 2009-06-09 17:03:59
|
Revision: 4860
http://fudaa.svn.sourceforge.net/fudaa/?rev=4860&view=rev
Author: caroledel
Date: 2009-06-09 17:03:53 +0000 (Tue, 09 Jun 2009)
Log Message:
-----------
DH : test lecture crue 10 + ecriture crue 9
Modified Paths:
--------------
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterOCAL.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterPCAL.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterPNUM.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/io/TestCrueDH.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/explorer/CrueLauncher.java
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterOCAL.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterOCAL.java 2009-06-09 13:13:46 UTC (rev 4859)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterOCAL.java 2009-06-09 17:03:53 UTC (rev 4860)
@@ -77,6 +77,7 @@
}
}
+ dataLinked.setOrdCalc(metier);
}
return metier;
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterPCAL.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterPCAL.java 2009-06-09 13:13:46 UTC (rev 4859)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterPCAL.java 2009-06-09 17:03:53 UTC (rev 4860)
@@ -49,6 +49,10 @@
metier.setVerbosite(dao.Verbosite);
}
+ if (dataLinked != null) {
+ dataLinked.setParamCalc(metier);
+ }
+
return metier;
}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterPNUM.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterPNUM.java 2009-06-09 13:13:46 UTC (rev 4859)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterPNUM.java 2009-06-09 17:03:53 UTC (rev 4860)
@@ -13,7 +13,14 @@
import org.fudaa.dodico.crue.io.dao.CrueDaoStructurePNUM.DaoParamNumCommuns;
import org.fudaa.dodico.crue.io.dao.CrueDaoStructurePNUM.DaoPdt;
import org.fudaa.dodico.crue.metier.CrueData;
-import org.fudaa.dodico.crue.metier.emh.*;
+import org.fudaa.dodico.crue.metier.emh.Duration;
+import org.fudaa.dodico.crue.metier.emh.ElemPdt;
+import org.fudaa.dodico.crue.metier.emh.ParamNumCalcPseudoPerm;
+import org.fudaa.dodico.crue.metier.emh.ParamNumCalcTrans;
+import org.fudaa.dodico.crue.metier.emh.ParamNumModeleBase;
+import org.fudaa.dodico.crue.metier.emh.Pdt;
+import org.fudaa.dodico.crue.metier.emh.PdtCst;
+import org.fudaa.dodico.crue.metier.emh.PdtVar;
/**
* Classe qui se charge de remplir les structures DAO du fichier PNUM avec les donnees metier et inversement.
@@ -34,6 +41,11 @@
metier.zref = dao.ParamNumCommuns.Zref;
metier.paramNumCalcPseudoPerm = daoToMetierPseudo(dao);
metier.paramNumCalcTrans = daoToMetierTrans(dao);
+
+ if (dataLinked != null) {
+ dataLinked.setParamNumModeleBase(metier);
+ }
+
return metier;
}
Modified: trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/io/TestCrueDH.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/io/TestCrueDH.java 2009-06-09 13:13:46 UTC (rev 4859)
+++ trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/io/TestCrueDH.java 2009-06-09 17:03:53 UTC (rev 4860)
@@ -9,7 +9,36 @@
import org.fudaa.dodico.crue.io.common.CrueIOResu;
import org.fudaa.dodico.crue.io.common.Messages;
import org.fudaa.dodico.crue.metier.CrueData;
-import org.fudaa.dodico.crue.metier.emh.*;
+import org.fudaa.dodico.crue.metier.emh.CalcPseudoPerm;
+import org.fudaa.dodico.crue.metier.emh.CalcPseudoPermBrancheOrificeManoeuvre;
+import org.fudaa.dodico.crue.metier.emh.CalcPseudoPermNoeudNiveauContinuQapp;
+import org.fudaa.dodico.crue.metier.emh.CalcPseudoPermNoeudNiveauContinuZimpose;
+import org.fudaa.dodico.crue.metier.emh.CalcTrans;
+import org.fudaa.dodico.crue.metier.emh.CalcTransBrancheOrificeManoeuvre;
+import org.fudaa.dodico.crue.metier.emh.CalcTransNoeudNiveauContinuQapp;
+import org.fudaa.dodico.crue.metier.emh.CalcTransNoeudNiveauContinuTarage;
+import org.fudaa.dodico.crue.metier.emh.CatEMHBranche;
+import org.fudaa.dodico.crue.metier.emh.CatEMHNoeud;
+import org.fudaa.dodico.crue.metier.emh.DonCLimM;
+import org.fudaa.dodico.crue.metier.emh.DonCLimMScenario;
+import org.fudaa.dodico.crue.metier.emh.DonCalcSansPrt;
+import org.fudaa.dodico.crue.metier.emh.DonCalcSansPrtBrancheSaintVenant;
+import org.fudaa.dodico.crue.metier.emh.DonCalcSansPrtBrancheSeuilTransversal;
+import org.fudaa.dodico.crue.metier.emh.DonPrtCIniBranche;
+import org.fudaa.dodico.crue.metier.emh.DonPrtCIniNoeudNiveauContinu;
+import org.fudaa.dodico.crue.metier.emh.EMHBrancheSaintVenant;
+import org.fudaa.dodico.crue.metier.emh.EMHBrancheSeuilTransversal;
+import org.fudaa.dodico.crue.metier.emh.EnumFormulePdc;
+import org.fudaa.dodico.crue.metier.emh.EnumSensOuv;
+import org.fudaa.dodico.crue.metier.emh.EvolutionFF;
+import org.fudaa.dodico.crue.metier.emh.Loi;
+import org.fudaa.dodico.crue.metier.emh.LoiDF;
+import org.fudaa.dodico.crue.metier.emh.LoiFF;
+import org.fudaa.dodico.crue.metier.emh.ParamCalcScenario;
+import org.fudaa.dodico.crue.metier.emh.ParamNumModeleBase;
+import org.fudaa.dodico.crue.metier.emh.Pdt;
+import org.fudaa.dodico.crue.metier.emh.PdtCst;
+import org.fudaa.dodico.crue.metier.emh.PtEvolutionFF;
import org.fudaa.dodico.crue.metier.helper.EMHBrancheHelper;
import org.fudaa.dodico.crue.metier.helper.EMHHelper;
import org.fudaa.dodico.crue.metier.helper.EMHNoeudHelper;
@@ -23,6 +52,13 @@
public class TestCrueDH extends AbstractTestCase {
protected static final String FICHIER_TEST_MODELE3_DH = "/fichierTest/Modele3.dh";
+ protected static final String FICHIER_TEST_MODELE3_DCSP = "/fichierTest/Modele3.dcsp.xml";
+ protected static final String FICHIER_TEST_MODELE3_OCAL = "/fichierTest/Modele3.ocal.xml";
+ protected static final String FICHIER_TEST_MODELE3_PCAL = "/fichierTest/Modele3.pcal.xml";
+ protected static final String FICHIER_TEST_MODELE3_PNUM = "/fichierTest/Modele3.pnum.xml";
+ protected static final String FICHIER_TEST_MODELE3_DPTI = "/fichierTest/Modele3.dpti.xml";
+ protected static final String FICHIER_TEST_MODELE3_DLHY = "/fichierTest/Modele3.dlhy.xml";
+ protected static final String FICHIER_TEST_MODELE3_DCLM = "/fichierTest/Modele3.dclm.xml";
/**
* Test de lecture
@@ -66,30 +102,48 @@
}
/**
- * Test cycle de lecture/ecriture/lecture (+ verif donnees) du modele 3
+ * Test lecture des fichiers crue 10 du modele 3 et ecriture du fichier DH correspondant
*/
- public void testLectureEcritureLectureCRUE9Modele3() {
+ public void testLectureFichiersCrue10etEcritureCrue9() {
- final CtuluAnalyze analyzer = new CtuluAnalyze();
- // -- lecture --//
- final TestCrueDC testDC = new TestCrueDC();
- CrueData data = testDC.testLectureFichierDC("/fichierTest/Modele3.dc");
- final CrueIOResu<CrueData> res = Crue9FileFormatFactory.getDHFileFormat().read(FICHIER_TEST_MODELE3_DH, analyzer,
- data);
+ final CtuluAnalyze analyzer = new CtuluAnalyze(Messages.RESOURCE_BUNDLE);
+ // -- lecture DRSO --//
+ final CrueData data = Crue10FileFormatFactory.getDRSOFileFormat().read(
+ TestCrueDRSOFile.FICHIER_TEST_MODELE3_DRSO_XML, analyzer, null);
testAnalyser(analyzer);
- // -- ecriture --//
- final File f = createTemptxtFile("modele3");
- writeModeleCrue9(analyzer, f, res.getMetier());
+ // -- lecture DCSP --//
+ Crue10FileFormatFactory.getDCSPFileFormat().read(FICHIER_TEST_MODELE3_DCSP, analyzer, data);
testAnalyser(analyzer);
- // -- lecture --//
- data = testDC.testLectureFichierDC("/fichierTest/Modele3.dc");
- final CrueIOResu<CrueData> res2 = Crue9FileFormatFactory.getDHFileFormat().read(f, analyzer, data);
+ // -- lecture PCAL --//
+ Crue10FileFormatFactory.getPCALFileFormat().read(FICHIER_TEST_MODELE3_PCAL, analyzer, data);
testAnalyser(analyzer);
- testData(res2.getMetier(), true);
+ // -- lecture DPTI --//
+ Crue10FileFormatFactory.getDPTIFileFormat().read(FICHIER_TEST_MODELE3_DPTI, analyzer, data);
+ testAnalyser(analyzer);
+ // -- lecture PNUM --//
+ Crue10FileFormatFactory.getPNUMFileFormat().read(FICHIER_TEST_MODELE3_PNUM, analyzer, data);
+ testAnalyser(analyzer);
+
+ // -- lecture DLHY --//
+ Crue10FileFormatFactory.getDLHYFileFormat().read(FICHIER_TEST_MODELE3_DLHY, analyzer, data);
+ testAnalyser(analyzer);
+
+ // -- lecture DCLM --//
+ Crue10FileFormatFactory.getDCLMFileFormat().read(FICHIER_TEST_MODELE3_DCLM, analyzer, data);
+ testAnalyser(analyzer);
+
+ // -- lecture OCAL --//
+ Crue10FileFormatFactory.getOCALFileFormat().read(FICHIER_TEST_MODELE3_OCAL, analyzer, data);
+ testAnalyser(analyzer);
+
+ // -- ecriture DH (crue9) --//
+ final File f = createTemptxtFile("modele3");
+ writeModeleCrue9(analyzer, f, data);
+ testAnalyser(analyzer);
}
/**
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 2009-06-09 13:13:46 UTC (rev 4859)
+++ trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/explorer/CrueLauncher.java 2009-06-09 17:03:53 UTC (rev 4860)
@@ -16,10 +16,6 @@
import javax.swing.SwingUtilities;
import javax.swing.UIManager;
-import com.memoire.bu.*;
-import com.memoire.fu.FuLib;
-import com.memoire.fu.FuLog;
-
import org.fudaa.ctulu.gui.CtuluTaskOperationGUI;
import org.fudaa.dodico.crue.io.CrueFileFormatManager;
import org.fudaa.fudaa.commun.FudaaLib;
@@ -28,6 +24,17 @@
import org.fudaa.fudaa.crue.common.CrueEditorImplementation;
import org.fudaa.fudaa.ressource.FudaaResource;
+import com.memoire.bu.BuApplication;
+import com.memoire.bu.BuCommonInterface;
+import com.memoire.bu.BuIcon;
+import com.memoire.bu.BuInformationsSoftware;
+import com.memoire.bu.BuLib;
+import com.memoire.bu.BuPreferences;
+import com.memoire.bu.BuRegistry;
+import com.memoire.bu.BuResource;
+import com.memoire.fu.FuLib;
+import com.memoire.fu.FuLog;
+
/**
* Launcher de crue.
*
@@ -86,7 +93,7 @@
// infoCrue_.logo = new BuIcon(pathLogo);
infoCrue_.name = "Fudaa-Crue";
infoCrue_.version = "0.1";
- infoCrue_.date = "29-mai -2009";
+ infoCrue_.date = "29-mai-2009";
infoCrue_.rights = "";
infoCrue_.contact = "fu...@ge...";
infoCrue_.license = "GPL2";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
