implementation of the strickler types (integer codes) for points

[modules/hydro.git] / src / HYDROPy / HYDROData_NaturalObject.sip

diff --git a/src/HYDROPy/HYDROData_NaturalObject.sip b/src/HYDROPy/HYDROData_NaturalObject.sip
index d0ec9300db7d7d951e30878b8350622733d9fce8..b59f1ef2c53aaf61725fae91ef98b91a17671bcb 100644 (file)
--- a/src/HYDROPy/HYDROData_NaturalObject.sip
+++ b/src/HYDROPy/HYDROData_NaturalObject.sip
@@ -1,12 +1,8 @@
-// Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
+// Copyright (C) 2014-2015  EDF-R&D
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
 // License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License, or (at your option) any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -20,12 +16,11 @@
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
-
 %ExportedHeaderCode
 #include <HYDROData_NaturalObject.h>
 %End
 
-class HYDROData_NaturalObject : HYDROData_Object /Abstract/
+class HYDROData_NaturalObject : public HYDROData_Object /Abstract/
 {
 %TypeHeaderCode
 #include <HYDROData_NaturalObject.h>
@@ -38,6 +33,14 @@ class HYDROData_NaturalObject : HYDROData_Object /Abstract/
       case KIND_IMMERSIBLE_ZONE:
         sipClass = sipClass_HYDROData_ImmersibleZone;
         break;
+        
+      case KIND_CONFLUENCE:
+        sipClass = sipClass_HYDROData_Confluence;
+        break;
+        
+      case KIND_STREAM:
+        sipClass = sipClass_HYDROData_Stream;
+        break;
 
       case KIND_UNKNOWN:
         sipClass = sipClass_HYDROData_NaturalObject;