Fix for the bug #45: check and warning when the same image is used in 2 arguments.

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

diff --git a/src/HYDROGUI/HYDROGUI_Operations.cxx b/src/HYDROGUI/HYDROGUI_Operations.cxx
index 89e8ab2cb9a4c61b43827e02a90ecf8e659aa502..85601129dadd793f7522178b8d52a669f80a73b8 100644 (file)
--- a/src/HYDROGUI/HYDROGUI_Operations.cxx
+++ b/src/HYDROGUI/HYDROGUI_Operations.cxx
@@ -41,7 +41,7 @@
 #include "HYDROGUI_StreamOp.h"
 #include "HYDROGUI_TwoImagesOp.h"
 #include "HYDROGUI_UpdateFlags.h"
-#include "HYDROGUI_UpdateImageOp.h"
+#include "HYDROGUI_UpdateObjectOp.h"
 #include "HYDROGUI_VisualStateOp.h"
 #include "HYDROGUI_ImmersibleZoneOp.h"
 #include "HYDROGUI_ImportGeomObjectOp.h"
@@ -102,11 +102,12 @@ void HYDROGUI_Module::createActions()
   createAction( CopyId, "COPY", "", Qt::CTRL + Qt::Key_C );
   createAction( PasteId, "PASTE", "", Qt::CTRL + Qt::Key_V );
 
+  createAction( UpdateObjectId, "UPDATE_OBJECT" );
+
   createAction( ImportImageId, "IMPORT_IMAGE", "", Qt::CTRL + Qt::Key_I );
   createAction( EditImportedImageId, "EDIT_IMPORTED_IMAGE" );
   createAction( ObserveImageId, "OBSERVE_IMAGE" );
   createAction( ExportImageId, "EXPORT_IMAGE" );
-  createAction( UpdateImageId, "UPDATE_IMAGE" );
   createAction( RemoveImageRefsId, "REMOVE_IMAGE_REFERENCE" );
 
   createAction( CreatePolylineId, "CREATE_POLYLINE" );
@@ -190,11 +191,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 );
@@ -347,8 +348,8 @@ LightApp_Operation* HYDROGUI_Module::createOperation( const int theId ) const
   case ExportImageId:
     anOp = new HYDROGUI_ExportImageOp( aModule );
     break;
-  case UpdateImageId:
-    anOp = new HYDROGUI_UpdateImageOp( aModule );
+  case UpdateObjectId:
+    anOp = new HYDROGUI_UpdateObjectOp( aModule );
     break;
   case RemoveImageRefsId:
     anOp = new HYDROGUI_RemoveImageRefsOp( aModule );