X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROPy%2FHYDROData_Region.sip;h=444d57f2a48d00fbcc3987ea2b5d694940c45869;hb=f58865bdfb548ebba53ecb264f17ef357fa4c409;hp=8c2017cbb81fbaa1ab820114dbf8125a15a81d17;hpb=84f8b4a57d3cdad820bc1333a5066699cd1c8ae3;p=modules%2Fhydro.git diff --git a/src/HYDROPy/HYDROData_Region.sip b/src/HYDROPy/HYDROData_Region.sip index 8c2017cb..444d57f2 100644 --- a/src/HYDROPy/HYDROData_Region.sip +++ b/src/HYDROPy/HYDROData_Region.sip @@ -24,13 +24,9 @@ #include %End -class HYDROData_Region : HYDROData_Entity +class HYDROData_Region : public HYDROData_Entity { -%TypeHeaderCode -#include -%End - %ConvertToSubClassCode switch ( sipCpp->GetKind() ) { @@ -44,36 +40,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 +%End - /** - * Returns number of reference zones of region. - */ - int NbZones() const; +public: /** * Add new one reference zone for region. @@ -93,75 +64,15 @@ 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. */ - void RemoveZone( HYDROData_Zone theZone ) const [void (const Handle_HYDROData_Zone&)]; + void RemoveZone( HYDROData_Zone theZone ) [void (const Handle_HYDROData_Zone&)]; %MethodCode Handle(HYDROData_Zone) aZone = @@ -176,11 +87,6 @@ public: %End - /** - * Removes reference zone from region by it index. - */ - void RemoveZone( const int theIndex ); - /** * Removes all reference zones from region. */