X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROData%2FHYDROData_Zone.h;h=aba5d5ba8c3a8b60dd349ba0558c2cd84d509f35;hb=90314a195b4d4951ba61a7333cb0de16c253dea9;hp=eddee171d3348cee5d93da139ec63e8a56e6e052;hpb=8538df60dfaeb61e0e44362e20d359747cdae923;p=modules%2Fhydro.git diff --git a/src/HYDROData/HYDROData_Zone.h b/src/HYDROData/HYDROData_Zone.h index eddee171..aba5d5ba 100644 --- 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 );