Fix for the bug #42: point C is not activated, but point C is shown in preview in...

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

diff --git a/src/HYDROGUI/HYDROGUI_Operations.cxx b/src/HYDROGUI/HYDROGUI_Operations.cxx
index 101a44251b0169a842c6138b4247eee09489cf6c..08aa0d8fb8f6664d577d65c784dac5517cbf6bf6 100644 (file)
--- a/src/HYDROGUI/HYDROGUI_Operations.cxx
+++ b/src/HYDROGUI/HYDROGUI_Operations.cxx
@@ -22,17 +22,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_ImmersibleZoneOp.h"
 #include "HYDROGUI_Module.h"
 #include "HYDROGUI_ObserveImageOp.h"
 #include "HYDROGUI_PolylineOp.h"
+#include "HYDROGUI_RemoveImageRefsOp.h"
 #include "HYDROGUI_ShowHideOp.h"
+#include "HYDROData_SplitToZonesTool.h"
 #include "HYDROGUI_TwoImagesOp.h"
 #include "HYDROGUI_UpdateFlags.h"
+#include "HYDROGUI_UpdateImageOp.h"
 #include "HYDROGUI_VisualStateOp.h"
 
 #include <CAM_Application.h>
@@ -69,19 +75,35 @@ void HYDROGUI_Module::createActions()
   createAction( SaveVisualStateId, "SAVE_VISUAL_STATE" );
   createAction( LoadVisualStateId, "LOAD_VISUAL_STATE" );
 
+  createAction( CopyId, "COPY", "", Qt::CTRL + Qt::Key_C );
+  createAction( PasteId, "PASTE", "", Qt::CTRL + Qt::Key_V );
+
   createAction( ImportImageId, "IMPORT_IMAGE", "", Qt::CTRL + Qt::Key_I );
   createAction( EditImportedImageId, "EDIT_IMPORTED_IMAGE" );
-  createAction( EditCompositeImageId, "EDIT_COMPOSITE_IMAGE" );
   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::SHIFT + Qt::Key_I );
+  createAction( ImportBathymetryId, "IMPORT_BATHYMETRY", "", Qt::CTRL + Qt::Key_B );
+
+  createAction( CreateImmersibleZoneId, "CREATE_IMMERSIBLE_ZONE" );
+  createAction( EditImmersibleZoneId, "EDIT_IMMERSIBLE_ZONE" );
+
+  createAction( CreateCalculationId, "CREATE_CALCULATION" );
+  createAction( EditCalculationId, "EDIT_CALCULATION" );
+
+  createAction( FuseImagesId, "FUSE_IMAGES" );
+  createAction( EditFusedImageId, "EDIT_FUSED_IMAGE" );
 
-  createAction( FuseId, "FUSE_IMAGES" );
-  createAction( CutId, "CUT_IMAGES" );
+  createAction( CutImagesId, "CUT_IMAGES" );
+  createAction( EditCutImageId, "EDIT_CUT_IMAGE" );
+
+  createAction( SplitImageId, "SPLIT_IMAGE" );
+  createAction( EditSplittedImageId, "EDIT_SPLITTED_IMAGE" );
 
   createAction( DeleteId, "DELETE", "", Qt::Key_Delete );
 
@@ -102,14 +124,21 @@ void HYDROGUI_Module::createMenus()
   int anEditMenu = createMenu( tr( "MEN_DESK_EDIT" ), -1, -1, 5 );
   createMenu( UndoId, anEditMenu );
   createMenu( RedoId, anEditMenu );
+  createMenu( separator(), anEditMenu );
+  createMenu( CopyId, anEditMenu );
+  createMenu( PasteId, anEditMenu );
 
   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( ImportBathymetryId, aHydroId, -1, -1 );
   createMenu( CreatePolylineId, aHydroId, -1, -1 );
-  createMenu( FuseId, aHydroId, -1, -1 );
-  createMenu( CutId, aHydroId, -1, -1 );
+  createMenu( CreateImmersibleZoneId, aHydroId, -1, -1 );
+  createMenu( CreateCalculationId, aHydroId, -1, -1 );
+  createMenu( separator(), aHydroId );
+  createMenu( FuseImagesId, aHydroId, -1, -1 );
+  createMenu( CutImagesId, aHydroId, -1, -1 );
+  createMenu( SplitImageId, aHydroId, -1, -1 );
 }
 
 void HYDROGUI_Module::createPopups()
@@ -118,7 +147,7 @@ void HYDROGUI_Module::createPopups()
 
 void HYDROGUI_Module::createToolbars()
 {
-  int aToolBar = createTool( tr( "HYDRO_TOOLBAR" ) );
+  int aToolBar = createTool( tr( "MEN_DESK_HYDRO" ) );
   createTool( UndoId, aToolBar );
   createTool( RedoId, aToolBar );
 }
@@ -226,6 +255,10 @@ LightApp_Operation* HYDROGUI_Module::createOperation( const int theId ) const
   case LoadVisualStateId:
     anOp = new HYDROGUI_VisualStateOp( aModule, theId == LoadVisualStateId );
     break;
+  case CopyId:
+  case PasteId:
+    anOp = new HYDROGUI_CopyPasteOp( aModule, theId == PasteId );
+    break;
   case ImportImageId:
   case EditImportedImageId:
     anOp = new HYDROGUI_ImportImageOp( aModule, theId == EditImportedImageId );
@@ -236,21 +269,38 @@ LightApp_Operation* HYDROGUI_Module::createOperation( const int theId ) const
   case ExportImageId:
     anOp = new HYDROGUI_ExportImageOp( aModule );
     break;
+  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 );
     break;
-  case FuseId:
-    anOp = new HYDROGUI_TwoImagesOp( aModule, HYDROGUI_TwoImagesOp::Fuse );
+  case ImportBathymetryId:
+    anOp = new HYDROGUI_ImportBathymetryOp( aModule );
     break;
-  case CutId:
-    anOp = new HYDROGUI_TwoImagesOp( aModule, HYDROGUI_TwoImagesOp::Cut );
+  case CreateImmersibleZoneId:
+  case EditImmersibleZoneId:
+    anOp = new HYDROGUI_ImmersibleZoneOp( aModule, theId == EditImmersibleZoneId );
     break;
-  case EditCompositeImageId:
-    anOp = new HYDROGUI_TwoImagesOp( aModule, HYDROGUI_TwoImagesOp::Edit );
+  case CreateCalculationId:
+  case EditCalculationId:
+    anOp = new HYDROGUI_CalculationOp( aModule, theId == EditCalculationId );
     break;
-  case ImportBathymetryId:
-    anOp = new HYDROGUI_ImportBathymetryOp( aModule );
+  case FuseImagesId:
+  case EditFusedImageId:
+    anOp = new HYDROGUI_TwoImagesOp( aModule, HYDROGUI_TwoImagesOp::Fuse, theId == EditFusedImageId );
+    break;
+  case CutImagesId:
+  case EditCutImageId:
+    anOp = new HYDROGUI_TwoImagesOp( aModule, HYDROGUI_TwoImagesOp::Cut, theId == EditCutImageId );
+    break;
+  case SplitImageId:
+  case EditSplittedImageId:
+    anOp = new HYDROGUI_TwoImagesOp( aModule, HYDROGUI_TwoImagesOp::Split, theId == EditSplittedImageId );
     break;
   case DeleteId:
     anOp = new HYDROGUI_DeleteOp( aModule );