merge BR_v14_rc

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

diff --git a/src/HYDROData/HYDROData_Bathymetry.h b/src/HYDROData/HYDROData_Bathymetry.h
index 854b29f460b44eb9be05a697c4cf54ae96a06246..d33a35231fe1fcfffcb8737d22f3e8940797a140 100644 (file)
--- a/src/HYDROData/HYDROData_Bathymetry.h
+++ b/src/HYDROData/HYDROData_Bathymetry.h
@@ -82,7 +82,7 @@ public:
    * Returns altitude points list.
    * \return points list
    */
-  HYDRODATA_EXPORT virtual AltitudePoints   GetAltitudePoints() const;
+  HYDRODATA_EXPORT virtual AltitudePoints   GetAltitudePoints(bool IsConvertToGlobal = false) const;
   HYDRODATA_EXPORT virtual HYDROData_QuadtreeNode* GetQuadtreeNodes() const;
 
   /**
@@ -145,6 +145,9 @@ private:
                                                                AltitudePoints& thePoints ) const;
   static std::map<int, HYDROData_QuadtreeNode*> myQuadtrees;
 
+  bool                                      importFromASCFile( QFile&          theFile,
+                                                               AltitudePoints& thePoints ) const;
+
 protected:
 
   friend class HYDROData_Iterator;