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
workaround for bug #16280 / #1514: tolerance for nodes on the border fixed to 0.01...
[modules/hydro.git]
/
src
/
HYDROData
/
HYDROData_Entity.h
diff --git
a/src/HYDROData/HYDROData_Entity.h
b/src/HYDROData/HYDROData_Entity.h
index 7042b8d06db4731f66b1c9ab1a60c16c27a1b02a..2396654f6623f463f049d5b2069229627b742ec5 100644
(file)
--- a/
src/HYDROData/HYDROData_Entity.h
+++ b/
src/HYDROData/HYDROData_Entity.h
@@
-26,6
+26,15
@@
#include <QString>
#include <Standard_Type.hxx>
#include <QString>
#include <Standard_Type.hxx>
+
+#ifdef NONLS
+#undef NONLS
+#endif
+
+#ifdef NOMINMAX
+#undef NOMINMAX
+#endif
+
class QColor;
class QVariant;
class QStringList;
class QColor;
class QVariant;
class QStringList;
@@
-67,7
+76,7
@@
const ObjectKind KIND_LAND_COVER_OBSOLETE = 27;
const ObjectKind KIND_CHANNEL_ALTITUDE = 28;
const ObjectKind KIND_LAND_COVER_MAP = 29;
const ObjectKind KIND_DTM = 30;
const ObjectKind KIND_CHANNEL_ALTITUDE = 28;
const ObjectKind KIND_LAND_COVER_MAP = 29;
const ObjectKind KIND_DTM = 30;
-const ObjectKind KIND_LAST = KIND_DTM;
+const ObjectKind KIND_LAST = KIND_DTM
+1
;
class MapOfTreatedObjects : public QMap<QString,Handle(Standard_Transient)>
{
class MapOfTreatedObjects : public QMap<QString,Handle(Standard_Transient)>
{
@@
-121,6
+130,9
@@
public:
public:
DEFINE_STANDARD_RTTIEXT(HYDROData_Entity, MMgt_TShared);
public:
DEFINE_STANDARD_RTTIEXT(HYDROData_Entity, MMgt_TShared);
+ HYDRODATA_EXPORT static QString Type( ObjectKind );
+ HYDRODATA_EXPORT virtual QString GetType() const;
+
/**
* Returns the kind of this object. Must be redefined in all objects of known type.
*/
/**
* Returns the kind of this object. Must be redefined in all objects of known type.
*/