From: Paul RASCLE <paul.rascle@edf.fr>
Date: Mon, 15 Jun 2015 15:36:52 +0000 (+0200)
Subject: Merge branch 'BR_v14_rc' into BR_quadtree
X-Git-Tag: BR_quadtree_20150925~23
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=f9bd5128a1aed8c1974b1d1cfb87aff32191fa60;p=modules%2Fhydro.git

Merge branch 'BR_v14_rc' into BR_quadtree
---

f9bd5128a1aed8c1974b1d1cfb87aff32191fa60
diff --cc src/HYDROData/HYDROData_Bathymetry.h
index 854b29f4,9cd17328..42719968
--- a/src/HYDROData/HYDROData_Bathymetry.h
+++ b/src/HYDROData/HYDROData_Bathymetry.h
@@@ -143,8 -141,10 +143,11 @@@ private
     */
    bool                                      importFromXYZFile( QFile&          theFile,
                                                                 AltitudePoints& thePoints ) const;
 +  static std::map<int, HYDROData_QuadtreeNode*> myQuadtrees;
  
+   bool                                      importFromASCFile( QFile&          theFile,
+                                                                AltitudePoints& thePoints ) const;
+ 
  protected:
  
    friend class HYDROData_Iterator;