X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROGUI%2FHYDROGUI_DataObject.cxx;h=bab5e03975076149e87011eed432c43cba875f6a;hb=de7cf9bb0a7a41d6487013c87f4a54d0664cd303;hp=c760d195a9ef14140f5e264844d2631dcc1a953d;hpb=527e097b1c23d10890ba04d9d7c4be86ac4abb96;p=modules%2Fhydro.git

diff --git a/src/HYDROGUI/HYDROGUI_DataObject.cxx b/src/HYDROGUI/HYDROGUI_DataObject.cxx
index c760d195..bab5e039 100644
--- a/src/HYDROGUI/HYDROGUI_DataObject.cxx
+++ b/src/HYDROGUI/HYDROGUI_DataObject.cxx
@@ -22,12 +22,12 @@
 
 #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 ),
@@ -58,33 +58,60 @@ QString HYDROGUI_DataObject::name() const
   return QString();
 }
 
-QString HYDROGUI_DataObject::dataObjectEntry( const Handle(HYDROData_Object)& theObject )
+QFont HYDROGUI_DataObject::font( const int theId ) const
+{
+  QFont aFont = LightApp_DataObject::font( theId );
+  if( theId == NameId )
+  {
+    Handle(HYDROData_Entity) aDataObject = modelObject();
+    if( !aDataObject.IsNull() && aDataObject->IsMustBeUpdated() )
+      aFont.setItalic( true );
+  }
+  return aFont;
+}
+
+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
 {
   return myName;
 }
+
+HYDROGUI_DropTargetObject::HYDROGUI_DropTargetObject( SUIT_DataObject* theParent,
+                                            const QString&   theName,
+                                            const QString&   theParentEntry  )
+: HYDROGUI_NamedObject( theParent, theName, theParentEntry ), CAM_DataObject( theParent )
+{
+}
+