Merge remote-tracking branch 'origin/BR_LAND_COVER_REMOVING' into BR_LAND_COVER_MAP

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

diff --git a/src/HYDROGUI/HYDROGUI_Operations.cxx b/src/HYDROGUI/HYDROGUI_Operations.cxx
index 3ede1f216c9e16197f7606e7538dee7725c9864d..5641a2c4ff77ae5bd642b73bee912d789f5b7fb9 100644 (file)
--- a/src/HYDROGUI/HYDROGUI_Operations.cxx
+++ b/src/HYDROGUI/HYDROGUI_Operations.cxx
@@ -62,12 +62,15 @@
 #include "HYDROGUI_SubmersibleOp.h"
 #include "HYDROGUI_StricklerTableOp.h"
 #include "HYDROGUI_DuplicateOp.h"
-#include "HYDROGUI_LandCoverOp.h"
+// TODO
+//#include "HYDROGUI_LandCoverMapOp.h"
+#include "HYDROGUI_PolylineExtractionOp.h"
 #include "HYDROGUI_ExportSinusXOp.h"
 #include "HYDROGUI_MergePolylinesOp.h"
 #include "HYDROGUI_SplitPolylinesOp.h"
 #include "HYDROGUI_LandCoverColoringOp.h"
-#include "HYDROGUI_ImportLandCoverOp.h"
+// TODO
+//#include "HYDROGUI_ImportLandCoverMapOp.h"
 
 #include <HYDROData_Document.h>
 #include <HYDROData_Obstacle.h>
@@ -132,7 +135,7 @@ void HYDROGUI_Module::createActions()
   createAction( ImportPolylineId, "IMPORT_POLYLINE", "IMPORT_POLYLINE_ICO" );
   createAction( ImportSinusXId, "IMPORT_SINUSX", "IMPORT_SINUSX_ICO" );
   createAction( ExportSinusXId, "EXPORT_SINUSX", "EXPORT_SINUSX_ICO" );
-  createAction( ImportLandcoverId, "IMPORT_LANDCOVER", "IMPORT_LANDCOVER_ICO" );
+  createAction( ImportLandCoverMapId, "IMPORT_LANDCOVER_MAP", "IMPORT_LANDCOVER_MAP_ICO" );
 
   createAction( CreatePolylineId, "CREATE_POLYLINE", "CREATE_POLYLINE_ICO" );
   createAction( EditPolylineId, "EDIT_POLYLINE", "EDIT_POLYLINE_ICO" ); 
@@ -167,8 +170,12 @@ void HYDROGUI_Module::createActions()
   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( CreateLandCoverMapId, "CREATE_LAND_COVER_MAP", "CREATE_LAND_COVER_MAP_ICO" );
+  
+  createAction( AddLandCoverId, "ADD_LAND_COVER", "ADD_LAND_COVER_ICO" );
+  createAction( RemoveLandCoverId, "REMOVE_LAND_COVER", "REMOVE_LAND_COVER_ICO" );
+  createAction( SplitLandCoverId, "SPLIT_LAND_COVER", "SPLIT_LAND_COVER_ICO" );
+  createAction( MergeLandCoverId, "MERGE_LAND_COVER", "MERGE_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" );
@@ -214,6 +221,7 @@ void HYDROGUI_Module::createActions()
   createAction( SubmersibleId, "SUBMERSIBLE", "SUBMERSIBLE_ICO" );
   createAction( ExportToShapeFileID, "EXPORT_TO_SHAPE_FILE", "EXPORT_TO_SHAPE_FILE_ICO" );
 
+  createAction( PolylineExtractionId, "POLYLINE_EXTRACTION" );
   createAction( SplitPolylinesId, "SPLIT_POLYLINES", "SPLIT_POLYLINES_ICO" );
   createAction( MergePolylinesId, "MERGE_POLYLINES", "MERGE_POLYLINES_ICO" );
 
@@ -239,7 +247,7 @@ void HYDROGUI_Module::createMenus()
   int aHydroId = createMenu( tr( "MEN_DESK_HYDRO" ), -1, -1, aHydroMenu );
   createMenu( ImportSinusXId, aHydroId, -1, -1 );
   createMenu( ExportSinusXId, aHydroId, -1, -1 );
