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 e2828c85cffa01cab64653513ad24d13a26184b7..39ac30b1d3eee244b349819a4018bc4b937a38fe 100644 (file)
--- a/src/HYDROData/HYDROData_Bathymetry.h
+++ b/src/HYDROData/HYDROData_Bathymetry.h
@@ -24,25 +24,11 @@
 #include <vtkPolyData.h>
 #include <vtkIdList.h>
 
-#include <vtkDelaunay2D.h>
-class hydroDelaunay2D: public vtkDelaunay2D
-{
-public:
-  static hydroDelaunay2D *New();
-  virtual int ProcessRequest(vtkInformation*, vtkInformationVector**,  vtkInformationVector*);
-protected:
-  hydroDelaunay2D();
-  ~hydroDelaunay2D();
-  virtual int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *);
-};
-
 class QFile;
 class gp_XYZ;
 class gp_XY;
-class Handle_HYDROData_PolylineXY;
-
+class HYDROData_PolylineXY;
 
-DEFINE_STANDARD_HANDLE(HYDROData_Bathymetry, HYDROData_IAltitudeObject)
 
 
 /**\class HYDROData_Bathymetry
@@ -71,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.
@@ -113,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.
@@ -152,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 );