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 593f5855562b8a8908bb2c51296fae1a6bd746e7..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>
 
+
+#ifdef NONLS
+#undef NONLS
+#endif
+
+#ifdef NOMINMAX
+#undef NOMINMAX
+#endif
+
 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_LAST                = KIND_LAND_COVER_MAP;
+const ObjectKind KIND_LAST                = KIND_DTM+1;
 
 class MapOfTreatedObjects : public QMap<QString,Handle(Standard_Transient)>
 {
@@ -121,6 +130,9 @@ public:
 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.
    */
@@ -414,7 +426,7 @@ protected:
 
 public:
 
-   virtual bool CompareLabels(const Handle(HYDROData_Entity)& theOtherObj);
+   HYDRODATA_EXPORT virtual bool CompareLabels(const Handle(HYDROData_Entity)& theOtherObj);
   
 protected: