X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROGUI%2FHYDROGUI_Operations.cxx;h=0a96e7986f8f9afffa28f14b8c0a29c913bfe757;hb=d6e19029f8b41f295db878e9aecf451c2edda4af;hp=9f440a6a3407e5a413e6adfdc26755c4231145e7;hpb=9c3749501bcf6c4eed78966cb69934bab0a1a3b9;p=modules%2Fhydro.git diff --git a/src/HYDROGUI/HYDROGUI_Operations.cxx b/src/HYDROGUI/HYDROGUI_Operations.cxx index 9f440a6a..0a96e798 100644 --- a/src/HYDROGUI/HYDROGUI_Operations.cxx +++ b/src/HYDROGUI/HYDROGUI_Operations.cxx @@ -1,8 +1,4 @@ -// Copyright (C) 2007-2015 CEA/DEN, EDF R&D, OPEN CASCADE -// -// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS -// +// Copyright (C) 2014-2015 EDF-R&D // 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 @@ -30,7 +26,9 @@ #include "HYDROGUI_DeleteOp.h" #include "HYDROGUI_DigueOp.h" #include "HYDROGUI_ExportImageOp.h" +#include "HYDROGUI_ExportFileOp.h" #include "HYDROGUI_ImportImageOp.h" +#include "HYDROGUI_ImportPolylineOp.h" #include "HYDROGUI_ImportBathymetryOp.h" #include "HYDROGUI_ImmersibleZoneOp.h" #include "HYDROGUI_Module.h" @@ -59,6 +57,10 @@ #include "HYDROGUI_LocalCSOp.h" #include "HYDROGUI_RiverBottomOp.h" #include "HYDROGUI_ProfileInterpolateOp.h" +#include "HYDROGUI_SubmersibleOp.h" +#include "HYDROGUI_StricklerTableOp.h" +#include "HYDROGUI_DuplicateOp.h" +#include "HYDROGUI_LandCoverOp.h" #include #include @@ -119,6 +121,8 @@ void HYDROGUI_Module::createActions() createAction( ObserveImageId, "OBSERVE_IMAGE", "OBSERVE_IMAGE_ICO" ); createAction( ExportImageId, "EXPORT_IMAGE", "EXPORT_IMAGE_ICO" ); createAction( RemoveImageRefsId, "REMOVE_IMAGE_REFERENCE", "REMOVE_IMAGE_REFERENCE_ICO" ); + + createAction( ImportPolylineId, "IMPORT_POLYLINE", "IMPORT_POLYLINE_ICO" ); createAction( CreatePolylineId, "CREATE_POLYLINE", "CREATE_POLYLINE_ICO" ); createAction( EditPolylineId, "EDIT_POLYLINE", "EDIT_POLYLINE_ICO" ); @@ -148,6 +152,14 @@ void HYDROGUI_Module::createActions() createAction( CreateDigueId, "CREATE_DIGUE", "CREATE_DIGUE_ICO" ); createAction( EditDigueId, "EDIT_DIGUE", "EDIT_DIGUE_ICO" ); + createAction( ImportStricklerTableFromFileId, "IMPORT_STRICKLER_TABLE", "IMPORT_STRICKLER_TABLE_ICO" ); + createAction( ExportStricklerTableFromFileId, "EXPORT_STRICKLER_TABLE", "EXPORT_STRICKLER_TABLE_ICO" ); + createAction( EditStricklerTableId, "EDIT_STRICKLER_TABLE", "EDIT_STRICKLER_TABLE_ICO" ); + createAction( DuplicateStricklerTableId, "DUPLICATE_STRICKLER_TABLE", "DUPLICATE_STRICKLER_TABLE_ICO" ); + + createAction( CreateLandCoverId, "CREATE_LAND_COVER", "CREATE_LAND_COVER_ICO" ); + createAction( EditLandCoverId, "EDIT_LAND_COVER", "EDIT_LAND_COVER_ICO" ); + createAction( ImportObstacleFromFileId, "IMPORT_OBSTACLE_FROM_FILE", "IMPORT_OBSTACLE_FROM_FILE_ICO" ); createAction( ImportGeomObjectAsObstacleId, "IMPORT_GEOM_OBJECT_AS_OBSTACLE", "IMPORT_GEOM_OBJECT_ICO" ); createAction( ImportGeomObjectAsPolylineId, "IMPORT_GEOM_OBJECT_AS_POLYLINE", "IMPORT_GEOM_OBJECT_ICO" ); @@ -183,9 +195,13 @@ void HYDROGUI_Module::createActions() createAction( HideId, "HIDE" ); createAction( HideAllId, "HIDE_ALL" ); - createAction( RiverBottom, "CREATE_RIVER_BOTTOM", "CREATE_RIVER_BOTTOM_ICO" ); - createAction( RiverBottomContext, "CREATE_RIVER_BOTTOM", "CREATE_RIVER_BOTTOM_ICO" ); - createAction( ProfileInterpolate, "PROFILE_INTERPOLATE", "PROFILE_INTERPOLATE_ICO" ); + createAction( RiverBottomId, "CREATE_STREAM_BOTTOM", "CREATE_STREAM_BOTTOM_ICO" ); + createAction( RiverBottomContextId, "CREATE_STREAM_BOTTOM", "CREATE_STREAM_BOTTOM_ICO" ); + createAction( ProfileInterpolateId, "PROFILE_INTERPOLATE", "PROFILE_INTERPOLATE_ICO" ); + + createAction( SubmersibleId, "SUBMERSIBLE", "SUBMERSIBLE_ICO" ); + createAction( ExportPolylineId, "EXPORT_POLYLINE", "EXPORT_POLYLINE_ICO" ); + } void HYDROGUI_Module::createMenus() @@ -205,25 +221,25 @@ void HYDROGUI_Module::createMenus() int aHydroMenu = 6; // Edit menu id == 5, View menu id == 10 int aHydroId = createMenu( tr( "MEN_DESK_HYDRO" ), -1, -1, aHydroMenu ); createMenu( ImportImageId, aHydroId, -1, -1 ); + createMenu( ImportPolylineId, aHydroId, -1, -1 ); createMenu( ImportBathymetryId, aHydroId, -1, -1 ); + createMenu( ImportStricklerTableFromFileId, aHydroId, -1, -1 ); createMenu( CreatePolylineId, aHydroId, -1, -1 ); createMenu( CreatePolyline3DId, aHydroId, -1, -1 ); - createMenu( RiverBottom, aHydroId, -1, -1 ); - createMenu( EditLocalCSId, aHydroId, -1, -1 ); + createMenu( CreateImmersibleZoneId, aHydroId, -1, -1 ); + createMenu( CreateChannelId, aHydroId, -1, -1 ); + createMenu( CreateDigueId, aHydroId, -1, -1 ); + createMenu( CreateLandCoverId, aHydroId, -1, -1 ); int aNewProfileId = createMenu( tr( "MEN_DESK_PROFILE" ), aHydroId, -1 ); createMenu( CreateProfileId, aNewProfileId, -1, -1 ); createMenu( ImportProfilesId, aNewProfileId, -1, -1 ); createMenu( AllGeoreferencementId, aNewProfileId, -1, -1 ); - createMenu( ProfileInterpolate, aNewProfileId, -1, -1 ); - - int anArtificialMenuId = createMenu( tr( "MEN_DESK_ARTIFICIAL" ), aHydroId, -1 ); - createMenu( CreateChannelId, anArtificialMenuId, -1, -1 ); - createMenu( CreateDigueId, anArtificialMenuId, -1, -1 ); - int aNaturalMenuId = createMenu( tr( "MEN_DESK_NATURAL" ), aHydroId, -1 ); - createMenu( CreateImmersibleZoneId, aNaturalMenuId, -1, -1 ); - createMenu( CreateStreamId, aNaturalMenuId, -1, -1 ); + int aStreamMenuId = createMenu( tr( "MEN_DESK_STREAM" ), aHydroId, -1 ); + createMenu( CreateStreamId, aStreamMenuId, -1, -1 ); + createMenu( RiverBottomId, aStreamMenuId, -1, -1 ); + createMenu( ProfileInterpolateId, aStreamMenuId, -1, -1 ); int anObstacleMenuId = createMenu( tr( "MEN_DESK_OBSTACLE" ), aHydroId, -1 ); createMenu( ImportObstacleFromFileId, anObstacleMenuId, -1, -1 ); @@ -232,6 +248,8 @@ void HYDROGUI_Module::createMenus() createMenu( CreateCalculationId, aHydroId, -1, -1 ); createMenu( separator(), aHydroId ); + createMenu( EditLocalCSId, aHydroId, -1, -1 ); + createMenu( separator(), aHydroId ); createMenu( FuseImagesId, aHydroId, -1, -1 ); createMenu( CutImagesId, aHydroId, -1, -1 ); createMenu( SplitImageId, aHydroId, -1, -1 ); @@ -250,6 +268,7 @@ void HYDROGUI_Module::createToolbars() createTool( separator(), aToolBar ); createTool( ImportImageId, aToolBar ); + createTool( ImportPolylineId, aToolBar ); createTool( ImportBathymetryId, aToolBar ); createTool( CreatePolylineId, aToolBar ); createTool( CreatePolyline3DId, aToolBar ); @@ -272,6 +291,12 @@ void HYDROGUI_Module::createToolbars() createTool( CreateBoxId, aToolBar ); createTool( CreateCylinderId, aToolBar ); + createTool( separator(), aToolBar ); + createTool( ImportStricklerTableFromFileId, aToolBar ); + + createTool( separator(), aToolBar ); + createTool( CreateLandCoverId, aToolBar ); + createTool( separator(), aToolBar ); createTool( CreateCalculationId, aToolBar ); @@ -402,6 +427,9 @@ LightApp_Operation* HYDROGUI_Module::createOperation( const int theId ) const case EditImportedImageId: anOp = new HYDROGUI_ImportImageOp( aModule, theId == EditImportedImageId ); break; + case ImportPolylineId: + anOp = new HYDROGUI_ImportPolylineOp( aModule/*, theId == EditImportedPolylineId*/ ); + break; case ObserveImageId: anOp = new HYDROGUI_ObserveImageOp( aModule ); break; @@ -412,6 +440,9 @@ LightApp_Operation* HYDROGUI_Module::createOperation( const int theId ) const case ForcedUpdateObjectId: anOp = new HYDROGUI_UpdateObjectOp( aModule, theId == ForcedUpdateObjectId ); break; + case ExportPolylineId: + anOp = new HYDROGUI_ExportFileOp( aModule ); + break; case RemoveImageRefsId: anOp = new HYDROGUI_RemoveImageRefsOp( aModule ); break; @@ -427,7 +458,7 @@ LightApp_Operation* HYDROGUI_Module::createOperation( const int theId ) const case EditProfileId: anOp = new HYDROGUI_ProfileOp( aModule, theId == EditProfileId ); break; - case ProfileInterpolate: + case ProfileInterpolateId: anOp = new HYDROGUI_ProfileInterpolateOp( aModule ); break; case ImportProfilesId: @@ -462,6 +493,18 @@ LightApp_Operation* HYDROGUI_Module::createOperation( const int theId ) const case EditDigueId: anOp = new HYDROGUI_DigueOp( aModule, theId == EditDigueId ); break; + case ImportStricklerTableFromFileId: + case ExportStricklerTableFromFileId: + case EditStricklerTableId: + anOp = new HYDROGUI_StricklerTableOp( aModule, theId ); + break; + case CreateLandCoverId: + case EditLandCoverId: + anOp = new HYDROGUI_LandCoverOp( aModule, theId == EditLandCoverId ); + break; + case DuplicateStricklerTableId: + anOp = new HYDROGUI_DuplicateOp( aModule ); + break; case CreateCalculationId: case EditCalculationId: anOp = new HYDROGUI_CalculationOp( aModule, theId == EditCalculationId ); @@ -516,8 +559,8 @@ LightApp_Operation* HYDROGUI_Module::createOperation( const int theId ) const case EditLocalCSId: anOp = new HYDROGUI_LocalCSOp( aModule ); break; - case RiverBottom: - case RiverBottomContext: + case RiverBottomId: + case RiverBottomContextId: anOp = new HYDROGUI_RiverBottomOp( aModule ); break; case ShowId: @@ -527,6 +570,9 @@ LightApp_Operation* HYDROGUI_Module::createOperation( const int theId ) const case HideAllId: anOp = new HYDROGUI_ShowHideOp( aModule, theId ); break; + case SubmersibleId: + anOp = new HYDROGUI_SubmersibleOp( aModule ); + break; } if( !anOp )