X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROData%2FHYDROData_Object.cxx;h=4bc6d2354210af352f73574a91b167bf5a593699;hb=deed826b2d6c39ba2ed410108cdf54d64cded321;hp=00158bbe4609228dca0620e4dd086df1d8ef3d08;hpb=061386caa71490489a0475540932d9f2e48d77dc;p=modules%2Fhydro.git

diff --git a/src/HYDROData/HYDROData_Object.cxx b/src/HYDROData/HYDROData_Object.cxx
index 00158bbe..4bc6d235 100644
--- a/src/HYDROData/HYDROData_Object.cxx
+++ b/src/HYDROData/HYDROData_Object.cxx
@@ -1,197 +1,97 @@
-#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"
 
-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::IsVisible( const int theViewId ) const
+void HYDROData_Object::SetShape3D( const TopoDS_Shape& theShape )
 {
-  ViewId2VisualStateMap aMap;
-  GetViewId2VisualStateMap( aMap );
-  if( aMap.find( theViewId ) != aMap.end() )
-  {
-    const VisualState& aVisualState = aMap[ theViewId ];
-    return aVisualState.Visibility;
-  }
-  return false;
+  TNaming_Builder aBuilder( myLab.FindChild( DataTag_Shape3D ) );
+  aBuilder.Generated( theShape );
 }
 
-void HYDROData_Object::SetVisible( const int theViewId,
-                                   const bool theVal )
+void HYDROData_Object::SetBathymetry( const Handle(HYDROData_Bathymetry)& theBathymetry )
 {
-  if( theViewId == 0 )
-    return;
-
-  ViewId2VisualStateMap aMap;
-  GetViewId2VisualStateMap( aMap );
-
-  VisualState& aVisualState = aMap[ theViewId ];
-  aVisualState.Visibility = theVal;
-
-  SetViewId2VisualStateMap( aMap );
+  SetReferenceObject( theBathymetry, DataTag_Bathymetry );
 }
 
-bool HYDROData_Object::IsRemoved() const
+Handle(HYDROData_Bathymetry) HYDROData_Object::GetBathymetry() const
 {
-  return !myLab.HasAttribute();
+  return Handle(HYDROData_Bathymetry)::DownCast( 
+           GetReferenceObject( DataTag_Bathymetry ) );
 }
 
-void HYDROData_Object::Remove()
+void HYDROData_Object::RemoveBathymetry()
 {
-  return myLab.ForgetAllAttributes(Standard_True);
+  ClearReferenceObjects( DataTag_Bathymetry );
 }
 
-HYDROData_Object::HYDROData_Object()
+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();
 }
 
-HYDROData_Object::~HYDROData_Object()
+TopoDS_Shape HYDROData_Object::getShape3D() const
 {
+  Handle(TNaming_NamedShape) aNamedShape;
+  if( myLab.FindChild( DataTag_Shape3D ).FindAttribute( TNaming_NamedShape::GetID(), aNamedShape ) )
+    return aNamedShape->Get();
+  return TopoDS_Shape();
 }
 
-void HYDROData_Object::CopyTo(Handle_HYDROData_Object theDestination) const
+void HYDROData_Object::SetFillingColor( const QColor& theColor )
 {
-  TDF_CopyLabel aCopy(myLab, theDestination->Label());
-  aCopy.Perform();
+  return SetColor( theColor, DataTag_FillingColor );
 }
 
-void HYDROData_Object::SetLabel(TDF_Label theLabel)
+QColor HYDROData_Object::GetFillingColor() const
 {
-  myLab = theLabel;
+  return GetColor( DefaultFillingColor(), DataTag_FillingColor );
 }
 
-void HYDROData_Object::SaveByteArray(const int theTag, 
-  const char* theData, const int theLen)
+void HYDROData_Object::SetBorderColor( const QColor& theColor )
 {
-  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]);
-  }
+  return SetColor( theColor, DataTag_BorderColor );
 }
 
-const char* HYDROData_Object::ByteArray(const int theTag, int& theLen)
+QColor HYDROData_Object::GetBorderColor() 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;
+  return GetColor( DefaultBorderColor(), DataTag_BorderColor );
 }
 
-void HYDROData_Object::GetViewId2VisualStateMap( ViewId2VisualStateMap& theMap ) const
+QColor HYDROData_Object::DefaultFillingColor()
 {
-  theMap.clear();
-
-  TDF_Label aViewIdLab = myLab.FindChild( DataTag_ViewId );
-  TDF_Label aVisibilityLab = myLab.FindChild( DataTag_Visibility );
-  TDF_Label aTransparencyLab = myLab.FindChild( DataTag_Transparency );
-  TDF_Label aZValueLab = myLab.FindChild( DataTag_ZValue );
-
-  Handle(TDataStd_IntegerArray) aViewIdArray;
-  Handle(TDataStd_BooleanArray) aVisibilityArray;
-  Handle(TDataStd_RealArray) aTransparencyArray;
-  Handle(TDataStd_RealArray) aZValueArray;
-
-  if( !aViewIdLab.FindAttribute( TDataStd_IntegerArray::GetID(), aViewIdArray ) ||
-      !aVisibilityLab.FindAttribute( TDataStd_BooleanArray::GetID(), aVisibilityArray ) ||
-      !aTransparencyLab.FindAttribute( TDataStd_RealArray::GetID(), aTransparencyArray ) ||
-      !aZValueLab.FindAttribute( TDataStd_RealArray::GetID(), aZValueArray ) )
-    return;
-
-  int aSize = qMin( qMin( aViewIdArray->Length(), aVisibilityArray->Length() ),
-                    qMin( aTransparencyArray->Length(), aZValueArray->Length() ) );
-  for( int anIndex = 0; anIndex < aSize; anIndex++ )
-  {
-    int aViewId = aViewIdArray->Value( anIndex );
-    VisualState aVisualState;
-    aVisualState.Visibility = aVisibilityArray->Value( anIndex );
-    aVisualState.Transparency = aTransparencyArray->Value( anIndex );
-    aVisualState.ZValue = aZValueArray->Value( anIndex );
-    theMap[ aViewId ] = aVisualState;
-  }
+  return QColor( Qt::yellow );
 }
 
-void HYDROData_Object::SetViewId2VisualStateMap( const ViewId2VisualStateMap& theMap )
+QColor HYDROData_Object::DefaultBorderColor()
 {
-  TDF_Label aViewIdLab = myLab.FindChild( DataTag_ViewId );
-  TDF_Label aVisibilityLab = myLab.FindChild( DataTag_Visibility );
-  TDF_Label aTransparencyLab = myLab.FindChild( DataTag_Transparency );
-  TDF_Label aZValueLab = myLab.FindChild( DataTag_ZValue );
-
-  aViewIdLab.ForgetAllAttributes();
-  aVisibilityLab.ForgetAllAttributes();
-  aTransparencyLab.ForgetAllAttributes();
-  aZValueLab.ForgetAllAttributes();
-
-  int aSize = theMap.size();
-
-  Handle(TDataStd_IntegerArray) aViewIdArray =
-    TDataStd_IntegerArray::Set( aViewIdLab, 0, aSize-1 );
-  Handle(TDataStd_BooleanArray) aVisibilityArray =
-    TDataStd_BooleanArray::Set( aVisibilityLab, 0, aSize-1 );
-  Handle(TDataStd_RealArray) aTransparencyArray =
-    TDataStd_RealArray::Set( aTransparencyLab, 0, aSize-1 );
-  Handle(TDataStd_RealArray) aZValueArray =
-    TDataStd_RealArray::Set( aZValueLab, 0, aSize-1 );
-
-  int anIndex = 0;
-  ViewId2VisualStateMapIterator anIter( theMap );
-  while( anIter.hasNext() )
-  {
-    int aViewId = anIter.next().key();
-    const VisualState& aVisualState = anIter.value();
-    aViewIdArray->SetValue( anIndex, aViewId );
-    aVisibilityArray->SetValue( anIndex, aVisualState.Visibility );
-    aTransparencyArray->SetValue( anIndex, aVisualState.Transparency );
-    aZValueArray->SetValue( anIndex, aVisualState.ZValue );
-    anIndex++;
-  }
-}
+  return QColor( Qt::transparent );
+}
\ No newline at end of file