Merge remote-tracking branch 'origin/BR_1321_ECW' into BR_DEMO

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

diff --git a/src/HYDROGUI/HYDROGUI_DataBrowser.cxx b/src/HYDROGUI/HYDROGUI_DataBrowser.cxx
index 3d8b1875a0b301c930ce55b919ed424059d0e5f2..66eec4f6f2873b067adee2bb296915a4afc3e624 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" );
 
@@ -277,7 +277,7 @@ HYDROGUI_DataBrowser::HYDROGUI_DataBrowser( HYDROGUI_Module* theModule,
   // Create OBSelector
   new HYDROGUI_OBSelector( this, theModule->getApp()->selectionMgr() );
 
-  treeView()->header()->setResizeMode(SUIT_DataObject::VisibilityId, QHeaderView::Fixed);
+  treeView()->header()->setSectionResizeMode(SUIT_DataObject::VisibilityId, QHeaderView::Fixed);
   treeView()->header()->moveSection(SUIT_DataObject::NameId,SUIT_DataObject::VisibilityId);
   treeView()->setColumnWidth(SUIT_DataObject::VisibilityId, VISIBILITY_COLUMN_WIDTH);
   treeView()->hideColumn( SUIT_DataObject::VisibilityId );
@@ -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
       {