Porting on OCCT 7.0 and Qt 5. Make compilable version.

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

diff --git a/src/HYDROData/HYDROData_Bathymetry.h b/src/HYDROData/HYDROData_Bathymetry.h
index 0987afbe15f8bc773ca535b34b7c96865dda12f4..39ac30b1d3eee244b349819a4018bc4b937a38fe 100644 (file)
--- a/src/HYDROData/HYDROData_Bathymetry.h
+++ b/src/HYDROData/HYDROData_Bathymetry.h
@@ -21,12 +21,14 @@
 
 #include "HYDROData_IAltitudeObject.h"
 #include "HYDROData_QuadtreeNode.hxx"
+#include <vtkPolyData.h>
+#include <vtkIdList.h>
 
 class QFile;
 class gp_XYZ;
-class Handle_HYDROData_PolylineXY;
+class gp_XY;
+class HYDROData_PolylineXY;
 
-DEFINE_STANDARD_HANDLE(HYDROData_Bathymetry, HYDROData_IAltitudeObject)
 
 
 /**\class HYDROData_Bathymetry
@@ -55,8 +57,7 @@ protected:
   };
 
 public:
-
-  DEFINE_STANDARD_RTTI(HYDROData_Bathymetry);
+  DEFINE_STANDARD_RTTIEXT(HYDROData_Bathymetry, HYDROData_IAltitudeObject);
 
   /**
    * Returns the kind of this object. Must be redefined in all objects of known type.
@@ -86,6 +87,9 @@ public:
   HYDRODATA_EXPORT virtual AltitudePoints   GetAltitudePoints(bool IsConvertToGlobal = false) const;
   HYDRODATA_EXPORT virtual HYDROData_QuadtreeNode* GetQuadtreeNodes() const;
 
+  HYDRODATA_EXPORT virtual vtkPolyData* GetVtkDelaunay2D() const;
+  //HYDRODATA_EXPORT bool interpolZtriangle(const gp_XY& point, vtkIdList* triangle, double* z);
+
   /**
    * Remove all altitude points.
    */
@@ -94,9 +98,10 @@ public:
   /**
    * Returns altitude for given point.
    * \param thePoint the point to examine
+   * \param theMethod interpolation model, default 0 = nearest point
    * \return altitude value
    */
-  HYDRODATA_EXPORT virtual double           GetAltitudeForPoint( const gp_XY& thePoint ) const;
+  HYDRODATA_EXPORT virtual double           GetAltitudeForPoint( const gp_XY& thePoint, int theMethod=0 ) const;
 
 public:
   // Public methods to work with files.
@@ -133,7 +138,7 @@ public:
    */
   HYDRODATA_EXPORT virtual bool             ImportFromFile( const TCollection_AsciiString& theFileName );
 
-  HYDRODATA_EXPORT Handle_HYDROData_PolylineXY CreateBoundaryPolyline() const;
+  HYDRODATA_EXPORT Handle(HYDROData_PolylineXY) CreateBoundaryPolyline() const;
 
   HYDRODATA_EXPORT virtual void UpdateLocalCS( double theDx, double theDy );
 
@@ -145,6 +150,7 @@ private:
   bool                                      importFromXYZFile( QFile&          theFile,
                                                                AltitudePoints& thePoints ) const;
   static std::map<int, HYDROData_QuadtreeNode*> myQuadtrees;
+  static std::map<int, vtkPolyData*> myDelaunay2D;
 
   bool                                      importFromASCFile( QFile&          theFile,
                                                                AltitudePoints& thePoints ) const;