SIP: HYDROData_Confluence is included.

diff --git a/CMake/UsePyQt4EXT.cmake b/CMake/UsePyQt4EXT.cmake
index 7b39624d619189b91133160f27bb1c0d0c9a315f..1b5c1ab0f46e01ae904454ff50998cb7d3f81636 100644 (file)
--- a/CMake/UsePyQt4EXT.cmake
+++ b/CMake/UsePyQt4EXT.cmake
@@ -88,6 +88,9 @@ MACRO(PYQT4_WRAP_SIP_EXT outfiles)
     LIST(APPEND _output ${CMAKE_CURRENT_BINARY_DIR}/sipHYDROPyHYDROData_NaturalObject.cc)
     SET(${outfiles} ${${outfiles}} ${CMAKE_CURRENT_BINARY_DIR}/sipHYDROPyHYDROData_NaturalObject.cc)
 
+    LIST(APPEND _output ${CMAKE_CURRENT_BINARY_DIR}/sipHYDROPyHYDROData_Confluence.cc)
+    SET(${outfiles} ${${outfiles}} ${CMAKE_CURRENT_BINARY_DIR}/sipHYDROPyHYDROData_Confluence.cc)
+
     LIST(APPEND _output ${CMAKE_CURRENT_BINARY_DIR}/sipHYDROPyHYDROData_Object.cc)
     SET(${outfiles} ${${outfiles}} ${CMAKE_CURRENT_BINARY_DIR}/sipHYDROPyHYDROData_Object.cc)
 

diff --git a/src/HYDROData/HYDROData_Confluence.h b/src/HYDROData/HYDROData_Confluence.h
index b8ef031725de82936a9fb8a73c24ec2ada1308e8..224b19e6b34e4ca5bc5267db56c90c22c140e093 100644 (file)
--- a/src/HYDROData/HYDROData_Confluence.h
+++ b/src/HYDROData/HYDROData_Confluence.h
@@ -27,7 +27,7 @@ public:
   /**
    * Returns the kind of this object. Must be redefined in all objects of known type.
    */
-  HYDRODATA_EXPORT virtual const ObjectKind GetKind() const {return KIND_RIVER;}
+  HYDRODATA_EXPORT virtual const ObjectKind GetKind() const {return KIND_CONFLUENCE;}
 
   /**
    * Dump object to Python script representation.

diff --git a/src/HYDROPy/CMakeLists.txt b/src/HYDROPy/CMakeLists.txt
index 67769d58831e61934a680fb62287ef4ca1e68a14..4d62992084708282d8fb5866b9ab42fdc387c75f 100644 (file)
--- a/src/HYDROPy/CMakeLists.txt
+++ b/src/HYDROPy/CMakeLists.txt
@@ -76,6 +76,7 @@ SET(_sip_files2
   HYDROData_Channel.sip
   HYDROData_Digue.sip
   HYDROData_NaturalObject.sip
+  HYDROData_Confluence.sip
   HYDROData_River.sip
   HYDROData_Stream.sip
   HYDROData_Image.sip

diff --git a/src/HYDROPy/HYDROData.sip b/src/HYDROPy/HYDROData.sip
index 3d613e0868c8c9d6b773c108242a3ba08de339cb..70a993a26fe6bbf6be6961df7bd3c698e0f88af7 100644 (file)
--- a/src/HYDROPy/HYDROData.sip
+++ b/src/HYDROPy/HYDROData.sip
@@ -73,6 +73,7 @@ See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 %Include HYDROData_Channel.sip
 %Include HYDROData_Digue.sip
 %Include HYDROData_NaturalObject.sip
+%Include HYDROData_Confluence.sip
 %Include HYDROData_River.sip
 %Include HYDROData_Stream.sip
 %Include HYDROData_Image.sip

diff --git a/src/HYDROPy/HYDROData_Confluence.sip b/src/HYDROPy/HYDROData_Confluence.sip
new file mode 100644 (file)
index 0000000..ccbb98a
--- /dev/null
+++ b/src/HYDROPy/HYDROData_Confluence.sip
@@ -0,0 +1,45 @@
+// 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
+//
+// 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.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+
+%ExportedHeaderCode
+#include <HYDROData_Confluence.h>
+%End
+
+class HYDROData_Confluence : public HYDROData_NaturalObject
+{
+
+%TypeHeaderCode
+#include <HYDROData_Confluence.h>
+%End
+protected:
+
+  /**
+   * Creates new object in the internal data structure. Use higher level objects 
+   * to create objects with real content.
+   */
+  HYDROData_Confluence();
+
+  /**
+   * Destructs properties of the object and object itself, removes it from the document.
+   */
+  virtual ~HYDROData_Confluence();
+};

diff --git a/src/HYDROPy/HYDROData_Document.sip b/src/HYDROPy/HYDROData_Document.sip
index e3b416f1aa51c2daa00f0cba46fdeb2c89dca6c1..bc921dee6ee6a4ff4213076d23d3f1ffae059596 100644 (file)
--- a/src/HYDROPy/HYDROData_Document.sip
+++ b/src/HYDROPy/HYDROData_Document.sip
@@ -82,6 +82,11 @@ class HYDROData_Document
         aRes = new HYDROData_ObstacleAltitude( *dynamic_cast<HYDROData_ObstacleAltitude*>( theObject ) );
         break;
       }
+      case KIND_CONFLUENCE:
+      {
+        aRes = new HYDROData_Confluence( *dynamic_cast<HYDROData_Confluence*>( theObject ) );
+        break;
+      }
       case KIND_IMMERSIBLE_ZONE:
       {
         aRes = new HYDROData_ImmersibleZone( *dynamic_cast<HYDROData_ImmersibleZone*>( theObject ) );

diff --git a/src/HYDROPy/HYDROData_Entity.sip b/src/HYDROPy/HYDROData_Entity.sip
index 2d2ae58e21dd23e12c845ca995c891ad5ce5ae30..88ad8470c34f3ca845682a78d6dea40bfa25a6a9 100644 (file)
--- a/src/HYDROPy/HYDROData_Entity.sip
+++ b/src/HYDROPy/HYDROData_Entity.sip
@@ -79,6 +79,10 @@ class HYDROData_Entity
         sipClass = sipClass_HYDROData_ObstacleAltitude;
         break;
 
+      case KIND_CONFLUENCE:
+        sipClass = sipClass_HYDROData_Confluence;
+        break;
+        
       case KIND_IMMERSIBLE_ZONE:
         sipClass = sipClass_HYDROData_ImmersibleZone;
         break;

diff --git a/src/HYDROPy/HYDROData_NaturalObject.sip b/src/HYDROPy/HYDROData_NaturalObject.sip
index 53bcce3c5982993883b12dc22b56acf120d8b66f..93b10b672736b7d117940533131c6b54713e0109 100644 (file)
--- a/src/HYDROPy/HYDROData_NaturalObject.sip
+++ b/src/HYDROPy/HYDROData_NaturalObject.sip
@@ -39,6 +39,10 @@ class HYDROData_NaturalObject : HYDROData_Object /Abstract/
         sipClass = sipClass_HYDROData_ImmersibleZone;
         break;
         
+      case KIND_CONFLUENCE:
+        sipClass = sipClass_HYDROData_Confluence;
+        break;
+        
       case KIND_STREAM:
         sipClass = sipClass_HYDROData_Stream;
         break;

diff --git a/src/HYDROPy/HYDROData_Object.sip b/src/HYDROPy/HYDROData_Object.sip
index a1736308469d67a2132cd3233dda78856974750b..b8ee11204fa40fb4ba3b208412cdec14ad8b0a76 100644 (file)
--- a/src/HYDROPy/HYDROData_Object.sip
+++ b/src/HYDROPy/HYDROData_Object.sip
@@ -38,6 +38,10 @@ class HYDROData_Object : HYDROData_Entity /Abstract/
       sipClass = sipClass_HYDROData_Obstacle;
       break;
 
+    case KIND_CONFLUENCE:
+      sipClass = sipClass_HYDROData_Confluence;
+      break;
+      
     case KIND_IMMERSIBLE_ZONE:
       sipClass = sipClass_HYDROData_ImmersibleZone;
       break;