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
Bug #478: unresolved conflicts appear again when Edit calculation case in Manual...
[modules/hydro.git]
/
src
/
HYDROPy
/
HYDROData.sip
diff --git
a/src/HYDROPy/HYDROData.sip
b/src/HYDROPy/HYDROData.sip
index e3146295f76f432eed6bd804508cd56eb10baf70..f78a73fe3a057e4dc152bb9b3660bbad02153660 100644
(file)
--- a/
src/HYDROPy/HYDROData.sip
+++ b/
src/HYDROPy/HYDROData.sip
@@
-56,11
+56,15
@@
See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
%Include CAS/TCollection_AsciiString.sip
%Include CAS/NCollection_Sequence.sip
%Include HYDROData_SequenceOfObjects.sip
%Include CAS/TCollection_AsciiString.sip
%Include CAS/NCollection_Sequence.sip
%Include HYDROData_SequenceOfObjects.sip
+%Include HYDROData_IInterpolator.sip
%Include HYDROData_Entity.sip
%Include HYDROData_ShapesGroup.sip
%Include HYDROData_Entity.sip
%Include HYDROData_ShapesGroup.sip
+%Include HYDROData_SplittedShapesGroup.sip
%Include HYDROData_IPolyline.sip
%Include HYDROData_IAltitudeObject.sip
%Include HYDROData_IPolyline.sip
%Include HYDROData_IAltitudeObject.sip
+%Include HYDROData_AltitudeObject.sip
%Include HYDROData_ObstacleAltitude.sip
%Include HYDROData_ObstacleAltitude.sip
+%Include HYDROData_StreamAltitude.sip
%Include HYDROData_Object.sip
%Include HYDROData_Profile.sip
%Include HYDROData_Polyline3D.sip
%Include HYDROData_Object.sip
%Include HYDROData_Profile.sip
%Include HYDROData_Polyline3D.sip
@@
-69,10
+73,11
@@
See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
%Include HYDROData_ArtificialObject.sip
%Include HYDROData_Obstacle.sip
%Include HYDROData_Channel.sip
%Include HYDROData_ArtificialObject.sip
%Include HYDROData_Obstacle.sip
%Include HYDROData_Channel.sip
-
//
Include HYDROData_Digue.sip
+
%
Include HYDROData_Digue.sip
%Include HYDROData_NaturalObject.sip
%Include HYDROData_NaturalObject.sip
+%Include HYDROData_Confluence.sip
%Include HYDROData_River.sip
%Include HYDROData_River.sip
-
//
Include HYDROData_Stream.sip
+
%
Include HYDROData_Stream.sip
%Include HYDROData_Image.sip
%Include HYDROData_PolylineXY.sip
%Include HYDROData_Bathymetry.sip
%Include HYDROData_Image.sip
%Include HYDROData_PolylineXY.sip
%Include HYDROData_Bathymetry.sip
@@
-82,5
+87,6
@@
See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
%Include HYDROData_CalculationCase.sip
%Include HYDROData_Document.sip
%Include HYDROData_CalculationCase.sip
%Include HYDROData_Document.sip
+%Include HYDROData_Application.sip