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

diff --git a/src/HYDROGUI/HYDROGUI_DataObject.cxx b/src/HYDROGUI/HYDROGUI_DataObject.cxx
index e060a5ac..bab5e039 100644
--- a/src/HYDROGUI/HYDROGUI_DataObject.cxx
+++ b/src/HYDROGUI/HYDROGUI_DataObject.cxx
@@ -23,12 +23,7 @@
 #include "HYDROGUI_DataObject.h"
 
 #include <HYDROData_Image.h>
-#include <HYDROData_Zone.h>
-#include <HYDROData_Object.h>
-#include <HYDROData_Bathymetry.h>
-
 #include <SUIT_DataObject.h>
-
 #include <TDF_Tool.hxx>
 
 HYDROGUI_DataObject::HYDROGUI_DataObject( SUIT_DataObject* theParent, 
@@ -68,64 +63,13 @@ 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::text( const int theColumnId ) const
-{
-  QString aRes;
-  if( !myData.IsNull() )
-  {
-    if ( theColumnId == RefObjectId || theColumnId == BathymetryId )
-    {
-      Handle(HYDROData_Zone) aZone = Handle(HYDROData_Zone)::DownCast( myData );
-      if ( !aZone.IsNull() )
-      {
-        HYDROData_SequenceOfObjects aSeq = aZone->GetGeometryObjects();
-        HYDROData_SequenceOfObjects::Iterator anIter( aSeq );
-        for ( ; anIter.More(); anIter.Next() )
-        {
-          Handle(HYDROData_Object) aRefGeomObj =
-            Handle(HYDROData_Object)::DownCast( anIter.Value() );
-          if ( !aRefGeomObj.IsNull() )
-          {
-            switch ( theColumnId )
-            {
-              case RefObjectId:
-                // Get Ref.Object name
-                aRes += aRefGeomObj->GetName() + ", ";
-                break;
-              case BathymetryId:
-                // Get bathymetry name
-                aRes += aRefGeomObj->GetBathymetry()->GetName();
-            }
-          }
-        }
-      }
-      if ( aRes.length() > 1 )
-      {
-        aRes.remove( aRes.length() - 2, 2 );
-      }
-    }
-    else
-    {
-      aRes = LightApp_DataObject::text( theColumnId );
-    }
-  }
-  return aRes;
-}
-
-QColor HYDROGUI_DataObject::color( const ColorRole theColorRole, const int theColumnId ) const
-{
-  //TODO: Implement red color for bathymetry conflicts in case creation dialog
-  return LightApp_DataObject::color( theColorRole, theColumnId );
-}
-
-
 QString HYDROGUI_DataObject::dataObjectEntry( const Handle(HYDROData_Entity)& theObject,
                                               const bool theWithPrefix )
 {
@@ -163,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 )
+{
+}
+