Merge remote-tracking branch 'origin/BR_SHAPE_RECOGNITION' into BR_v14_rc

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

diff --git a/src/HYDROPy/HYDROData_ImmersibleZone.sip b/src/HYDROPy/HYDROData_ImmersibleZone.sip
index 326dd5cbdbeb9ad62646a69bc0d24bab7b314d0f..bd9ecd7a9f6b4f69e467aa9b75aed1660020be2f 100644 (file)
--- a/src/HYDROPy/HYDROData_ImmersibleZone.sip
+++ b/src/HYDROPy/HYDROData_ImmersibleZone.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_ImmersibleZone.h>
 %End
 
-class HYDROData_ImmersibleZone : HYDROData_NaturalObject
+class HYDROData_ImmersibleZone : public HYDROData_NaturalObject
 {
 
 %TypeHeaderCode
@@ -46,26 +42,6 @@ class HYDROData_ImmersibleZone : HYDROData_NaturalObject
 
 public:      
 
-  /**
-   * Sets filling color for zone.
-   */
-  void SetFillingColor( const QColor& theColor );
-
-  /**
-   * Returns filling color of zone.
-   */
-  QColor GetFillingColor() const;
-
-  /**
-   * Sets border color for zone.
-   */
-  void SetBorderColor( const QColor& theColor );
-
-  /**
-   * Returns border color of zone.
-   */
-  QColor GetBorderColor() const;
-
   /**
    * Sets reference polyline object for zone.
    */
@@ -106,46 +82,6 @@ public:
    */
   void RemovePolyline();
 
-  /**
-   * Set reference bathymetry object for zone.
-   */
-  void SetBathymetry( HYDROData_Bathymetry theBathymetry ) [void (const Handle_HYDROData_Bathymetry&)];
-  %MethodCode
-
-    Handle(HYDROData_Bathymetry) aRefBath =
-      Handle(HYDROData_Bathymetry)::DownCast( createHandle( a0 ) );
-    if ( !aRefBath.IsNull() )
-    {
-      Py_BEGIN_ALLOW_THREADS
-      sipSelfWasArg ? sipCpp->HYDROData_ImmersibleZone::SetBathymetry( aRefBath ) : 
-                      sipCpp->SetBathymetry( aRefBath );
-      Py_END_ALLOW_THREADS
-    }
-
-  %End
-
-  /**
-   * Returns reference bathymetry object of zone.
-   */
-  HYDROData_Bathymetry GetBathymetry() const [Handle_HYDROData_Bathymetry ()];
-  %MethodCode
-
-    Handle(HYDROData_Bathymetry) aRefBath;
-    
-    Py_BEGIN_ALLOW_THREADS
-    aRefBath = sipSelfWasArg ? sipCpp->HYDROData_ImmersibleZone::GetBathymetry() : 
-                               sipCpp->GetBathymetry();
-    Py_END_ALLOW_THREADS
-    
-    sipRes = (HYDROData_Bathymetry*)createPointer( aRefBath );
-  
-  %End
-
-  /**
-   * Clear the bathymetry object for zone.
-   */
-  void RemoveBathymetry();
-
 protected:
 
   /**