X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROData%2FHYDROData_Object.cxx;h=87ffb2dfbdd881d30748c7f100de859e02104ad9;hb=c374597f70481110faa82dc189353d689d66bc0c;hp=9b84cef2d03c1123b4b5c903b446b1e539de54ec;hpb=d63a2e4caa93023bac64aef525cc4f597bc72512;p=modules%2Fhydro.git

diff --git a/src/HYDROData/HYDROData_Object.cxx b/src/HYDROData/HYDROData_Object.cxx
index 9b84cef2..87ffb2df 100644
--- a/src/HYDROData/HYDROData_Object.cxx
+++ b/src/HYDROData/HYDROData_Object.cxx
@@ -1,119 +1,66 @@
-#include <HYDROData_Object.h>
 
-#include <TDataStd_Name.hxx>
-#include <TDataStd_ByteArray.hxx>
-#include <TDataStd_UAttribute.hxx>
-#include <TDataStd_IntegerArray.hxx>
-#include <TDataStd_BooleanArray.hxx>
-#include <TDataStd_RealArray.hxx>
-#include <TDF_CopyLabel.hxx>
+#include "HYDROData_Object.h"
 
-#include <QString>
-#include <QStringList>
-#include <QVariant>
+#include "HYDROData_Bathymetry.h"
 
-IMPLEMENT_STANDARD_HANDLE(HYDROData_Object,MMgt_TShared)
-IMPLEMENT_STANDARD_RTTIEXT(HYDROData_Object,MMgt_TShared)
+#include <TNaming_Builder.hxx>
+#include <TNaming_NamedShape.hxx>
 
-// is equal function for unique object mapping
-bool IsEqual(const Handle_HYDROData_Object& theObj1, const Handle_HYDROData_Object& theObj2)
-{
-  return (theObj1->ID() == theObj2->ID());
-}
-
-QString HYDROData_Object::GetName() const
-{
-  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)
-{
-  TDataStd_Name::Set(myLab, TCollection_ExtendedString(theName.toLatin1().constData()));
-}
+#include <TopoDS_Shape.hxx>
 
-QStringList HYDROData_Object::DumpToPython( MapOfTreatedObjects& theTreatedObjects ) const
-{
-  QStringList anEmptyList;
-  return anEmptyList;
-}
+IMPLEMENT_STANDARD_HANDLE(HYDROData_Object,HYDROData_Entity)
+IMPLEMENT_STANDARD_RTTIEXT(HYDROData_Object,HYDROData_Entity)
 
-void HYDROData_Object::Update()
+HYDROData_Object::HYDROData_Object()
+: HYDROData_Entity()
 {
 }
 
-QVariant HYDROData_Object::GetDataVariant()
+HYDROData_Object::~HYDROData_Object()
 {
-  return QVariant();
 }
 
-bool HYDROData_Object::IsRemoved() const
+void HYDROData_Object::SetTopShape( const TopoDS_Shape& theShape )
 {
-  return !myLab.HasAttribute();
+  TNaming_Builder aBuilder( myLab.FindChild( DataTag_TopShape ) );
+  aBuilder.Generated( theShape );
 }
 
-void HYDROData_Object::Remove()
+void HYDROData_Object::SetShape3D( const TopoDS_Shape& theShape )
 {
-  return myLab.ForgetAllAttributes(Standard_True);
+  TNaming_Builder aBuilder( myLab.FindChild( DataTag_Shape3D ) );
+  aBuilder.Generated( theShape );
 }
 
-HYDROData_Object::HYDROData_Object()
+void HYDROData_Object::SetBathymetry( const Handle(HYDROData_Bathymetry)& theBathymetry )
 {
+  SetReferenceObject( theBathymetry, DataTag_Bathymetry );
 }
 
-HYDROData_Object::~HYDROData_Object()
+Handle(HYDROData_Bathymetry) HYDROData_Object::GetBathymetry() const
 {
+  return Handle(HYDROData_Bathymetry)::DownCast( 
+           GetReferenceObject( DataTag_Bathymetry ) );
 }
 
-void HYDROData_Object::CopyTo(Handle_HYDROData_Object theDestination) const
+void HYDROData_Object::RemoveBathymetry()
 {
-  TDF_CopyLabel aCopy(myLab, theDestination->Label());
-  aCopy.Perform();
+  ClearReferenceObjects( DataTag_Bathymetry );
 }
 
-void HYDROData_Object::SetLabel(TDF_Label theLabel)
+TopoDS_Shape HYDROData_Object::getTopShape() const
 {
-  myLab = theLabel;
+  Handle(TNaming_NamedShape) aNamedShape;
+  if( myLab.FindChild( DataTag_TopShape ).FindAttribute( TNaming_NamedShape::GetID(), aNamedShape ) )
+    return aNamedShape->Get();
+  return TopoDS_Shape();
 }
 
-void HYDROData_Object::SaveByteArray(const int theTag, 
-  const char* theData, const int theLen)
+TopoDS_Shape HYDROData_Object::getShape3D() const
 {
-  TDF_Label aLab = theTag == 0 ? myLab : myLab.FindChild(theTag);
-  // array is empty, remove the attribute
-  if (theLen <= 0) {
-    aLab.ForgetAttribute(TDataStd_ByteArray::GetID());
-    return;
-  }
-  // store data of image in byte array
-  Handle(TDataStd_ByteArray) aData;
-  if (!aLab.FindAttribute(TDataStd_ByteArray::GetID(), aData)) {
-    aData = TDataStd_ByteArray::Set(aLab, 1, theLen);
-  }
-  // copy bytes one by one
-  if (aData->Length() != theLen) {
-    Handle(TColStd_HArray1OfByte) aNewData = new TColStd_HArray1OfByte(1, theLen);
-    for(int a = 0; a < theLen; a++)
-      aNewData->SetValue(a + 1, theData[a]);
-    aData->ChangeArray(aNewData);
-  } else {
-    for(int a = 0; a < theLen; a++)
-      aData->SetValue(a + 1, theData[a]);
-  }
+  Handle(TNaming_NamedShape) aNamedShape;
+  if( myLab.FindChild( DataTag_Shape3D ).FindAttribute( TNaming_NamedShape::GetID(), aNamedShape ) )
+    return aNamedShape->Get();
+  return TopoDS_Shape();
 }
 
-const char* HYDROData_Object::ByteArray(const int theTag, int& theLen) const
-{
-  TDF_Label aLab = theTag == 0 ? myLab : myLab.FindChild(theTag);
-  Handle(TDataStd_ByteArray) aData;
-  if (!aLab.FindAttribute(TDataStd_ByteArray::GetID(), aData))
-    return NULL; // return empty image if there is no array
-  theLen = aData->Length();
-  if (theLen)
-    return (const char*)(&(aData->InternalArray()->ChangeArray1().ChangeValue(1)));
-  return NULL;
-}