Keywords for objects creation in python scripts added (Feature #13).

diff --git a/src/HYDROData/HYDROData_Bathymetry.cxx b/src/HYDROData/HYDROData_Bathymetry.cxx
index fbe2dc31c1c24f0cdc7d576cc7084e1a6c38ab87..43b2b1056a822638cd6af8667a51e792b8f80809 100644 (file)
--- a/src/HYDROData/HYDROData_Bathymetry.cxx
+++ b/src/HYDROData/HYDROData_Bathymetry.cxx
@@ -16,7 +16,7 @@
 #include <QStringList>
 
 #define INVALID_ALTITUDE_VALUE -9999.0
-#define PYTHON_BATHYMETRY_ID "4"
+#define PYTHON_BATHYMETRY_ID "KIND_BATHYMETRY"
 
 
 IMPLEMENT_STANDARD_HANDLE(HYDROData_Bathymetry, HYDROData_Object)

diff --git a/src/HYDROData/HYDROData_Image.cxx b/src/HYDROData/HYDROData_Image.cxx
index 08a069fd756abcdb2ef11a4c6943781354fadb7d..49b9f1fbecd143db7947bcd63ac116efa0364676 100644 (file)
--- a/src/HYDROData/HYDROData_Image.cxx
+++ b/src/HYDROData/HYDROData_Image.cxx
@@ -22,7 +22,7 @@
 static const Standard_GUID GUID_MUST_BE_UPDATED("80f2bb81-3873-4631-8ddd-940d2119f000");
 static const Standard_GUID GUID_SELF_SPLITTED("997995aa-5c19-40bf-9a60-ab4b70ad04d8");
 
-#define PYTHON_IMAGE_ID "1"
+#define PYTHON_IMAGE_ID "KIND_IMAGE"
 
 IMPLEMENT_STANDARD_HANDLE(HYDROData_Image, HYDROData_Object)
 IMPLEMENT_STANDARD_RTTIEXT(HYDROData_Image, HYDROData_Object)

diff --git a/src/HYDROData/HYDROData_Polyline.cxx b/src/HYDROData/HYDROData_Polyline.cxx
index d80af2eb11ab0529b3ba95f3dbd62f6c2d6eb1f7..64ae5f201373ee3477dd27b216bac2131cc53232 100755 (executable)
--- a/src/HYDROData/HYDROData_Polyline.cxx
+++ b/src/HYDROData/HYDROData_Polyline.cxx
@@ -18,7 +18,7 @@
 // tage of the child of my label that contains information about the operator
 static const Standard_GUID GUID_MUST_BE_UPDATED("6647e1f7-1971-4c5a-86c7-11ff0291452d");
 
-#define PYTHON_POLYLINE_ID "2"
+#define PYTHON_POLYLINE_ID "KIND_POLYLINE"
 
 IMPLEMENT_STANDARD_HANDLE(HYDROData_Polyline, HYDROData_Object)
 IMPLEMENT_STANDARD_RTTIEXT(HYDROData_Polyline, HYDROData_Object)

diff --git a/src/HYDROPy/HYDROData_Object.sip b/src/HYDROPy/HYDROData_Object.sip
index 3e201871b886da6ffc9a8da04171697aaee7f6ee..ea7165670cc267c7bfe43f6caf8f455030c585ec 100644 (file)
--- a/src/HYDROPy/HYDROData_Object.sip
+++ b/src/HYDROPy/HYDROData_Object.sip
@@ -27,6 +27,12 @@
 
 typedef int ObjectKind;
 
+const ObjectKind KIND_UNKNOWN;
+const ObjectKind KIND_IMAGE;
+const ObjectKind KIND_POLYLINE;
+const ObjectKind KIND_VISUAL_STATE;
+const ObjectKind KIND_BATHYMETRY;
+
 class HYDROData_Object
 {
 %TypeHeaderCode