X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROGUI%2FHYDROGUI_DataObject.cxx;h=bab5e03975076149e87011eed432c43cba875f6a;hb=de7cf9bb0a7a41d6487013c87f4a54d0664cd303;hp=f0b47e22b4beb40f0440981ae3271517a0b6a97f;hpb=38afdfd781e77ef1d5135bed210c8ebd4b60f34f;p=modules%2Fhydro.git diff --git a/src/HYDROGUI/HYDROGUI_DataObject.cxx b/src/HYDROGUI/HYDROGUI_DataObject.cxx index f0b47e22..bab5e039 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 ), @@ -65,21 +63,24 @@ QFont HYDROGUI_DataObject::font( const int theId ) const QFont aFont = LightApp_DataObject::font( theId ); if( theId == NameId ) { - Handle(HYDROData_Image) anImage = Handle(HYDROData_Image)::DownCast( modelObject() ); - if( !anImage.IsNull() && anImage->MustBeUpdated() ) + Handle(HYDROData_Entity) aDataObject = modelObject(); + if( !aDataObject.IsNull() && aDataObject->IsMustBeUpdated() ) aFont.setItalic( true ); } 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; } @@ -106,3 +107,11 @@ QString HYDROGUI_NamedObject::name() const { return myName; } + +HYDROGUI_DropTargetObject::HYDROGUI_DropTargetObject( SUIT_DataObject* theParent, + const QString& theName, + const QString& theParentEntry ) +: HYDROGUI_NamedObject( theParent, theName, theParentEntry ), CAM_DataObject( theParent ) +{ +} +