Remove references to land cover object from data model and GUI in order to have a...

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

diff --git a/src/HYDROGUI/HYDROGUI_Module.cxx b/src/HYDROGUI/HYDROGUI_Module.cxx
index 81ad9fa08755b9f788dd910c46f02633b4c3bd1b..168dc17f92b772ad30112b81b1c39e33c4b11878 100644 (file)
--- a/src/HYDROGUI/HYDROGUI_Module.cxx
+++ b/src/HYDROGUI/HYDROGUI_Module.cxx
@@ -338,7 +338,7 @@ void HYDROGUI_Module::contextMenuPopup( const QString& theClient,
   bool anIsZone = false;
   bool anIsObstacle = false;
   bool anIsStricklerTable = false;
-  bool anIsLandCover = false;
+  bool anIsLandCoverMap = false;
   bool anIsStream = false;
   bool anIsChannel = false;
   bool anIsDigue = false;
@@ -459,8 +459,8 @@ void HYDROGUI_Module::contextMenuPopup( const QString& theClient,
         anIsObstacle = true;
       else if( anObjectKind == KIND_STRICKLER_TABLE )
         anIsStricklerTable = true;
-      else if( anObjectKind == KIND_LAND_COVER )
-        anIsLandCover = true;
+      else if( anObjectKind == KIND_LAND_COVER_MAP )
+        anIsLandCoverMap = true;
       else if( anObjectKind == KIND_STREAM )
       {
         anIsStream = true;
@@ -517,9 +517,9 @@ void HYDROGUI_Module::contextMenuPopup( const QString& theClient,
         case KIND_STRICKLER_TABLE:
           theMenu->addAction( action( ImportStricklerTableFromFileId ) );          
           break;
-        case KIND_LAND_COVER:
-          theMenu->addAction( action( CreateLandCoverId ) ); 
-          theMenu->addAction( action( ImportLandCoverId ) ); 
+        case KIND_LAND_COVER_MAP:
+          theMenu->addAction( action( CreateLandCoverMapId ) ); 
+          theMenu->addAction( action( ImportLandCoverMapId ) ); 
           break;
         case KIND_CALCULATION:
           theMenu->addAction( action( CreateCalculationId ) );
@@ -666,14 +666,18 @@ void HYDROGUI_Module::contextMenuPopup( const QString& theClient,
           HYDROGUI_DataObject::dataObjectEntry( getLandCoverColoringTable( anActiveViewId ) );
         bool isUsed = aCurrentTable == HYDROGUI_DataObject::dataObjectEntry( aTable );
 
-        if ( !isUsed && !getObjectShapes( anActiveViewId, KIND_LAND_COVER ).isEmpty() ) {
+        if ( !isUsed && !getObjectShapes( anActiveViewId, KIND_LAND_COVER_MAP ).isEmpty() ) {
           theMenu->addAction( action( LandCoverScalarMapModeOnId ) );
           theMenu->addSeparator();
         }
       }
-      else if( anIsLandCover )
+      else if( anIsLandCoverMap )
       {
-        theMenu->addAction( action( EditLandCoverId ) );
+        theMenu->addAction( action( AddLandCoverId ) );
+        theMenu->addAction( action( RemoveLandCoverId ) );
+        theMenu->addSeparator();
+        theMenu->addAction( action( SplitLandCoverId ) );
+        theMenu->addAction( action( MergeLandCoverId ) );
         theMenu->addSeparator();
       }      
       else if( anIsVisualState && anIsObjectBrowser )
@@ -701,7 +705,7 @@ void HYDROGUI_Module::contextMenuPopup( const QString& theClient,
     }
 
     bool anIsPoly = anIsPolyline || anIsPolyline3D;
-    if ((anIsPoly && !anIsLandCover) || (!anIsPoly && anIsLandCover))
+    if ((anIsPoly && !anIsLandCoverMap) || (!anIsPoly && anIsLandCoverMap))
       theMenu->addAction( action( ExportToShapeFileID ) );
 
     // Add copy action
@@ -721,7 +725,7 @@ void HYDROGUI_Module::contextMenuPopup( const QString& theClient,
         anIsImmersibleZone || anIsZone || anIsRegion ||
         anIsBathymetry || anIsObstacle || anIsStream ||
         anIsChannel || anIsDigue || anIsDummyObject3D ||
-        anIsValidProfile || anIsGroup || anIsLandCover )
+        anIsValidProfile || anIsGroup || anIsLandCoverMap )
     {
       if( anIsHiddenInSelection )
         theMenu->addAction( action( ShowId ) );
@@ -1081,7 +1085,7 @@ void HYDROGUI_Module::setObjectVisible( const int theViewId,
 
     if ( theObject->GetKind() == KIND_BATHYMETRY && theState ) {
       setLandCoversScalarMapModeOff( theViewId );
-    } else if ( theObject->GetKind() == KIND_LAND_COVER && theState ) {
+    } else if ( theObject->GetKind() == KIND_LAND_COVER_MAP && theState ) {
       getOCCDisplayer()->SetToUpdateColorScale();
     }
   }