Menu
▾
▴
[Fudaa-svn-commit] SF.net SVN: fudaa:[3731] trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa
|
From: <opa...@us...> - 2008-08-07 14:48:19
|
Revision: 3731
http://fudaa.svn.sourceforge.net/fudaa/?rev=3731&view=rev
Author: opasteur
Date: 2008-08-07 14:48:20 +0000 (Thu, 07 Aug 2008)
Log Message:
-----------
Modified Paths:
--------------
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/Hydraulique1dBaseImplementation.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/Hydraulique1dExport.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/Hydraulique1dImport.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/Hydraulique1dPoint.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/Hydraulique1dProfilModel.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/Hydraulique1dProjet.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/conv/CConversionHydraulique1d.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/conv/ConvH1D_Masc.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/conv/ConvMasc_H1D.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/conv/ConvUnite.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dApportEditor.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dBiefEditor.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dConcentrationsInitialesEditor.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dConditionsInitialesEditor.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dCrueCalagePanel.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dCruesCalageEditor.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dCustomizer.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dDeversoirEditor.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dExtremLibreEditor.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dGraphesResultatsEditor.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dLaissesEditor.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dLigneInitialeEditor.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dListeLoiCombo.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dListingsCalageEditor.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dLoiHydrauliqueCellEditor.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dLoiHydrauliqueEditor2.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dLoiHydrauliqueLibraryEditor.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dLoiSeuilEditor2.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dMaillageEditor.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dMeteoEditor.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dModeleQEauEditor.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dNoeudFluvEditor.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dNoeudTransEditor.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dNoeudTransParamEditor.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dNoyauEditor.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dParametresCalageEditor.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dParametresGenerauxAvancesEditor.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dParametresGenerauxEditor.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dParametresRepriseEditor.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dParametresResultatsEditor.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dParametresResultatsQualiteDEauEditor.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dParametresTemporelsEditor.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dParamsGenerauxQualiteDEauEditor.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dParamsPhysiqueQEEditor.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dPerteChargeEditor.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dPlanimetrageEditor.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dResultatsGenerauxEditor.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dSectionsSeriesEditor.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dSeuilAvecLoiEditor.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dSeuilChooser.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dSeuilLoiEditor.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dSeuilVanneEditor.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dSitesEditor.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dSourceEditor.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dTableauZoneEditor.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dTableauxEditor.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dVariablesResultatsEditor.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dVisuInitialeEditor.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dZoneFrottementCalageEditor.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dZoneFrottementEditor.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dZoneSecheEditor.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/PanneauGraphesResultats.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/casier/Hydraulique1dCasierApportDebitPanel.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/casier/Hydraulique1dCasierCaracLiaisonPanel.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/casier/Hydraulique1dCasierEditor.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/casier/Hydraulique1dCasierGeometriePanel.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/casier/Hydraulique1dCasierLiaisonEditor.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/casier/Hydraulique1dCasierNumeriqueEditor.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/casier/Hydraulique1dCasierPlanimEditor.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/casier/Hydraulique1dCasierSemiPointsEditor.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/casier/Hydraulique1dCasierTableauPlanimPanel.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/casier/Hydraulique1dCasierTableauXYZPanel.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/casier/tableau/Hydraulique1dCasierTabPlanimModel.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/casier/tableau/Hydraulique1dCasierTabXYZ.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/casier/tableau/Hydraulique1dCasierTabXYZModel.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/profil/Hydraulique1dProfilEditor.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/profil/Hydraulique1dProfilSimpleEditor.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/profil/Hydraulique1dProfilTableauPanel.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/graphe/Hydraulique1dGrapheProfilDataset.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHMRepository.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_Apport2.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_Base.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_Bief.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_Casier.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_CasierLiaison.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_CasierNumerique.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_CasierPlanim.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_CasierSemiPoints.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_ConcentrationsInitiales.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_ConditionsInitiales.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_CruesCalage.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_Deversoir.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_ExtremiteLibre.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_GraphesResultats.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_Laisse.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_LibraryLoiHydraulique.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_LigneInitiale.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_ListingsCalage.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_LoiHydraulique2.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_Maillage2.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_Meteo.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_ModeleQEau.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_Noyau.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_ParamCalage.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_ParamGeneraux.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_ParamReprise.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_ParamResultat.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_ParamResultatQualiteDEau.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_ParamTemporel.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_ParamsGenerauxQualiteDEau.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_ParamsPhysiqueQE.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_Planimetrage2.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_Profil.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_ProfilResultats.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_ResultatsGeneraux.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_SectionsParSections.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_SectionsParSerie2.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_SeuilAvecLoi.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_SeuilLoi.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_SeuilVanne.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_SitesStockage.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_Source.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_Tableaux.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_VariableResultat.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_VisuInitiale.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_ZonesFrottement.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_ZonesFrottementACaler.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_ZonesFrottementCalees.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_ZonesSeches.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/reseau/Hydraulique1dReseauApport.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/reseau/Hydraulique1dReseauBarragePrincipal.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/reseau/Hydraulique1dReseauBiefCourbe.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/reseau/Hydraulique1dReseauBiefDroit.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/reseau/Hydraulique1dReseauCasier.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/reseau/Hydraulique1dReseauDeversoir.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/reseau/Hydraulique1dReseauExtremLibre.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/reseau/Hydraulique1dReseauFrame.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/reseau/Hydraulique1dReseauGridAdapter.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/reseau/Hydraulique1dReseauLiaisonCasier.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/reseau/Hydraulique1dReseauMouseAdapter.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/reseau/Hydraulique1dReseauNoeud.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/reseau/Hydraulique1dReseauPerteCharge.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/reseau/Hydraulique1dReseauSeuil.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/reseau/Hydraulique1dReseauSingularite.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/reseau/Hydraulique1dReseauSource.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/reseau/Hydraulique1dReseauVerificateur.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/tableau/Hydraulique1dLigneConcentrationsInitialesTableau.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/tableau/Hydraulique1dLigneLaisseTableau.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/tableau/Hydraulique1dLigneLigneDEauTableau.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/tableau/Hydraulique1dLigneOptionsTraceurTableau.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/tableau/Hydraulique1dLigneParamsPhysiqueQETableau.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/tableau/Hydraulique1dLigneProfilTableau.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/tableau/Hydraulique1dLigneSiteTableau.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/tableau/Hydraulique1dLigneZoneFrottementTableau.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/tableau/Hydraulique1dLigneZoneTableau.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/tableau/Hydraulique1dLigneZoneTailleTableau.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/tableau/Hydraulique1dTableauConcInitsModel.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/tableau/Hydraulique1dTableauLaisseModel.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/tableau/Hydraulique1dTableauLigneEauModel.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/tableau/Hydraulique1dTableauOptionsTraceurModel.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/tableau/Hydraulique1dTableauParamsPhysQEModel.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/tableau/Hydraulique1dTableauProfilsModel.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/tableau/Hydraulique1dTableauSiteModel.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/tableau/Hydraulique1dTableauZoneFrottementCalageModel.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/tableau/Hydraulique1dTableauZoneFrottementModel.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/tableau/Hydraulique1dTableauZoneModel.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/tableau/Hydraulique1dTableauZoneSecheModel.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/tableau/Hydraulique1dTableauZoneTailleModel.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/mascaret/MascaretImplementation.java
Modified: trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/Hydraulique1dBaseImplementation.java
===================================================================
--- trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/Hydraulique1dBaseImplementation.java 2008-08-07 14:42:27 UTC (rev 3730)
+++ trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/Hydraulique1dBaseImplementation.java 2008-08-07 14:48:20 UTC (rev 3731)
@@ -7,8 +7,8 @@
* @mail de...@fu...
*/
package org.fudaa.fudaa.hydraulique1d;
-import org.fudaa.fudaa.hydraulique1d.metier.evenement.H1dObjetEvent;
-import org.fudaa.fudaa.hydraulique1d.metier.evenement.H1dObjetEventListener;
+import org.fudaa.dodico.hydraulique1d.metier.evenement.H1dObjetEvent;
+import org.fudaa.dodico.hydraulique1d.metier.evenement.H1dObjetEventListener;
import org.fudaa.fudaa.commun.impl.FudaaImplementation;
import org.fudaa.fudaa.commun.projet.FudaaParamChangeLog;
Modified: trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/Hydraulique1dExport.java
===================================================================
--- trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/Hydraulique1dExport.java 2008-08-07 14:42:27 UTC (rev 3730)
+++ trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/Hydraulique1dExport.java 2008-08-07 14:48:20 UTC (rev 3731)
@@ -14,16 +14,16 @@
import javax.swing.filechooser.FileFilter;
import org.fudaa.ctulu.gui.CtuluFileChooser;
-import org.fudaa.fudaa.hydraulique1d.metier.MetierBief;
-import org.fudaa.fudaa.hydraulique1d.metier.MetierCasier;
-import org.fudaa.fudaa.hydraulique1d.metier.MetierEtude1d;
-import org.fudaa.fudaa.hydraulique1d.metier.MetierLigneEauInitiale;
-import org.fudaa.fudaa.hydraulique1d.metier.MetierLigneEauPoint;
-import org.fudaa.fudaa.hydraulique1d.metier.MetierParametresReprise;
-import org.fudaa.fudaa.hydraulique1d.metier.MetierReseau;
-import org.fudaa.fudaa.hydraulique1d.metier.MetierResultatsTemporelSpatial;
-import org.fudaa.fudaa.hydraulique1d.metier.loi.MetierLoiTracer;
-import org.fudaa.fudaa.hydraulique1d.metier.qualitedeau.MetierParamPhysTracer;
+import org.fudaa.dodico.hydraulique1d.metier.MetierBief;
+import org.fudaa.dodico.hydraulique1d.metier.MetierCasier;
+import org.fudaa.dodico.hydraulique1d.metier.MetierEtude1d;
+import org.fudaa.dodico.hydraulique1d.metier.MetierLigneEauInitiale;
+import org.fudaa.dodico.hydraulique1d.metier.MetierLigneEauPoint;
+import org.fudaa.dodico.hydraulique1d.metier.MetierParametresReprise;
+import org.fudaa.dodico.hydraulique1d.metier.MetierReseau;
+import org.fudaa.dodico.hydraulique1d.metier.MetierResultatsTemporelSpatial;
+import org.fudaa.dodico.hydraulique1d.metier.loi.MetierLoiTracer;
+import org.fudaa.dodico.hydraulique1d.metier.qualitedeau.MetierParamPhysTracer;
import org.fudaa.dodico.mascaret.DParametresMascaret;
import org.fudaa.dodico.mascaret.DResultatsMascaret;
import org.fudaa.fudaa.hydraulique1d.conv.ConvH1D_Masc;
Modified: trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/Hydraulique1dImport.java
===================================================================
--- trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/Hydraulique1dImport.java 2008-08-07 14:42:27 UTC (rev 3730)
+++ trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/Hydraulique1dImport.java 2008-08-07 14:48:20 UTC (rev 3731)
@@ -33,32 +33,32 @@
import org.fudaa.dodico.corba.lido.SParametresPRO;
import org.fudaa.dodico.corba.mascaret.SParametresCAS;
import org.fudaa.dodico.corba.mascaret.SParametresGEO;
+import org.fudaa.dodico.hydraulique1d.metier.EnumMetierMethodeMaillage;
+import org.fudaa.dodico.hydraulique1d.metier.MetierBief;
+import org.fudaa.dodico.hydraulique1d.metier.MetierDefinitionSectionsParSections;
+import org.fudaa.dodico.hydraulique1d.metier.MetierDefinitionSectionsParSeries;
+import org.fudaa.dodico.hydraulique1d.metier.MetierDefinitionSectionsParSeriesUnitaire;
+import org.fudaa.dodico.hydraulique1d.metier.MetierEtude1d;
+import org.fudaa.dodico.hydraulique1d.metier.MetierLoiHydraulique;
+import org.fudaa.dodico.hydraulique1d.metier.MetierMaillage;
+import org.fudaa.dodico.hydraulique1d.metier.MetierParametresGeneraux;
+import org.fudaa.dodico.hydraulique1d.metier.MetierProfil;
+import org.fudaa.dodico.hydraulique1d.metier.MetierReseau;
+import org.fudaa.dodico.hydraulique1d.metier.MetierResultatsTemporelSpatial;
+import org.fudaa.dodico.hydraulique1d.metier.MetierSite;
+import org.fudaa.dodico.hydraulique1d.metier.MetierZoneFrottement;
+import org.fudaa.dodico.hydraulique1d.metier.casier.MetierGeometrieCasier;
+import org.fudaa.dodico.hydraulique1d.metier.casier.MetierNuagePointsCasier;
+import org.fudaa.dodico.hydraulique1d.metier.casier.MetierPlanimetrageCasier;
+import org.fudaa.dodico.hydraulique1d.metier.geometrie.MetierPoint;
+import org.fudaa.dodico.hydraulique1d.metier.geometrie.MetierPoint2D;
+import org.fudaa.dodico.hydraulique1d.metier.qualitedeau.MetierParamPhysTracer;
import org.fudaa.dodico.lido.DParametresLido;
import org.fudaa.dodico.mascaret.DParametresMascaret;
import org.fudaa.dodico.mascaret.DResultatsMascaret;
import org.fudaa.dodico.mascaret.FichierMascaretException;
import org.fudaa.fudaa.hydraulique1d.conv.ConvH1D_Masc;
import org.fudaa.fudaa.hydraulique1d.conv.ConvMasc_H1D;
-import org.fudaa.fudaa.hydraulique1d.metier.EnumMetierMethodeMaillage;
-import org.fudaa.fudaa.hydraulique1d.metier.MetierBief;
-import org.fudaa.fudaa.hydraulique1d.metier.MetierDefinitionSectionsParSections;
-import org.fudaa.fudaa.hydraulique1d.metier.MetierDefinitionSectionsParSeries;
-import org.fudaa.fudaa.hydraulique1d.metier.MetierDefinitionSectionsParSeriesUnitaire;
-import org.fudaa.fudaa.hydraulique1d.metier.MetierEtude1d;
-import org.fudaa.fudaa.hydraulique1d.metier.MetierLoiHydraulique;
-import org.fudaa.fudaa.hydraulique1d.metier.MetierMaillage;
-import org.fudaa.fudaa.hydraulique1d.metier.MetierParametresGeneraux;
-import org.fudaa.fudaa.hydraulique1d.metier.MetierProfil;
-import org.fudaa.fudaa.hydraulique1d.metier.MetierReseau;
-import org.fudaa.fudaa.hydraulique1d.metier.MetierResultatsTemporelSpatial;
-import org.fudaa.fudaa.hydraulique1d.metier.MetierSite;
-import org.fudaa.fudaa.hydraulique1d.metier.MetierZoneFrottement;
-import org.fudaa.fudaa.hydraulique1d.metier.casier.MetierGeometrieCasier;
-import org.fudaa.fudaa.hydraulique1d.metier.casier.MetierNuagePointsCasier;
-import org.fudaa.fudaa.hydraulique1d.metier.casier.MetierPlanimetrageCasier;
-import org.fudaa.fudaa.hydraulique1d.metier.geometrie.MetierPoint;
-import org.fudaa.fudaa.hydraulique1d.metier.geometrie.MetierPoint2D;
-import org.fudaa.fudaa.hydraulique1d.metier.qualitedeau.MetierParamPhysTracer;
import org.fudaa.fudaa.hydraulique1d.tableau.Hydraulique1dLigneConcentrationsInitialesTableau;
import org.fudaa.fudaa.hydraulique1d.tableau.Hydraulique1dLigneLaisseTableau;
import org.fudaa.fudaa.hydraulique1d.tableau.Hydraulique1dLigneLigneDEauTableau;
@@ -1365,8 +1365,8 @@
}
- public static void importProfilsPRO_MASCARET(File filename, MetierBief[] biefs) {
- Vector profils= new Vector();
+ public static void importProfilsPRO_MASCARET(File filename, MetierBief[] biefs) {
+ Vector profils= new Vector();
Vector ptsProfil= new Vector();
String logMsg=
"R\xE9sultat de l'importation de " + filename.getPath() + ":\n\n";
@@ -1415,7 +1415,9 @@
logMsg += "profil vide: '" + line + "' (ligne " + lineNb + ")\n";
break;
} /*else {*/
- mascaretPointProfil(logMsg, line, ptsProfil);
+ boolean avecGeoref = mascaretPointProfil(logMsg, line, ptsProfil);
+ //Si un seul point possede un g\xE9oref alors avecGeoreferencement \xE0 true
+ if (avecGeoref) nouveauProfil.avecGeoreferencement(avecGeoref);
etat= "points";
//}
} else if (etat.equals("points")) {
@@ -1505,23 +1507,44 @@
res.abscisse(abscisse);
return res;
}
- private static void mascaretPointProfil(
+ private static boolean mascaretPointProfil(
String logMsg,
String line,
Vector ptsProfil)
throws NoSuchElementException, NumberFormatException {
+ System.err.println("in mascaretPointProfil");
+ MetierPoint2D pt2D;
+ boolean avecGeoReferencement = false;
+
StringTokenizer st= new StringTokenizer(line);
- MetierPoint2D pt2D=
- new MetierPoint2D(
- Double.parseDouble(st.nextToken()),
- Double.parseDouble(st.nextToken()));
+ double x = Double.parseDouble(st.nextToken());
+ double y = Double.parseDouble(st.nextToken());
String lit= st.nextToken();
+ double cx = 0;
+ double cy = 0;
+ try{
+ cx = Double.parseDouble(st.nextToken());
+ cy = Double.parseDouble(st.nextToken());
+ avecGeoReferencement=true;
+ }catch(NoSuchElementException e){avecGeoReferencement=false;}
+
+ if (avecGeoReferencement){
+ System.err.println("georef found "+ cx +" "+cy);
+ pt2D=new MetierPoint2D(x,y,cx,cy);
+ }else{
+ pt2D=new MetierPoint2D(x,y);
+ }
+
if ((!lit.equals("B")) && (!lit.equals("T")))
throw new NumberFormatException(lit);
+
+
Object[] pt= new Object[2];
pt[0]= pt2D;
pt[1]= lit;
ptsProfil.add(pt);
+
+ return avecGeoReferencement;
}
private static void mascaretInitIndiceLit(
MetierProfil nouveauProfil,
@@ -1591,7 +1614,7 @@
return (Hydraulique1dProfilModel[])profils.toArray(new Hydraulique1dProfilModel[profils.size()]);
}
public static Hydraulique1dProfilModel[] importProfilsPRO_MASCARET(File filename) {
- ArrayList profils= new ArrayList();
+ ArrayList profils= new ArrayList();
ArrayList ptsProfil= new ArrayList();
String logMsg=
"R\xE9sultat de l'importation de " + filename.getPath() + ":\n\n";
@@ -1638,7 +1661,9 @@
logMsg += "profil vide: '" + line + "' (ligne " + lineNb + ")\n";
break;
} /*else {*/
- mascaretPointProfil(logMsg, line, ptsProfil);
+ boolean avecGeoref = mascaretPointProfil(logMsg, line, ptsProfil);
+ //Si un seul point possede un g\xE9oref alors avecGeoreferencement \xE0 true
+ if (avecGeoref) nouveauProfil.avecGeoreferencement(avecGeoref);
etat= "points";
//}
} else if (etat.equals("points")) {
@@ -1664,7 +1689,10 @@
break;
}
} else {
- mascaretPointProfil(logMsg, line, ptsProfil);
+
+ boolean avecGeoref = mascaretPointProfil(logMsg, line, ptsProfil);
+ //Si un seul point possede un g\xE9oref alors avecGeoreferencement \xE0 true
+ if (avecGeoref) nouveauProfil.avecGeoreferencement(avecGeoref);
// etat="points";
}
} // fin test etat
@@ -1726,23 +1754,45 @@
res.setAbscisse(abscisse);
return res;
}
- private static void mascaretPointProfil(
+ private static boolean mascaretPointProfil(
String logMsg,
String line,
ArrayList ptsProfil)
throws NoSuchElementException, NumberFormatException {
- StringTokenizer st= new StringTokenizer(line);
- MetierPoint2D pt2D=
- new MetierPoint2D(
- Double.parseDouble(st.nextToken()),
- Double.parseDouble(st.nextToken()));
- String lit= st.nextToken();
- if ((!lit.equals("B")) && (!lit.equals("T")))
- throw new NumberFormatException(lit);
- Object[] pt= new Object[2];
- pt[0]= pt2D;
- pt[1]= lit;
- ptsProfil.add(pt);
+ System.err.println("in mascaretPointProfil");
+ MetierPoint2D pt2D;
+ boolean avecGeoReferencement = false;
+
+ StringTokenizer st= new StringTokenizer(line);
+ double x = Double.parseDouble(st.nextToken());
+ double y = Double.parseDouble(st.nextToken());
+ String lit= st.nextToken();
+ double cx = 0;
+ double cy = 0;
+ try{
+ cx = Double.parseDouble(st.nextToken());
+ cy = Double.parseDouble(st.nextToken());
+ avecGeoReferencement=true;
+ }catch(NoSuchElementException e){avecGeoReferencement=false;}
+
+ if (avecGeoReferencement){
+ System.err.println("georef found "+ cx +" "+cy);
+ pt2D=new MetierPoint2D(x,y,cx,cy);
+ }else{
+ pt2D=new MetierPoint2D(x,y);
+ }
+
+ if ((!lit.equals("B")) && (!lit.equals("T")))
+ throw new NumberFormatException(lit);
+
+
+ Object[] pt= new Object[2];
+ pt[0]= pt2D;
+ pt[1]= lit;
+ ptsProfil.add(pt);
+
+ return avecGeoReferencement;
+
}
private static void mascaretInitIndiceLit(
Hydraulique1dProfilModel nouveauProfil,
Modified: trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/Hydraulique1dPoint.java
===================================================================
--- trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/Hydraulique1dPoint.java 2008-08-07 14:42:27 UTC (rev 3730)
+++ trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/Hydraulique1dPoint.java 2008-08-07 14:48:20 UTC (rev 3731)
@@ -8,7 +8,7 @@
*/
package org.fudaa.fudaa.hydraulique1d;
-import org.fudaa.fudaa.hydraulique1d.metier.geometrie.MetierPoint2D;
+import org.fudaa.dodico.hydraulique1d.metier.geometrie.MetierPoint2D;
/**
* Mod\xE8le de donn\xE9e utilis\xE9 pour repr\xE9senter un point d\u2019un profil.
* Ce mod\xE8le est utilis\xE9 par la classe \xAB\xA0Hydraulique1dProfilModel\xA0\xBB.
@@ -18,6 +18,9 @@
public final class Hydraulique1dPoint implements Cloneable {
private Double X_=null;
private Double Y_=null;
+ //Coordonn\xE9es de g\xE9oreferencement
+ private Double CX_=null;
+ private Double CY_=null;
/**
@@ -32,7 +35,7 @@
* @param pt le point 2D.
*/
public Hydraulique1dPoint(MetierPoint2D pt) {
- this(pt.x, pt.y);
+ this(pt.x, pt.y,pt.cx,pt.cy);
}
/**
* Constructeur d'un point \xE0 partir 2 r\xE9els primitifs.
@@ -40,7 +43,10 @@
* @param y deuxi\xE8me \xE9l\xE9ment .
*/
public Hydraulique1dPoint(double x, double y) {
- this(doubleValue(x), doubleValue(y));
+ this(doubleValue(x), doubleValue(y));
+ }
+ public Hydraulique1dPoint(double x, double y, double cx, double cy) {
+ this(doubleValue(x), doubleValue(y),doubleValue(cx), doubleValue(cy));
}
/**
@@ -51,59 +57,67 @@
public Hydraulique1dPoint(Double x, Double y) {
X_= x;
Y_=y;
+ CX_=new Double(0);
+ CY_=new Double(0);
}
+ public Hydraulique1dPoint(Double x, Double y,Double cx, Double cy) {
+ X_= x;
+ Y_=y;
+ CX_=cx;
+ CY_=cy;
+ }
public MetierPoint2D toSPoint2D() {
- MetierPoint2D pt2D = new MetierPoint2D(x(),y());
+ MetierPoint2D pt2D = new MetierPoint2D(x(),y(),Cx(),Cy());
return pt2D;
}
/**
- * @return la valeur du premier \xE9lement (double non primitif).
+ * @return la valeur du premier \xE9lement de coordon\xE9e(double non primitif).
*/
public Double X() {
return X_;
}
/**
- * @return la valeur du premier \xE9lement (double primitif).
+ * @return la valeur du premier \xE9lement de coordon\xE9e(double primitif).
*/
public double x() {
return doubleValue(X_);
}
/**
- * Initialise le premier \xE9lement.
+ * Initialise le premier \xE9lement de coordon\xE9e.
* @param X La nouvelle valeur du premier \xE9lement (peut \xEAtre null).
*/
public void X(Double X) {
X_=X;
}
/**
- * Initialise le premier \xE9lement.
+ * Initialise le premier \xE9lement de coordon\xE9e.
* @param x La nouvelle valeur du premier \xE9lement.
*/
public void x(double x) {
X_= doubleValue(x);
}
/**
- * @return la valeur du deuxi\xE8me \xE9lement (double non primitif).
+ * @return la valeur du deuxi\xE8me \xE9lement de coordon\xE9e(double non primitif).
*/
public Double Y() {
return Y_;
}
/**
- * @return la valeur du deuxi\xE8me \xE9lement (double primitif).
+ * @return la valeur du deuxi\xE8me \xE9lement de coordon\xE9e (double primitif).
*/
public double y() {
return doubleValue(Y_);
}
/**
- * Initialise le deuxi\xE8me \xE9lement.
+ * Initialise le deuxi\xE8me \xE9lement de coordon\xE9e.
* @param Y La nouvelle valeur du deuxi\xE8me \xE9lement (peut \xEAtre null).
*/
public void Y(Double Y) {
Y_=Y;
}
/**
- * Initialise le deuxi\xE8me \xE9lement.
+ * Initialise le deuxi\xE8me \xE9lement de coordon\xE9e.
* @param y La nouvelle valeur du deuxi\xE8me \xE9lement.
*/
public void y(double y) {
@@ -111,6 +125,59 @@
}
/**
+ * @return la valeur du premier \xE9lement de coordon\xE9e(double non primitif).
+ */
+ public Double CX() {
+ return CX_;
+ }
+ /**
+ * @return la valeur du premier \xE9lement de coordon\xE9e(double primitif).
+ */
+ public double Cx() {
+ return doubleValue(CX_);
+ }
+ /**
+ * Initialise le premier \xE9lement de coordon\xE9e.
+ * @param X La nouvelle valeur du premier \xE9lement (peut \xEAtre null).
+ */
+ public void CX(Double CX) {
+ CX_=CX;
+ }
+ /**
+ * Initialise le premier \xE9lement de coordon\xE9e.
+ * @param x La nouvelle valeur du premier \xE9lement.
+ */
+ public void Cx(double Cx) {
+ CX_= doubleValue(Cx);
+ }
+ /**
+ * @return la valeur du deuxi\xE8me \xE9lement de coordon\xE9e (double non primitif).
+ */
+ public Double CY() {
+ return CY_;
+ }
+ /**
+ * @return la valeur du deuxi\xE8me \xE9lement de coordon\xE9e(double primitif).
+ */
+ public double Cy() {
+ return doubleValue(CY_);
+ }
+ /**
+ * Initialise le deuxi\xE8me \xE9lement de coordon\xE9e.
+ * @param Y La nouvelle valeur du deuxi\xE8me \xE9lement (peut \xEAtre null).
+ */
+ public void CY(Double CY) {
+ CY_=CY;
+ }
+ /**
+ * Initialise le deuxi\xE8me \xE9lement de coordon\xE9e.
+ * @param y La nouvelle valeur du deuxi\xE8me \xE9lement.
+ */
+ public void Cy(double Cy) {
+ CY_= doubleValue(Cy);
+ }
+
+ /**
* @return true si le point est nul (une de ses coordonnees n'est pas renseigne).
*/
public boolean isNull() {
@@ -118,7 +185,7 @@
}
public Object clone() {
- Hydraulique1dPoint clone = new Hydraulique1dPoint(X_, Y_);
+ Hydraulique1dPoint clone = new Hydraulique1dPoint(X_, Y_,CX_, CY_);
return clone;
}
Modified: trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/Hydraulique1dProfilModel.java
===================================================================
--- trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/Hydraulique1dProfilModel.java 2008-08-07 14:42:27 UTC (rev 3730)
+++ trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/Hydraulique1dProfilModel.java 2008-08-07 14:48:20 UTC (rev 3731)
@@ -10,8 +10,9 @@
import java.util.*;
-import org.fudaa.fudaa.hydraulique1d.metier.geometrie.MetierPoint2D;
-import org.fudaa.fudaa.hydraulique1d.metier.MetierProfil;
+import org.fudaa.dodico.hydraulique1d.metier.MetierProfil;
+import org.fudaa.dodico.hydraulique1d.metier.evenement.Notifieur;
+import org.fudaa.dodico.hydraulique1d.metier.geometrie.MetierPoint2D;
import jxl.*;
import jxl.write.Label;
@@ -80,6 +81,9 @@
/** Les auditeurs pour la selection modifi\xE9e. */
private HashSet hsellisteners_=new HashSet();
+ private boolean avecGeoreferencement_;
+
+
// constructeurs
public Hydraulique1dProfilModel() {
numero_ = ord++;
@@ -89,6 +93,7 @@
ptLitMinGa_ = null;
ptLitMajDr_ = null;
ptLitMajGa_ = null;
+ avecGeoreferencement_ = false;
}
public Hydraulique1dProfilModel(MetierProfil iprofil) {
@@ -100,6 +105,7 @@
setIndiceLitMinGa(iprofil.indiceLitMinGa());
setIndiceLitMinDr(iprofil.indiceLitMinDr());
setIndiceLitMajDr(iprofil.indiceLitMajDr());
+ avecGeoreferencement_= iprofil.avecGeoreferencement();
}
public Object clone() {
@@ -116,6 +122,7 @@
clone.setIndiceLitMinGa(getIndiceLitMinGa());
clone.setIndiceLitMinDr(getIndiceLitMinDr());
clone.setIndiceLitMajDr(getIndiceLitMajDr());
+ clone.avecGeoreferencement(avecGeoreferencement_);
return clone;
}
@@ -174,6 +181,15 @@
}
numero_ = s;
}
+
+ public boolean avecGeoreferencement() {
+ return avecGeoreferencement_;
+ }
+
+ public void avecGeoreferencement(boolean b) {
+ if (avecGeoreferencement_==b) return;
+ avecGeoreferencement_= b;
+ }
public String nom() {
return nom_;
@@ -934,7 +950,7 @@
// Nouveaux points.
for (int i=0; i<vclip_.size(); i++) {
Hydraulique1dPoint pi=(Hydraulique1dPoint)vclip_.get(i);
- listePoints_.add(indDest+1+i,new Hydraulique1dPoint(pi.X()==null? null:new Double(pi.x()+dx),pi.Y()));
+ listePoints_.add(indDest+1+i,new Hydraulique1dPoint(pi.X()==null? null:new Double(pi.x()+dx),pi.Y(),pi.CX(),pi.CY()));
}
// Selection de ces nouveaux points
@@ -1433,6 +1449,7 @@
double dst=Math.abs(aa*pi.x()+bb*pi.y()+cc)/Math.sqrt(aa*aa+bb*bb);
hdst2pts.put(new Double(dst),new Integer(i));
}
+
// Suppression de tous les points dont la distance est inf\xE9rieure \xE0 _dst
bsup=false;
Modified: trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/Hydraulique1dProjet.java
===================================================================
--- trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/Hydraulique1dProjet.java 2008-08-07 14:42:27 UTC (rev 3730)
+++ trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/Hydraulique1dProjet.java 2008-08-07 14:48:20 UTC (rev 3731)
@@ -40,14 +40,14 @@
import org.fudaa.ctulu.CtuluLibMessage;
import org.fudaa.dodico.boony.BoonyXmlDeserializer;
import org.fudaa.dodico.boony.BoonyXmlSerializer;
-import org.fudaa.fudaa.hydraulique1d.metier.MetierBief;
-import org.fudaa.fudaa.hydraulique1d.metier.MetierCasier;
-import org.fudaa.fudaa.hydraulique1d.metier.MetierEtude1d;
-import org.fudaa.fudaa.hydraulique1d.metier.MetierExtremite;
-import org.fudaa.fudaa.hydraulique1d.metier.MetierLiaison;
-import org.fudaa.fudaa.hydraulique1d.metier.MetierNoeud;
-import org.fudaa.fudaa.hydraulique1d.metier.MetierReseau;
-import org.fudaa.fudaa.hydraulique1d.metier.MetierSingularite;
+import org.fudaa.dodico.hydraulique1d.metier.MetierBief;
+import org.fudaa.dodico.hydraulique1d.metier.MetierCasier;
+import org.fudaa.dodico.hydraulique1d.metier.MetierEtude1d;
+import org.fudaa.dodico.hydraulique1d.metier.MetierExtremite;
+import org.fudaa.dodico.hydraulique1d.metier.MetierLiaison;
+import org.fudaa.dodico.hydraulique1d.metier.MetierNoeud;
+import org.fudaa.dodico.hydraulique1d.metier.MetierReseau;
+import org.fudaa.dodico.hydraulique1d.metier.MetierSingularite;
import org.fudaa.fudaa.hydraulique1d.ihmhelper.Hydraulique1dIHMRepository;
import org.fudaa.fudaa.hydraulique1d.reseau.Hydraulique1dReseauBarragePrincipal;
import org.fudaa.fudaa.hydraulique1d.reseau.Hydraulique1dReseauBiefCourbe;
Modified: trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/conv/CConversionHydraulique1d.java
===================================================================
--- trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/conv/CConversionHydraulique1d.java 2008-08-07 14:42:27 UTC (rev 3730)
+++ trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/conv/CConversionHydraulique1d.java 2008-08-07 14:48:20 UTC (rev 3731)
@@ -7,11 +7,6 @@
* @mail de...@fu...
*/
package org.fudaa.fudaa.hydraulique1d.conv;
-import org.fudaa.fudaa.hydraulique1d.metier.MetierCalculHydraulique1d;
-import org.fudaa.fudaa.hydraulique1d.metier.MetierEtude1d;
-import org.fudaa.fudaa.hydraulique1d.metier.MetierParametresTailleMaxFichier;
-import org.fudaa.fudaa.hydraulique1d.metier.MetierResultatsGeneraux;
-import org.fudaa.fudaa.hydraulique1d.metier.calageauto.MetierResultatsCalageAuto;
import org.fudaa.dodico.corba.mascaret.ICalculMascaret;
import org.fudaa.dodico.corba.mascaret.ICalculMascaretHelper;
import org.fudaa.dodico.corba.mascaret.IParametresMascaret;
@@ -23,6 +18,11 @@
import org.fudaa.dodico.corba.mascaret.SParametresREP;
import org.fudaa.dodico.corba.mascaret.SParametresTailleMaxFichier;
import org.fudaa.dodico.corba.objet.IConnexion;
+import org.fudaa.dodico.hydraulique1d.metier.MetierCalculHydraulique1d;
+import org.fudaa.dodico.hydraulique1d.metier.MetierEtude1d;
+import org.fudaa.dodico.hydraulique1d.metier.MetierParametresTailleMaxFichier;
+import org.fudaa.dodico.hydraulique1d.metier.MetierResultatsGeneraux;
+import org.fudaa.dodico.hydraulique1d.metier.calageauto.MetierResultatsCalageAuto;
/**
* Classe qui contient des m\xE9thodes utiles \xE0 la conversion entre les 2 mod\xE8les.
*
Modified: trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/conv/ConvH1D_Masc.java
===================================================================
--- trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/conv/ConvH1D_Masc.java 2008-08-07 14:42:27 UTC (rev 3730)
+++ trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/conv/ConvH1D_Masc.java 2008-08-07 14:48:20 UTC (rev 3731)
@@ -12,89 +12,6 @@
import java.util.List;
import java.util.Vector;
-import org.fudaa.fudaa.hydraulique1d.metier.geometrie.MetierPoint;
-import org.fudaa.fudaa.hydraulique1d.metier.geometrie.MetierPoint2D;
-import org.fudaa.fudaa.hydraulique1d.metier.MetierBarragePrincipal;
-import org.fudaa.fudaa.hydraulique1d.metier.MetierBief;
-import org.fudaa.fudaa.hydraulique1d.metier.MetierCasier;
-import org.fudaa.fudaa.hydraulique1d.metier.MetierConditionsInitiales;
-import org.fudaa.fudaa.hydraulique1d.metier.MetierDefinitionSectionsParSections;
-import org.fudaa.fudaa.hydraulique1d.metier.MetierDefinitionSectionsParSeries;
-import org.fudaa.fudaa.hydraulique1d.metier.MetierDescriptionVariable;
-import org.fudaa.fudaa.hydraulique1d.metier.MetierDonneesHydrauliques;
-import org.fudaa.fudaa.hydraulique1d.metier.MetierEtude1d;
-import org.fudaa.fudaa.hydraulique1d.metier.MetierExtremite;
-import org.fudaa.fudaa.hydraulique1d.metier.MetierLiaison;
-import org.fudaa.fudaa.hydraulique1d.metier.MetierLigneEauInitiale;
-import org.fudaa.fudaa.hydraulique1d.metier.MetierLigneEauPoint;
-import org.fudaa.fudaa.hydraulique1d.metier.MetierLimite;
-import org.fudaa.fudaa.hydraulique1d.metier.MetierLoiHydraulique;
-import org.fudaa.fudaa.hydraulique1d.metier.MetierMaillage;
-import org.fudaa.fudaa.hydraulique1d.metier.MetierNoeud;
-import org.fudaa.fudaa.hydraulique1d.metier.MetierParametresGeneraux;
-import org.fudaa.fudaa.hydraulique1d.metier.MetierParametresGenerauxCasier;
-import org.fudaa.fudaa.hydraulique1d.metier.MetierParametresReprise;
-import org.fudaa.fudaa.hydraulique1d.metier.MetierParametresResultats;
-import org.fudaa.fudaa.hydraulique1d.metier.MetierParametresTemporels;
-import org.fudaa.fudaa.hydraulique1d.metier.MetierProfil;
-import org.fudaa.fudaa.hydraulique1d.metier.MetierReseau;
-import org.fudaa.fudaa.hydraulique1d.metier.MetierResultatsTemporelSpatial;
-import org.fudaa.fudaa.hydraulique1d.metier.MetierResultatsTemporelSpatialBief;
-import org.fudaa.fudaa.hydraulique1d.metier.MetierSite;
-import org.fudaa.fudaa.hydraulique1d.metier.MetierZone;
-import org.fudaa.fudaa.hydraulique1d.metier.MetierZoneFrottement;
-import org.fudaa.fudaa.hydraulique1d.metier.MetierZonePlanimetrage;
-import org.fudaa.fudaa.hydraulique1d.metier.EnumMetierCondLimiteImposee;
-import org.fudaa.fudaa.hydraulique1d.metier.EnumMetierCritereArret;
-import org.fudaa.fudaa.hydraulique1d.metier.EnumMetierLimiteCalcule;
-import org.fudaa.fudaa.hydraulique1d.metier.EnumMetierMethodeMaillage;
-import org.fudaa.fudaa.hydraulique1d.metier.EnumMetierRegime;
-import org.fudaa.fudaa.hydraulique1d.metier.EnumMetierTypeFrottement;
-import org.fudaa.fudaa.hydraulique1d.metier.EnumMetierTypeNombre;
-import org.fudaa.fudaa.hydraulique1d.metier.EnumMetierUnite;
-import org.fudaa.fudaa.hydraulique1d.metier.calageauto.MetierApportCrueCalageAuto;
-import org.fudaa.fudaa.hydraulique1d.metier.calageauto.MetierCrueCalageAuto;
-import org.fudaa.fudaa.hydraulique1d.metier.calageauto.MetierMesureCrueCalageAuto;
-import org.fudaa.fudaa.hydraulique1d.metier.calageauto.MetierParametresCalageAuto;
-import org.fudaa.fudaa.hydraulique1d.metier.calageauto.EnumMetierMethodeOpt;
-import org.fudaa.fudaa.hydraulique1d.metier.calageauto.EnumMetierTypeLit;
-import org.fudaa.fudaa.hydraulique1d.metier.casier.MetierGeometrieCasier;
-import org.fudaa.fudaa.hydraulique1d.metier.casier.MetierPlanimetrageCasier;
-import org.fudaa.fudaa.hydraulique1d.metier.evenement.Notifieur;
-import org.fudaa.fudaa.hydraulique1d.metier.loi.MetierLoiHydrogramme;
-import org.fudaa.fudaa.hydraulique1d.metier.loi.MetierLoiLimniHydrogramme;
-import org.fudaa.fudaa.hydraulique1d.metier.loi.MetierLoiLimnigramme;
-import org.fudaa.fudaa.hydraulique1d.metier.loi.MetierLoiOuvertureVanne;
-import org.fudaa.fudaa.hydraulique1d.metier.loi.MetierLoiRegulation;
-import org.fudaa.fudaa.hydraulique1d.metier.loi.MetierLoiSeuil;
-import org.fudaa.fudaa.hydraulique1d.metier.loi.MetierLoiTarage;
-import org.fudaa.fudaa.hydraulique1d.metier.loi.MetierLoiTracer;
-import org.fudaa.fudaa.hydraulique1d.metier.qualitedeau.MetierConcentrationInitiale;
-import org.fudaa.fudaa.hydraulique1d.metier.qualitedeau.MetierLimiteQualiteDEau;
-import org.fudaa.fudaa.hydraulique1d.metier.qualitedeau.MetierOptionTraceur;
-import org.fudaa.fudaa.hydraulique1d.metier.qualitedeau.MetierParamPhysTracer;
-import org.fudaa.fudaa.hydraulique1d.metier.qualitedeau.MetierParametresQualiteDEau;
-import org.fudaa.fudaa.hydraulique1d.metier.qualitedeau.EnumMetierModeleQualiteDEau;
-import org.fudaa.fudaa.hydraulique1d.metier.qualitedeau.EnumMetierOptionConvec;
-import org.fudaa.fudaa.hydraulique1d.metier.qualitedeau.EnumMetierOptionDiffus;
-import org.fudaa.fudaa.hydraulique1d.metier.qualitedeau.EnumMetierTypeCondLimiteTracer;
-import org.fudaa.fudaa.hydraulique1d.metier.singularite.MetierApport;
-import org.fudaa.fudaa.hydraulique1d.metier.singularite.MetierBarrage;
-import org.fudaa.fudaa.hydraulique1d.metier.singularite.MetierDeversoir;
-import org.fudaa.fudaa.hydraulique1d.metier.singularite.MetierDeversoirComportementLoi;
-import org.fudaa.fudaa.hydraulique1d.metier.singularite.MetierDeversoirComportementZCoefQ;
-import org.fudaa.fudaa.hydraulique1d.metier.singularite.MetierPerteCharge;
-import org.fudaa.fudaa.hydraulique1d.metier.singularite.MetierSeuil;
-import org.fudaa.fudaa.hydraulique1d.metier.singularite.MetierSeuilDenoye;
-import org.fudaa.fudaa.hydraulique1d.metier.singularite.MetierSeuilGeometrique;
-import org.fudaa.fudaa.hydraulique1d.metier.singularite.MetierSeuilLimniAmont;
-import org.fudaa.fudaa.hydraulique1d.metier.singularite.MetierSeuilLoi;
-import org.fudaa.fudaa.hydraulique1d.metier.singularite.MetierSeuilNoye;
-import org.fudaa.fudaa.hydraulique1d.metier.singularite.MetierSeuilTarageAmont;
-import org.fudaa.fudaa.hydraulique1d.metier.singularite.MetierSeuilTarageAval;
-import org.fudaa.fudaa.hydraulique1d.metier.singularite.MetierSeuilVanne;
-import org.fudaa.fudaa.hydraulique1d.metier.singularite.MetierSource;
-import org.fudaa.fudaa.hydraulique1d.metier.singularite.EnumMetierTypeSource;
import org.fudaa.dodico.corba.mascaret.SGeoCasier;
import org.fudaa.dodico.corba.mascaret.SGeoCasiers;
import org.fudaa.dodico.corba.mascaret.SLoiHydraulique;
@@ -182,6 +99,89 @@
import org.fudaa.dodico.corba.mascaret.SResultatsTemporelSpatial;
import org.fudaa.dodico.corba.mascaret.SResultatsTemporelSpatialBief;
import org.fudaa.dodico.corba.mascaret.SResultatsVariable;
+import org.fudaa.dodico.hydraulique1d.metier.EnumMetierCondLimiteImposee;
+import org.fudaa.dodico.hydraulique1d.metier.EnumMetierCritereArret;
+import org.fudaa.dodico.hydraulique1d.metier.EnumMetierLimiteCalcule;
+import org.fudaa.dodico.hydraulique1d.metier.EnumMetierMethodeMaillage;
+import org.fudaa.dodico.hydraulique1d.metier.EnumMetierRegime;
+import org.fudaa.dodico.hydraulique1d.metier.EnumMetierTypeFrottement;
+import org.fudaa.dodico.hydraulique1d.metier.EnumMetierTypeNombre;
+import org.fudaa.dodico.hydraulique1d.metier.EnumMetierUnite;
+import org.fudaa.dodico.hydraulique1d.metier.MetierBarragePrincipal;
+import org.fudaa.dodico.hydraulique1d.metier.MetierBief;
+import org.fudaa.dodico.hydraulique1d.metier.MetierCasier;
+import org.fudaa.dodico.hydraulique1d.metier.MetierConditionsInitiales;
+import org.fudaa.dodico.hydraulique1d.metier.MetierDefinitionSectionsParSections;
+import org.fudaa.dodico.hydraulique1d.metier.MetierDefinitionSectionsParSeries;
+import org.fudaa.dodico.hydraulique1d.metier.MetierDescriptionVariable;
+import org.fudaa.dodico.hydraulique1d.metier.MetierDonneesHydrauliques;
+import org.fudaa.dodico.hydraulique1d.metier.MetierEtude1d;
+import org.fudaa.dodico.hydraulique1d.metier.MetierExtremite;
+import org.fudaa.dodico.hydraulique1d.metier.MetierLiaison;
+import org.fudaa.dodico.hydraulique1d.metier.MetierLigneEauInitiale;
+import org.fudaa.dodico.hydraulique1d.metier.MetierLigneEauPoint;
+import org.fudaa.dodico.hydraulique1d.metier.MetierLimite;
+import org.fudaa.dodico.hydraulique1d.metier.MetierLoiHydraulique;
+import org.fudaa.dodico.hydraulique1d.metier.MetierMaillage;
+import org.fudaa.dodico.hydraulique1d.metier.MetierNoeud;
+import org.fudaa.dodico.hydraulique1d.metier.MetierParametresGeneraux;
+import org.fudaa.dodico.hydraulique1d.metier.MetierParametresGenerauxCasier;
+import org.fudaa.dodico.hydraulique1d.metier.MetierParametresReprise;
+import org.fudaa.dodico.hydraulique1d.metier.MetierParametresResultats;
+import org.fudaa.dodico.hydraulique1d.metier.MetierParametresTemporels;
+import org.fudaa.dodico.hydraulique1d.metier.MetierProfil;
+import org.fudaa.dodico.hydraulique1d.metier.MetierReseau;
+import org.fudaa.dodico.hydraulique1d.metier.MetierResultatsTemporelSpatial;
+import org.fudaa.dodico.hydraulique1d.metier.MetierResultatsTemporelSpatialBief;
+import org.fudaa.dodico.hydraulique1d.metier.MetierSite;
+import org.fudaa.dodico.hydraulique1d.metier.MetierZone;
+import org.fudaa.dodico.hydraulique1d.metier.MetierZoneFrottement;
+import org.fudaa.dodico.hydraulique1d.metier.MetierZonePlanimetrage;
+import org.fudaa.dodico.hydraulique1d.metier.calageauto.EnumMetierMethodeOpt;
+import org.fudaa.dodico.hydraulique1d.metier.calageauto.EnumMetierTypeLit;
+import org.fudaa.dodico.hydraulique1d.metier.calageauto.MetierApportCrueCalageAuto;
+import org.fudaa.dodico.hydraulique1d.metier.calageauto.MetierCrueCalageAuto;
+import org.fudaa.dodico.hydraulique1d.metier.calageauto.MetierMesureCrueCalageAuto;
+import org.fudaa.dodico.hydraulique1d.metier.calageauto.MetierParametresCalageAuto;
+import org.fudaa.dodico.hydraulique1d.metier.casier.MetierGeometrieCasier;
+import org.fudaa.dodico.hydraulique1d.metier.casier.MetierPlanimetrageCasier;
+import org.fudaa.dodico.hydraulique1d.metier.evenement.Notifieur;
+import org.fudaa.dodico.hydraulique1d.metier.geometrie.MetierPoint;
+import org.fudaa.dodico.hydraulique1d.metier.geometrie.MetierPoint2D;
+import org.fudaa.dodico.hydraulique1d.metier.loi.MetierLoiHydrogramme;
+import org.fudaa.dodico.hydraulique1d.metier.loi.MetierLoiLimniHydrogramme;
+import org.fudaa.dodico.hydraulique1d.metier.loi.MetierLoiLimnigramme;
+import org.fudaa.dodico.hydraulique1d.metier.loi.MetierLoiOuvertureVanne;
+import org.fudaa.dodico.hydraulique1d.metier.loi.MetierLoiRegulation;
+import org.fudaa.dodico.hydraulique1d.metier.loi.MetierLoiSeuil;
+import org.fudaa.dodico.hydraulique1d.metier.loi.MetierLoiTarage;
+import org.fudaa.dodico.hydraulique1d.metier.loi.MetierLoiTracer;
+import org.fudaa.dodico.hydraulique1d.metier.qualitedeau.EnumMetierModeleQualiteDEau;
+import org.fudaa.dodico.hydraulique1d.metier.qualitedeau.EnumMetierOptionConvec;
+import org.fudaa.dodico.hydraulique1d.metier.qualitedeau.EnumMetierOptionDiffus;
+import org.fudaa.dodico.hydraulique1d.metier.qualitedeau.EnumMetierTypeCondLimiteTracer;
+import org.fudaa.dodico.hydraulique1d.metier.qualitedeau.MetierConcentrationInitiale;
+import org.fudaa.dodico.hydraulique1d.metier.qualitedeau.MetierLimiteQualiteDEau;
+import org.fudaa.dodico.hydraulique1d.metier.qualitedeau.MetierOptionTraceur;
+import org.fudaa.dodico.hydraulique1d.metier.qualitedeau.MetierParamPhysTracer;
+import org.fudaa.dodico.hydraulique1d.metier.qualitedeau.MetierParametresQualiteDEau;
+import org.fudaa.dodico.hydraulique1d.metier.singularite.EnumMetierTypeSource;
+import org.fudaa.dodico.hydraulique1d.metier.singularite.MetierApport;
+import org.fudaa.dodico.hydraulique1d.metier.singularite.MetierBarrage;
+import org.fudaa.dodico.hydraulique1d.metier.singularite.MetierDeversoir;
+import org.fudaa.dodico.hydraulique1d.metier.singularite.MetierDeversoirComportementLoi;
+import org.fudaa.dodico.hydraulique1d.metier.singularite.MetierDeversoirComportementZCoefQ;
+import org.fudaa.dodico.hydraulique1d.metier.singularite.MetierPerteCharge;
+import org.fudaa.dodico.hydraulique1d.metier.singularite.MetierSeuil;
+import org.fudaa.dodico.hydraulique1d.metier.singularite.MetierSeuilDenoye;
+import org.fudaa.dodico.hydraulique1d.metier.singularite.MetierSeuilGeometrique;
+import org.fudaa.dodico.hydraulique1d.metier.singularite.MetierSeuilLimniAmont;
+import org.fudaa.dodico.hydraulique1d.metier.singularite.MetierSeuilLoi;
+import org.fudaa.dodico.hydraulique1d.metier.singularite.MetierSeuilNoye;
+import org.fudaa.dodico.hydraulique1d.metier.singularite.MetierSeuilTarageAmont;
+import org.fudaa.dodico.hydraulique1d.metier.singularite.MetierSeuilTarageAval;
+import org.fudaa.dodico.hydraulique1d.metier.singularite.MetierSeuilVanne;
+import org.fudaa.dodico.hydraulique1d.metier.singularite.MetierSource;
import org.fudaa.dodico.mascaret.DescriptionVariables;
/**
* Classe qui contient les m\xE9thodes statiques permettant de convertir le mod\xE8le
@@ -2588,6 +2588,7 @@
geoMas.biefs[i].profils[j].absc = biefs[i].profils()[j].abscisse();
geoMas.biefs[i].profils[j].nom =
biefs[i].profils()[j].nom().trim().replace(' ', '_');
+ geoMas.biefs[i].profils[j].avecGeoReferencement = biefs[i].profils()[j].avecGeoreferencement();
geoMas.biefs[i].profils[j].pts =
new SParametresPt[biefs[i].profils()[j].points().length];
for (int k = 0; k < biefs[i].profils()[j].points().length; k++) {
@@ -2596,6 +2597,10 @@
biefs[i].profils()[j].points()[k].x;
geoMas.biefs[i].profils[j].pts[k].y =
biefs[i].profils()[j].points()[k].y;
+ geoMas.biefs[i].profils[j].pts[k].cx =
+ biefs[i].profils()[j].points()[k].cx;
+ geoMas.biefs[i].profils[j].pts[k].cx =
+ biefs[i].profils()[j].points()[k].cy;
if ( (biefs[i].profils()[j].indiceLitMinGa() <= k)
&& (k <= biefs[i].profils()[j].indiceLitMinDr())) {
geoMas.biefs[i].profils[j].pts[k].lit = "B";
Modified: trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/conv/ConvMasc_H1D.java
===================================================================
--- trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/conv/ConvMasc_H1D.java 2008-08-07 14:42:27 UTC (rev 3730)
+++ trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/conv/ConvMasc_H1D.java 2008-08-07 14:48:20 UTC (rev 3731)
@@ -93,100 +93,100 @@
import org.fudaa.dodico.corba.mascaret.SResultatsTemporelSpatial;
import org.fudaa.dodico.corba.mascaret.SResultatsTemporelSpatialBief;
import org.fudaa.dodico.corba.mascaret.SResultatsVariable;
+import org.fudaa.dodico.hydraulique1d.metier.EnumMetierCondLimiteImposee;
+import org.fudaa.dodico.hydraulique1d.metier.EnumMetierCritereArret;
+import org.fudaa.dodico.hydraulique1d.metier.EnumMetierLimiteCalcule;
+import org.fudaa.dodico.hydraulique1d.metier.EnumMetierMethodeMaillage;
+import org.fudaa.dodico.hydraulique1d.metier.EnumMetierOptionStockage;
+import org.fudaa.dodico.hydraulique1d.metier.EnumMetierRegime;
+import org.fudaa.dodico.hydraulique1d.metier.EnumMetierSensDebitLiaison;
+import org.fudaa.dodico.hydraulique1d.metier.EnumMetierTypeCompositionLits;
+import org.fudaa.dodico.hydraulique1d.metier.EnumMetierTypeFrottement;
+import org.fudaa.dodico.hydraulique1d.metier.MetierBarragePrincipal;
+import org.fudaa.dodico.hydraulique1d.metier.MetierBief;
+import org.fudaa.dodico.hydraulique1d.metier.MetierCasier;
+import org.fudaa.dodico.hydraulique1d.metier.MetierConditionsInitiales;
+import org.fudaa.dodico.hydraulique1d.metier.MetierDefinitionSectionsParSections;
+import org.fudaa.dodico.hydraulique1d.metier.MetierDefinitionSectionsParSeries;
+import org.fudaa.dodico.hydraulique1d.metier.MetierDefinitionSectionsParSeriesUnitaire;
+import org.fudaa.dodico.hydraulique1d.metier.MetierDescriptionVariable;
+import org.fudaa.dodico.hydraulique1d.metier.MetierDonneesHydrauliques;
+import org.fudaa.dodico.hydraulique1d.metier.MetierEtude1d;
+import org.fudaa.dodico.hydraulique1d.metier.MetierExtremite;
+import org.fudaa.dodico.hydraulique1d.metier.MetierHydraulique1d;
+import org.fudaa.dodico.hydraulique1d.metier.MetierLiaison;
+import org.fudaa.dodico.hydraulique1d.metier.MetierLigneEauInitiale;
+import org.fudaa.dodico.hydraulique1d.metier.MetierLigneEauPoint;
+import org.fudaa.dodico.hydraulique1d.metier.MetierLimite;
+import org.fudaa.dodico.hydraulique1d.metier.MetierLoiHydraulique;
+import org.fudaa.dodico.hydraulique1d.metier.MetierMaillage;
+import org.fudaa.dodico.hydraulique1d.metier.MetierNoeud;
+import org.fudaa.dodico.hydraulique1d.metier.MetierParametresGeneraux;
+import org.fudaa.dodico.hydraulique1d.metier.MetierParametresGenerauxCasier;
+import org.fudaa.dodico.hydraulique1d.metier.MetierParametresReprise;
+import org.fudaa.dodico.hydraulique1d.metier.MetierParametresResultats;
+import org.fudaa.dodico.hydraulique1d.metier.MetierParametresTemporels;
+import org.fudaa.dodico.hydraulique1d.metier.MetierProfil;
+import org.fudaa.dodico.hydraulique1d.metier.MetierReseau;
+import org.fudaa.dodico.hydraulique1d.metier.MetierResultatsTemporelSpatial;
+import org.fudaa.dodico.hydraulique1d.metier.MetierResultatsTemporelSpatialBief;
+import org.fudaa.dodico.hydraulique1d.metier.MetierSite;
+import org.fudaa.dodico.hydraulique1d.metier.MetierZone;
+import org.fudaa.dodico.hydraulique1d.metier.MetierZoneFrottement;
+import org.fudaa.dodico.hydraulique1d.metier.MetierZonePlanimetrage;
+import org.fudaa.dodico.hydrau...
[truncated message content] |
