X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROGUI%2FHYDROGUI_DataObject.cxx;h=b54120e1db8c83b479857063a5d3cf6496647594;hb=5cae7e874afd2fc1b6f61023e8ebd33a933db3c7;hp=f0b47e22b4beb40f0440981ae3271517a0b6a97f;hpb=38afdfd781e77ef1d5135bed210c8ebd4b60f34f;p=modules%2Fhydro.git diff --git a/src/HYDROGUI/HYDROGUI_DataObject.cxx b/src/HYDROGUI/HYDROGUI_DataObject.cxx index f0b47e22..b54120e1 100644 --- a/src/HYDROGUI/HYDROGUI_DataObject.cxx +++ b/src/HYDROGUI/HYDROGUI_DataObject.cxx @@ -23,13 +23,11 @@ #include "HYDROGUI_DataObject.h" #include - #include - #include 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,14 +70,17 @@ 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; }