X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROPy%2FHYDROData_Region.sip;h=444d57f2a48d00fbcc3987ea2b5d694940c45869;hb=f58865bdfb548ebba53ecb264f17ef357fa4c409;hp=5566811be15b0ddc4f2ff5fc0955284e95e26dd7;hpb=b2793422d30042c499edd45b1a13e1b38f9189dd;p=modules%2Fhydro.git

diff --git a/src/HYDROPy/HYDROData_Region.sip b/src/HYDROPy/HYDROData_Region.sip
index 5566811b..444d57f2 100644
--- a/src/HYDROPy/HYDROData_Region.sip
+++ b/src/HYDROPy/HYDROData_Region.sip
@@ -24,13 +24,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,58 +40,12 @@ class HYDROData_Region : HYDROData_Entity
     }
 %End
 
-public:
-
-  // Enumeration of mergin types for conflict bathymetries
-  enum MergeBathymetriesType
-  {
-    Merge_ZMIN,
-    Merge_ZMAX
-  };
+%TypeHeaderCode
+#include <HYDROData_Region.h>
+%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();
-
-
-  /**
-   * Sets the merging type for conflict bathymetries.
-   * By default it is set to Merge_ZMIN.
-   */
-  void SetMergeType( const MergeBathymetriesType& theType );
-
-  /**
-   * Returns the merging type for conflict bathymetries.
-   */
-  MergeBathymetriesType GetMergeType() const;
-
-
-  /**
-   * Returns number of reference zones of region.
-   */
-  int NbZones() const;
-
   /**
    * Add new one reference zone for region.
    */
@@ -114,70 +64,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.
@@ -197,11 +87,6 @@ public:
 
   %End
 
-  /**
-   * Removes reference zone from region by it index.
-   */
-  void RemoveZone( const int theIndex );
-
   /**
    * Removes all reference zones from region.
    */