refs #497: redesign of HYDRO main menu.

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

diff --git a/src/HYDROGUI/HYDROGUI_Operations.cxx b/src/HYDROGUI/HYDROGUI_Operations.cxx
index 12106628e9b83560b222905895e7ba4edbee6828..c51d90b675925d7a1916c358de575fe24f0d30df 100644 (file)
--- a/src/HYDROGUI/HYDROGUI_Operations.cxx
+++ b/src/HYDROGUI/HYDROGUI_Operations.cxx
@@ -183,8 +183,9 @@ void HYDROGUI_Module::createActions()
   createAction( HideId, "HIDE" );
   createAction( HideAllId, "HIDE_ALL" );
 
-  createAction( RiverBottom, "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" );
 }
 
 void HYDROGUI_Module::createMenus()
@@ -207,22 +208,19 @@ void HYDROGUI_Module::createMenus()
   createMenu( ImportBathymetryId, 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 );
 
   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 );
@@ -231,6 +229,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 );
@@ -426,7 +426,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:
@@ -515,7 +515,8 @@ LightApp_Operation* HYDROGUI_Module::createOperation( const int theId ) const
   case EditLocalCSId:
     anOp = new HYDROGUI_LocalCSOp( aModule );
     break;
-  case RiverBottom:
+  case RiverBottomId:
+  case RiverBottomContextId:
     anOp = new HYDROGUI_RiverBottomOp( aModule );
     break;
   case ShowId: