The data model has been rolled back to previous version.

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

diff --git a/src/HYDROData/HYDROData_Zone.h b/src/HYDROData/HYDROData_Zone.h
index eddee171d3348cee5d93da139ec63e8a56e6e052..c0472ea79906d6789cf1a9f6a1d658129750fd57 100644 (file)
--- a/src/HYDROData/HYDROData_Zone.h
+++ b/src/HYDROData/HYDROData_Zone.h
@@ -22,9 +22,10 @@ public:
   // Enumeration of mergin types for conflict bathymetries
   enum MergeBathymetriesType
   {
-    Merge_ZMIN,   // The minimum values
-    Merge_ZMAX,   // The maximum values
-    Merge_Object  // Only one bathymetry will be taken into account
+    Merge_UNKNOWN, // Undefined
+    Merge_ZMIN,    // The minimum values
+    Merge_ZMAX,    // The maximum values
+    Merge_Object   // Only one bathymetry will be taken into account
   };
 
 protected:
@@ -65,9 +66,15 @@ public:
   HYDRODATA_EXPORT virtual TopoDS_Shape GetShape() const;
 
 
+  /**
+   * Returns true if zone needs merge of bathymetries.
+   */
+  HYDRODATA_EXPORT virtual bool IsMergingNeed() const;
+
+
   /**
    * Sets the merging type for conflict bathymetries.
-   * By default it is set to Merge_ZMIN.
+   * By default it is set to Merge_UNKNOWN.
    */
   HYDRODATA_EXPORT virtual void SetMergeType( const MergeBathymetriesType& theType );
 
@@ -119,12 +126,12 @@ protected:
    * Creates new object in the internal data structure. Use higher level objects 
    * to create objects with real content.
    */
-  HYDROData_Zone();
+  HYDRODATA_EXPORT HYDROData_Zone();
 
   /**
    * Destructs properties of the object and object itself, removes it from the document.
    */
-  ~HYDROData_Zone();
+  HYDRODATA_EXPORT ~HYDROData_Zone();
 
 };