Altitude object for stream added.

diff --git a/CMake/UsePyQt4EXT.cmake b/CMake/UsePyQt4EXT.cmake
index b3898524b8657d92a6b46087f6083fa1c50be3b4..ce9201388086d6cdfd859de15f1ad0aa775a6572 100644 (file)
--- a/CMake/UsePyQt4EXT.cmake
+++ b/CMake/UsePyQt4EXT.cmake
@@ -76,6 +76,9 @@ MACRO(PYQT4_WRAP_SIP_EXT outfiles)
     LIST(APPEND _output ${CMAKE_CURRENT_BINARY_DIR}/sipHYDROPyHYDROData_ObstacleAltitude.cc)
     SET(${outfiles} ${${outfiles}} ${CMAKE_CURRENT_BINARY_DIR}/sipHYDROPyHYDROData_ObstacleAltitude.cc)
 
+    LIST(APPEND _output ${CMAKE_CURRENT_BINARY_DIR}/sipHYDROPyHYDROData_StreamAltitude.cc)
+    SET(${outfiles} ${${outfiles}} ${CMAKE_CURRENT_BINARY_DIR}/sipHYDROPyHYDROData_StreamAltitude.cc)
+
     LIST(APPEND _output ${CMAKE_CURRENT_BINARY_DIR}/sipHYDROPyHYDROData_Image.cc)
     SET(${outfiles} ${${outfiles}} ${CMAKE_CURRENT_BINARY_DIR}/sipHYDROPyHYDROData_Image.cc)
 

diff --git a/src/HYDROPy/CMakeLists.txt b/src/HYDROPy/CMakeLists.txt
index 4d62992084708282d8fb5866b9ab42fdc387c75f..1e3ef48acf5366b6e1e4d1ea525b04671d89bb6b 100644 (file)
--- a/src/HYDROPy/CMakeLists.txt
+++ b/src/HYDROPy/CMakeLists.txt
@@ -66,6 +66,7 @@ SET(_sip_files2
   HYDROData_IAltitudeObject.sip
   HYDROData_AltitudeObject.sip
   HYDROData_ObstacleAltitude.sip
+  HYDROData_StreamAltitude.sip
   HYDROData_Object.sip
   HYDROData_Profile.sip
   HYDROData_Polyline3D.sip

diff --git a/src/HYDROPy/HYDROData.sip b/src/HYDROPy/HYDROData.sip
index 70a993a26fe6bbf6be6961df7bd3c698e0f88af7..ecaceb97e7f377ec9a6f0227f792dbcb320bd516 100644 (file)
--- a/src/HYDROPy/HYDROData.sip
+++ b/src/HYDROPy/HYDROData.sip
@@ -63,6 +63,7 @@ See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 %Include HYDROData_IAltitudeObject.sip
 %Include HYDROData_AltitudeObject.sip
 %Include HYDROData_ObstacleAltitude.sip
+%Include HYDROData_StreamAltitude.sip
 %Include HYDROData_Object.sip
 %Include HYDROData_Profile.sip
 %Include HYDROData_Polyline3D.sip

diff --git a/src/HYDROPy/HYDROData_Entity.sip b/src/HYDROPy/HYDROData_Entity.sip
index 88ad8470c34f3ca845682a78d6dea40bfa25a6a9..6208ab9fe1027a0c49360683ef53e4b8ce2007a0 100644 (file)
--- a/src/HYDROPy/HYDROData_Entity.sip
+++ b/src/HYDROPy/HYDROData_Entity.sip
@@ -44,6 +44,9 @@ const ObjectKind KIND_POLYLINEXY;
 const ObjectKind KIND_CALCULATION;
 const ObjectKind KIND_ZONE;
 const ObjectKind KIND_REGION;
+const ObjectKind KIND_SHAPES_GROUP;
+const ObjectKind KIND_SPLITTED_GROUP;
+const ObjectKind KIND_OBSTACLE_ALTITUDE;
 
 class HYDROData_Entity
 {
@@ -55,74 +58,74 @@ class HYDROData_Entity
     // HYDROData_Entity sub-classes provide a unique kind ID.
     switch ( sipCpp->GetKind() )
     {
-      case KIND_ALTITUDE:
-        sipClass = sipClass_HYDROData_AltitudeObject;
-        break;
-      
       case KIND_IMAGE:
         sipClass = sipClass_HYDROData_Image;
         break;
 
-      case KIND_POLYLINEXY:
-        sipClass = sipClass_HYDROData_PolylineXY;
-        break;
-
-      case KIND_PROFILEUZ:
-        sipClass = sipClass_HYDROData_ProfileUZ;
+      case KIND_POLYLINE:
+        sipClass = sipClass_HYDROData_Polyline3D;
         break;
 
       case KIND_BATHYMETRY:
         sipClass = sipClass_HYDROData_Bathymetry;
         break;
 
-      case KIND_OBSTACLE_ALTITUDE:
-        sipClass = sipClass_HYDROData_ObstacleAltitude;
+      case KIND_ALTITUDE:
+        sipClass = sipClass_HYDROData_AltitudeObject;
         break;
 
-      case KIND_CONFLUENCE:
-        sipClass = sipClass_HYDROData_Confluence;
-        break;
-        
       case KIND_IMMERSIBLE_ZONE:
         sipClass = sipClass_HYDROData_ImmersibleZone;
         break;
-        
-      case KIND_DIGUE:
-        sipClass = sipClass_HYDROData_Digue;
+
+      case KIND_RIVER:
+        sipClass = sipClass_HYDROData_River;
+        break;
+
+      case KIND_STREAM:
+        sipClass = sipClass_HYDROData_Stream;
+        break;
+
+      case KIND_CONFLUENCE:
+        sipClass = sipClass_HYDROData_Confluence;
         break;
 
       case KIND_CHANNEL:
         sipClass = sipClass_HYDROData_Channel;
         break;
-      
-      case KIND_CALCULATION:
-        sipClass = sipClass_HYDROData_CalculationCase;
-        break;
 
       case KIND_OBSTACLE:
         sipClass = sipClass_HYDROData_Obstacle;
         break;
 
-      case KIND_POLYLINE:
-        sipClass = sipClass_HYDROData_Polyline3D;
+      case KIND_DIGUE:
+        sipClass = sipClass_HYDROData_Digue;
         break;
 
       case KIND_PROFILE:
         sipClass = sipClass_HYDROData_Profile;
         break;
 
-      case KIND_REGION:
-        sipClass = sipClass_HYDROData_Region;
+      case KIND_PROFILEUZ:
+        sipClass = sipClass_HYDROData_ProfileUZ;
         break;
 
-      case KIND_STREAM:
-        sipClass = sipClass_HYDROData_Stream;
+      case KIND_POLYLINEXY:
+        sipClass = sipClass_HYDROData_PolylineXY;
+        break;
+
+      case KIND_CALCULATION:
+        sipClass = sipClass_HYDROData_CalculationCase;
         break;
 
       case KIND_ZONE:
         sipClass = sipClass_HYDROData_Zone;
         break;
 
+      case KIND_REGION:
+        sipClass = sipClass_HYDROData_Region;
+        break;
+
       case KIND_SHAPES_GROUP:
         sipClass = sipClass_HYDROData_ShapesGroup;
         break;
@@ -131,6 +134,14 @@ class HYDROData_Entity
         sipClass = sipClass_HYDROData_SplittedShapesGroup;
         break;
 
+      case KIND_STREAM_ALTITUDE:
+        sipClass = sipClass_HYDROData_StreamAltitude;
+        break;
+
+      case KIND_OBSTACLE_ALTITUDE:
+        sipClass = sipClass_HYDROData_ObstacleAltitude;
+        break;
+
       case KIND_UNKNOWN:
         sipClass = sipClass_HYDROData_Entity;
         break;

diff --git a/src/HYDROPy/HYDROData_IAltitudeObject.sip b/src/HYDROPy/HYDROData_IAltitudeObject.sip
index 0dc512a0fb3bc2c69753dd13ce7177ed6791a153..2e5fce946bfd8fa7bc847809589d224ea5e050f9 100644 (file)
--- a/src/HYDROPy/HYDROData_IAltitudeObject.sip
+++ b/src/HYDROPy/HYDROData_IAltitudeObject.sip
@@ -42,6 +42,10 @@ class HYDROData_IAltitudeObject : HYDROData_Entity /Abstract/
         sipClass = sipClass_HYDROData_AltitudeObject;
         break;
       
+      case KIND_STREAM_ALTITUDE:
+        sipClass = sipClass_HYDROData_StreamAltitude;
+        break;
+
       default:
         // We don't recognise the type.
         sipClass = NULL;

diff --git a/src/HYDROPy/HYDROData_StreamAltitude.sip b/src/HYDROPy/HYDROData_StreamAltitude.sip
new file mode 100644 (file)
index 0000000..de34341
--- /dev/null
+++ b/src/HYDROPy/HYDROData_StreamAltitude.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_StreamAltitude.h"
+%End
+
+class HYDROData_StreamAltitude : public HYDROData_IAltitudeObject
+{
+%TypeHeaderCode
+#include "HYDROData_StreamAltitude.h"
+%End
+
+protected:
+
+  /**
+   * Creates new object in the internal data structure. Use higher level objects 
+   * to create objects with real content.
+   */
+  HYDROData_StreamAltitude();
+
+  /**
+   * Destructs properties of the object and object itself, removes it from the document.
+   */
+   ~HYDROData_StreamAltitude();
+};