X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROPy%2FHYDROData_IAltitudeObject.sip;h=1e93fdcfe86c3e57f7d2a8c9b72e9ef7b556a5be;hb=3bece499e83cc9ca95536228c7f6740030e9d5d8;hp=99cc265eb7fd5f91486d295ca119834e16226734;hpb=b60a48c43d8cce2dffe69ae6fb825379ab988f9b;p=modules%2Fhydro.git

diff --git a/src/HYDROPy/HYDROData_IAltitudeObject.sip b/src/HYDROPy/HYDROData_IAltitudeObject.sip
index 99cc265e..1e93fdcf 100644
--- a/src/HYDROPy/HYDROData_IAltitudeObject.sip
+++ b/src/HYDROPy/HYDROData_IAltitudeObject.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
@@ -24,7 +20,7 @@
 #include <HYDROData_IAltitudeObject.h>
 %End
 
-class HYDROData_IAltitudeObject : HYDROData_Entity /Abstract/
+class HYDROData_IAltitudeObject : public HYDROData_Entity /Abstract/
 {
 
 %ConvertToSubClassCode
@@ -38,10 +34,14 @@ class HYDROData_IAltitudeObject : HYDROData_Entity /Abstract/
         sipClass = sipClass_HYDROData_ObstacleAltitude;
         break;
 
-/*      case KIND_ALTITUDE:
+      case KIND_ALTITUDE:
         sipClass = sipClass_HYDROData_AltitudeObject;
-        break;*/
-      
+        break;
+
+      case KIND_STREAM_ALTITUDE:
+        sipClass = sipClass_HYDROData_StreamAltitude;
+        break;
+
       default:
         // We don't recognise the type.
         sipClass = NULL;
@@ -52,19 +52,39 @@ class HYDROData_IAltitudeObject : HYDROData_Entity /Abstract/
 #include <HYDROData_IAltitudeObject.h>
 %End
 
-public:      
+public:
   // Public methods to work with altitudes.
 
   /**
    * Returns altitude points list.
    * \return points list
    */
-  static double             GetInvalidAltitude();
+  static double GetInvalidAltitude();
+
+  /**
+   * Returns altitude for given point.
+   * \param thePoint the point to examine
+   * \return altitude value
+   */
+  virtual double GetAltitudeForPoint( const double theCoordX,
+                                      const double theCoordX ) const = 0 [double ( const gp_XY&,  int)];
+  %MethodCode
+    gp_XY aPnt( a0, a1 );
+
+    Py_BEGIN_ALLOW_THREADS
+    sipRes = sipCpp->GetAltitudeForPoint( aPnt );
+    Py_END_ALLOW_THREADS
+  %End
+  %VirtualCatcherCode
+    PyObject *sipResObj = sipCallMethod(0, sipMethod, "dd",a0.X(),a0.Y());
+
+    sipParseResultEx(sipGILState, sipErrorHandler, sipPySelf, sipMethod, sipResObj, "d", &sipRes);
+  %End
 
 protected:
 
   /**
-   * Creates new object in the internal data structure. Use higher level objects 
+   * Creates new object in the internal data structure. Use higher level objects
    * to create objects with real content.
    */
   HYDROData_IAltitudeObject();