refs #651: wrapping land cover map by Python

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

diff --git a/src/HYDROData/HYDROData_Zone.cxx b/src/HYDROData/HYDROData_Zone.cxx
index 33a7cd2fc782af07c0afb5b1c4c43965987b1811..661e23c9b6a757a4ba1df0d1047fad084edf98c1 100644 (file)
--- a/src/HYDROData/HYDROData_Zone.cxx
+++ b/src/HYDROData/HYDROData_Zone.cxx
@@ -22,22 +22,16 @@
 #include "HYDROData_IAltitudeObject.h"
 #include "HYDROData_Document.h"
 #include "HYDROData_NaturalObject.h"
-
-#include <TNaming_Builder.hxx>
-#include <TNaming_NamedShape.hxx>
-
-#include <TopoDS_Shape.hxx>
-
 #include <QStringList>
-
 #include <TDataStd_Integer.hxx>
+#include <TopoDS_Shape.hxx>
 
 IMPLEMENT_STANDARD_HANDLE(HYDROData_Zone, HYDROData_Entity)
 IMPLEMENT_STANDARD_RTTIEXT(HYDROData_Zone, HYDROData_Entity)
 
 
 HYDROData_Zone::HYDROData_Zone()
-: HYDROData_Entity()
+: HYDROData_Entity( Geom_2d )
 {
   myInterpolator = NULL;
 }
@@ -73,21 +67,12 @@ HYDROData_SequenceOfObjects HYDROData_Zone::GetAllReferenceObjects() const
 
 void HYDROData_Zone::SetShape( const TopoDS_Shape& theShape )
 {
-  TNaming_Builder aBuilder( myLab.FindChild( DataTag_Shape ) );
-  aBuilder.Generated( theShape );
+  HYDROData_Entity::SetShape( DataTag_Shape, theShape );
 }
 
 TopoDS_Shape HYDROData_Zone::GetShape() const
 {
-  TDF_Label aLabel = myLab.FindChild( DataTag_Shape, false );
-  if ( !aLabel.IsNull() )
-  {
-    Handle(TNaming_NamedShape) aNamedShape;
-    if( aLabel.FindAttribute( TNaming_NamedShape::GetID(), aNamedShape ) )
-      return aNamedShape->Get();
-  }
-
-  return TopoDS_Shape();
+  return HYDROData_Entity::GetShape( DataTag_Shape );
 }
 
 bool HYDROData_Zone::IsMergingNeed() const