Code alignment.

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

diff --git a/src/HYDROGUI/HYDROGUI_Operations.cxx b/src/HYDROGUI/HYDROGUI_Operations.cxx
index a2b8286435eba691739d85c310e00f91eb00ea8a..e5e3ea7788b1f6cccb76381d5693f5f83325ed65 100644 (file)
--- a/src/HYDROGUI/HYDROGUI_Operations.cxx
+++ b/src/HYDROGUI/HYDROGUI_Operations.cxx
@@ -26,12 +26,14 @@
 #include "HYDROGUI_DeleteOp.h"
 #include "HYDROGUI_ExportImageOp.h"
 #include "HYDROGUI_ImportImageOp.h"
+#include "HYDROGUI_ImportBathymetryOp.h"
 #include "HYDROGUI_Module.h"
 #include "HYDROGUI_ObserveImageOp.h"
 #include "HYDROGUI_PolylineOp.h"
 #include "HYDROGUI_ShowHideOp.h"
 #include "HYDROGUI_TwoImagesOp.h"
 #include "HYDROGUI_UpdateFlags.h"
+#include "HYDROGUI_UpdateImageOp.h"
 #include "HYDROGUI_VisualStateOp.h"
 
 #include <CAM_Application.h>
@@ -69,12 +71,17 @@ void HYDROGUI_Module::createActions()
   createAction( LoadVisualStateId, "LOAD_VISUAL_STATE" );
 
   createAction( ImportImageId, "IMPORT_IMAGE", "", Qt::CTRL + Qt::Key_I );
-  createAction( EditImageId, "EDIT_IMAGE" );
+  createAction( EditImportedImageId, "EDIT_IMPORTED_IMAGE" );
+  createAction( EditCompositeImageId, "EDIT_COMPOSITE_IMAGE" );
   createAction( ObserveImageId, "OBSERVE_IMAGE" );
   createAction( ExportImageId, "EXPORT_IMAGE" );
+  createAction( UpdateImageId, "UPDATE_IMAGE" );
+
   createAction( CreatePolylineId, "CREATE_POLYLINE" );
   createAction( EditPolylineId, "EDIT_POLYLINE" ); 
 
+  createAction( ImportBathymetryId, "IMPORT_BATHYMETRY", "", Qt::CTRL + Qt::SHIFT + Qt::Key_I );
+
   createAction( FuseId, "FUSE_IMAGES" );
   createAction( CutId, "CUT_IMAGES" );
 
@@ -101,6 +108,7 @@ void HYDROGUI_Module::createMenus()
   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 );
@@ -221,8 +229,8 @@ LightApp_Operation* HYDROGUI_Module::createOperation( const int theId ) const
     anOp = new HYDROGUI_VisualStateOp( aModule, theId == LoadVisualStateId );
     break;
   case ImportImageId:
-  case EditImageId:
-    anOp = new HYDROGUI_ImportImageOp( aModule, theId == EditImageId );
+  case EditImportedImageId:
+    anOp = new HYDROGUI_ImportImageOp( aModule, theId == EditImportedImageId );
     break;
   case ObserveImageId:
     anOp = new HYDROGUI_ObserveImageOp( aModule );
@@ -230,6 +238,9 @@ 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 CreatePolylineId:
   case EditPolylineId:
     anOp = new HYDROGUI_PolylineOp( aModule, theId == EditPolylineId );
@@ -240,6 +251,12 @@ LightApp_Operation* HYDROGUI_Module::createOperation( const int theId ) const
   case CutId:
     anOp = new HYDROGUI_TwoImagesOp( aModule, HYDROGUI_TwoImagesOp::Cut );
     break;
+  case EditCompositeImageId:
+    anOp = new HYDROGUI_TwoImagesOp( aModule, HYDROGUI_TwoImagesOp::Edit );
+    break;
+  case ImportBathymetryId:
+    anOp = new HYDROGUI_ImportBathymetryOp( aModule );
+    break;
   case DeleteId:
     anOp = new HYDROGUI_DeleteOp( aModule );
     break;