X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROData%2FHYDROData_Zone.h;h=2bdcac746de8207bad6968862cea690eab9acb72;hb=81c9f5cdf82909d0aebd2c491c50fa7516cc80b7;hp=a01db41e835c4b10c06d2ddb0b584bd4fe203f78;hpb=c6ed1fc51a1a0c344f148e006c9601f98fe184f3;p=modules%2Fhydro.git

diff --git a/src/HYDROData/HYDROData_Zone.h b/src/HYDROData/HYDROData_Zone.h
index a01db41e..2bdcac74 100644
--- a/src/HYDROData/HYDROData_Zone.h
+++ b/src/HYDROData/HYDROData_Zone.h
@@ -2,10 +2,11 @@
 #ifndef HYDROData_Zone_HeaderFile
 #define HYDROData_Zone_HeaderFile
 
-#include <HYDROData_Entity.h>
+#include "HYDROData_Entity.h"
+#include "HYDROData_IInterpolator.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 +20,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 +39,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:
@@ -49,16 +50,17 @@ public:
    */
   HYDRODATA_EXPORT virtual const ObjectKind GetKind() const { return KIND_ZONE; }
 
+
   /**
-   * Dump object to Python script representation.
+   * Returns flag indicating that object is updateble or not.
    */
-  HYDRODATA_EXPORT virtual QStringList DumpToPython( MapOfTreatedObjects& theTreatedObjects ) const;
+  HYDRODATA_EXPORT virtual bool CanBeUpdated() const;
 
 
   /**
-   * Returns flag indicating that object is updateble or not.
+   * Checks that object has 2D presentation. Reimlemented to retun true.
    */
-  HYDRODATA_EXPORT virtual bool CanBeUpdated() const;
+  HYDRODATA_EXPORT virtual bool IsHas2dPrs() const;
 
 
   /**
@@ -90,32 +92,46 @@ public:
 
 
   /**
-   * Sets the merging type for conflict bathymetries.
+   * Sets the interpolator for zone. By default it is NULL and original
+   * interpolation algorithms are used to calculate points altitudes.
+   * If you set interpolator it won't be stored in the data model structure,
+   * it will be deleted during that time as this zone will be freed.
+   */
+  HYDRODATA_EXPORT virtual void SetInterpolator( HYDROData_IInterpolator* theInter );
+
+  /**
+   * * Returns the interpolator of zone object.
+   */
+  HYDRODATA_EXPORT virtual HYDROData_IInterpolator* GetInterpolator() const;
+
+
+  /**
+   * 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();
   
 
   /**
@@ -133,7 +149,6 @@ public:
    */
   HYDRODATA_EXPORT virtual void RemoveGeometryObjects();
 
-
 protected:
 
   friend class HYDROData_Region;
@@ -150,6 +165,9 @@ protected:
    */
   HYDRODATA_EXPORT ~HYDROData_Zone();
 
+private:
+  HYDROData_IInterpolator* myInterpolator;
+
 };
 
 #endif