Refs #289 - Spline profile is represented in OCC view as polyline profile

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

diff --git a/src/HYDROData/HYDROData_Zone.cxx b/src/HYDROData/HYDROData_Zone.cxx
index 29fd5bbe805e24c9bacf9ac9ff6d0cebc36e2231..70272326726f6cf06226ebd22cae9ae70884d477 100644 (file)
--- a/src/HYDROData/HYDROData_Zone.cxx
+++ b/src/HYDROData/HYDROData_Zone.cxx
@@ -2,7 +2,7 @@
 #include "HYDROData_Zone.h"
 
 #include "HYDROData_ArtificialObject.h"
-#include "HYDROData_Bathymetry.h"
+#include "HYDROData_IAltitudeObject.h"
 #include "HYDROData_Document.h"
 #include "HYDROData_NaturalObject.h"
 
@@ -34,7 +34,7 @@ QStringList HYDROData_Zone::DumpToPython( MapOfTreatedObjects& theTreatedObjects
 {
   QStringList aResList;
 
-  Handle(HYDROData_Document) aDocument = HYDROData_Document::Document( this );
+  Handle(HYDROData_Document) aDocument = HYDROData_Document::Document( myLab );
   if ( aDocument.IsNull() )
     return aResList;
 
@@ -63,6 +63,26 @@ QStringList HYDROData_Zone::DumpToPython( MapOfTreatedObjects& theTreatedObjects
   return aResList;
 }
 
+bool HYDROData_Zone::CanBeUpdated() const
+{
+  return false;
+}
+
+bool HYDROData_Zone::CanRemove()
+{
+  return false;
+}
+
+HYDROData_SequenceOfObjects HYDROData_Zone::GetAllReferenceObjects() const
+{
+  HYDROData_SequenceOfObjects aResSeq = HYDROData_Entity::GetAllReferenceObjects();
+
+  HYDROData_SequenceOfObjects aSeqOfGeomObjects = GetGeometryObjects();
+  aResSeq.Append( aSeqOfGeomObjects );
+
+  return aResSeq;
+}
+
 void HYDROData_Zone::SetShape( const TopoDS_Shape& theShape )
 {
   TNaming_Builder aBuilder( myLab.FindChild( DataTag_Shape ) );
@@ -79,7 +99,7 @@ TopoDS_Shape HYDROData_Zone::GetShape() const
 
 bool HYDROData_Zone::IsMergingNeed() const
 {
-  Handle(HYDROData_Bathymetry) aRefBathymetry;
+  Handle(HYDROData_IAltitudeObject) aRefAltitude;
 
   HYDROData_SequenceOfObjects aGeomObjects = GetGeometryObjects();
   HYDROData_SequenceOfObjects::Iterator aGeomObjsIter( aGeomObjects );
@@ -90,56 +110,61 @@ bool HYDROData_Zone::IsMergingNeed() const
     if ( aRefGeomObj.IsNull() )
       continue;
 
-    Handle(HYDROData_Bathymetry) anObjBathymetry = aRefGeomObj->GetBathymetry();
-    if ( anObjBathymetry.IsNull() )
+    Handle(HYDROData_IAltitudeObject) anObjAltitude = aRefGeomObj->GetAltitudeObject();
+    if ( anObjAltitude.IsNull() )
       continue;
 
-    if ( aRefBathymetry.IsNull() )
+    if ( aRefAltitude.IsNull() )
     {
-      aRefBathymetry = anObjBathymetry;
+      aRefAltitude = anObjAltitude;
       continue;
     }
 
-    if ( !IsEqual( aRefBathymetry, anObjBathymetry ) )
+    if ( !IsEqual( aRefAltitude, anObjAltitude ) )
       return true;
   }
 
   return false;
 }
 
-void HYDROData_Zone::SetMergeType( const MergeBathymetriesType& theType )
+void HYDROData_Zone::SetMergeType( const MergeAltitudesType& theType )
 {
   Handle(TDataStd_Integer) anInt;
-  if ( !myLab.FindChild( DataTag_MergeType ).FindAttribute( TDataStd_Integer::GetID(), anInt ) )
-    anInt = TDataStd_Integer::Set( myLab, 0 );
-  anInt->Set( (int)theType );
+  if ( myLab.FindChild( DataTag_MergeType ).FindAttribute( TDataStd_Integer::GetID(), anInt ) )
+  {
+    anInt->Set( (int)theType );
+  }
+  else
+  {
+    anInt = TDataStd_Integer::Set( myLab.FindChild( DataTag_MergeType ), (int)theType );
+  }
 }
 
-HYDROData_Zone::MergeBathymetriesType HYDROData_Zone::GetMergeType() const
+HYDROData_Zone::MergeAltitudesType HYDROData_Zone::GetMergeType() const
 {
-  MergeBathymetriesType aMergeType = Merge_UNKNOWN;
+  MergeAltitudesType aMergeType = Merge_UNKNOWN;
   
   Handle(TDataStd_Integer) anInt;
   if ( myLab.FindChild( DataTag_MergeType ).FindAttribute( TDataStd_Integer::GetID(), anInt ) )
-    aMergeType = (MergeBathymetriesType)anInt->Get();
+    aMergeType = (MergeAltitudesType)anInt->Get();
 
   return aMergeType;
 }
 
-void HYDROData_Zone::SetMergeBathymetry( const Handle(HYDROData_Bathymetry)& theBathymetry )
+void HYDROData_Zone::SetMergeAltitude( const Handle(HYDROData_IAltitudeObject)& theAltitude )
 {
-  SetReferenceObject( theBathymetry, DataTag_Bathymetry );
+  SetReferenceObject( theAltitude, DataTag_MergeAltitude );
 }
 
-Handle(HYDROData_Bathymetry) HYDROData_Zone::GetMergeBathymetry() const
+Handle(HYDROData_IAltitudeObject) HYDROData_Zone::GetMergeAltitude() const
 {
-  return Handle(HYDROData_Bathymetry)::DownCast( 
-           GetReferenceObject( DataTag_Bathymetry ) );
+  return Handle(HYDROData_IAltitudeObject)::DownCast( 
+           GetReferenceObject( DataTag_MergeAltitude ) );
 }
 
-void HYDROData_Zone::RemoveMergeBathymetry()
+void HYDROData_Zone::RemoveMergeAltitude()
 {
-  ClearReferenceObjects( DataTag_Bathymetry );
+  ClearReferenceObjects( DataTag_MergeAltitude );
 }
 
 bool HYDROData_Zone::AddGeometryObject( const Handle(HYDROData_Object)& theObject )