X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROData%2FHYDROData_Bathymetry.h;h=3797f19586eee6ace4c51b6fd59a6e90f985a371;hb=f9d37ee66fa46871478d806faa54de237225d3c6;hp=7c4f092da723d9e40f382439599b2f47f40830f4;hpb=7e825ec456c9331ef0df1cb59865cc55f0d8516a;p=modules%2Fhydro.git diff --git a/src/HYDROData/HYDROData_Bathymetry.h b/src/HYDROData/HYDROData_Bathymetry.h index 7c4f092d..3797f195 100644 --- a/src/HYDROData/HYDROData_Bathymetry.h +++ b/src/HYDROData/HYDROData_Bathymetry.h @@ -1,11 +1,34 @@ +// Copyright (C) 2014-2015 EDF-R&D +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// #ifndef HYDROData_Bathymetry_HeaderFile #define HYDROData_Bathymetry_HeaderFile #include "HYDROData_IAltitudeObject.h" +#include 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) @@ -18,9 +41,14 @@ DEFINE_STANDARD_HANDLE(HYDROData_Bathymetry, HYDROData_IAltitudeObject) class HYDROData_Bathymetry : public HYDROData_IAltitudeObject { public: - - typedef gp_XYZ AltitudePoint; - typedef QList 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 AltitudePoints; protected: @@ -30,8 +58,10 @@ protected: enum DataTag { 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_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 }; public: @@ -47,7 +77,8 @@ public: /** * Dump Bathymetry object to Python script representation. */ - HYDRODATA_EXPORT virtual QStringList DumpToPython( MapOfTreatedObjects& theTreatedObjects ) const; + HYDRODATA_EXPORT virtual QStringList DumpToPython( const QString& thePyScriptPath, + MapOfTreatedObjects& theTreatedObjects ) const; public: // Public methods to work with Bathymetry altitudes. @@ -62,7 +93,13 @@ public: * Returns altitude points list. * \return points list */ - HYDRODATA_EXPORT virtual AltitudePoints GetAltitudePoints() const; + 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. @@ -72,9 +109,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. @@ -83,12 +121,29 @@ public: * Stores the bathymetry file path * \param theFilePath image file path */ - HYDRODATA_EXPORT void SetFilePath( const QString& theFilePath ); + HYDRODATA_EXPORT void SetFilePath( const TCollection_AsciiString& theFilePath ); + + HYDRODATA_EXPORT void SetFilePaths( const QStringList& theFilePaths ); /** * Returns uploaded bathymetry file path */ - HYDRODATA_EXPORT QString GetFilePath() const; + HYDRODATA_EXPORT TCollection_AsciiString GetFilePath() const; + + HYDRODATA_EXPORT QStringList GetFilePaths() const; + + /** + * Set flag indicating needs to invert altitude values + * \param theIsInverted new invert value + * \param theIsUpdate flag indicating necessity to update points + */ + HYDRODATA_EXPORT void SetAltitudesInverted( const bool theIsInverted, + const bool theIsUpdate = true ); + + /** + * Returns flag indicating needs to invert altitude values. + */ + HYDRODATA_EXPORT bool IsAltitudesInverted() const; /** * Imports Bathymetry data from file. The supported file types: @@ -96,8 +151,13 @@ public: * \param theFileName the path to file * \return \c true if file has been successfully read */ + 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 ); private: @@ -105,7 +165,13 @@ private: * Imports Bathymetry data from 'XYZ' file. */ bool importFromXYZFile( QFile& theFile, - AltitudePoints& thePoints ); + AltitudePoints& thePoints ) const; + static std::map myQuadtrees; +#ifndef LIGHT_MODE + static std::map myDelaunay2D; +#endif + bool importFromASCFile( QFile& theFile, + AltitudePoints& thePoints ) const; protected: