refs #596, #597: redesign of HYDRO main menu: create new Image and Polyline items.

[modules/hydro.git] / src / HYDROGUI / HYDROGUI_Operations.cxx

diff --git a/src/HYDROGUI/HYDROGUI_Operations.cxx b/src/HYDROGUI/HYDROGUI_Operations.cxx
index ad34f778a3fed7121b7017a1218ef59bc1e24e0f..3ede1f216c9e16197f7606e7538dee7725c9864d 100644 (file)
--- a/src/HYDROGUI/HYDROGUI_Operations.cxx
+++ b/src/HYDROGUI/HYDROGUI_Operations.cxx
@@ -67,6 +67,7 @@
 #include "HYDROGUI_MergePolylinesOp.h"
 #include "HYDROGUI_SplitPolylinesOp.h"
 #include "HYDROGUI_LandCoverColoringOp.h"
+#include "HYDROGUI_ImportLandCoverOp.h"
 
 #include <HYDROData_Document.h>
 #include <HYDROData_Obstacle.h>
@@ -131,6 +132,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( CreatePolylineId, "CREATE_POLYLINE", "CREATE_POLYLINE_ICO" );
   createAction( EditPolylineId, "EDIT_POLYLINE", "EDIT_POLYLINE_ICO" ); 
@@ -210,7 +212,7 @@ void HYDROGUI_Module::createActions()
   createAction( ProfileInterpolateId, "PROFILE_INTERPOLATE", "PROFILE_INTERPOLATE_ICO" );
 
   createAction( SubmersibleId, "SUBMERSIBLE", "SUBMERSIBLE_ICO" );
-  createAction( ExportPolylineId, "EXPORT_POLYLINE", "EXPORT_POLYLINE_ICO" );
+  createAction( ExportToShapeFileID, "EXPORT_TO_SHAPE_FILE", "EXPORT_TO_SHAPE_FILE_ICO" );
 
   createAction( SplitPolylinesId, "SPLIT_POLYLINES", "SPLIT_POLYLINES_ICO" );
   createAction( MergePolylinesId, "MERGE_POLYLINES", "MERGE_POLYLINES_ICO" );
@@ -235,20 +237,30 @@ 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( ImportSinusXId, aHydroId, -1, -1 );
   createMenu( ExportSinusXId, aHydroId, -1, -1 );
+  createMenu( ImportLandcoverId, aHydroId, -1, -1 );
   
   createMenu( ImportBathymetryId, aHydroId, -1, -1 );
   createMenu( ImportStricklerTableFromFileId, aHydroId, -1, -1 );
-  createMenu( CreatePolylineId, aHydroId, -1, -1 );
   createMenu( CreatePolyline3DId, aHydroId, -1, -1 );
   createMenu( CreateImmersibleZoneId, aHydroId, -1, -1 );
   createMenu( CreateChannelId, aHydroId, -1, -1 );
   createMenu( CreateDigueId, aHydroId, -1, -1 );  
   createMenu( CreateLandCoverId, aHydroId, -1, -1 );  
 
+  int aNewImageId = createMenu( tr( "MEN_DESK_IMAGE" ), aHydroId, -1 );
+  createMenu( ImportImageId, aNewImageId, -1, -1 );
+  createMenu( FuseImagesId, aNewImageId, -1, -1 );
+  createMenu( CutImagesId, aNewImageId, -1, -1 );
+  createMenu( SplitImageId, aNewImageId, -1, -1 );
+
+  int aNewPolylineId = createMenu( tr( "MEN_DESK_POLYLINE" ), aHydroId, -1 );
+  createMenu( ImportPolylineId, aNewPolylineId, -1, -1 );
+  createMenu( CreatePolylineId, aNewPolylineId, -1, -1 );
+  createMenu( SplitPolylinesId, aNewPolylineId, -1, -1 );
+  createMenu( MergePolylinesId, aNewPolylineId, -1, -1 );
+
   int aNewProfileId = createMenu( tr( "MEN_DESK_PROFILE" ), aHydroId, -1 );
   createMenu( CreateProfileId, aNewProfileId, -1, -1 );
   createMenu( ImportProfilesId, aNewProfileId, -1, -1 );
@@ -268,12 +280,6 @@ void HYDROGUI_Module::createMenus()
   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 );
-  createMenu( separator(), aHydroId );
-  createMenu( SplitPolylinesId, aHydroId, -1, -1 );
-  createMenu( MergePolylinesId, aHydroId, -1, -1 );
 }
 
 void HYDROGUI_Module::createPopups()
@@ -291,6 +297,7 @@ void HYDROGUI_Module::createToolbars()
   createTool( ImportPolylineId, aToolBar );
   createTool( ImportSinusXId, aToolBar );
   createTool( ExportSinusXId, aToolBar );
+  createTool( ImportLandcoverId, aToolBar );
 
   createTool( ImportBathymetryId, aToolBar );
   createTool( CreatePolylineId, aToolBar );
@@ -469,9 +476,12 @@ LightApp_Operation* HYDROGUI_Module::createOperation( const int theId ) const
   case ForcedUpdateObjectId:
     anOp = new HYDROGUI_UpdateObjectOp( aModule, theId == ForcedUpdateObjectId );
     break;
-  case ExportPolylineId:
+  case ExportToShapeFileID:
     anOp = new HYDROGUI_ExportFileOp( aModule );
     break;
+  case ImportLandcoverId:
+    anOp = new HYDROGUI_ImportLandCoverOp( aModule );
+    break;
   case RemoveImageRefsId:
     anOp = new HYDROGUI_RemoveImageRefsOp( aModule );
     break;