Salome HOME
projects
/
modules
/
hydro.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'BR_H2018_3' into BR_2018_V8_5
[modules/hydro.git]
/
src
/
HYDROPy
/
HYDROData_IAltitudeObject.sip
diff --git
a/src/HYDROPy/HYDROData_IAltitudeObject.sip
b/src/HYDROPy/HYDROData_IAltitudeObject.sip
index 0dc512a0fb3bc2c69753dd13ce7177ed6791a153..e1e2742cc80e7c055bd24d3e8a11f955f7eec35e 100644
(file)
--- 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
// 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
//
// 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
#include <HYDROData_IAltitudeObject.h>
%End
-class HYDROData_IAltitudeObject : HYDROData_Entity /Abstract/
+class HYDROData_IAltitudeObject :
public
HYDROData_Entity /Abstract/
{
%ConvertToSubClassCode
{
%ConvertToSubClassCode
@@
-42,6
+38,10
@@
class HYDROData_IAltitudeObject : HYDROData_Entity /Abstract/
sipClass = sipClass_HYDROData_AltitudeObject;
break;
sipClass = sipClass_HYDROData_AltitudeObject;
break;
+ case KIND_STREAM_ALTITUDE:
+ sipClass = sipClass_HYDROData_StreamAltitude;
+ break;
+
default:
// We don't recognise the type.
sipClass = NULL;
default:
// We don't recognise the type.
sipClass = NULL;
@@
-59,15
+59,28
@@
public:
* Returns altitude points list.
* \return points list
*/
* 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
*/
/**
* Returns altitude for given point.
* \param thePoint the point to examine
* \return altitude value
*/
- virtual double GetAltitudeForPoint( const gp_XY& thePoint ) const = 0;
+ virtual double GetAltitudeForPoint( const double theCoordX,
+ const double theCoordX ) const = 0 [double ( const gp_XY& )];
+ %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:
/**
protected:
/**