lot 10 - warnings for DTM - untested

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

diff --git a/src/HYDROGUI/HYDROGUI_Operations.cxx b/src/HYDROGUI/HYDROGUI_Operations.cxx
index 82402e07bd659dea1da3ea3a903b0994ea7637e7..f4cec87b19e80ccce1cb00de53bd487b1315f4de 100644 (file)
--- a/src/HYDROGUI/HYDROGUI_Operations.cxx
+++ b/src/HYDROGUI/HYDROGUI_Operations.cxx
@@ -45,6 +45,7 @@
 #include "HYDROGUI_UpdateObjectOp.h"
 #include "HYDROGUI_VisualStateOp.h"
 #include "HYDROGUI_ImmersibleZoneOp.h"
+#include "HYDROGUI_MeasurementToolOp.h"
 #include "HYDROGUI_ImportGeomObjectOp.h"
 #include "HYDROGUI_ImportObstacleFromFileOp.h"
 #include "HYDROGUI_TranslateObstacleOp.h"
@@ -147,6 +148,8 @@ void HYDROGUI_Module::createActions()
   createAction( ExportSinusXId, "EXPORT_SINUSX", "EXPORT_SINUSX_ICO" );
   createAction( ImportLandCoverMapId, "IMPORT_LANDCOVER_MAP", "IMPORT_LANDCOVER_MAP_ICO" );
 
+  createAction( MeasurementToolId, "MEASUREMENT_TOOL", "MEASUREMENT_TOOL_ICO" );
+
   createAction( ImportBCPolygonId, "IMPORT_BC_POLYGON", "IMPORT_BC_POLYGON_ICO" );
 
   createAction( CreatePolylineId, "CREATE_POLYLINE", "CREATE_POLYLINE_ICO" );
@@ -211,6 +214,8 @@ void HYDROGUI_Module::createActions()
   createAction( EditCalculationId, "EDIT_CALCULATION", "EDIT_CALCULATION_ICO" );
   createAction( ExportCalculationId, "EXPORT_CALCULATION", "EXPORT_CALCULATION_ICO" );
 
+  createAction( CompleteCalculationId, "COMPLETE_CALCULATION", "COMPLETE_CALCULATION_ICO" );
+
   createAction( FuseImagesId, "FUSE_IMAGES", "FUSE_IMAGES_ICO" );
   createAction( EditFusedImageId, "EDIT_FUSED_IMAGE", "EDIT_FUSED_IMAGE_ICO" );
 
@@ -282,11 +287,14 @@ void HYDROGUI_Module::createMenus()
   
   createMenu( ImportBathymetryId, aHydroId, -1, -1 );
   createMenu( ImportStricklerTableFromFileId, aHydroId, -1, -1 );
+  createMenu( ImportBCPolygonId, aHydroId, -1, -1 );
   createMenu( CreatePolyline3DId, aHydroId, -1, -1 );
   createMenu( CreateImmersibleZoneId, aHydroId, -1, -1 );
   createMenu( CreateChannelId, aHydroId, -1, -1 );
   createMenu( CreateDigueId, aHydroId, -1, -1 );
 
+  createMenu( MeasurementToolId, aHydroId, -1, -1 );
+
   int aNewImageId = createMenu( tr( "MEN_DESK_IMAGE" ), aHydroId, -1 );
   createMenu( ImportImageId, aNewImageId, -1, -1 );
   createMenu( separator(), aNewImageId );
@@ -354,6 +362,7 @@ void HYDROGUI_Module::createToolbars()
   createTool( ImportLandCoverMapId, aToolBar );
 
   createTool( ImportBCPolygonId, aToolBar );
+  createTool( MeasurementToolId, aToolBar );
 
   createTool( ImportBathymetryId, aToolBar );
   createTool( CreatePolylineId, aToolBar );
@@ -631,6 +640,9 @@ LightApp_Operation* HYDROGUI_Module::createOperation( const int theId ) const
   case ImportBCPolygonId:
     anOp = new HYDROGUI_ImportBCPolygonOp( aModule );
     break;
+  case MeasurementToolId:
+    anOp = new HYDROGUI_MeasurementToolOp( aModule );
+    break;
   case ObserveImageId:
     anOp = new HYDROGUI_ObserveImageOp( aModule );
     break;
@@ -726,8 +738,13 @@ LightApp_Operation* HYDROGUI_Module::createOperation( const int theId ) const
     break;
   case CreateCalculationId:
   case EditCalculationId:
-    anOp = new HYDROGUI_CalculationOp( aModule, theId == EditCalculationId );
+    anOp = new HYDROGUI_CalculationOp( aModule, theId == EditCalculationId, false );
     break;
+
+  case CompleteCalculationId:
+    anOp = new HYDROGUI_CalculationOp( aModule, true, true);
+    break;
+
   case ExportCalculationId:
     anOp = new HYDROGUI_ExportCalculationOp( aModule );
     break;