patch for correct compilation on Linux

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

diff --git a/src/HYDROGUI/HYDROGUI_Operations.cxx b/src/HYDROGUI/HYDROGUI_Operations.cxx
index de2587d5fd6a841012ccef2219de54a878c8412b..96f78286d9da998e396e6abcac89ae8ceb50e9de 100644 (file)
--- a/src/HYDROGUI/HYDROGUI_Operations.cxx
+++ b/src/HYDROGUI/HYDROGUI_Operations.cxx
@@ -122,6 +122,7 @@ void HYDROGUI_Module::createActions()
   createAction( SelectedGeoreferencementId, "GEOREFERENCEMENT" ); 
   
   createAction( ImportBathymetryId, "IMPORT_BATHYMETRY", "", Qt::CTRL + Qt::Key_B );
+  createAction( EditImportedBathymetryId, "EDIT_IMPORTED_BATHYMETRY" );
 
   createAction( CreateImmersibleZoneId, "CREATE_IMMERSIBLE_ZONE" );
   createAction( EditImmersibleZoneId, "EDIT_IMMERSIBLE_ZONE" );
@@ -189,11 +190,11 @@ void HYDROGUI_Module::createMenus()
   createMenu( AllGeoreferencementId, aNewProfileId, -1, -1 );
 
   int anArtificialMenuId = createMenu( tr( "MEN_DESK_ARTIFICIAL" ), aHydroId, -1 );
-  createMenu( CreateImmersibleZoneId, anArtificialMenuId, -1, -1 );
-  createMenu( CreateStreamId, anArtificialMenuId, -1, -1 );
+  createMenu( CreateChannelId, anArtificialMenuId, -1, -1 );
 
   int aNaturalMenuId = createMenu( tr( "MEN_DESK_NATURAL" ), aHydroId, -1 );
-  createMenu( CreateChannelId, aNaturalMenuId, -1, -1 );
+  createMenu( CreateImmersibleZoneId, aNaturalMenuId, -1, -1 );
+  createMenu( CreateStreamId, aNaturalMenuId, -1, -1 );
 
   int anObstacleMenuId = createMenu( tr( "MEN_DESK_OBSTACLE" ), aHydroId, -1 );
   createMenu( ImportObstacleFromFileId, anObstacleMenuId, -1, -1 );
@@ -374,7 +375,8 @@ LightApp_Operation* HYDROGUI_Module::createOperation( const int theId ) const
     anOp = new HYDROGUI_GeoreferencementOp( aModule, HYDROGUI_GeoreferencementOp::Selected ) ;
     break;
   case ImportBathymetryId:
-    anOp = new HYDROGUI_ImportBathymetryOp( aModule );
+  case EditImportedBathymetryId:
+    anOp = new HYDROGUI_ImportBathymetryOp( aModule, theId == EditImportedBathymetryId  );
     break;
   case CreateImmersibleZoneId:
   case EditImmersibleZoneId: