Salome HOME
projects
/
modules
/
hydro.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tests 1 to 7 OK, 8 and above failed
[modules/hydro.git]
/
src
/
HYDROData
/
HYDROData_Bathymetry.h
diff --git
a/src/HYDROData/HYDROData_Bathymetry.h
b/src/HYDROData/HYDROData_Bathymetry.h
index 881af2c56d5f991c76992079b9e6e45e719f0956..3797f19586eee6ace4c51b6fd59a6e90f985a371 100644
(file)
--- a/
src/HYDROData/HYDROData_Bathymetry.h
+++ b/
src/HYDROData/HYDROData_Bathymetry.h
@@
-1,8
+1,4
@@
-// Copyright (C) 2007-2015 CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
+// 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
// 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
@@
-24,10
+20,15
@@
#define HYDROData_Bathymetry_HeaderFile
#include "HYDROData_IAltitudeObject.h"
#define HYDROData_Bathymetry_HeaderFile
#include "HYDROData_IAltitudeObject.h"
+#include <vector>
class QFile;
class gp_XYZ;
class QFile;
class gp_XYZ;
+class gp_XY;
class Handle_HYDROData_PolylineXY;
class Handle_HYDROData_PolylineXY;
+class HYDROData_QuadtreeNode;
+class vtkPolyData;
+class vtkIdList;
DEFINE_STANDARD_HANDLE(HYDROData_Bathymetry, HYDROData_IAltitudeObject)
DEFINE_STANDARD_HANDLE(HYDROData_Bathymetry, HYDROData_IAltitudeObject)
@@
-40,9
+41,14
@@
DEFINE_STANDARD_HANDLE(HYDROData_Bathymetry, HYDROData_IAltitudeObject)
class HYDROData_Bathymetry : public HYDROData_IAltitudeObject
{
public:
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:
protected:
@@
-54,6
+60,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_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
};
DataTag_AltitudesInverted, ///< flag to invert z values
};
@@
-70,7
+77,8
@@
public:
/**
* Dump Bathymetry object to Python script representation.
*/
/**
* 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.
public:
// Public methods to work with Bathymetry altitudes.
@@
-85,7
+93,13
@@
public:
* Returns altitude points list.
* \return points list
*/
* 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.
/**
* Remove all altitude points.
@@
-95,9
+109,10
@@
public:
/**
* Returns altitude for given point.
* \param thePoint the point to examine
/**
* Returns altitude for given point.
* \param thePoint the point to examine
+ * \param theMethod interpolation model, default 0 = nearest point
* \return altitude value
*/
* \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.
public:
// Public methods to work with files.
@@
-108,11
+123,15
@@
public:
*/
HYDRODATA_EXPORT void SetFilePath( const TCollection_AsciiString& theFilePath );
*/
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;
/**
* 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
/**
* Set flag indicating needs to invert altitude values
* \param theIsInverted new invert value
@@
-132,7
+151,9
@@
public:
* \param theFileName the path to file
* \return \c true if file has been successfully read
*/
* \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;
HYDRODATA_EXPORT Handle_HYDROData_PolylineXY CreateBoundaryPolyline() const;
@@
-145,7
+166,10
@@
private:
*/
bool importFromXYZFile( QFile& theFile,
AltitudePoints& thePoints ) const;
*/
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;
bool importFromASCFile( QFile& theFile,
AltitudePoints& thePoints ) const;