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

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

diff --git a/src/HYDROData/HYDROData_Zone.h b/src/HYDROData/HYDROData_Zone.h
index a01db41e835c4b10c06d2ddb0b584bd4fe203f78..ed7e1d7cbf843ef1b9d16913611215e1e61a8ce9 100644 (file)
--- a/src/HYDROData/HYDROData_Zone.h
+++ b/src/HYDROData/HYDROData_Zone.h
@@ -5,7 +5,7 @@
 #include <HYDROData_Entity.h>
 
 class Handle(HYDROData_Object);
-class Handle(HYDROData_Bathymetry);
+class Handle(HYDROData_IAltitudeObject);
 class TopoDS_Shape;
 
 DEFINE_STANDARD_HANDLE(HYDROData_Zone, HYDROData_Entity)
@@ -19,13 +19,13 @@ class HYDROData_Zone : public HYDROData_Entity
 
 public:
 
-  // Enumeration of mergin types for conflict bathymetries
-  enum MergeBathymetriesType
+  // Enumeration of mergin types for conflict altitudes
+  enum MergeAltitudesType
   {
     Merge_UNKNOWN, // Undefined
     Merge_ZMIN,    // The minimum values
     Merge_ZMAX,    // The maximum values
-    Merge_Object   // Only one bathymetry will be taken into account
+    Merge_Object   // Only one altitude will be taken into account
   };
 
 protected:
@@ -38,7 +38,7 @@ protected:
     DataTag_Shape,           ///< reference shape
     DataTag_GeometryObject,  ///< reference geometry objects
     DataTag_MergeType,       ///< mergin type of conflict bathymetries
-    DataTag_Bathymetry,      ///< reference bathymetry
+    DataTag_MergeAltitude,   ///< reference altitude for conflict merge
   };
 
 public:
@@ -90,32 +90,32 @@ public:
 
 
   /**
-   * Sets the merging type for conflict bathymetries.
+   * Sets the merging type for conflict altitudes.
    * By default it is set to Merge_UNKNOWN.
    */
-  HYDRODATA_EXPORT virtual void SetMergeType( const MergeBathymetriesType& theType );
+  HYDRODATA_EXPORT virtual void SetMergeType( const MergeAltitudesType& theType );
 
   /**
-   * Returns the merging type for conflict bathymetries.
+   * Returns the merging type for conflict altitudes.
    */
-  HYDRODATA_EXPORT virtual MergeBathymetriesType GetMergeType() const;
+  HYDRODATA_EXPORT virtual MergeAltitudesType GetMergeType() const;
 
 
   /**
-   * Sets the reference bathymetry to resolve the conflict.
+   * Sets the reference altitude to resolve the conflict.
    * This object is used only in case of "Merge_Object" merge type.
    */
-  HYDRODATA_EXPORT virtual void SetMergeBathymetry( const Handle(HYDROData_Bathymetry)& theBathymetry );
+  HYDRODATA_EXPORT virtual void SetMergeAltitude( const Handle(HYDROData_IAltitudeObject)& theAltitude );
 
   /**
-   * Returns the reference bathymetry to resolve the conflict.
+   * Returns the reference altitude to resolve the conflict.
    */
-  HYDRODATA_EXPORT virtual Handle(HYDROData_Bathymetry) GetMergeBathymetry() const;
+  HYDRODATA_EXPORT virtual Handle(HYDROData_IAltitudeObject) GetMergeAltitude() const;
 
   /**
-   * Removes the reference bathymetry for resolving the conflict.
+   * Removes the reference altitude for resolving the conflict.
    */
-  HYDRODATA_EXPORT virtual void RemoveMergeBathymetry();
+  HYDRODATA_EXPORT virtual void RemoveMergeAltitude();
   
 
   /**