-  createMenu( ImportLandcoverId, aHydroId, -1, -1 );
+  createMenu( ImportLandCoverMapId, aHydroId, -1, -1 );
   
   createMenu( ImportBathymetryId, aHydroId, -1, -1 );
   createMenu( ImportStricklerTableFromFileId, aHydroId, -1, -1 );
@@ -247,7 +255,7 @@ void HYDROGUI_Module::createMenus()
   createMenu( CreateImmersibleZoneId, aHydroId, -1, -1 );
   createMenu( CreateChannelId, aHydroId, -1, -1 );
   createMenu( CreateDigueId, aHydroId, -1, -1 );  
-  createMenu( CreateLandCoverId, aHydroId, -1, -1 );  
+  createMenu( CreateLandCoverMapId, aHydroId, -1, -1 );  
 
   int aNewImageId = createMenu( tr( "MEN_DESK_IMAGE" ), aHydroId, -1 );
   createMenu( ImportImageId, aNewImageId, -1, -1 );
@@ -297,7 +305,7 @@ void HYDROGUI_Module::createToolbars()
   createTool( ImportPolylineId, aToolBar );
   createTool( ImportSinusXId, aToolBar );
   createTool( ExportSinusXId, aToolBar );
-  createTool( ImportLandcoverId, aToolBar );
+  createTool( ImportLandCoverMapId, aToolBar );
 
   createTool( ImportBathymetryId, aToolBar );
   createTool( CreatePolylineId, aToolBar );
@@ -325,7 +333,7 @@ void HYDROGUI_Module::createToolbars()
   createTool( ImportStricklerTableFromFileId, aToolBar );
 
   createTool( separator(), aToolBar );
-  createTool( CreateLandCoverId, aToolBar );
+  createTool( CreateLandCoverMapId, aToolBar );
 
   createTool( separator(), aToolBar );
   createTool( CreateCalculationId, aToolBar );
@@ -479,8 +487,9 @@ LightApp_Operation* HYDROGUI_Module::createOperation( const int theId ) const
   case ExportToShapeFileID:
     anOp = new HYDROGUI_ExportFileOp( aModule );
     break;
-  case ImportLandcoverId:
-    anOp = new HYDROGUI_ImportLandCoverOp( aModule );
+  case ImportLandCoverMapId:
+    // TODO
+    //anOp = new HYDROGUI_ImportLandCoverMapOp( aModule );
     break;
   case RemoveImageRefsId:
     anOp = new HYDROGUI_RemoveImageRefsOp( aModule );
@@ -537,9 +546,21 @@ LightApp_Operation* HYDROGUI_Module::createOperation( const int theId ) const
   case EditStricklerTableId:
     anOp = new HYDROGUI_StricklerTableOp( aModule, theId );
     break;
-  case CreateLandCoverId:
-  case EditLandCoverId:
-    anOp = new HYDROGUI_LandCoverOp( aModule, theId == EditLandCoverId );
+  case CreateLandCoverMapId:
+    // TODO
+    //anOp = new HYDROGUI_LandCoverMapOp( aModule, theId == EditLandCoverMapId );
+    break;
+  case AddLandCoverId:
+    // TODO
+    break;
+  case RemoveLandCoverId:
+    // TODO
+    break;
+  case SplitLandCoverId:
+    // TODO
+    break;
+  case MergeLandCoverId:
+    // TODO
     break;
   case DuplicateStricklerTableId:
     anOp = new HYDROGUI_DuplicateOp( aModule );
@@ -615,6 +636,9 @@ LightApp_Operation* HYDROGUI_Module::createOperation( const int theId ) const
   case SubmersibleId:
     anOp = new HYDROGUI_SubmersibleOp( aModule );
     break;
+  case PolylineExtractionId:
+    anOp = new HYDROGUI_PolylineExtractionOp( aModule );
+    break;
   case SplitPolylinesId:
     anOp = new HYDROGUI_SplitPolylinesOp( aModule );
     break;