Merge branch 'BR_H2018_3' into BR_2018_V8_5

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

diff --git a/src/HYDROPy/HYDROData_Polyline3D.sip b/src/HYDROPy/HYDROData_Polyline3D.sip
index 6d867e05e97804f3072af74f76756858adce2c52..9e293a032a9dfeea0b75fe4ca099d2892e7db793 100644 (file)
--- a/src/HYDROPy/HYDROData_Polyline3D.sip
+++ b/src/HYDROPy/HYDROData_Polyline3D.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
@@ -34,12 +30,12 @@ public:
   /**
    * Returns default filling color for new 3D polyline.
    */
-  static QColor DefaultFillingColor();
+  virtual QColor DefaultFillingColor() const;
 
   /**
    * Returns default border color for new 3D polyline.
    */
-  static QColor DefaultBorderColor();
+  virtual QColor DefaultBorderColor() const;
 
 
 public:      
@@ -50,7 +46,7 @@ public:
    */
   bool SetPolylineXY( HYDROData_PolylineXY thePolyline,
                               const bool theIsUpdateProfile = true )
-  [bool ( const Handle_HYDROData_PolylineXY&,
+  [bool ( const opencascade::handle<HYDROData_PolylineXY>&,
           const bool = true )];
   %MethodCode
     Handle(HYDROData_PolylineXY) aRef =
@@ -68,7 +64,7 @@ public:
    * Returns reference x,y polyline object of 3D polyline.
    */
   HYDROData_PolylineXY GetPolylineXY() const
-  [Handle_HYDROData_PolylineXY ()];
+  [opencascade::handle<HYDROData_PolylineXY> ()];
   %MethodCode
     Handle(HYDROData_PolylineXY) aRef;
     
@@ -90,7 +86,7 @@ public:
    * Sets reference u,z profile object for 3D polyline.
    */
   bool SetProfileUZ( HYDROData_ProfileUZ theProfile )
-  [bool ( const Handle_HYDROData_ProfileUZ& )];
+  [bool ( const opencascade::handle<HYDROData_ProfileUZ>& )];
   %MethodCode
     Handle(HYDROData_ProfileUZ) aRef =
       Handle(HYDROData_ProfileUZ)::DownCast( createHandle( a0 ) );
@@ -107,7 +103,7 @@ public:
    * Returns reference u,z profile object of 3D polyline.
    */
   HYDROData_ProfileUZ GetProfileUZ() const
-  [Handle_HYDROData_ProfileUZ ()];
+  [Hopencascade::handle<HYDROData_ProfileUZ> ()];
   %MethodCode
     Handle(HYDROData_ProfileUZ) aRef;
     
@@ -130,7 +126,7 @@ public:
    * Reimplemented to remove reference u,z profile.
    */
   bool SetAltitudeObject( HYDROData_IAltitudeObject theAltitude )
-  [bool ( const Handle_HYDROData_IAltitudeObject& )];
+  [bool ( const opencascade::handle<HYDROData_IAltitudeObject>& )];
   %MethodCode
     Handle(HYDROData_IAltitudeObject) aRef =
       Handle(HYDROData_IAltitudeObject)::DownCast( createHandle( a0 ) );
@@ -154,7 +150,7 @@ public:
    * Returns the child u,z profile which has been generated from bathymetry.
    */
   HYDROData_ProfileUZ GetChildProfileUZ( const bool theIsCreate = true ) const
-  [Handle_HYDROData_ProfileUZ ( const bool = true )];
+  [opencascade::handle<HYDROData_ProfileUZ> ( const bool = true )];
   %MethodCode
     Handle(HYDROData_ProfileUZ) aRef;
     
@@ -170,7 +166,7 @@ public:
   /**
    * Sets the child u,z profile for polyline.
    */
-  void SetChildProfileUZ( HYDROData_ProfileUZ theProfile ) [void ( const Handle_HYDROData_ProfileUZ& )];
+  void SetChildProfileUZ( HYDROData_ProfileUZ theProfile ) [void ( const opencascade::handle<HYDROData_ProfileUZ>& )];
   %MethodCode
     Handle(HYDROData_ProfileUZ) aRef =
       Handle(HYDROData_ProfileUZ)::DownCast( createHandle( a0 ) );