From: <bma...@us...> - 2009-03-30 08:10:51
|
Revision: 4594 http://fudaa.svn.sourceforge.net/fudaa/?rev=4594&view=rev Author: bmarchan Date: 2009-03-30 08:10:42 +0000 (Mon, 30 Mar 2009) Log Message: ----------- Created tag FudaaModeleur_0_13. Added Paths: ----------- tags/FudaaModeleur_0_13/ tags/FudaaModeleur_0_13/fudaa_devel/ctulu/src/org/fudaa/ctulu/fileformat/FileFormatVersionInterface.java tags/FudaaModeleur_0_13/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISAttributeConstants.java tags/FudaaModeleur_0_13/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISAttributeInteger.java tags/FudaaModeleur_0_13/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISCoordinateSequenceFactory.java tags/FudaaModeleur_0_13/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISCoordinateSequenceImmutable.java tags/FudaaModeleur_0_13/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISCoordinateSequenceUniqueImmutable.java tags/FudaaModeleur_0_13/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISDataModel.java tags/FudaaModeleur_0_13/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISGeometry.java tags/FudaaModeleur_0_13/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISGeometryCollection.java tags/FudaaModeleur_0_13/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISGeometryFactory.java tags/FudaaModeleur_0_13/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISLib.java tags/FudaaModeleur_0_13/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISPolygone.java tags/FudaaModeleur_0_13/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISPolyligne.java tags/FudaaModeleur_0_13/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISZoneCollection.java tags/FudaaModeleur_0_13/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISZoneCollectionBloc.java tags/FudaaModeleur_0_13/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISZoneCollectionPoint.java tags/FudaaModeleur_0_13/fudaa_devel/ctulu/src/org/fudaa/ctulu/interpolation/profile/InterpolationProfilRefineAndProj.java tags/FudaaModeleur_0_13/fudaa_devel/ctulu/src/org/fudaa/ctulu/interpolation/profile/ProfileCalculator.java tags/FudaaModeleur_0_13/fudaa_devel/ctulu/test/org/fudaa/ctulu/interpolation/profile/TestInterpolationProfile.java tags/FudaaModeleur_0_13/fudaa_devel/dodico/src/org/fudaa/dodico/fortran/FortranDoubleReader.java tags/FudaaModeleur_0_13/fudaa_devel/dodico/src/org/fudaa/dodico/mascaret/io/MascaretCasierFileFormat.java tags/FudaaModeleur_0_13/fudaa_devel/dodico/src/org/fudaa/dodico/mascaret/io/MascaretCasierWriter.java tags/FudaaModeleur_0_13/fudaa_devel/dodico/src/org/fudaa/dodico/rubar/io/RubarCasierFileFormat.java tags/FudaaModeleur_0_13/fudaa_devel/dodico/src/org/fudaa/dodico/rubar/io/RubarCasierWriter.java tags/FudaaModeleur_0_13/fudaa_devel/dodico/src/org/fudaa/dodico/rubar/io/RubarSEMFileFormat.java tags/FudaaModeleur_0_13/fudaa_devel/dodico/src/org/fudaa/dodico/rubar/io/RubarStReader.java tags/FudaaModeleur_0_13/fudaa_devel/dodico/src/org/fudaa/dodico/rubar/io/RubarStWriter.java tags/FudaaModeleur_0_13/fudaa_devel/ebli/src/org/fudaa/ebli/calque/CalqueGISTreeModel.java tags/FudaaModeleur_0_13/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueAffichageDonneesAbstract.java tags/FudaaModeleur_0_13/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueAffichageDonneesTraceConfigure.java tags/FudaaModeleur_0_13/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueBloc.java tags/FudaaModeleur_0_13/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueGeometry.java tags/FudaaModeleur_0_13/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueLigneBrisee.java tags/FudaaModeleur_0_13/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZEbliCalquePanelController.java tags/FudaaModeleur_0_13/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZEbliCalquesPanel.java tags/FudaaModeleur_0_13/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZModeleBloc.java tags/FudaaModeleur_0_13/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZScene.java tags/FudaaModeleur_0_13/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/EbliSingleObjectEditorPanel.java tags/FudaaModeleur_0_13/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZCalqueEditionInteractionTargetI.java tags/FudaaModeleur_0_13/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZEditorDefault.java tags/FudaaModeleur_0_13/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZEditorLigneBriseePanel.java tags/FudaaModeleur_0_13/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZModeleBlocDefault.java tags/FudaaModeleur_0_13/fudaa_devel/ebli/src/org/fudaa/ebli/controle/BSelecteurSurfaceModel.java tags/FudaaModeleur_0_13/fudaa_devel/ebli/src/org/fudaa/ebli/geometrie/GrVecteur.java tags/FudaaModeleur_0_13/fudaa_devel/ebli/src/org/fudaa/ebli/trace/TraceSurface.java tags/FudaaModeleur_0_13/fudaa_devel/ebli/src/org/fudaa/ebli/trace/TraceSurfaceChooser.java tags/FudaaModeleur_0_13/fudaa_devel/ebli/src/org/fudaa/ebli/trace/TraceSurfaceRenderer.java tags/FudaaModeleur_0_13/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/impl/FudaaCommonImplementation.java tags/FudaaModeleur_0_13/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/LibUtils.java tags/FudaaModeleur_0_13/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/Mdl.java tags/FudaaModeleur_0_13/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlCasierExportPanel.java tags/FudaaModeleur_0_13/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlCasierExporter.java tags/FudaaModeleur_0_13/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlCasierExporterFilter.java tags/FudaaModeleur_0_13/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlCutCopyPasteManager.java tags/FudaaModeleur_0_13/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlDecimationPanel.java tags/FudaaModeleur_0_13/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlEditionManager.java tags/FudaaModeleur_0_13/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlFille2d.java tags/FudaaModeleur_0_13/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlImplementation.java tags/FudaaModeleur_0_13/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlInterpolateProfilePanel.java tags/FudaaModeleur_0_13/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlProjectImportPanel.java tags/FudaaModeleur_0_13/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlProjectImportTreeModel.java tags/FudaaModeleur_0_13/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlProjectionPanel.java tags/FudaaModeleur_0_13/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlRefinementPanel.java tags/FudaaModeleur_0_13/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlSceneEditor.java tags/FudaaModeleur_0_13/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlVisuPanel.java tags/FudaaModeleur_0_13/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlWizardImport.java tags/FudaaModeleur_0_13/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlWizardImportStepDestination.java tags/FudaaModeleur_0_13/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlZDialog.java tags/FudaaModeleur_0_13/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/action/MdlCasierExportAction.java tags/FudaaModeleur_0_13/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/action/SceneOrganizePointAction.java tags/FudaaModeleur_0_13/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/action/SceneProfilInterpolationAction.java tags/FudaaModeleur_0_13/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/action/package.html tags/FudaaModeleur_0_13/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayer1dAxe.java tags/FudaaModeleur_0_13/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayer1dBank.java tags/FudaaModeleur_0_13/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayer1dLimiteStockage.java tags/FudaaModeleur_0_13/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayer1dTrace.java tags/FudaaModeleur_0_13/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayer2dCasier.java tags/FudaaModeleur_0_13/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayer2dCloud.java tags/FudaaModeleur_0_13/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayer2dConstraintLine.java tags/FudaaModeleur_0_13/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayer2dContour.java tags/FudaaModeleur_0_13/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayer2dDirectionLine.java tags/FudaaModeleur_0_13/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayer2dLevel.java tags/FudaaModeleur_0_13/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayer2dProfile.java tags/FudaaModeleur_0_13/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayer2dZone.java tags/FudaaModeleur_0_13/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayerFactory.java tags/FudaaModeleur_0_13/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlModel2dCasier.java tags/FudaaModeleur_0_13/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlModel2dLevel.java tags/FudaaModeleur_0_13/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlModel2dLine.java tags/FudaaModeleur_0_13/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/package.html tags/FudaaModeleur_0_13/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/controller/BiefImporterFromModels.java tags/FudaaModeleur_0_13/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/controller/Controller1d.java tags/FudaaModeleur_0_13/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/controller/ControllerBief.java tags/FudaaModeleur_0_13/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/controller/Exporter1d.java tags/FudaaModeleur_0_13/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/controller/package.html tags/FudaaModeleur_0_13/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/model/Bief.java tags/FudaaModeleur_0_13/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/model/ProfilContainer.java tags/FudaaModeleur_0_13/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/model/ProfilContainerAdapter.java tags/FudaaModeleur_0_13/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/model/UtilsProfil1d.java tags/FudaaModeleur_0_13/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/model/package.html tags/FudaaModeleur_0_13/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/package.html tags/FudaaModeleur_0_13/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/view/ExportPanel.java tags/FudaaModeleur_0_13/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/view/FusionBiefPanel.java tags/FudaaModeleur_0_13/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/view/OpenBiefPanel.java tags/FudaaModeleur_0_13/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/view/VueBief.java tags/FudaaModeleur_0_13/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/view/VueCourbe.java tags/FudaaModeleur_0_13/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/view/VueTableau.java tags/FudaaModeleur_0_13/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/view/package.html tags/FudaaModeleur_0_13/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/package.html tags/FudaaModeleur_0_13/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/persistence/MdlLayer2dCasierPersistence.java tags/FudaaModeleur_0_13/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/persistence/package.html tags/FudaaModeleur_0_13/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/resource/ tags/FudaaModeleur_0_13/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/resource/exporter-casier.png tags/FudaaModeleur_0_13/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/resource/new-casier.png tags/FudaaModeleur_0_13/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/resource/package.html tags/FudaaModeleur_0_13/fudaa_devel/fudaa/src/org/fudaa/fudaa/sig/layer/FSigVisuPanel.java tags/FudaaModeleur_0_13/fudaa_devel/fudaa/src/org/fudaa/fudaa/sig/wizard/FSigFileLoaderPanel.java tags/FudaaModeleur_0_13/fudaa_devel/fudaa/src/org/fudaa/fudaa/sig/wizard/FSigFileLoaderRubarSt.java tags/FudaaModeleur_0_13/fudaa_devel/fudaa/src/org/fudaa/fudaa/sig/wizard/FSigWizardVariableModifier.java Removed Paths: ------------- tags/FudaaModeleur_0_13/fudaa_devel/ctulu/src/org/fudaa/ctulu/fileformat/FileFormatVersionInterface.java tags/FudaaModeleur_0_13/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISAttributeConstants.java tags/FudaaModeleur_0_13/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISAttributeInteger.java tags/FudaaModeleur_0_13/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISCoordinateSequenceFactory.java tags/FudaaModeleur_0_13/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISDataModel.java tags/FudaaModeleur_0_13/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISGeometry.java tags/FudaaModeleur_0_13/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISGeometryCollection.java tags/FudaaModeleur_0_13/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISGeometryFactory.java tags/FudaaModeleur_0_13/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISLib.java tags/FudaaModeleur_0_13/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISPolygone.java tags/FudaaModeleur_0_13/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISPolyligne.java tags/FudaaModeleur_0_13/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISZoneCollection.java tags/FudaaModeleur_0_13/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISZoneCollectionPoint.java tags/FudaaModeleur_0_13/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GiSCoordinateSequenceImmutable.java tags/FudaaModeleur_0_13/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GisCoordinateSequenceUniqueImmutable.java tags/FudaaModeleur_0_13/fudaa_devel/ctulu/src/org/fudaa/ctulu/interpolation/profile/ProfileCalculator.java tags/FudaaModeleur_0_13/fudaa_devel/ctulu/test/org/fudaa/ctulu/interpolation/profile/TestInterpolationProfile.java tags/FudaaModeleur_0_13/fudaa_devel/dodico/src/org/fudaa/dodico/fortran/FortranDoubleReader.java tags/FudaaModeleur_0_13/fudaa_devel/dodico/src/org/fudaa/dodico/rubar/io/RubarSEMFileFormat.java tags/FudaaModeleur_0_13/fudaa_devel/dodico/src/org/fudaa/dodico/rubar/io/RubarStReader.java tags/FudaaModeleur_0_13/fudaa_devel/dodico/src/org/fudaa/dodico/rubar/io/RubarStWriter.java tags/FudaaModeleur_0_13/fudaa_devel/ebli/src/org/fudaa/ebli/calque/CalqueGISTreeModel.java tags/FudaaModeleur_0_13/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueAffichageDonneesAbstract.java tags/FudaaModeleur_0_13/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueAffichageDonneesTraceConfigure.java tags/FudaaModeleur_0_13/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueGeometry.java tags/FudaaModeleur_0_13/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueLigneBrisee.java tags/FudaaModeleur_0_13/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZEbliCalquePanelController.java tags/FudaaModeleur_0_13/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZEbliCalquesPanel.java tags/FudaaModeleur_0_13/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZScene.java tags/FudaaModeleur_0_13/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/EbliSingleObjectEditorPanel.java tags/FudaaModeleur_0_13/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZCalqueEditionInteractionTargetI.java tags/FudaaModeleur_0_13/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZEditorDefault.java tags/FudaaModeleur_0_13/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZEditorLigneBriseePanel.java tags/FudaaModeleur_0_13/fudaa_devel/ebli/src/org/fudaa/ebli/geometrie/GrVecteur.java tags/FudaaModeleur_0_13/fudaa_devel/ebli/src/org/fudaa/ebli/trace/TraceSurface.java tags/FudaaModeleur_0_13/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/impl/FudaaCommonImplementation.java tags/FudaaModeleur_0_13/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/CutCopyPasteManager.java tags/FudaaModeleur_0_13/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/LibUtils.java tags/FudaaModeleur_0_13/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/Mdl.java tags/FudaaModeleur_0_13/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlDecimationPanel.java tags/FudaaModeleur_0_13/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlEditionManager.java tags/FudaaModeleur_0_13/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlFille2d.java tags/FudaaModeleur_0_13/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlImplementation.java tags/FudaaModeleur_0_13/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlInterpolateProfilePanel.java tags/FudaaModeleur_0_13/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlProjectImportPanel.java tags/FudaaModeleur_0_13/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlProjectImportTreeModel.java tags/FudaaModeleur_0_13/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlProjectionPanel.java tags/FudaaModeleur_0_13/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlRefinementPanel.java tags/FudaaModeleur_0_13/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlResource.java tags/FudaaModeleur_0_13/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlSceneEditor.java tags/FudaaModeleur_0_13/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlVisuPanel.java tags/FudaaModeleur_0_13/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlWizardImport.java tags/FudaaModeleur_0_13/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlWizardImportStepDestination.java tags/FudaaModeleur_0_13/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/ZDialog.java tags/FudaaModeleur_0_13/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/action/SceneOrganizePoint.java tags/FudaaModeleur_0_13/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/action/SceneProfilInterpolation.java tags/FudaaModeleur_0_13/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/action/package.html tags/FudaaModeleur_0_13/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayer1dAxe.java tags/FudaaModeleur_0_13/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayer1dBank.java tags/FudaaModeleur_0_13/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayer1dLimiteStockage.java tags/FudaaModeleur_0_13/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayer1dTrace.java tags/FudaaModeleur_0_13/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayer2dCloud.java tags/FudaaModeleur_0_13/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayer2dConstraintLine.java tags/FudaaModeleur_0_13/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayer2dContour.java tags/FudaaModeleur_0_13/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayer2dDirectionLine.java tags/FudaaModeleur_0_13/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayer2dLevel.java tags/FudaaModeleur_0_13/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayer2dProfile.java tags/FudaaModeleur_0_13/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayer2dZone.java tags/FudaaModeleur_0_13/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayerFactory.java tags/FudaaModeleur_0_13/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlModel2dLevel.java tags/FudaaModeleur_0_13/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlModel2dLine.java tags/FudaaModeleur_0_13/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/package.html tags/FudaaModeleur_0_13/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/mdl_en.fr_txt tags/FudaaModeleur_0_13/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/controller/BiefImporterFromModels.java tags/FudaaModeleur_0_13/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/controller/Controller1d.java tags/FudaaModeleur_0_13/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/controller/ControllerBief.java tags/FudaaModeleur_0_13/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/controller/Exporter1d.java tags/FudaaModeleur_0_13/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/model/Bief.java tags/FudaaModeleur_0_13/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/model/ProfilContainer.java tags/FudaaModeleur_0_13/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/model/ProfilContainerAdapter.java tags/FudaaModeleur_0_13/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/model/UtilsProfil1d.java tags/FudaaModeleur_0_13/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/view/ExportPanel.java tags/FudaaModeleur_0_13/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/view/OpenBiefPanel.java tags/FudaaModeleur_0_13/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/view/VueBief.java tags/FudaaModeleur_0_13/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/view/VueCourbe.java tags/FudaaModeleur_0_13/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/view/VueFusionBief.java tags/FudaaModeleur_0_13/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/view/VueTableau.java tags/FudaaModeleur_0_13/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/package.html tags/FudaaModeleur_0_13/fudaa_devel/fudaa/src/org/fudaa/fudaa/sig/layer/FSigVisuPanel.java tags/FudaaModeleur_0_13/fudaa_devel/fudaa/src/org/fudaa/fudaa/sig/wizard/FSigFileLoaderPanel.java tags/FudaaModeleur_0_13/fudaa_devel/fudaa/src/org/fudaa/fudaa/sig/wizard/FSigFileLoaderRubarSt.java tags/FudaaModeleur_0_13/fudaa_devel/fudaa/src/org/fudaa/fudaa/sig/wizard/FSigWizardVariableModifier.java Property changes on: tags/FudaaModeleur_0_13 ___________________________________________________________________ Added: svn:ignore + eclipse_projects Added: svn:mergeinfo + /branches/Br_FudaaModeleur_TF:3445-3850 /branches/FudaaModeleur_TC1:3861-3891 Deleted: tags/FudaaModeleur_0_13/fudaa_devel/ctulu/src/org/fudaa/ctulu/fileformat/FileFormatVersionInterface.java =================================================================== --- branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/fileformat/FileFormatVersionInterface.java 2009-02-27 08:37:25 UTC (rev 4503) +++ tags/FudaaModeleur_0_13/fudaa_devel/ctulu/src/org/fudaa/ctulu/fileformat/FileFormatVersionInterface.java 2009-03-30 08:10:42 UTC (rev 4594) @@ -1,57 +0,0 @@ -/* - * @creation 24 sept. 2004 - * @modification $Date: 2006-02-09 08:59:30 $ - * @license GNU General Public License 2 - * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne - * @mail de...@fu... - */ -package org.fudaa.ctulu.fileformat; - -import java.io.File; - -import org.fudaa.ctulu.CtuluIOOperationSynthese; -import org.fudaa.ctulu.ProgressionInterface; - - -/** - * @author Fred Deniger - * @version $Id: FileFormatVersionInterface.java,v 1.3 2006-02-09 08:59:30 deniger Exp $ - */ -public interface FileFormatVersionInterface { - - /** - * @return le format parent - */ - FileFormat getFileFormat(); - - /** - * @return le nom de cette version - */ - String getVersionName(); - - - /** - * @return le reader asssocie a ce format - */ - FileReadOperationAbstract createReader(); - - /** - * @return le writer associe a cette version - */ - FileWriteOperationAbstract createWriter(); - - /** - * @param _f le fichier a lire - * @param _prog la barre de progression - * @return la synthese de la lecture. Les donnees lues sont dans la synthese (getSource()). - */ - CtuluIOOperationSynthese read(File _f,ProgressionInterface _prog); - - /** - * @param _f le fichier a ecrire - * @param _source la source. Il faut tester si l'instance est correcte - * @param _prog la barre de progression - * @return la synthese de l'operation - */ - CtuluIOOperationSynthese write(File _f,Object _source,ProgressionInterface _prog); -} \ No newline at end of file Copied: tags/FudaaModeleur_0_13/fudaa_devel/ctulu/src/org/fudaa/ctulu/fileformat/FileFormatVersionInterface.java (from rev 4547, branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/fileformat/FileFormatVersionInterface.java) =================================================================== --- tags/FudaaModeleur_0_13/fudaa_devel/ctulu/src/org/fudaa/ctulu/fileformat/FileFormatVersionInterface.java (rev 0) +++ tags/FudaaModeleur_0_13/fudaa_devel/ctulu/src/org/fudaa/ctulu/fileformat/FileFormatVersionInterface.java 2009-03-30 08:10:42 UTC (rev 4594) @@ -0,0 +1,59 @@ +/* + * @creation 24 sept. 2004 + * @modification $Date: 2006-02-09 08:59:30 $ + * @license GNU General Public License 2 + * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne + * @mail de...@fu... + */ +package org.fudaa.ctulu.fileformat; + +import java.io.File; + +import org.fudaa.ctulu.CtuluIOOperationSynthese; +import org.fudaa.ctulu.ProgressionInterface; + + +/** + * Une interface d\xE9finissant un format de fichier. Elle permet d'acc\xE9der a la classe d'\xE9criture/lecture de ce format + * de fichier. + * @author Fred Deniger + * @version $Id: FileFormatVersionInterface.java,v 1.3 2006-02-09 08:59:30 deniger Exp $ + */ +public interface FileFormatVersionInterface { + + /** + * @return le format parent + */ + FileFormat getFileFormat(); + + /** + * @return le nom de cette version + */ + String getVersionName(); + + + /** + * @return le reader asssocie a ce format + */ + FileReadOperationAbstract createReader(); + + /** + * @return le writer associe a cette version + */ + FileWriteOperationAbstract createWriter(); + + /** + * @param _f le fichier a lire + * @param _prog la barre de progression + * @return la synthese de la lecture. Les donnees lues sont dans la synthese (getSource()). + */ + CtuluIOOperationSynthese read(File _f,ProgressionInterface _prog); + + /** + * @param _f le fichier a ecrire + * @param _source la source. Il faut tester si l'instance est correcte + * @param _prog la barre de progression + * @return la synthese de l'operation + */ + CtuluIOOperationSynthese write(File _f,Object _source,ProgressionInterface _prog); +} \ No newline at end of file Deleted: tags/FudaaModeleur_0_13/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISAttributeConstants.java =================================================================== --- branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISAttributeConstants.java 2009-02-27 08:37:25 UTC (rev 4503) +++ tags/FudaaModeleur_0_13/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISAttributeConstants.java 2009-03-30 08:10:42 UTC (rev 4594) @@ -1,367 +0,0 @@ -/* - * @creation 7 avr. 2005 - * @modification $Date$ - * @license GNU General Public License 2 - * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne - * @mail de...@fu... - */ -package org.fudaa.ctulu.gis; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - -import org.fudaa.ctulu.CtuluLib; -import org.fudaa.ctulu.CtuluLibString; -import org.fudaa.ctulu.gui.CtuluValueEditorChoice; - -import com.memoire.fu.FuLib; - -/** - * Une classe pour d\xE9finir des attributs syst\xE8mes associables \xE0 des objets GIS. Les attributs syst\xE8mes - * sont en principe des attributs programme (non construits par l'utilisateur). Le systeme connait - * ces attributs sp\xE9cifiques, et peut r\xE9agir en cons\xE9quence.<p> - * L'ID de chacun de ces attributs est ind\xE9pendant de la langue pour \xEAtre correctement sauv\xE9 dans - * les fichiers GML. - * - * @author Fred Deniger - * @version $Id$ - */ -public final class GISAttributeConstants { - - /** Etat geom modifi\xE9. */ - public final static String ATT_VAL_ETAT_MODI="MODI"; - /** Etat geom origine */ - public final static String ATT_VAL_ETAT_ORIG="ORIG"; - /** Une valeur d'attribut valant True */ - public final static String ATT_VAL_TRUE="T"; - /** Une valeur d'attribut valant False */ - public final static String ATT_VAL_FALSE="F"; - - /** Nature Semis */ - public final static String ATT_NATURE_SM="SM"; - /** Nature Courbe niveau */ - public final static String ATT_NATURE_CN="CN"; - /** Nature Profil */ - public final static String ATT_NATURE_PF="PF"; - /** Nature Ligne directrice */ - public final static String ATT_NATURE_LD="LD"; - /** Nature Ligne de contrainte */ - public final static String ATT_NATURE_LC="LC"; - /** Nature Trace de profil */ - public final static String ATT_NATURE_TP="TP"; - /** Nature Zone */ - public final static String ATT_NATURE_ZN="ZN"; - /** Nature Contour d'\xE9tude */ - public final static String ATT_NATURE_CE="CE"; - /** Nature axe hydraulique */ - public final static String ATT_NATURE_AH="AH"; - /** Nature rive (gauche ou droite) */ - public final static String ATT_NATURE_RV="RV"; - /** Nature limite de stockage */ - public final static String ATT_NATURE_LS="LS"; - - /** - * Un attribut nom, global. - */ - public final static GISAttributeString TITRE = new GISAttributeString(CtuluLib.getS("Nom")) { - /** Numero d'identifiant, incr\xE9ment\xE9 \xE0 chaque nouvelle cr\xE9ation de nom. */ - private int numid_=0; - String def_ = CtuluLib.getS("<Defaut>"); - - public String getID() { - return "ATTRIBUTE_TITLE"; - } - - protected Object createGlobalValues(final Object _initValues) { - Object r = _initValues; - // Si la valeur en entr\xE9e est la valeur par d\xE9faut, alors une nouvelle valeur en sortie est cr\xE9\xE9e. - // Ceci permet d'affecter automatiquement un nom nouveau \xE0 une g\xE9om\xE9trie cr\xE9\xE9e. - if (r == null || def_.equals(r)) { - return r="Geom_"+(++numid_); - } - else { - return super.createGlobalValues(_initValues); - } - } - - public Object getDefaultValue() { - return def_; - } - }; - - /** - * Un attribut nature, global. - */ - public final static GISAttributeString NATURE = new GISAttributeString(CtuluLib.getS("Nature"), false) { - public String getID() { - return "ATTRIBUTE_NATURE"; - } - - public boolean isEditable() { - return false; - } - }; - - /** - * Un attribut etat, global a la g\xE9om\xE9trie. - */ - public final static GISAttributeString ETAT_GEOM= - new GISAttributeString(new CtuluValueEditorChoice(new String[]{ATT_VAL_ETAT_ORIG, ATT_VAL_ETAT_MODI}, - new String[]{CtuluLib.getS("Origine"), CtuluLib.getS("Modifi\xE9")}), CtuluLib.getS("Etat"), false) { - public String getID() { - return "ATTRIBUTE_ETAT_GEOM"; - } - - protected Object createGlobalValues(Object _initValues) { - if (_initValues instanceof Object[]) { - // Si au moins une des valeurs est "modifi\xE9", on retourne "modifi\xE9". - boolean modifie=false; - int i=-1; - while (!modifie&&++i<((Object[])_initValues).length) - modifie=((Object[])_initValues)[i]==ATT_VAL_ETAT_MODI; - if (modifie) - _initValues=ATT_VAL_ETAT_MODI; - else - _initValues=ATT_VAL_ETAT_ORIG; - } - return super.createGlobalValues(_initValues); - } - - public boolean isEditable() { - return true; - } - - public Object getDefaultValue() { - return ATT_VAL_ETAT_ORIG; - } - }; - - /** - * Un attribut visibilit\xE9, global a la g\xE9om\xE9trie. - */ - public final static GISAttributeString VISIBILITE = - new GISAttributeString(new CtuluValueEditorChoice(new String[]{ATT_VAL_TRUE, ATT_VAL_FALSE}, - new String[]{CtuluLib.getS("Oui"), CtuluLib.getS("Non")}), CtuluLib.getS("Visibilit\xE9"), false) { - - public String getID() { - return "ATTRIBUTE_VISIBILITY"; - } - - public boolean isEditable() { - return true; - } - - public Object getDefaultValue() { - return ATT_VAL_TRUE; - } - }; - - /** - * Un attribut commentaire hydraulique, utilis\xE9 dans la lecture/ecriture des fichiers. - */ - public final static GISAttributeString COMMENTAIRE_HYDRO = new GISAttributeString(CtuluLib.getS("Commentaire hydro"), false) { - public String getID() { - return "ATTRIBUTE_HYDRO_COMMENT"; - } - }; - - /** - * Un attribut label, atomique. - */ - public final static GISAttributeString LABEL = new GISAttributeString(CtuluLib.getS("Label"), true) { - public String getID() { - return "ATTRIBUTE_LABEL"; - } - }; - - /** - * Un attribut bathy, atomique. - */ - public final static GISAttributeDouble BATHY = new GISAttributeDouble(CtuluLib.getS("z"), true) { - - public String getID() { - return "ATTRIBUTE_Z"; - } - }; - - /** - * Un attribut index de g\xE9om\xE9trie. - * Attention : Il n'est utilis\xE9 que lors de la sauvegarde, et n'apparait pas dans les calques autrement. - */ - public final static GISAttributeInteger INDEX_GEOM = new GISAttributeInteger(CtuluLib.getS("Index"), false) { - - public String getID() { - return "ATTRIBUTE_INDEX_GEOM"; - } - }; - - /** La liste des attributs syst\xE8mes. */ - protected final static List<GISAttribute> attrs_= - Arrays.asList(new GISAttribute[]{BATHY,TITRE,NATURE,VISIBILITE,ETAT_GEOM,COMMENTAIRE_HYDRO,LABEL}); - - private GISAttributeConstants() {} - - public static String toString(final GISAttributeInterface _att) { - for (GISAttributeInterface att: attrs_) { - if (_att==att) return _att.getID(); - } - final String attributeSep = getAttributeSep(); - return _att.getDataClass().getName() + attributeSep + FuLib.replace(_att.getName(), attributeSep, "_") - + attributeSep + CtuluLibString.toString(_att.isAtomicValue()); - } - - private static String getAttributeSep() { - return "|"; - } - - /** - * Retourne l'attribut syst\xE8me a partir de son identifiant. - * @param _idName L'identifiant. - * @return L'attribut syst\xE8me, ou null si aucun ne correspond a l'identifiant. - */ - public static GISAttributeInterface getConstantAttribute(final String _idName) { - for (GISAttributeInterface att: attrs_) { - if (att.getID().equals(_idName)) return att; - } - return null; - } - - public static GISAttributeInterface restoreFrom(final String _s) { - GISAttributeInterface res = getConstantAttribute(_s); - if (res != null) { - return res; - } - final String[] s = CtuluLibString.parseString(_s, getAttributeSep()); - if (s == null || s.length != 3) { - return null; - } - final String clazz = s[0]; - final String name = s[1]; - final boolean atomic = CtuluLibString.toBoolean(s[2]); - if (clazz.equals(Double.class.getName())) { - res = new GISAttributeDouble(name, atomic); - if (BATHY.isSameContent(res)) { - res = BATHY; - } - } else if (clazz.equals(Integer.class.getName())) { - res = new GISAttributeInteger(name, atomic); - } else { - res = new GISAttributeString(name, atomic); - if (TITRE.isSameContent(res)) { - res = TITRE; - } - else if (NATURE.isSameContent(res)) { - res = NATURE; - } - else if (ETAT_GEOM.isSameContent(res)) { - res = ETAT_GEOM; - } - else if (VISIBILITE.isSameContent(res)) { - res = VISIBILITE; - } - else if (COMMENTAIRE_HYDRO.isSameContent(res)) { - res = COMMENTAIRE_HYDRO; - } - } - - return res; - } - - /** - * Retourne la liste des attributs syst\xE8mes. - * @return La liste. - */ - public static List<GISAttribute> getDefaults() { - return new ArrayList<GISAttribute>(attrs_); // Une copie, pour eviter les modifications. - } - - /** - * L'attribut est-il un attribut syst\xE8me ? - * @param _att L'attribut a tester. - * @return True si l'attribut est systeme. - */ - public static boolean isConstant(final GISAttributeInterface _att) { - for (GISAttributeInterface att: attrs_) { - if (_att==att) return true; - } - return false; - } - - // Attributs 1D \\ - - /** - * Attribut contenant l'index du point correspondant \xE0 l'intersection entre - * une rive gauche et un profil. - */ - public final static GISAttributeInteger INTERSECTION_RIVE_GAUCHE=new GISAttributeInteger(CtuluLib.getS("Intersection rive gauche"), false){ - @Override - public String getID() { - return "ATTRIBUTE_INTERSECTION_RIVE_GAUCHE"; - } - }; - - /** - * Attribut contenant l'index du point correspondant \xE0 l'intersection entre - * une rive droite et un profil. - */ - public final static GISAttributeInteger INTERSECTION_RIVE_DROITE=new GISAttributeInteger(CtuluLib.getS("Intersection rive droite"), false){ - @Override - public String getID() { - return "ATTRIBUTE_INTERSECTION_RIVE_DROITE"; - } - }; - - /** - * Attribut contenant l'index du point correspondant \xE0 l'intersection entre - * une limite de stockage gauche et un profil. - */ - public final static GISAttributeInteger INTERSECTION_LIMITE_STOCKAGE_GAUCHE=new GISAttributeInteger(CtuluLib - .getS("Intersection limite stockage gauche"), false){ - @Override - public String getID() { - return "ATTRIBUTE_INTERSECTION_LIMITE_STOCKAGE_GAUCHE"; - } - }; - - /** - * Attribut contenant l'index du point correspondant \xE0 l'intersection entre - * une limite de stockage droite et un profil. - */ - public final static GISAttributeInteger INTERSECTION_LIMITE_STOCKAGE_DROITE=new GISAttributeInteger(CtuluLib - .getS("Intersection limite stockage droite"), false){ - @Override - public String getID() { - return "ATTRIBUTE_INTERSECTION_LIMITE_STOCKAGE_DROITE"; - } - }; - - /** - * Attribut contenant l'index des points correspondants aux l'intersections entre - * les lignes directrices et un profil. Ces index sont stock\xE9s dans une {@link GISAttributeModelIntegerList}. - */ - public final static GISAttribute INTERSECTIONS_LIGNES_DIRECTRICES=new GISAttribute(null, CtuluLib - .getS("Intersections lignes directrices"), false){ - @Override - public String getID() { - return "ATTRIBUTE_INTERSECTIONS_LIGNES_DIRECTRICES"; - } - @Override - protected Object createGlobalValues(Object _initValues) { - if (_initValues instanceof GISAttributeModelIntegerList) - return _initValues; - else - return getDefaultValue(); - }; - }; - - /** - * Attribut contenant le d\xE9calage curviligne de l'axe hydraulique. - */ - public final static GISAttribute CURVILIGNE_DECALAGE=new GISAttributeDouble(CtuluLib.getS("D\xE9calage curviligne"), false) { - @Override - public String getID() { - return "ATTRIBUTE_CURVILIGNE_DECALAGE"; - } - }; -} Copied: tags/FudaaModeleur_0_13/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISAttributeConstants.java (from rev 4547, branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISAttributeConstants.java) =================================================================== --- tags/FudaaModeleur_0_13/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISAttributeConstants.java (rev 0) +++ tags/FudaaModeleur_0_13/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISAttributeConstants.java 2009-03-30 08:10:42 UTC (rev 4594) @@ -0,0 +1,369 @@ +/* + * @creation 7 avr. 2005 + * @modification $Date$ + * @license GNU General Public License 2 + * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne + * @mail de...@fu... + */ +package org.fudaa.ctulu.gis; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +import org.fudaa.ctulu.CtuluLib; +import org.fudaa.ctulu.CtuluLibString; +import org.fudaa.ctulu.gui.CtuluValueEditorChoice; + +import com.memoire.fu.FuLib; + +/** + * Une classe pour d\xE9finir des attributs syst\xE8mes associables \xE0 des objets GIS. Les attributs syst\xE8mes + * sont en principe des attributs programme (non construits par l'utilisateur). Le systeme connait + * ces attributs sp\xE9cifiques, et peut r\xE9agir en cons\xE9quence.<p> + * L'ID de chacun de ces attributs est ind\xE9pendant de la langue pour \xEAtre correctement sauv\xE9 dans + * les fichiers GML. + * + * @author Fred Deniger + * @version $Id$ + */ +public final class GISAttributeConstants { + + /** Etat geom modifi\xE9. */ + public final static String ATT_VAL_ETAT_MODI="MODI"; + /** Etat geom origine */ + public final static String ATT_VAL_ETAT_ORIG="ORIG"; + /** Une valeur d'attribut valant True */ + public final static String ATT_VAL_TRUE="T"; + /** Une valeur d'attribut valant False */ + public final static String ATT_VAL_FALSE="F"; + + /** Nature Semis */ + public final static String ATT_NATURE_SM="SM"; + /** Nature Courbe niveau */ + public final static String ATT_NATURE_CN="CN"; + /** Nature Profil */ + public final static String ATT_NATURE_PF="PF"; + /** Nature Ligne directrice */ + public final static String ATT_NATURE_LD="LD"; + /** Nature Ligne de contrainte */ + public final static String ATT_NATURE_LC="LC"; + /** Nature Trace de profil */ + public final static String ATT_NATURE_TP="TP"; + /** Nature Zone */ + public final static String ATT_NATURE_ZN="ZN"; + /** Nature Contour d'\xE9tude */ + public final static String ATT_NATURE_CE="CE"; + /** Nature axe hydraulique */ + public final static String ATT_NATURE_AH="AH"; + /** Nature rive (gauche ou droite) */ + public final static String ATT_NATURE_RV="RV"; + /** Nature limite de stockage */ + public final static String ATT_NATURE_LS="LS"; + /** Nature casier */ + public final static String ATT_NATURE_CA="CA"; + + /** + * Un attribut nom, global. + */ + public final static GISAttributeString TITRE = new GISAttributeString(CtuluLib.getS("Nom")) { + /** Numero d'identifiant, incr\xE9ment\xE9 \xE0 chaque nouvelle cr\xE9ation de nom. */ + private int numid_=0; + String def_ = CtuluLib.getS("<Defaut>"); + + public String getID() { + return "ATTRIBUTE_TITLE"; + } + + protected Object createGlobalValues(final Object _initValues) { + Object r = _initValues; + // Si la valeur en entr\xE9e est la valeur par d\xE9faut, alors une nouvelle valeur en sortie est cr\xE9\xE9e. + // Ceci permet d'affecter automatiquement un nom nouveau \xE0 une g\xE9om\xE9trie cr\xE9\xE9e. + if (r == null || def_.equals(r)) { + return r="Geom_"+(++numid_); + } + else { + return super.createGlobalValues(_initValues); + } + } + + public Object getDefaultValue() { + return def_; + } + }; + + /** + * Un attribut nature, global. + */ + public final static GISAttributeString NATURE = new GISAttributeString(CtuluLib.getS("Nature"), false) { + public String getID() { + return "ATTRIBUTE_NATURE"; + } + + public boolean isEditable() { + return false; + } + }; + + /** + * Un attribut etat, global a la g\xE9om\xE9trie. + */ + public final static GISAttributeString ETAT_GEOM= + new GISAttributeString(new CtuluValueEditorChoice(new String[]{ATT_VAL_ETAT_ORIG, ATT_VAL_ETAT_MODI}, + new String[]{CtuluLib.getS("Origine"), CtuluLib.getS("Modifi\xE9")}), CtuluLib.getS("Etat"), false) { + public String getID() { + return "ATTRIBUTE_ETAT_GEOM"; + } + + protected Object createGlobalValues(Object _initValues) { + if (_initValues instanceof Object[]) { + // Si au moins une des valeurs est "modifi\xE9", on retourne "modifi\xE9". + boolean modifie=false; + int i=-1; + while (!modifie&&++i<((Object[])_initValues).length) + modifie=((Object[])_initValues)[i]==ATT_VAL_ETAT_MODI; + if (modifie) + _initValues=ATT_VAL_ETAT_MODI; + else + _initValues=ATT_VAL_ETAT_ORIG; + } + return super.createGlobalValues(_initValues); + } + + public boolean isEditable() { + return true; + } + + public Object getDefaultValue() { + return ATT_VAL_ETAT_ORIG; + } + }; + + /** + * Un attribut visibilit\xE9, global a la g\xE9om\xE9trie. + */ + public final static GISAttributeString VISIBILITE = + new GISAttributeString(new CtuluValueEditorChoice(new String[]{ATT_VAL_TRUE, ATT_VAL_FALSE}, + new String[]{CtuluLib.getS("Oui"), CtuluLib.getS("Non")}), CtuluLib.getS("Visibilit\xE9"), false) { + + public String getID() { + return "ATTRIBUTE_VISIBILITY"; + } + + public boolean isEditable() { + return true; + } + + public Object getDefaultValue() { + return ATT_VAL_TRUE; + } + }; + + /** + * Un attribut commentaire hydraulique, utilis\xE9 dans la lecture/ecriture des fichiers. + */ + public final static GISAttributeString COMMENTAIRE_HYDRO = new GISAttributeString(CtuluLib.getS("Commentaire hydro"), false) { + public String getID() { + return "ATTRIBUTE_HYDRO_COMMENT"; + } + }; + + /** + * Un attribut label, atomique. + */ + public final static GISAttributeString LABEL = new GISAttributeString(CtuluLib.getS("Label"), true) { + public String getID() { + return "ATTRIBUTE_LABEL"; + } + }; + + /** + * Un attribut bathy, atomique. + */ + public final static GISAttributeDouble BATHY = new GISAttributeDouble(CtuluLib.getS("z"), true) { + + public String getID() { + return "ATTRIBUTE_Z"; + } + }; + + /** + * Un attribut index de g\xE9om\xE9trie. + * Attention : Il n'est utilis\xE9 que lors de la sauvegarde, et n'apparait pas dans les calques autrement. + */ + public final static GISAttributeInteger INDEX_GEOM = new GISAttributeInteger(CtuluLib.getS("Index"), false) { + + public String getID() { + return "ATTRIBUTE_INDEX_GEOM"; + } + }; + + /** La liste des attributs syst\xE8mes. */ + protected final static List<GISAttribute> attrs_= + Arrays.asList(new GISAttribute[]{BATHY,TITRE,NATURE,VISIBILITE,ETAT_GEOM,COMMENTAIRE_HYDRO,LABEL}); + + private GISAttributeConstants() {} + + public static String toString(final GISAttributeInterface _att) { + for (GISAttributeInterface att: attrs_) { + if (_att==att) return _att.getID(); + } + final String attributeSep = getAttributeSep(); + return _att.getDataClass().getName() + attributeSep + FuLib.replace(_att.getName(), attributeSep, "_") + + attributeSep + CtuluLibString.toString(_att.isAtomicValue()); + } + + private static String getAttributeSep() { + return "|"; + } + + /** + * Retourne l'attribut syst\xE8me a partir de son identifiant. + * @param _idName L'identifiant. + * @return L'attribut syst\xE8me, ou null si aucun ne correspond a l'identifiant. + */ + public static GISAttributeInterface getConstantAttribute(final String _idName) { + for (GISAttributeInterface att: attrs_) { + if (att.getID().equals(_idName)) return att; + } + return null; + } + + public static GISAttributeInterface restoreFrom(final String _s) { + GISAttributeInterface res = getConstantAttribute(_s); + if (res != null) { + return res; + } + final String[] s = CtuluLibString.parseString(_s, getAttributeSep()); + if (s == null || s.length != 3) { + return null; + } + final String clazz = s[0]; + final String name = s[1]; + final boolean atomic = CtuluLibString.toBoolean(s[2]); + if (clazz.equals(Double.class.getName())) { + res = new GISAttributeDouble(name, atomic); + if (BATHY.isSameContent(res)) { + res = BATHY; + } + } else if (clazz.equals(Integer.class.getName())) { + res = new GISAttributeInteger(name, atomic); + } else { + res = new GISAttributeString(name, atomic); + if (TITRE.isSameContent(res)) { + res = TITRE; + } + else if (NATURE.isSameContent(res)) { + res = NATURE; + } + else if (ETAT_GEOM.isSameContent(res)) { + res = ETAT_GEOM; + } + else if (VISIBILITE.isSameContent(res)) { + res = VISIBILITE; + } + else if (COMMENTAIRE_HYDRO.isSameContent(res)) { + res = COMMENTAIRE_HYDRO; + } + } + + return res; + } + + /** + * Retourne la liste des attributs syst\xE8mes. + * @return La liste. + */ + public static List<GISAttribute> getDefaults() { + return new ArrayList<GISAttribute>(attrs_); // Une copie, pour eviter les modifications. + } + + /** + * L'attribut est-il un attribut syst\xE8me ? + * @param _att L'attribut a tester. + * @return True si l'attribut est systeme. + */ + public static boolean isConstant(final GISAttributeInterface _att) { + for (GISAttributeInterface att: attrs_) { + if (_att==att) return true; + } + return false; + } + + // Attributs 1D \\ + + /** + * Attribut contenant l'index du point correspondant \xE0 l'intersection entre + * une rive gauche et un profil. + */ + public final static GISAttributeInteger INTERSECTION_RIVE_GAUCHE=new GISAttributeInteger(CtuluLib.getS("Intersection rive gauche"), false){ + @Override + public String getID() { + return "ATTRIBUTE_INTERSECTION_RIVE_GAUCHE"; + } + }; + + /** + * Attribut contenant l'index du point correspondant \xE0 l'intersection entre + * une rive droite et un profil. + */ + public final static GISAttributeInteger INTERSECTION_RIVE_DROITE=new GISAttributeInteger(CtuluLib.getS("Intersection rive droite"), false){ + @Override + public String getID() { + return "ATTRIBUTE_INTERSECTION_RIVE_DROITE"; + } + }; + + /** + * Attribut contenant l'index du point correspondant \xE0 l'intersection entre + * une limite de stockage gauche et un profil. + */ + public final static GISAttributeInteger INTERSECTION_LIMITE_STOCKAGE_GAUCHE=new GISAttributeInteger(CtuluLib + .getS("Intersection limite stockage gauche"), false){ + @Override + public String getID() { + return "ATTRIBUTE_INTERSECTION_LIMITE_STOCKAGE_GAUCHE"; + } + }; + + /** + * Attribut contenant l'index du point correspondant \xE0 l'intersection entre + * une limite de stockage droite et un profil. + */ + public final static GISAttributeInteger INTERSECTION_LIMITE_STOCKAGE_DROITE=new GISAttributeInteger(CtuluLib + .getS("Intersection limite stockage droite"), false){ + @Override + public String getID() { + return "ATTRIBUTE_INTERSECTION_LIMITE_STOCKAGE_DROITE"; + } + }; + + /** + * Attribut contenant l'index des points correspondants aux l'intersections entre + * les lignes directrices et un profil. Ces index sont stock\xE9s dans une {@link GISAttributeModelIntegerList}. + */ + public final static GISAttribute INTERSECTIONS_LIGNES_DIRECTRICES=new GISAttribute(null, CtuluLib + .getS("Intersections lignes directrices"), false){ + @Override + public String getID() { + return "ATTRIBUTE_INTERSECTIONS_LIGNES_DIRECTRICES"; + } + @Override + protected Object createGlobalValues(Object _initValues) { + if (_initValues instanceof GISAttributeModelIntegerList) + return _initValues; + else + return getDefaultValue(); + }; + }; + + /** + * Attribut contenant le d\xE9calage curviligne de l'axe hydraulique. + */ + public final static GISAttribute CURVILIGNE_DECALAGE=new GISAttributeDouble(CtuluLib.getS("D\xE9calage curviligne"), false) { + @Override + public String getID() { + return "ATTRIBUTE_CURVILIGNE_DECALAGE"; + } + }; +} Deleted: tags/FudaaModeleur_0_13/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISAttributeInteger.java =================================================================== --- branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISAttributeInteger.java 2009-02-27 08:37:25 UTC (rev 4503) +++ tags/FudaaModeleur_0_13/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISAttributeInteger.java 2009-03-30 08:10:42 UTC (rev 4594) @@ -1,73 +0,0 @@ -/* - * @creation 7 avr. 2005 - * @modification $Date: 2006-09-19 14:36:53 $ - * @license GNU General Public License 2 - * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne - * @mail de...@fu... - */ -package org.fudaa.ctulu.gis; - -import org.fudaa.ctulu.gui.CtuluValueEditorInteger; - -/** - * @author Fred Deniger - * @version $Id: GISAttributeInteger.java,v 1.8 2006-09-19 14:36:53 deniger Exp $ - */ -public class GISAttributeInteger extends GISAttribute { - - public GISAttributeInteger() { - super(new CtuluValueEditorInteger()); - } - - public GISAttributeModelObservable createAtomicModel(final Object[] _initValues, final int _nbValues) { - if (_initValues != null) { - if (_initValues.length != _nbValues) { - throw new IllegalArgumentException("bad size value=" + _nbValues + " used=" + _initValues.length); - } - return new GISAttributeModelIntegerArray(_initValues, this); - } - return new GISAttributeModelIntegerArray(_nbValues, this); - } - - public GISAttributeModelObservable createAtomicModel(final int _nbValues) { - return createAtomicModelInteger(_nbValues); - } - - public GISAttributeModelIntegerArray createAtomicModelInteger(final int _nbValues) { - return new GISAttributeModelIntegerArray(_nbValues, this); - } - - public GISAttributeModelObservable createListModel(final int _defaultCap) { - return createListModelInteger(_defaultCap); - } - - public GISAttributeModelObservable createListModelInteger(final int _defaultCap) { - return new GISAttributeModelIntegerList(_defaultCap, this); - } - - /** - * @param _name - */ - public GISAttributeInteger(final String _name) { - super(new CtuluValueEditorInteger(), _name); - } - - /** - * @param _name - * @param _atomic - * true si donnees sur vertex - */ - public GISAttributeInteger(final String _name, final boolean _atomic) { - super(new CtuluValueEditorInteger(), _name, _atomic); - } - - public final Class getDataClass() { - return Integer.class; - } - - Integer def_ = new Integer(0); - - public Object getDefaultValue() { - return def_; - } -} Copied: tags/FudaaModeleur_0_13/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISAttributeInteger.java (from rev 4565, branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISAttributeInteger.java) =================================================================== --- tags/FudaaModeleur_0_13/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISAttributeInteger.java (rev 0) +++ tags/FudaaModeleur_0_13/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISAttributeInteger.java 2009-03-30 08:10:42 UTC (rev 4594) @@ -0,0 +1,74 @@ +/* + * @creation 7 avr. 2005 + * @modification $Date: 2006-09-19 14:36:53 $ + * @license GNU General Public License 2 + * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne + * @mail de...@fu... + */ +package org.fudaa.ctulu.gis; + +import org.fudaa.ctulu.gui.CtuluValueEditorInteger; + +/** + * @author Fred Deniger + * @version $Id$ + */ +public class GISAttributeInteger extends GISAttribute { + + public GISAttributeInteger() { + super(new CtuluValueEditorInteger()); + } + + public GISAttributeModelObservable createAtomicModel(final Object[] _initValues, final int _nbValues) { + if (_initValues != null) { + if (_initValues.length != _nbValues) { + throw new IllegalArgumentException("bad size value=" + _nbValues + " used=" + _initValues.length); + } + return new GISAttributeModelIntegerArray(_initValues, this); + } + return new GISAttributeModelIntegerArray(_nbValues, this); + } + + public GISAttributeModelObservable createAtomicModel(final int _nbValues) { + return createAtomicModelInteger(_nbValues); + } + + public GISAttributeModelIntegerArray createAtomicModelInteger(final int _nbValues) { + return new GISAttributeModelIntegerArray(_nbValues, this); + } + + public GISAttributeModelObservable createListModel(final int _defaultCap) { + return createListModelInteger(_defaultCap); + } + + public GISAttributeModelObservable createListModelInteger(final int _defaultCap) { + return new GISAttributeModelIntegerList(_defaultCap, this); + } + + /** + * Cree un attribut integer, par defaut global. + * @param _name Le nom de l'attribut + */ + public GISAttributeInteger(final String _name) { + super(new CtuluValueEditorInteger(), _name); + } + + /** + * @param _name + * @param _atomic + * true si donnees sur vertex + */ + public GISAttributeInteger(final String _name, final boolean _atomic) { + super(new CtuluValueEditorInteger(), _name, _atomic); + } + + public final Class getDataClass() { + return Integer.class; + } + + Integer def_ = new Integer(0); + + public Object getDefaultValue() { + return def_; + } +} Deleted: tags/FudaaModeleur_0_13/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISCoordinateSequenceFactory.java =================================================================== --- branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISCoordinateSequenceFactory.java 2009-02-27 08:37:25 UTC (rev 4503) +++ tags/FudaaModeleur_0_13/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISCoordinateSequenceFactory.java 2009-03-30 08:10:42 UTC (rev 4594) @@ -1,135 +0,0 @@ -/* - * The JTS Topology Suite is a collection of Java classes that - * implement the fundamental operations required to validate a given - * geo-spatial data set to a known topological specification. - * - * Copyright (C) 2001 Vivid Solutions - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * For more information, contact: - * - * Vivid Solutions - * Suite #1A - * 2328 Government Street - * Victoria BC V8T 5G5 - * Canada - * - * (250)385-6040 - * www.vividsolutions.com - */ -package org.fudaa.ctulu.gis; - -import com.vividsolutions.jts.geom.Coordinate; -import com.vividsolutions.jts.geom.CoordinateSequence; -import com.vividsolutions.jts.geom.CoordinateSequenceFactory; - - -/** - * @author Fred Deniger - * @version $Id: GISCoordinateSequenceFactory.java,v 1.7 2007-01-17 10:45:25 deniger Exp $ - */ -public class GISCoordinateSequenceFactory implements CoordinateSequenceFactory { - - private GISCoordinateSequenceEmpty empty_; - - public GISCoordinateSequenceFactory() {} - - public GISCoordinateSequenceEmpty getEmpty(){ - if (empty_ != null) { - empty_ = new GISCoordinateSequenceEmpty(); - } - return empty_; - } - - public CoordinateSequence create(final Coordinate[] _coordinates){ - //vide on renvoie la sequence vide! - if (_coordinates == null) { - return null; - } - if (_coordinates.length == 0) { - return getEmpty(); - } - //unique on renvoie l'unique - if (_coordinates.length == 1) { - return new GISCoordinateSequenceUnique(_coordinates[0]); - } - //la sequence par defaut - return new GISCoordinateSequence(_coordinates); - } - - public CoordinateSequence create(final CoordinateSequence _coordSeq){ - if (_coordSeq == null) { - return null; - } - if (_coordSeq == empty_ || _coordSeq.size() == 0) { - return getEmpty(); - } - if (_coordSeq.size() == 1) { - return new GISCoordinateSequenceUnique(_coordSeq.getCoordinate(0)); - } - return new GISCoordinateSequence(_coordSeq); - } - - public CoordinateSequence create(final int _size,final int _dim){ - if (_size == 0) { - return getEmpty(); - } - if (_size == 1) { - return new GISCoordinateSequenceUnique(0, 0, 0); - } - return new GISCoordinateSequence(_size); - } - - public CoordinateSequence createImmutable(final Coordinate[] _coordinates){ - //vide on renvoie la sequence vide! - if (_coordinates == null) { - return null; - } - if (_coordinates.length == 0) { - return getEmpty(); - } - //unique on renvoie l'unique - if (_coordinates.length == 1) { - return new GisCoordinateSequenceUniqueImmutable(_coordinates[0]); - } - /... [truncated message content] |