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

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

diff --git a/src/HYDROGUI/HYDROGUI_Module.cxx b/src/HYDROGUI/HYDROGUI_Module.cxx
index 2871e99214fc3687dca8eb6d66ab6d36a8b1830b..81ad9fa08755b9f788dd910c46f02633b4c3bd1b 100644 (file)
--- a/src/HYDROGUI/HYDROGUI_Module.cxx
+++ b/src/HYDROGUI/HYDROGUI_Module.cxx
@@ -399,7 +399,7 @@ void HYDROGUI_Module::contextMenuPopup( const QString& theClient,
       anIsVisibleInSelection |= aVisibility;
       anIsHiddenInSelection |= !aVisibility;
 
-      if ( anObject->CanBeUpdated() && anObject->IsMustBeUpdated() )
+      if ( anObject->CanBeUpdated() && anObject->IsMustBeUpdated( HYDROData_Entity::Geom_All ) )
       {
         anIsMustObjectBeUpdated = true;
       }
@@ -518,12 +518,14 @@ void HYDROGUI_Module::contextMenuPopup( const QString& theClient,
           theMenu->addAction( action( ImportStricklerTableFromFileId ) );          
           break;
         case KIND_LAND_COVER:
-          theMenu->addAction( action( CreateLandCoverId ) );          
+          theMenu->addAction( action( CreateLandCoverId ) ); 
+          theMenu->addAction( action( ImportLandCoverId ) ); 
           break;
         case KIND_CALCULATION:
           theMenu->addAction( action( CreateCalculationId ) );
           break;
         case KIND_POLYLINEXY:
+          theMenu->addAction( action( ImportPolylineId ) );
           theMenu->addAction( action( CreatePolylineId ) );
           break;
         case KIND_POLYLINE:
@@ -599,6 +601,9 @@ void HYDROGUI_Module::contextMenuPopup( const QString& theClient,
       {
         theMenu->addAction( action( EditPolylineId ) );
         theMenu->addSeparator();
+        theMenu->addAction( action( SplitPolylinesId ) );
+        theMenu->addAction( action( MergePolylinesId ) );
+        theMenu->addSeparator();
       }
       else if( anIsPolyline3D )
       {
@@ -680,7 +685,7 @@ void HYDROGUI_Module::contextMenuPopup( const QString& theClient,
 
       if ( anIsStream || anIsChannel || anIsDigue || anIsObstacle )
       {
-        theMenu->addAction( action( PolylineExtraction ) );
+        theMenu->addAction( action( PolylineExtractionId ) );
         theMenu->addSeparator();
       }