debug of tests for DTM

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

diff --git a/src/HYDROData/HYDROData_Bathymetry.h b/src/HYDROData/HYDROData_Bathymetry.h
index c7039c3c511bedcbd0066f55bbf8e257340793a5..3797f19586eee6ace4c51b6fd59a6e90f985a371 100644 (file)
--- a/src/HYDROData/HYDROData_Bathymetry.h
+++ b/src/HYDROData/HYDROData_Bathymetry.h
@@ -20,18 +20,15 @@
 #define HYDROData_Bathymetry_HeaderFile
 
 #include "HYDROData_IAltitudeObject.h"
-#include "HYDROData_QuadtreeNode.hxx"
-
-#ifndef LIGHT_MODE
-#include <vtkPolyData.h>
-#include <vtkIdList.h>
-#endif
+#include <vector>
 
 class QFile;
 class gp_XYZ;
 class gp_XY;
 class Handle_HYDROData_PolylineXY;
-
+class HYDROData_QuadtreeNode;
+class vtkPolyData;
+class vtkIdList;
 
 DEFINE_STANDARD_HANDLE(HYDROData_Bathymetry, HYDROData_IAltitudeObject)
 
@@ -44,9 +41,14 @@ DEFINE_STANDARD_HANDLE(HYDROData_Bathymetry, HYDROData_IAltitudeObject)
 class HYDROData_Bathymetry : public HYDROData_IAltitudeObject
 {
 public:
-
-  typedef gp_XYZ                              AltitudePoint;
-  typedef NCollection_Sequence<AltitudePoint> AltitudePoints;
+  struct AltitudePoint
+  {
+    AltitudePoint( double x=0, double y=0, double z=0 ) { X=x; Y=y; Z=z; }
+    double X;
+    double Y;
+    double Z;
+  };
+  typedef std::vector<AltitudePoint> AltitudePoints;
 
 protected:
 
@@ -151,6 +153,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 );