X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROData%2FHYDROData_Bathymetry.h;h=8a0d8504aa2b07546d355556f0bd56ef973d7522;hb=9082efb75ca2505f8b4c5096d37e8d87491cd5d9;hp=0987afbe15f8bc773ca535b34b7c96865dda12f4;hpb=9d44116e703eee10527cef6c81ab5f6805515111;p=modules%2Fhydro.git

diff --git a/src/HYDROData/HYDROData_Bathymetry.h b/src/HYDROData/HYDROData_Bathymetry.h
index 0987afbe..8a0d8504 100644
--- a/src/HYDROData/HYDROData_Bathymetry.h
+++ b/src/HYDROData/HYDROData_Bathymetry.h
@@ -20,11 +20,15 @@
 #define HYDROData_Bathymetry_HeaderFile
 
 #include "HYDROData_IAltitudeObject.h"
-#include "HYDROData_QuadtreeNode.hxx"
+#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)
 
@@ -37,9 +41,16 @@ DEFINE_STANDARD_HANDLE(HYDROData_Bathymetry, HYDROData_IAltitudeObject)
 class HYDROData_Bathymetry : public HYDROData_IAltitudeObject
 {
 public:
+  struct HYDRODATA_EXPORT AltitudePoint
+  {
+    AltitudePoint( double x=0, double y=0, double z=0 );
+    double X;
+    double Y;
+    double Z;
 
-  typedef gp_XYZ                              AltitudePoint;
-  typedef NCollection_Sequence<AltitudePoint> AltitudePoints;
+    double SquareDistance( const AltitudePoint& ) const;
+  };
+  typedef std::vector<AltitudePoint> AltitudePoints;
 
 protected:
 
@@ -51,6 +62,7 @@ protected:
     DataTag_First = HYDROData_IAltitudeObject::DataTag_First + 100, ///< first tag, to reserve
     DataTag_AltitudePoints,    ///< altitude points, array of reals
     DataTag_FilePath,          ///< bathymetry imported file path
+    DataTag_FilePaths,         ///< bathymetry imported file paths
     DataTag_AltitudesInverted, ///< flag to invert z values
   };
 
@@ -86,6 +98,11 @@ public:
   HYDRODATA_EXPORT virtual AltitudePoints   GetAltitudePoints(bool IsConvertToGlobal = false) const;
   HYDRODATA_EXPORT virtual HYDROData_QuadtreeNode* GetQuadtreeNodes() const;
 
+#ifndef LIGHT_MODE
+  HYDRODATA_EXPORT virtual vtkPolyData* GetVtkDelaunay2D() const;
+  //HYDRODATA_EXPORT bool interpolZtriangle(const gp_XY& point, vtkIdList* triangle, double* z);
+#endif
+
   /**
    * Remove all altitude points.
    */
@@ -94,9 +111,10 @@ public:
   /**
    * Returns altitude for given point.
    * \param thePoint the point to examine
+   * \param theMethod interpolation model, default 0 = nearest point
    * \return altitude value
    */
-  HYDRODATA_EXPORT virtual double           GetAltitudeForPoint( const gp_XY& thePoint ) const;
+  HYDRODATA_EXPORT virtual double           GetAltitudeForPoint( const gp_XY& thePoint, int theMethod=0 ) const;
 
 public:
   // Public methods to work with files.
@@ -107,11 +125,15 @@ public:
    */
   HYDRODATA_EXPORT void                     SetFilePath( const TCollection_AsciiString& theFilePath );
 
+  HYDRODATA_EXPORT void                     SetFilePaths( const QStringList& theFilePaths );
+
   /**
    * Returns uploaded bathymetry file path
    */
   HYDRODATA_EXPORT TCollection_AsciiString  GetFilePath() const;
 
+  HYDRODATA_EXPORT QStringList GetFilePaths() const;
+
   /**
    * Set flag indicating needs to invert altitude values
    * \param theIsInverted new invert value
@@ -131,7 +153,9 @@ public:
    * \param theFileName the path to file
    * \return \c true if file has been successfully read
    */
-  HYDRODATA_EXPORT virtual bool             ImportFromFile( const TCollection_AsciiString& theFileName );
+  HYDRODATA_EXPORT virtual bool             ImportFromFiles( const QStringList& theFileNames );
+
+  HYDRODATA_EXPORT virtual bool             ImportFromFile( const QString& theFileName );
 
   HYDRODATA_EXPORT Handle_HYDROData_PolylineXY CreateBoundaryPolyline() const;
 
@@ -145,7 +169,9 @@ private:
   bool                                      importFromXYZFile( QFile&          theFile,
                                                                AltitudePoints& thePoints ) const;
   static std::map<int, HYDROData_QuadtreeNode*> myQuadtrees;
-
+#ifndef LIGHT_MODE
+  static std::map<int, vtkPolyData*> myDelaunay2D;
+#endif
   bool                                      importFromASCFile( QFile&          theFile,
                                                                AltitudePoints& thePoints ) const;