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

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

diff --git a/src/HYDROPy/HYDROData_Region.sip b/src/HYDROPy/HYDROData_Region.sip
index 44be2e0bf2690da36be130a68b414d6c2ff7a891..f3af2f810e820b21ad8acf03d1930f5de3bcc334 100644 (file)
--- a/src/HYDROPy/HYDROData_Region.sip
+++ b/src/HYDROPy/HYDROData_Region.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,13 +20,9 @@
 #include <HYDROData_Region.h>
 %End
 
-class HYDROData_Region : HYDROData_Entity
+class HYDROData_Region : public HYDROData_Entity
 {
 
-%TypeHeaderCode
-#include <HYDROData_Region.h>
-%End
-
 %ConvertToSubClassCode
     switch ( sipCpp->GetKind() )
     {
@@ -44,36 +36,11 @@ class HYDROData_Region : HYDROData_Entity
     }
 %End
 
-public:      
-
-  /**
-   * Create new one reference zone for region on child label.
-   * The new zone is not added into the list of reference zones.
-   */
-  HYDROData_Zone AddNewZone() [Handle_HYDROData_Zone ()];
-  %MethodCode
-
-    Handle(HYDROData_Zone) aNewZone;
-    
-    Py_BEGIN_ALLOW_THREADS
-    aNewZone = sipSelfWasArg ? sipCpp->HYDROData_Region::AddNewZone() : 
-                               sipCpp->AddNewZone();
-    Py_END_ALLOW_THREADS
-    
-    sipRes = (HYDROData_Zone*)createPointer( aNewZone );
-
-  %End
-
-  /**
-   * Removes all child zones from region.
-   */
-  void RemoveChildZones();
-
+%TypeHeaderCode
+#include <HYDROData_Region.h>
+%End
 
-  /**
-   * Returns number of reference zones of region.
-   */
-  int NbZones() const;
+public:      
 
   /**
    * Add new one reference zone for region.
@@ -93,70 +60,10 @@ public:
 
   %End
 
-  /**
-   * Replace the reference zone for region.
-   */
-  void SetZone( const int      theIndex, 
-                HYDROData_Zone theZone ) [void (const int, const Handle_HYDROData_Zone&)];
-  %MethodCode
-
-    Handle(HYDROData_Zone) aZone =
-      Handle(HYDROData_Zone)::DownCast( createHandle( a1 ) );
-    if ( !aZone.IsNull() )
-    {
-      Py_BEGIN_ALLOW_THREADS
-      sipSelfWasArg ? sipCpp->HYDROData_Region::SetZone( a0, aZone ) : 
-                      sipCpp->SetZone( a0, aZone );
-      Py_END_ALLOW_THREADS
-    }
-
-  %End
-
-  /**
-   * Inserts the reference zone for region before given index.
-   */
-  void InsertZone( const int      theBeforeIndex, 
-                   HYDROData_Zone theZone ) [void (const int, const Handle_HYDROData_Zone&)];
-  %MethodCode
-
-    Handle(HYDROData_Zone) aZone =
-      Handle(HYDROData_Zone)::DownCast( createHandle( a1 ) );
-    if ( !aZone.IsNull() )
-    {
-      Py_BEGIN_ALLOW_THREADS
-      sipSelfWasArg ? sipCpp->HYDROData_Region::InsertZone( a0, aZone ) : 
-                      sipCpp->InsertZone( a0, aZone );
-      Py_END_ALLOW_THREADS
-    }
-
-  %End
-
-  /**
-   * Sets reference zones for calculation region.
-   */
-  //void SetZones( const HYDROData_SequenceOfObjects& theZones );
-
-  /**
-   * Returns reference zone of region by index.
-   */
-  HYDROData_Zone GetZone( const int theIndex ) const [Handle_HYDROData_Zone (const int)];
-  %MethodCode
-
-    Handle(HYDROData_Zone) aRefZone;
-    
-    Py_BEGIN_ALLOW_THREADS
-    aRefZone = sipSelfWasArg ? sipCpp->HYDROData_Region::GetZone( a0 ) : 
-                               sipCpp->GetZone( a0 );
-    Py_END_ALLOW_THREADS
-    
-    sipRes = (HYDROData_Zone*)createPointer( aRefZone );
-  
-  %End
-
   /**
    * Returns all reference zone of region.
    */
-  //void HYDROData_SequenceOfObjects GetZones() const;
+  HYDROData_SequenceOfObjects GetZones() const;
 
   /**
    * Removes reference zone from region.
@@ -176,11 +83,6 @@ public:
 
   %End
 
-  /**
-   * Removes reference zone from region by it index.
-   */
-  void RemoveZone( const int theIndex );
-
   /**
    * Removes all reference zones from region.
    */