X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROGUI%2FHYDROGUI_Operations.cxx;h=08aa0d8fb8f6664d577d65c784dac5517cbf6bf6;hb=de7cf9bb0a7a41d6487013c87f4a54d0664cd303;hp=706d9b75c56787c6f0b020ca62fee5c9606b023a;hpb=f664563df96e1f99e099bc90a1088533e6a018b0;p=modules%2Fhydro.git

diff --git a/src/HYDROGUI/HYDROGUI_Operations.cxx b/src/HYDROGUI/HYDROGUI_Operations.cxx
index 706d9b75..08aa0d8f 100644
--- a/src/HYDROGUI/HYDROGUI_Operations.cxx
+++ b/src/HYDROGUI/HYDROGUI_Operations.cxx
@@ -23,22 +23,23 @@
 #include "HYDROGUI_Operations.h"
 
 #include "HYDROGUI_CopyPasteOp.h"
+#include "HYDROGUI_CalculationOp.h"
 #include "HYDROGUI_DataModel.h"
 #include "HYDROGUI_DeleteOp.h"
 #include "HYDROGUI_ExportImageOp.h"
 #include "HYDROGUI_ImportImageOp.h"
 #include "HYDROGUI_ImportBathymetryOp.h"
-#include "HYDROGUI_CalculationOp.h"
+#include "HYDROGUI_ImmersibleZoneOp.h"
 #include "HYDROGUI_Module.h"
 #include "HYDROGUI_ObserveImageOp.h"
 #include "HYDROGUI_PolylineOp.h"
+#include "HYDROGUI_RemoveImageRefsOp.h"
 #include "HYDROGUI_ShowHideOp.h"
-#include "HYDROGUI_SplitZonesTool.h"
+#include "HYDROData_SplitToZonesTool.h"
 #include "HYDROGUI_TwoImagesOp.h"
 #include "HYDROGUI_UpdateFlags.h"
 #include "HYDROGUI_UpdateImageOp.h"
 #include "HYDROGUI_VisualStateOp.h"
-#include "HYDROGUI_ZoneOp.h"
 
 #include <CAM_Application.h>
 
@@ -82,14 +83,15 @@ void HYDROGUI_Module::createActions()
   createAction( ObserveImageId, "OBSERVE_IMAGE" );
   createAction( ExportImageId, "EXPORT_IMAGE" );
   createAction( UpdateImageId, "UPDATE_IMAGE" );
+  createAction( RemoveImageRefsId, "REMOVE_IMAGE_REFERENCE" );
 
   createAction( CreatePolylineId, "CREATE_POLYLINE" );
   createAction( EditPolylineId, "EDIT_POLYLINE" ); 
 
   createAction( ImportBathymetryId, "IMPORT_BATHYMETRY", "", Qt::CTRL + Qt::Key_B );
 
-  createAction( CreateZoneId, "CREATE_ZONE" );
-  createAction( EditZoneId, "EDIT_ZONE" );
+  createAction( CreateImmersibleZoneId, "CREATE_IMMERSIBLE_ZONE" );
+  createAction( EditImmersibleZoneId, "EDIT_IMMERSIBLE_ZONE" );
 
   createAction( CreateCalculationId, "CREATE_CALCULATION" );
   createAction( EditCalculationId, "EDIT_CALCULATION" );
@@ -131,7 +133,7 @@ void HYDROGUI_Module::createMenus()
   createMenu( ImportImageId, aHydroId, -1, -1 );
   createMenu( ImportBathymetryId, aHydroId, -1, -1 );
   createMenu( CreatePolylineId, aHydroId, -1, -1 );
-  createMenu( CreateZoneId, aHydroId, -1, -1 );
+  createMenu( CreateImmersibleZoneId, aHydroId, -1, -1 );
   createMenu( CreateCalculationId, aHydroId, -1, -1 );
   createMenu( separator(), aHydroId );
   createMenu( FuseImagesId, aHydroId, -1, -1 );
@@ -270,6 +272,9 @@ LightApp_Operation* HYDROGUI_Module::createOperation( const int theId ) const
   case UpdateImageId:
     anOp = new HYDROGUI_UpdateImageOp( aModule );
     break;
+  case RemoveImageRefsId:
+    anOp = new HYDROGUI_RemoveImageRefsOp( aModule );
+    break;
   case CreatePolylineId:
   case EditPolylineId:
     anOp = new HYDROGUI_PolylineOp( aModule, theId == EditPolylineId );
@@ -277,9 +282,9 @@ LightApp_Operation* HYDROGUI_Module::createOperation( const int theId ) const
   case ImportBathymetryId:
     anOp = new HYDROGUI_ImportBathymetryOp( aModule );
     break;
-  case CreateZoneId:
-  case EditZoneId:
-    anOp = new HYDROGUI_ZoneOp( aModule, theId == EditZoneId );
+  case CreateImmersibleZoneId:
+  case EditImmersibleZoneId:
+    anOp = new HYDROGUI_ImmersibleZoneOp( aModule, theId == EditImmersibleZoneId );
     break;
   case CreateCalculationId:
   case EditCalculationId: