From: rkv Date: Mon, 13 Jan 2014 07:25:32 +0000 (+0000) Subject: SIP: HYDROData_Confluence is included. X-Git-Tag: BR_hydro_v_1_0~110 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=689300b77850ff61c260063115544e462783620c;p=modules%2Fhydro.git SIP: HYDROData_Confluence is included. --- diff --git a/CMake/UsePyQt4EXT.cmake b/CMake/UsePyQt4EXT.cmake index 7b39624d..1b5c1ab0 100644 --- 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 b8ef0317..224b19e6 100644 --- 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 67769d58..4d629920 100644 --- 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 3d613e08..70a993a2 100644 --- 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 index 00000000..ccbb98af --- /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 +%End + +class HYDROData_Confluence : public HYDROData_NaturalObject +{ + +%TypeHeaderCode +#include +%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 e3b416f1..bc921dee 100644 --- 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( theObject ) ); break; } + case KIND_CONFLUENCE: + { + aRes = new HYDROData_Confluence( *dynamic_cast( theObject ) ); + break; + } case KIND_IMMERSIBLE_ZONE: { aRes = new HYDROData_ImmersibleZone( *dynamic_cast( theObject ) ); diff --git a/src/HYDROPy/HYDROData_Entity.sip b/src/HYDROPy/HYDROData_Entity.sip index 2d2ae58e..88ad8470 100644 --- 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 53bcce3c..93b10b67 100644 --- 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 a1736308..b8ee1120 100644 --- 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;