Merge branch 'BR_MULTI_BATHS' into HEAD

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

diff --git a/src/HYDROGUI/HYDROGUI_DataBrowser.cxx b/src/HYDROGUI/HYDROGUI_DataBrowser.cxx
index 57d868a19f18ad277be9623711f6067442c50fef..eb5f2539e9528b890fa1fa61dd49f6743b6bd33f 100644 (file)
--- a/src/HYDROGUI/HYDROGUI_DataBrowser.cxx
+++ b/src/HYDROGUI/HYDROGUI_DataBrowser.cxx
@@ -188,7 +188,10 @@ void HYDROGUI_OBSelector::fillEntries( QMap<QString, LightApp_DataObject*>& entr
 }
 
 
-HYDROGUI_DataBrowser::HYDROGUI_DataBrowser( HYDROGUI_Module* theModule, SUIT_DataObject* theRoot, QWidget* theParent )
+HYDROGUI_DataBrowser::HYDROGUI_DataBrowser( HYDROGUI_Module* theModule,
+                                            SUIT_DataObject* theRoot,
+                                            QWidget* theParent,
+                                            bool theLandCover/* = false*/)
 : SUIT_DataBrowser( theRoot, theParent ), myModule( theModule )
 {
   SUIT_ResourceMgr* resMgr = theModule->getApp()->resourceMgr();
@@ -211,7 +214,11 @@ HYDROGUI_DataBrowser::HYDROGUI_DataBrowser( HYDROGUI_Module* theModule, SUIT_Dat
 
   QString EntryCol = QObject::tr( "ENTRY_COLUMN" );
   QString RefObjCol = tr( "REF_OBJECT_COLUMN" );
-  QString AltitudeCol = tr( "ALTITUDE_COLUMN" );
+  QString AltitudeCol;
+  if ( theLandCover )
+    AltitudeCol = tr( "LAND_COVER_COLUMN" );
+  else
+    AltitudeCol = tr( "ALTITUDE_COLUMN" );
 
   SUIT_AbstractModel* treeModel = dynamic_cast<SUIT_AbstractModel*>( model() );
   //RKV: treeModel->setSearcher( theModule->getApp() );
@@ -335,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
       {