Merge remote-tracking branch 'origin/BR_1323_0' into BR_2017

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

diff --git a/src/HYDROGUI/HYDROGUI_Operations.h b/src/HYDROGUI/HYDROGUI_Operations.h
index 534d56caa108b9e7d172e44c346fa66c1eaa73a0..88afbe3cd3e11cb9b3f160987739651e0605afd2 100644 (file)
--- a/src/HYDROGUI/HYDROGUI_Operations.h
+++ b/src/HYDROGUI/HYDROGUI_Operations.h
@@ -1,12 +1,8 @@
-// Copyright (C) 2007-2013  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
-// version 2.1 of the License.
+// version 2.1 of the License, or (at your option) any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -36,11 +32,13 @@ enum OperationId
   CopyId,
   PasteId,
 
+  UpdateObjectId,
+  ForcedUpdateObjectId,
+
   ImportImageId,
   EditImportedImageId,
   ObserveImageId,
   ExportImageId,
-  UpdateImageId,
   RemoveImageRefsId,
 
   CreatePolylineId,
@@ -57,6 +55,7 @@ enum OperationId
 
   ImportBathymetryId,
   EditImportedBathymetryId,
+  BathymetryBoundsId,
 
   CreateImmersibleZoneId,
   EditImmersibleZoneId,
@@ -64,6 +63,12 @@ enum OperationId
   CreateStreamId,
   EditStreamId,
 
+  CreateChannelId,
+  EditChannelId,
+
+  CreateDigueId,
+  EditDigueId,
+
   CreateCalculationId,
   EditCalculationId,
   ExportCalculationId,
@@ -75,13 +80,16 @@ enum OperationId
   EditCutImageId,
 
   SplitImageId,
-  EditSplittedImageId,
+  EditSplitImageId,
 
   ImportObstacleFromFileId,
-  ImportGeomObjectId,
-  ImportCreatedPrimitiveId,
+  ImportGeomObjectAsObstacleId,
+  ImportGeomObjectAsPolylineId,
   CreateBoxId,
   CreateCylinderId,
+  TranslateObstacleId,
+
+  CopyViewerPositionId,
 
   DeleteId,
 
@@ -91,7 +99,54 @@ enum OperationId
   HideId,
   HideAllId,
 
-  SetColorId
+  SetColorId,
+  SetTransparencyId,
+  SetZLevelId,
+  EditLocalCSId,
+
+  RiverBottomId,
+  RiverBottomContextId,
+  ProfileInterpolateId,
+
+  RecognizeContoursId,
+  SubmersibleId,
+  UnSubmersibleId,
+  ImportPolylineId,
+  ImportSinusXId,
+  ExportSinusXId,
+    
+  ExportToShapeFileID,
+  ImportLandCoverMapId,
+
+  ImportStricklerTableFromFileId,
+  ExportStricklerTableFromFileId,
+  EditStricklerTableId,
+  DuplicateStricklerTableId,
+
+  CreateLandCoverMapId,
+  
+  AddLandCoverId,
+  RemoveLandCoverId,
+  SplitLandCoverId,
+  MergeLandCoverId,
+  ChangeLandCoverTypeId,
+
+  PolylineExtractionId,
+  SplitPolylinesId,
+  MergePolylinesId,
+
+  LandCoverScalarMapModeOnId,
+  LandCoverScalarMapModeOffId,
+
+  BathymetrySelectionId,
+  BathymetryTextId,
+  BathymetryRescaleSelectionId,
+  BathymetryRescaleVisibleId,
+  BathymetryRescaleUserId,
+  BathymetryRescaleDefaultId,
+
+  ShowHideArrows,
+  RegenerateRegionColorsId
 };
 
 #endif