Merge branch 'BR_v14_rc' of ssh://git.salome-platform.org/modules/hydro into BR_v14_rc

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

diff --git a/src/HYDROGUI/HYDROGUI_Operations.cxx b/src/HYDROGUI/HYDROGUI_Operations.cxx
index c51d90b675925d7a1916c358de575fe24f0d30df..ad34f778a3fed7121b7017a1218ef59bc1e24e0f 100644 (file)
--- a/src/HYDROGUI/HYDROGUI_Operations.cxx
+++ b/src/HYDROGUI/HYDROGUI_Operations.cxx
@@ -1,8 +1,4 @@
-// Copyright (C) 2007-2015  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
+// Copyright (C) 2014-2015  EDF-R&D
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
 // License as published by the Free Software Foundation; either
@@ -30,7 +26,10 @@
 #include "HYDROGUI_DeleteOp.h"
 #include "HYDROGUI_DigueOp.h"
 #include "HYDROGUI_ExportImageOp.h"
+#include "HYDROGUI_ExportFileOp.h"
 #include "HYDROGUI_ImportImageOp.h"
+#include "HYDROGUI_ImportPolylineOp.h"
+#include "HYDROGUI_ImportSinusXOp.h"
 #include "HYDROGUI_ImportBathymetryOp.h"
 #include "HYDROGUI_ImmersibleZoneOp.h"
 #include "HYDROGUI_Module.h"
@@ -59,6 +58,15 @@
 #include "HYDROGUI_LocalCSOp.h"
 #include "HYDROGUI_RiverBottomOp.h"
 #include "HYDROGUI_ProfileInterpolateOp.h"
+#include "HYDROGUI_RecognizeContoursOp.h"
+#include "HYDROGUI_SubmersibleOp.h"
+#include "HYDROGUI_StricklerTableOp.h"
+#include "HYDROGUI_DuplicateOp.h"
+#include "HYDROGUI_LandCoverOp.h"
+#include "HYDROGUI_ExportSinusXOp.h"
+#include "HYDROGUI_MergePolylinesOp.h"
+#include "HYDROGUI_SplitPolylinesOp.h"
+#include "HYDROGUI_LandCoverColoringOp.h"
 
 #include <HYDROData_Document.h>
 #include <HYDROData_Obstacle.h>
@@ -119,6 +127,10 @@ void HYDROGUI_Module::createActions()
   createAction( ObserveImageId, "OBSERVE_IMAGE", "OBSERVE_IMAGE_ICO" );
   createAction( ExportImageId, "EXPORT_IMAGE", "EXPORT_IMAGE_ICO" );
   createAction( RemoveImageRefsId, "REMOVE_IMAGE_REFERENCE", "REMOVE_IMAGE_REFERENCE_ICO" );
+  
+  createAction( ImportPolylineId, "IMPORT_POLYLINE", "IMPORT_POLYLINE_ICO" );
+  createAction( ImportSinusXId, "IMPORT_SINUSX", "IMPORT_SINUSX_ICO" );
+  createAction( ExportSinusXId, "EXPORT_SINUSX", "EXPORT_SINUSX_ICO" );
 
   createAction( CreatePolylineId, "CREATE_POLYLINE", "CREATE_POLYLINE_ICO" );
   createAction( EditPolylineId, "EDIT_POLYLINE", "EDIT_POLYLINE_ICO" ); 
@@ -148,6 +160,14 @@ void HYDROGUI_Module::createActions()
   createAction( CreateDigueId, "CREATE_DIGUE", "CREATE_DIGUE_ICO" );
   createAction( EditDigueId, "EDIT_DIGUE", "EDIT_DIGUE_ICO" );
 
+  createAction( ImportStricklerTableFromFileId, "IMPORT_STRICKLER_TABLE", "IMPORT_STRICKLER_TABLE_ICO" );
+  createAction( ExportStricklerTableFromFileId, "EXPORT_STRICKLER_TABLE", "EXPORT_STRICKLER_TABLE_ICO" );
+  createAction( EditStricklerTableId, "EDIT_STRICKLER_TABLE", "EDIT_STRICKLER_TABLE_ICO" );
+  createAction( DuplicateStricklerTableId, "DUPLICATE_STRICKLER_TABLE", "DUPLICATE_STRICKLER_TABLE_ICO" );
+
+  createAction( CreateLandCoverId, "CREATE_LAND_COVER", "CREATE_LAND_COVER_ICO" );
+  createAction( EditLandCoverId, "EDIT_LAND_COVER", "EDIT_LAND_COVER_ICO" );
+
   createAction( ImportObstacleFromFileId, "IMPORT_OBSTACLE_FROM_FILE", "IMPORT_OBSTACLE_FROM_FILE_ICO" );
   createAction( ImportGeomObjectAsObstacleId, "IMPORT_GEOM_OBJECT_AS_OBSTACLE", "IMPORT_GEOM_OBJECT_ICO" );
   createAction( ImportGeomObjectAsPolylineId, "IMPORT_GEOM_OBJECT_AS_POLYLINE", "IMPORT_GEOM_OBJECT_ICO" );
@@ -168,6 +188,8 @@ void HYDROGUI_Module::createActions()
   createAction( SplitImageId, "SPLIT_IMAGE", "SPLIT_IMAGE_ICO" );
   createAction( EditSplittedImageId, "EDIT_SPLITTED_IMAGE", "EDIT_SPLITTED_IMAGE_ICO" );
 
+  createAction( RecognizeContoursId, "RECOGNIZE_CONTOURS", "RECOGNIZE_CONTOURS_ICO" );
+
   createAction( CopyViewerPositionId, "COPY_VIEWER_POSITION", "" );
 
   createAction( DeleteId, "DELETE", "", Qt::Key_Delete, false,
@@ -186,6 +208,15 @@ void HYDROGUI_Module::createActions()
   createAction( RiverBottomId, "CREATE_STREAM_BOTTOM", "CREATE_STREAM_BOTTOM_ICO" );
   createAction( RiverBottomContextId, "CREATE_STREAM_BOTTOM", "CREATE_STREAM_BOTTOM_ICO" );
   createAction( ProfileInterpolateId, "PROFILE_INTERPOLATE", "PROFILE_INTERPOLATE_ICO" );
+
+  createAction( SubmersibleId, "SUBMERSIBLE", "SUBMERSIBLE_ICO" );
+  createAction( ExportPolylineId, "EXPORT_POLYLINE", "EXPORT_POLYLINE_ICO" );
+
+  createAction( SplitPolylinesId, "SPLIT_POLYLINES", "SPLIT_POLYLINES_ICO" );
+  createAction( MergePolylinesId, "MERGE_POLYLINES", "MERGE_POLYLINES_ICO" );
+
+  createAction( LandCoverScalarMapModeOnId, "LC_SCALARMAP_COLORING_ON" );
+  createAction( LandCoverScalarMapModeOffId, "LC_SCALARMAP_COLORING_OFF" );
 }
 
 void HYDROGUI_Module::createMenus()
@@ -205,12 +236,18 @@ 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( ImportPolylineId, aHydroId, -1, -1 );
+  createMenu( ImportSinusXId, aHydroId, -1, -1 );
+  createMenu( ExportSinusXId, aHydroId, -1, -1 );
+  
   createMenu( ImportBathymetryId, aHydroId, -1, -1 );
+  createMenu( ImportStricklerTableFromFileId, aHydroId, -1, -1 );
   createMenu( CreatePolylineId, aHydroId, -1, -1 );
   createMenu( CreatePolyline3DId, aHydroId, -1, -1 );
   createMenu( CreateImmersibleZoneId, aHydroId, -1, -1 );
   createMenu( CreateChannelId, aHydroId, -1, -1 );
-  createMenu( CreateDigueId, aHydroId, -1, -1 );
+  createMenu( CreateDigueId, aHydroId, -1, -1 );  
+  createMenu( CreateLandCoverId, aHydroId, -1, -1 );  
 
   int aNewProfileId = createMenu( tr( "MEN_DESK_PROFILE" ), aHydroId, -1 );
   createMenu( CreateProfileId, aNewProfileId, -1, -1 );
@@ -235,6 +272,8 @@ void HYDROGUI_Module::createMenus()
   createMenu( CutImagesId, aHydroId, -1, -1 );
   createMenu( SplitImageId, aHydroId, -1, -1 );
   createMenu( separator(), aHydroId );
+  createMenu( SplitPolylinesId, aHydroId, -1, -1 );
+  createMenu( MergePolylinesId, aHydroId, -1, -1 );
 }
 
 void HYDROGUI_Module::createPopups()
@@ -249,6 +288,10 @@ void HYDROGUI_Module::createToolbars()
 
   createTool( separator(), aToolBar );
   createTool( ImportImageId, aToolBar );
