References in object browser

diff --git a/src/Qtx/QtxListView.cxx b/src/Qtx/QtxListView.cxx
index e009ea3b26fecec9b0375d47dcec164a926352ea..e00dc39ef802870833e0cbe2fc27a60465d370c9 100755 (executable)
--- a/src/Qtx/QtxListView.cxx
+++ b/src/Qtx/QtxListView.cxx
@@ -176,10 +176,12 @@ void QtxListView::setShown( int ind, bool sh )
   }
   else
   {
-    data.width = columnWidth( ind );
-    data.resizeable = header()->isResizeEnabled( ind );
+    int w = columnWidth( ind );
+    bool r = header()->isResizeEnabled( ind );
     setColumnWidth( ind, 0 );
     header()->setResizeEnabled( false, ind );
+    data.width = w;
+    data.resizeable = r;
   }
   updateContents();
 }

diff --git a/src/SalomeApp/SalomeApp_DataModel.cxx b/src/SalomeApp/SalomeApp_DataModel.cxx
index 0340c68440224a03cfdc0763d7529559e297e879..c995ffb878a795a2081df4f2a5714636a85f457f 100644 (file)
--- a/src/SalomeApp/SalomeApp_DataModel.cxx
+++ b/src/SalomeApp/SalomeApp_DataModel.cxx
@@ -35,9 +35,10 @@ SUIT_DataObject* SalomeApp_DataModel::BuildTree( const _PTR(SObject)& obj,
   if ( !obj || !study )
     return aDataObj;
 
-  if ( obj->GetName().size() ) { // skip nameless SObjects
-    _PTR(SComponent) aSComp ( obj );
-
+  _PTR(SObject) refObj;
+  if ( obj->GetName().size() || obj->ReferencedObject( refObj ) )  // skip nameless non references SObjects
+  {
+    _PTR(SComponent) aSComp( obj );
     aDataObj = aSComp ? new SalomeApp_ModuleObject( aSComp, parent ) :
                         new SalomeApp_DataObject  ( obj, parent );
 
@@ -45,7 +46,7 @@ SUIT_DataObject* SalomeApp_DataModel::BuildTree( const _PTR(SObject)& obj,
     for ( ; it->More();it->Next() ) {
       // don't use shared_ptr here, for Data Object will take
       // ownership of this pointer
-      _PTR(SObject) aSO ( it->Value() );
+      _PTR(SObject) aSO( it->Value() );
       BuildTree( aSO, aDataObj, study );
     }
   }

diff --git a/src/SalomeApp/SalomeApp_DataObject.cxx b/src/SalomeApp/SalomeApp_DataObject.cxx
index b1a21c8f6c2451c0c203c7b481d965df743d0fa7..e1937ceb9124f378a8988028563fe88bd2fa8638 100644 (file)
--- a/src/SalomeApp/SalomeApp_DataObject.cxx
+++ b/src/SalomeApp/SalomeApp_DataObject.cxx
@@ -95,6 +95,13 @@ QString SalomeApp_DataObject::name() const
   if ( myObject )
     str = myObject->GetName().c_str();
 
+  if ( str.isEmpty() )
+  {
+    _PTR(SObject) refObj = referencedObject();
+    if ( refObj )
+      str = refObj->GetName().c_str();
+  }
+
   if ( isReference() )
     str = QString( "* " ) + str;