Merge branch 'master' of https://git.salome-platform.org/git/modules/hydro

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

diff --git a/src/HYDROGUI/HYDROGUI_DataBrowser.cxx b/src/HYDROGUI/HYDROGUI_DataBrowser.cxx
index 3d8b1875a0b301c930ce55b919ed424059d0e5f2..eb5f2539e9528b890fa1fa61dd49f6743b6bd33f 100644 (file)
--- a/src/HYDROGUI/HYDROGUI_DataBrowser.cxx
+++ b/src/HYDROGUI/HYDROGUI_DataBrowser.cxx
@@ -216,7 +216,7 @@ HYDROGUI_DataBrowser::HYDROGUI_DataBrowser( HYDROGUI_Module* theModule,
   QString RefObjCol = tr( "REF_OBJECT_COLUMN" );
   QString AltitudeCol;
   if ( theLandCover )
-    AltitudeCol = tr( "STRICKLER_TABLE_COLUMN" );
+    AltitudeCol = tr( "LAND_COVER_COLUMN" );
   else
     AltitudeCol = tr( "ALTITUDE_COLUMN" );
 
@@ -342,6 +342,14 @@ void HYDROGUI_DataBrowser::createPopupMenu( QMenu* theMenu )
         isOnlyZones = aModelObj->GetKind()==KIND_ZONE;
         if( !isOnlyZones )
           break;
+
+        SUIT_DataObject* aParentObj = aHydroObj->parent();
+        if ( aParentObj )
+        {
+          isOnlyZones = aParentObj->childCount() > 1;
+          if( !isOnlyZones )
+            break;
+        }
       }
       else
       {