refs #653, #665 - 669: start implementation of features.

[modules/hydro.git] / src / HYDROData / HYDROData_Object.cxx

diff --git a/src/HYDROData/HYDROData_Object.cxx b/src/HYDROData/HYDROData_Object.cxx
index 88ce930a911e848c7534fa423dcb059dff59b4ba..78f734ea0a9b387d71b020c1fbae3f0c5e3ed986 100644 (file)
--- a/src/HYDROData/HYDROData_Object.cxx
+++ b/src/HYDROData/HYDROData_Object.cxx
@@ -23,10 +23,6 @@
 #include "HYDROData_Tool.h"
 #include "HYDROData_Iterator.h"
 #include "HYDROData_IAltitudeObject.h"
-
-#include <TNaming_Builder.hxx>
-#include <TNaming_NamedShape.hxx>
-
 #include <TopoDS_Shape.hxx>
 #include <TDataStd_Integer.hxx>
 
@@ -77,11 +73,11 @@ void HYDROData_Object::Update()
 {
   if( IsMustBeUpdated( Geom_2d ) )
   {
-    removeTopShape();
-    removeGroupObjects();
+    RemoveTopShape();
+    RemoveGroupObjects();
   }
   if( IsMustBeUpdated( Geom_3d ) )
-    removeShape3D();
+    RemoveShape3D();
 
   checkAndSetAltitudeObject();
   HYDROData_Entity::Update();
@@ -109,19 +105,26 @@ void HYDROData_Object::Changed( Geometry theChangedGeometry )
 
 void HYDROData_Object::SetTopShape( const TopoDS_Shape& theShape )
 {
-  TNaming_Builder aBuilder( myLab.FindChild( DataTag_TopShape ) );
-  aBuilder.Generated( theShape );
+  HYDROData_Entity::SetShape( DataTag_TopShape, theShape );
+}
+
+TopoDS_Shape HYDROData_Object::GetTopShape() const
+{
+  return HYDROData_Entity::GetShape( DataTag_TopShape );
 }
 
 void HYDROData_Object::SetShape3D( const TopoDS_Shape& theShape )
 {
-  TNaming_Builder aBuilder( myLab.FindChild( DataTag_Shape3D ) );
-  aBuilder.Generated( theShape );
-  
+  HYDROData_Entity::SetShape( DataTag_Shape3D, theShape );
   // Check the object 3D existance
   checkAndSetObject3D();
 }
 
+TopoDS_Shape HYDROData_Object::GetShape3D() const
+{
+  return HYDROData_Entity::GetShape( DataTag_Shape3D );
+}
+
 Handle(HYDROData_DummyObject3D) HYDROData_Object::GetObject3D() const
 {
   Handle(HYDROData_DummyObject3D) anObject;
@@ -232,7 +235,7 @@ void HYDROData_Object::SetFillingColor( const QColor& theColor )
 
 QColor HYDROData_Object::GetFillingColor() const
 {
-  return GetColor( getDefaultFillingColor(), DataTag_FillingColor );
+  return GetColor( DefaultFillingColor(), DataTag_FillingColor );
 }
 
 void HYDROData_Object::SetBorderColor( const QColor& theColor )
@@ -242,15 +245,15 @@ void HYDROData_Object::SetBorderColor( const QColor& theColor )
 
 QColor HYDROData_Object::GetBorderColor() const
 {
-  return GetColor( getDefaultBorderColor(), DataTag_BorderColor );
+  return GetColor( DefaultBorderColor(), DataTag_BorderColor );
 }
 
-QColor HYDROData_Object::getDefaultFillingColor() const
+QColor HYDROData_Object::DefaultFillingColor() const
 {
   return QColor( Qt::yellow );
 }
 
-QColor HYDROData_Object::getDefaultBorderColor() const
+QColor HYDROData_Object::DefaultBorderColor() const
 {
   return QColor( Qt::transparent );
 }
@@ -264,10 +267,10 @@ QStringList HYDROData_Object::dumpObjectCreation( MapOfTreatedObjects& theTreate
   QStringList aColorsDef;
 
   QColor aFillingColor = GetFillingColor();
-  setPythonObjectColor( aColorsDef, aFillingColor, getDefaultFillingColor(), "SetFillingColor" );
+  setPythonObjectColor( aColorsDef, aFillingColor, DefaultFillingColor(), "SetFillingColor" );
 
   QColor aBorderColor = GetBorderColor();
-  setPythonObjectColor( aColorsDef, aBorderColor, getDefaultBorderColor(), "SetBorderColor" );
+  setPythonObjectColor( aColorsDef, aBorderColor, DefaultBorderColor(), "SetBorderColor" );
 
   if ( !aColorsDef.isEmpty() )
   {
@@ -337,51 +340,21 @@ Handle(HYDROData_ShapesGroup) HYDROData_Object::createGroupObject()
   return aNewGroup;
 }
 
-void HYDROData_Object::removeGroupObjects()
+void HYDROData_Object::RemoveGroupObjects()
 {
   TDF_Label aLabel = myLab.FindChild( DataTag_EdgesGroup, false );
   if ( !aLabel.IsNull() )
     aLabel.ForgetAllAttributes();
 }
 
-TopoDS_Shape HYDROData_Object::getTopShape() const
+void HYDROData_Object::RemoveTopShape()
 {
-  TDF_Label aLabel = myLab.FindChild( DataTag_TopShape, false );
-  if ( !aLabel.IsNull() )
-  {
-    Handle(TNaming_NamedShape) aNamedShape;
-    if( aLabel.FindAttribute( TNaming_NamedShape::GetID(), aNamedShape ) )
-      return aNamedShape->Get();
-  }
-
-  return TopoDS_Shape();
+  HYDROData_Entity::SetShape( DataTag_TopShape, TopoDS_Shape() );
 }
 
-void HYDROData_Object::removeTopShape()
+void HYDROData_Object::RemoveShape3D()
 {
-  TDF_Label aLabel = myLab.FindChild( DataTag_TopShape, false );
-  if ( !aLabel.IsNull() )
-    aLabel.ForgetAllAttributes();
-}
-
-TopoDS_Shape HYDROData_Object::getShape3D() const
-{
-  TDF_Label aLabel = myLab.FindChild( DataTag_Shape3D, false );
-  if ( !aLabel.IsNull() )
-  {
-    Handle(TNaming_NamedShape) aNamedShape;
-    if( aLabel.FindAttribute( TNaming_NamedShape::GetID(), aNamedShape ) )
-      return aNamedShape->Get();
-  }
-
-  return TopoDS_Shape();
-}
-
-void HYDROData_Object::removeShape3D()
-{
-  TDF_Label aLabel = myLab.FindChild( DataTag_Shape3D, false );
-  if ( !aLabel.IsNull() )
-    aLabel.ForgetAllAttributes();
+  HYDROData_Entity::SetShape( DataTag_Shape3D, TopoDS_Shape() );
 }
 
 bool HYDROData_Object::IsSubmersible() const