Initial merge of branch 'BR_HYDRO_IMPS_2016' into BR_PORTING_OCCT_7

[modules/hydro.git] / src / HYDROPy / HYDROData_Stream.sip

diff --git a/src/HYDROPy/HYDROData_Stream.sip b/src/HYDROPy/HYDROData_Stream.sip
index 8b17eff4253652e4cf7264bed98e5a6bf1122f09..7963b776caa4dc2310a23d4932d4db6a620f302f 100644 (file)
--- a/src/HYDROPy/HYDROData_Stream.sip
+++ b/src/HYDROPy/HYDROData_Stream.sip
@@ -1,8 +1,4 @@
-// Copyright (C) 2007-2015  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
@@ -31,26 +27,21 @@ class HYDROData_Stream : public HYDROData_NaturalObject
 %End
 
 public:
-  /**
-   * Update the shape presentations of stream.
-   */
-  void UpdatePrs();
-
   /**
    * Returns default filling color for new stream.
    */
-  static QColor DefaultFillingColor();
+  virtual QColor DefaultFillingColor() const;
 
   /**
    * Returns default border color for new stream.
    */
-  static QColor DefaultBorderColor();
+  virtual QColor DefaultBorderColor() const;
 
   /**
    * Returns true if given polyline can be used as stream axis.
    */
   static bool IsValidAsAxis( HYDROData_PolylineXY theAxis ) 
-  [bool ( const Handle_HYDROData_PolylineXY& )];
+  [bool ( const opencascade::handle<HYDROData_PolylineXY>& )];
   %MethodCode
     Handle(HYDROData_PolylineXY) aRef =
       Handle(HYDROData_PolylineXY)::DownCast( createHandle( a0 ) );
@@ -69,7 +60,7 @@ public:
    * Sets reference hydraulic axis object for stream.
    */
   bool SetHydraulicAxis( HYDROData_PolylineXY theAxis )
-  [bool ( const Handle_HYDROData_PolylineXY& )];
+  [bool ( const opencascade::handle<HYDROData_PolylineXY>& )];
   %MethodCode
     Handle(HYDROData_PolylineXY) aRef =
       Handle(HYDROData_PolylineXY)::DownCast( createHandle( a0 ) );
@@ -86,7 +77,7 @@ public:
    * Returns reference hydraulic axis object of stream.
    */
   HYDROData_PolylineXY GetHydraulicAxis() const
-  [Handle_HYDROData_PolylineXY ()];
+  [opencascade::handle<HYDROData_PolylineXY> ()];
   %MethodCode
     Handle(HYDROData_PolylineXY) aRef;
     
@@ -107,7 +98,7 @@ public:
    * Add new one reference profile object for stream.
    */
   bool AddProfile( HYDROData_Profile theProfile )
-  [bool ( const Handle_HYDROData_Profile& )];
+  [bool ( const opencascade::handle<HYDROData_Profile>& )];
   %MethodCode
     Handle(HYDROData_Profile) aRef =
       Handle(HYDROData_Profile)::DownCast( createHandle( a0 ) );
@@ -129,7 +120,7 @@ public:
    * Removes reference profile object from stream.
    */
   bool RemoveProfile( HYDROData_Profile theProfile )
-  [bool ( const Handle_HYDROData_Profile& )];
+  [bool ( const opencascade::handle<HYDROData_Profile>& )];
   %MethodCode
     Handle(HYDROData_Profile) aRef =
       Handle(HYDROData_Profile)::DownCast( createHandle( a0 ) );
@@ -156,7 +147,7 @@ public:
    * Returns reference bottom polyline object of stream.
    */
   HYDROData_Polyline3D GetBottomPolyline() const
-  [Handle_HYDROData_Polyline3D ()];
+  [opencascade::handle<HYDROData_Polyline3D> ()];
   %MethodCode
     Handle(HYDROData_Polyline3D) aRef;
     
@@ -172,7 +163,7 @@ public:
    * Sets reference bottom polyline object for stream.
    */
   bool SetBottomPolyline( HYDROData_Polyline3D theBottom )
-  [bool ( const Handle_HYDROData_Polyline3D& )];
+  [bool ( const opencascade::handle<HYDROData_Polyline3D>& )];
   %MethodCode
     Handle(HYDROData_Polyline3D) aRef =
       Handle(HYDROData_Polyline3D)::DownCast( createHandle( a0 ) );
@@ -185,6 +176,13 @@ public:
     }
   %End
 
+  /**
+   * Add interpolated profiles into the stream.
+   * \param theInterpolator the interpolator
+   * \return true in case of success
+   */
+  virtual bool Interpolate( HYDROData_IProfilesInterpolator* theInterpolator );
+
 protected:
   /**
    * Creates new object in the internal data structure. Use higher level objects