X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROData%2FHYDROData_Bathymetry.h;h=8a0d8504aa2b07546d355556f0bd56ef973d7522;hb=9082efb75ca2505f8b4c5096d37e8d87491cd5d9;hp=1cffaaf27919a943c65b36ef19fee097b2d83cb2;hpb=abdcba0f2ee048bf3c1f6073ef7fea4f0b200dcb;p=modules%2Fhydro.git diff --git a/src/HYDROData/HYDROData_Bathymetry.h b/src/HYDROData/HYDROData_Bathymetry.h index 1cffaaf2..8a0d8504 100644 --- a/src/HYDROData/HYDROData_Bathymetry.h +++ b/src/HYDROData/HYDROData_Bathymetry.h @@ -20,6 +20,7 @@ #define HYDROData_Bathymetry_HeaderFile #include "HYDROData_IAltitudeObject.h" +#include class QFile; class gp_XYZ; @@ -40,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 AltitudePoints; + double SquareDistance( const AltitudePoint& ) const; + }; + typedef std::vector AltitudePoints; protected: @@ -54,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 }; @@ -116,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 @@ -140,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;