From: isn Date: Tue, 30 Jun 2015 10:46:46 +0000 (+0300) Subject: refs #619 X-Git-Tag: v1.4.2~5 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=b821d31d282090cdaf4bb59d2372a76b8d98ee4e;p=modules%2Fhydro.git refs #619 --- diff --git a/src/HYDROGUI/HYDROGUI_Module.cxx b/src/HYDROGUI/HYDROGUI_Module.cxx index 112499ae..60609a97 100644 --- a/src/HYDROGUI/HYDROGUI_Module.cxx +++ b/src/HYDROGUI/HYDROGUI_Module.cxx @@ -518,7 +518,8 @@ void HYDROGUI_Module::contextMenuPopup( const QString& theClient, theMenu->addAction( action( ImportStricklerTableFromFileId ) ); break; case KIND_LAND_COVER: - theMenu->addAction( action( CreateLandCoverId ) ); + theMenu->addAction( action( CreateLandCoverId ) ); + theMenu->addAction( action( ImportLandCoverId ) ); break; case KIND_CALCULATION: theMenu->addAction( action( CreateCalculationId ) ); diff --git a/src/HYDROGUI/HYDROGUI_Operations.cxx b/src/HYDROGUI/HYDROGUI_Operations.cxx index be2b9cdb..ae08b720 100644 --- a/src/HYDROGUI/HYDROGUI_Operations.cxx +++ b/src/HYDROGUI/HYDROGUI_Operations.cxx @@ -133,7 +133,7 @@ void HYDROGUI_Module::createActions() createAction( ImportPolylineId, "IMPORT_POLYLINE", "IMPORT_POLYLINE_ICO" ); createAction( ImportSinusXId, "IMPORT_SINUSX", "IMPORT_SINUSX_ICO" ); createAction( ExportSinusXId, "EXPORT_SINUSX", "EXPORT_SINUSX_ICO" ); - createAction( ImportLandcoverId, "IMPORT_LANDCOVER", "IMPORT_LANDCOVER_ICO" ); + createAction( ImportLandCoverId, "IMPORT_LANDCOVER", "IMPORT_LANDCOVER_ICO" ); createAction( CreatePolylineId, "CREATE_POLYLINE", "CREATE_POLYLINE_ICO" ); createAction( EditPolylineId, "EDIT_POLYLINE", "EDIT_POLYLINE_ICO" ); @@ -241,7 +241,7 @@ void HYDROGUI_Module::createMenus() int aHydroId = createMenu( tr( "MEN_DESK_HYDRO" ), -1, -1, aHydroMenu ); createMenu( ImportSinusXId, aHydroId, -1, -1 ); createMenu( ExportSinusXId, aHydroId, -1, -1 ); - createMenu( ImportLandcoverId, aHydroId, -1, -1 ); + createMenu( ImportLandCoverId, aHydroId, -1, -1 ); createMenu( ImportBathymetryId, aHydroId, -1, -1 ); createMenu( ImportStricklerTableFromFileId, aHydroId, -1, -1 ); @@ -299,7 +299,7 @@ void HYDROGUI_Module::createToolbars() createTool( ImportPolylineId, aToolBar ); createTool( ImportSinusXId, aToolBar ); createTool( ExportSinusXId, aToolBar ); - createTool( ImportLandcoverId, aToolBar ); + createTool( ImportLandCoverId, aToolBar ); createTool( ImportBathymetryId, aToolBar ); createTool( CreatePolylineId, aToolBar ); @@ -481,7 +481,7 @@ LightApp_Operation* HYDROGUI_Module::createOperation( const int theId ) const case ExportToShapeFileID: anOp = new HYDROGUI_ExportFileOp( aModule ); break; - case ImportLandcoverId: + case ImportLandCoverId: anOp = new HYDROGUI_ImportLandCoverOp( aModule ); break; case RemoveImageRefsId: diff --git a/src/HYDROGUI/HYDROGUI_Operations.h b/src/HYDROGUI/HYDROGUI_Operations.h index 37d02053..9264dfc3 100644 --- a/src/HYDROGUI/HYDROGUI_Operations.h +++ b/src/HYDROGUI/HYDROGUI_Operations.h @@ -114,7 +114,7 @@ enum OperationId ExportSinusXId, ExportToShapeFileID, - ImportLandcoverId, + ImportLandCoverId, ImportStricklerTableFromFileId, ExportStricklerTableFromFileId,