Merge branch 'BR_HYDRO_IMPS_2016' into pre/IMPS_2016

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

diff --git a/src/HYDROData/HYDROData_Bathymetry.h b/src/HYDROData/HYDROData_Bathymetry.h
index 4c8a23e64e694ade5e421e9cdb37c8645eddce37..8a0d8504aa2b07546d355556f0bd56ef973d7522 100644 (file)
--- a/src/HYDROData/HYDROData_Bathymetry.h
+++ b/src/HYDROData/HYDROData_Bathymetry.h
@@ -41,12 +41,14 @@ DEFINE_STANDARD_HANDLE(HYDROData_Bathymetry, HYDROData_IAltitudeObject)
 class HYDROData_Bathymetry : public HYDROData_IAltitudeObject
 {
 public:
-  struct AltitudePoint
+  struct HYDRODATA_EXPORT AltitudePoint
   {
-    AltitudePoint( double x=0, double y=0, double z=0 ) { X=x; Y=y; Z=z; }
+    AltitudePoint( double x=0, double y=0, double z=0 );
     double X;
     double Y;
     double Z;
+
+    double SquareDistance( const AltitudePoint& ) const;
   };
   typedef std::vector<AltitudePoint> AltitudePoints;
 
@@ -153,6 +155,8 @@ public:
    */
   HYDRODATA_EXPORT virtual bool             ImportFromFiles( const QStringList& theFileNames );
 
+  HYDRODATA_EXPORT virtual bool             ImportFromFile( const QString& theFileName );
+
   HYDRODATA_EXPORT Handle_HYDROData_PolylineXY CreateBoundaryPolyline() const;
 
   HYDRODATA_EXPORT virtual void UpdateLocalCS( double theDx, double theDy );