+  createTool( ImportPolylineId, aToolBar );
+  createTool( ImportSinusXId, aToolBar );
+  createTool( ExportSinusXId, aToolBar );
+
   createTool( ImportBathymetryId, aToolBar );
   createTool( CreatePolylineId, aToolBar );
   createTool( CreatePolyline3DId, aToolBar );
@@ -271,6 +314,12 @@ void HYDROGUI_Module::createToolbars()
   createTool( CreateBoxId, aToolBar );
   createTool( CreateCylinderId, aToolBar );
 
+  createTool( separator(), aToolBar );
+  createTool( ImportStricklerTableFromFileId, aToolBar );
+
+  createTool( separator(), aToolBar );
+  createTool( CreateLandCoverId, aToolBar );
+
   createTool( separator(), aToolBar );
   createTool( CreateCalculationId, aToolBar );
 
@@ -401,6 +450,15 @@ LightApp_Operation* HYDROGUI_Module::createOperation( const int theId ) const
   case EditImportedImageId:
     anOp = new HYDROGUI_ImportImageOp( aModule, theId == EditImportedImageId );
     break;
+  case ImportPolylineId:
+    anOp = new HYDROGUI_ImportPolylineOp( aModule/*, theId == EditImportedPolylineId*/ );
+    break;
+  case ImportSinusXId:
+    anOp = new HYDROGUI_ImportSinusXOp( aModule );
+    break;
+  case ExportSinusXId:
+    anOp = new HYDROGUI_ExportSinusXOp( aModule );
+    break;
   case ObserveImageId:
     anOp = new HYDROGUI_ObserveImageOp( aModule );
     break;
@@ -411,6 +469,9 @@ LightApp_Operation* HYDROGUI_Module::createOperation( const int theId ) const
   case ForcedUpdateObjectId:
     anOp = new HYDROGUI_UpdateObjectOp( aModule, theId == ForcedUpdateObjectId );
     break;
+  case ExportPolylineId:
+    anOp = new HYDROGUI_ExportFileOp( aModule );
+    break;
   case RemoveImageRefsId:
     anOp = new HYDROGUI_RemoveImageRefsOp( aModule );
     break;
@@ -461,6 +522,18 @@ LightApp_Operation* HYDROGUI_Module::createOperation( const int theId ) const
   case EditDigueId:
     anOp = new HYDROGUI_DigueOp( aModule, theId == EditDigueId );
     break;
+  case ImportStricklerTableFromFileId:
+  case ExportStricklerTableFromFileId:
+  case EditStricklerTableId:
+    anOp = new HYDROGUI_StricklerTableOp( aModule, theId );
+    break;
+  case CreateLandCoverId:
+  case EditLandCoverId:
+    anOp = new HYDROGUI_LandCoverOp( aModule, theId == EditLandCoverId );
+    break;
+  case DuplicateStricklerTableId:
+    anOp = new HYDROGUI_DuplicateOp( aModule );
+    break;
   case CreateCalculationId:
   case EditCalculationId:
     anOp = new HYDROGUI_CalculationOp( aModule, theId == EditCalculationId );
@@ -519,6 +592,9 @@ LightApp_Operation* HYDROGUI_Module::createOperation( const int theId ) const
   case RiverBottomContextId:
     anOp = new HYDROGUI_RiverBottomOp( aModule );
     break;
+  case RecognizeContoursId:
+    anOp = new HYDROGUI_RecognizeContoursOp( aModule );
+    break;
   case ShowId:
   case ShowOnlyId:
   case ShowAllId:
@@ -526,6 +602,19 @@ LightApp_Operation* HYDROGUI_Module::createOperation( const int theId ) const
   case HideAllId:
     anOp = new HYDROGUI_ShowHideOp( aModule, theId );
     break;
+  case SubmersibleId:
+    anOp = new HYDROGUI_SubmersibleOp( aModule );
+    break;
+  case SplitPolylinesId:
+    anOp = new HYDROGUI_SplitPolylinesOp( aModule );
+    break;
+  case MergePolylinesId:
+    anOp = new HYDROGUI_MergePolylinesOp( aModule );
+    break;
+  case LandCoverScalarMapModeOnId:
+  case LandCoverScalarMapModeOffId:
+    anOp = new HYDROGUI_LandCoverColoringOp( aModule, theId );
+    break;
   }
 
   if( !anOp )