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
Merge branch 'BR_HYDRO_IMPS_2016' into pre/IMPS_2016
[modules/hydro.git]
/
src
/
HYDROData
/
HYDROData_Bathymetry.h
diff --git
a/src/HYDROData/HYDROData_Bathymetry.h
b/src/HYDROData/HYDROData_Bathymetry.h
index c7039c3c511bedcbd0066f55bbf8e257340793a5..8a0d8504aa2b07546d355556f0bd56ef973d7522 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"
#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 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)
DEFINE_STANDARD_HANDLE(HYDROData_Bathymetry, HYDROData_IAltitudeObject)
@@
-44,9
+41,16
@@
DEFINE_STANDARD_HANDLE(HYDROData_Bathymetry, HYDROData_IAltitudeObject)
class HYDROData_Bathymetry : public HYDROData_IAltitudeObject
{
public:
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:
protected:
@@
-151,6
+155,8
@@
public:
*/
HYDRODATA_EXPORT virtual bool ImportFromFiles( const QStringList& theFileNames );
*/
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 );
HYDRODATA_EXPORT Handle_HYDROData_PolylineXY CreateBoundaryPolyline() const;
HYDRODATA_EXPORT virtual void UpdateLocalCS( double theDx, double theDy );