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
6.12.2013.Fix of HasIntersection method.
[modules/hydro.git]
/
src
/
HYDROData
/
HYDROData_Bathymetry.h
diff --git
a/src/HYDROData/HYDROData_Bathymetry.h
b/src/HYDROData/HYDROData_Bathymetry.h
index 68d08aac30e9df066810065d22255781bbd45d4b..7c4f092da723d9e40f382439599b2f47f40830f4 100644
(file)
--- a/
src/HYDROData/HYDROData_Bathymetry.h
+++ b/
src/HYDROData/HYDROData_Bathymetry.h
@@
-2,14
+2,12
@@
#ifndef HYDROData_Bathymetry_HeaderFile
#define HYDROData_Bathymetry_HeaderFile
#ifndef HYDROData_Bathymetry_HeaderFile
#define HYDROData_Bathymetry_HeaderFile
-#include
<HYDROData_Object.h>
+#include
"HYDROData_IAltitudeObject.h"
-class gp_XY;
-class gp_XYZ;
-class QPointF;
class QFile;
class QFile;
+class gp_XYZ;
-DEFINE_STANDARD_HANDLE(HYDROData_Bathymetry, HYDROData_Object)
+DEFINE_STANDARD_HANDLE(HYDROData_Bathymetry, HYDROData_
IAltitude
Object)
/**\class HYDROData_Bathymetry
/**\class HYDROData_Bathymetry
@@
-17,7
+15,7
@@
DEFINE_STANDARD_HANDLE(HYDROData_Bathymetry, HYDROData_Object)
*
* The Bathymetry represents measurement of the altitude of points on the terrain.
*/
*
* The Bathymetry represents measurement of the altitude of points on the terrain.
*/
-class HYDROData_Bathymetry : public HYDROData_Object
+class HYDROData_Bathymetry : public HYDROData_
IAltitude
Object
{
public:
{
public:
@@
-31,7
+29,7
@@
protected:
*/
enum DataTag
{
*/
enum DataTag
{
- DataTag_First = HYDROData_Object::DataTag_First + 100, ///< first tag, to reserve
+ DataTag_First = HYDROData_
IAltitude
Object::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
};
@@
-54,12
+52,6
@@
public:
public:
// Public methods to work with Bathymetry altitudes.
public:
// Public methods to work with Bathymetry altitudes.
- /**
- * Returns altitude points list.
- * \return points list
- */
- HYDRODATA_EXPORT static double GetInvalidAltitude();
-
/**
* Replace current altitude points by new one.
* \param thePoints the altitude points list
/**
* Replace current altitude points by new one.
* \param thePoints the altitude points list
@@
-77,13
+69,6
@@
public:
*/
HYDRODATA_EXPORT virtual void RemoveAltitudePoints();
*/
HYDRODATA_EXPORT virtual void RemoveAltitudePoints();
- /**
- * Returns altitude for given point.
- * \param thePoint the point to examine
- * \return altitude value
- */
- HYDRODATA_EXPORT virtual double GetAltitudeForPoint( const QPointF& thePoint ) const;
-
/**
* Returns altitude for given point.
* \param thePoint the point to examine
/**
* Returns altitude for given point.
* \param thePoint the point to examine
@@
-91,7
+76,6
@@
public:
*/
HYDRODATA_EXPORT virtual double GetAltitudeForPoint( const gp_XY& thePoint ) const;
*/
HYDRODATA_EXPORT virtual double GetAltitudeForPoint( const gp_XY& thePoint ) const;
-
public:
// Public methods to work with files.
public:
// Public methods to work with files.
@@
-131,12
+115,12
@@
protected:
* Creates new object in the internal data structure. Use higher level objects
* to create objects with real content.
*/
* Creates new object in the internal data structure. Use higher level objects
* to create objects with real content.
*/
- HYDROData_Bathymetry();
+ HYDROD
ATA_EXPORT HYDROD
ata_Bathymetry();
/**
* Destructs properties of the object and object itself, removes it from the document.
*/
/**
* Destructs properties of the object and object itself, removes it from the document.
*/
- ~HYDROData_Bathymetry();
+
HYDRODATA_EXPORT
~HYDROData_Bathymetry();
};
#endif
};
#endif