Merge branch 'BR_v14_rc' into BR_quadtree

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

diff --git a/src/HYDROData/HYDROData_Bathymetry.h b/src/HYDROData/HYDROData_Bathymetry.h
index be47445bb18e05dcc388cce57cd32894d5f7bc35..427199688f9ac274de2a2a927b43788b8ba8fd36 100644 (file)
--- a/src/HYDROData/HYDROData_Bathymetry.h
+++ b/src/HYDROData/HYDROData_Bathymetry.h
@@ -20,6 +20,7 @@
 #define HYDROData_Bathymetry_HeaderFile
 
 #include "HYDROData_IAltitudeObject.h"
+#include "HYDROData_QuadtreeNode.hxx"
 
 class QFile;
 class gp_XYZ;
@@ -82,6 +83,7 @@ public:
    * \return points list
    */
   HYDRODATA_EXPORT virtual AltitudePoints   GetAltitudePoints() const;
+  HYDRODATA_EXPORT virtual HYDROData_QuadtreeNode* GetQuadtreeNodes() const;
 
   /**
    * Remove all altitude points.
@@ -141,6 +143,10 @@ private:
    */
   bool                                      importFromXYZFile( QFile&          theFile,
                                                                AltitudePoints& thePoints ) const;
+  static std::map<int, HYDROData_QuadtreeNode*> myQuadtrees;
+
+  bool                                      importFromASCFile( QFile&          theFile,
+                                                               AltitudePoints& thePoints ) const;
 
 protected: