X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROData%2FHYDROData_Object.cxx;h=4bc6d2354210af352f73574a91b167bf5a593699;hb=d5ab854432d2b0ec5a504b7f5bbf67d12bec472a;hp=488b03ef973faf061417d121b977fce416089cfa;hpb=5e350d1b82873d4a8b4844d4026221635ebedf10;p=modules%2Fhydro.git

diff --git a/src/HYDROData/HYDROData_Object.cxx b/src/HYDROData/HYDROData_Object.cxx
index 488b03ef..4bc6d235 100644
--- a/src/HYDROData/HYDROData_Object.cxx
+++ b/src/HYDROData/HYDROData_Object.cxx
@@ -1,57 +1,97 @@
-#include <HYDROData_Object.h>
 
-#include <TDataStd_Name.hxx>
-#include <TDF_CopyLabel.hxx>
+#include "HYDROData_Object.h"
 
-IMPLEMENT_STANDARD_HANDLE(HYDROData_Object,MMgt_TShared)
-IMPLEMENT_STANDARD_RTTIEXT(HYDROData_Object,MMgt_TShared)
+#include "HYDROData_Bathymetry.h"
 
-// is equal function for unique object mapping
-bool IsEqual(const Handle_HYDROData_Object& theObj1, const Handle_HYDROData_Object& theObj2)
+#include <TNaming_Builder.hxx>
+#include <TNaming_NamedShape.hxx>
+
+#include <TopoDS_Shape.hxx>
+
+#include <QColor>
+
+IMPLEMENT_STANDARD_HANDLE(HYDROData_Object,HYDROData_Entity)
+IMPLEMENT_STANDARD_RTTIEXT(HYDROData_Object,HYDROData_Entity)
+
+HYDROData_Object::HYDROData_Object()
+: HYDROData_Entity()
 {
-  return (theObj1->ID() == theObj2->ID());
 }
 
-QString HYDROData_Object::GetName() const
+HYDROData_Object::~HYDROData_Object()
 {
-  Handle(TDataStd_Name) aName;
-  if (myLab.FindAttribute(TDataStd_Name::GetID(), aName)) {
-    TCollection_AsciiString aStr(aName->Get());
-    return QString(aStr.ToCString());
-  }
-  return QString();
 }
 
-void HYDROData_Object::SetName(const QString& theName)
+void HYDROData_Object::SetTopShape( const TopoDS_Shape& theShape )
 {
-  TDataStd_Name::Set(myLab, TCollection_ExtendedString(theName.toLatin1().constData()));
+  TNaming_Builder aBuilder( myLab.FindChild( DataTag_TopShape ) );
+  aBuilder.Generated( theShape );
 }
 
-bool HYDROData_Object::IsRemoved() const
+void HYDROData_Object::SetShape3D( const TopoDS_Shape& theShape )
 {
-  return !myLab.HasAttribute();
+  TNaming_Builder aBuilder( myLab.FindChild( DataTag_Shape3D ) );
+  aBuilder.Generated( theShape );
 }
 
-void HYDROData_Object::Remove()
+void HYDROData_Object::SetBathymetry( const Handle(HYDROData_Bathymetry)& theBathymetry )
 {
-  return myLab.ForgetAllAttributes(Standard_True);
+  SetReferenceObject( theBathymetry, DataTag_Bathymetry );
 }
 
-HYDROData_Object::HYDROData_Object()
+Handle(HYDROData_Bathymetry) HYDROData_Object::GetBathymetry() const
 {
+  return Handle(HYDROData_Bathymetry)::DownCast( 
+           GetReferenceObject( DataTag_Bathymetry ) );
 }
 
-HYDROData_Object::~HYDROData_Object()
+void HYDROData_Object::RemoveBathymetry()
+{
+  ClearReferenceObjects( DataTag_Bathymetry );
+}
+
+TopoDS_Shape HYDROData_Object::getTopShape() const
 {
+  Handle(TNaming_NamedShape) aNamedShape;
+  if( myLab.FindChild( DataTag_TopShape ).FindAttribute( TNaming_NamedShape::GetID(), aNamedShape ) )
+    return aNamedShape->Get();
+  return TopoDS_Shape();
 }
 
-void HYDROData_Object::CopyTo(Handle_HYDROData_Object theDestination) const
+TopoDS_Shape HYDROData_Object::getShape3D() const
 {
-  TDF_CopyLabel aCopy(myLab, theDestination->Label());
-  aCopy.Perform();
+  Handle(TNaming_NamedShape) aNamedShape;
+  if( myLab.FindChild( DataTag_Shape3D ).FindAttribute( TNaming_NamedShape::GetID(), aNamedShape ) )
+    return aNamedShape->Get();
+  return TopoDS_Shape();
 }
 
-void HYDROData_Object::SetLabel(TDF_Label theLabel)
+void HYDROData_Object::SetFillingColor( const QColor& theColor )
 {
-  myLab = theLabel;
+  return SetColor( theColor, DataTag_FillingColor );
 }
+
+QColor HYDROData_Object::GetFillingColor() const
+{
+  return GetColor( DefaultFillingColor(), DataTag_FillingColor );
+}
+
+void HYDROData_Object::SetBorderColor( const QColor& theColor )
+{
+  return SetColor( theColor, DataTag_BorderColor );
+}
+
+QColor HYDROData_Object::GetBorderColor() const
+{
+  return GetColor( DefaultBorderColor(), DataTag_BorderColor );
+}
+
+QColor HYDROData_Object::DefaultFillingColor()
+{
+  return QColor( Qt::yellow );
+}
+
+QColor HYDROData_Object::DefaultBorderColor()
+{
+  return QColor( Qt::transparent );
+}
\ No newline at end of file