X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROGUI%2FHYDROGUI_DataObject.cxx;h=b54120e1db8c83b479857063a5d3cf6496647594;hb=5cae7e874afd2fc1b6f61023e8ebd33a933db3c7;hp=bbd53f6b68e42d0484d48c6c10770242dad26829;hpb=8c87cbf681f35c575bf15818e2afc226c272404d;p=modules%2Fhydro.git

diff --git a/src/HYDROGUI/HYDROGUI_DataObject.cxx b/src/HYDROGUI/HYDROGUI_DataObject.cxx
index bbd53f6b..b54120e1 100644
--- a/src/HYDROGUI/HYDROGUI_DataObject.cxx
+++ b/src/HYDROGUI/HYDROGUI_DataObject.cxx
@@ -23,13 +23,11 @@
 #include "HYDROGUI_DataObject.h"
 
 #include <HYDROData_Image.h>
-
 #include <SUIT_DataObject.h>
-
 #include <TDF_Tool.hxx>
 
 HYDROGUI_DataObject::HYDROGUI_DataObject( SUIT_DataObject* theParent, 
-                                          Handle(HYDROData_Object) theData,
+                                          Handle(HYDROData_Entity) theData,
                                           const QString& theParentEntry )
 : CAM_DataObject( theParent ),
   LightApp_DataObject( theParent ),
@@ -72,30 +70,37 @@ QFont HYDROGUI_DataObject::font( const int theId ) const
   return aFont;
 }
 
-QString HYDROGUI_DataObject::dataObjectEntry( const Handle(HYDROData_Object)& theObject )
+QString HYDROGUI_DataObject::dataObjectEntry( const Handle(HYDROData_Entity)& theObject,
+                                              const bool theWithPrefix )
 {
   QString aEntryStr = QString::null;
   if( !theObject.IsNull() )
   {
     TCollection_AsciiString aLabEntr;
     TDF_Tool::Entry( theObject->Label(), aLabEntr );
-    aEntryStr = HYDROGUI_DataObject::entryPrefix() + QString( aLabEntr.ToCString() );
+    aEntryStr = aLabEntr.ToCString();
+    if( theWithPrefix )
+      aEntryStr.prepend( HYDROGUI_DataObject::entryPrefix() );
   }
   return aEntryStr;
 }
 
 HYDROGUI_NamedObject::HYDROGUI_NamedObject( SUIT_DataObject* theParent,
-                                            const QString& theName )
+                                            const QString&   theName,
+                                            const QString&   theParentEntry  )
 : CAM_DataObject( theParent ),
   LightApp_DataObject( theParent ),
-  myName( theName )
+  myName( theName ),
+  myParentEntry( theParentEntry )
 {
 }
 
 QString HYDROGUI_NamedObject::entry() const
 {
-  //return LightApp_DataObject::entry();
-  return HYDROGUI_DataObject::entryPrefix() + name();
+  QString anEntry = HYDROGUI_DataObject::entryPrefix() + name();
+  if( !myParentEntry.isEmpty() )
+    anEntry.prepend( myParentEntry + "_" );
+  return anEntry;
 }
 
 QString HYDROGUI_NamedObject::name() const