X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROPy%2FHYDROData_CalculationCase.sip;h=52c09e4f954aa47742ceb3502fa2b00ab380fc3f;hb=e3143f45b5b09e2ee43f2058fd23de2926fb4944;hp=9ed401988486480b14b05c1d982e02a555b70fb9;hpb=9c947f35615e69e9e54a8c4b074dd1f2be13689c;p=modules%2Fhydro.git diff --git a/src/HYDROPy/HYDROData_CalculationCase.sip b/src/HYDROPy/HYDROData_CalculationCase.sip index 9ed40198..52c09e4f 100644 --- a/src/HYDROPy/HYDROData_CalculationCase.sip +++ b/src/HYDROPy/HYDROData_CalculationCase.sip @@ -72,7 +72,7 @@ public: DataTag_Region, ///< reference regions DataTag_Polyline, ///< reference boundary polyline DataTag_GeometryGroup, ///< reference geometry groups - DataTag_SplittedGroups, ///< reference splitted groups + DataTag_SplitGroups, ///< reference split groups DataTag_CustomRules, ///< custom rules DataTag_AssignmentMode, ///< assignment mode DataTag_StricklerTable, ///< reference Strickler table @@ -87,7 +87,7 @@ public: /** * Add new one reference geometry object for calculation case. */ - bool AddGeometryObject( HYDROData_Object theObject ) [bool ( const Handle_HYDROData_Object& )]; + bool AddGeometryObject( HYDROData_Object theObject ) [bool ( const opencascade::handle& )]; %MethodCode Handle(HYDROData_Object) aRef = Handle(HYDROData_Object)::DownCast( createHandle( a0 ) ); @@ -109,7 +109,7 @@ public: * Removes reference geometry object from calculation case. */ void RemoveGeometryObject( HYDROData_Object theObject ) - [void ( const Handle_HYDROData_Object& )]; + [void ( const opencascade::handle& )]; %MethodCode Handle(HYDROData_Object) aRef = Handle(HYDROData_Object)::DownCast( createHandle( a0 ) ); @@ -134,7 +134,7 @@ public: /** * Add new one reference geometry group for calculation case. */ - bool AddGeometryGroup( HYDROData_ShapesGroup theGroup ) [bool ( const Handle_HYDROData_ShapesGroup& )]; + bool AddGeometryGroup( HYDROData_ShapesGroup theGroup ) [bool ( const opencascade::handle& )]; %MethodCode Handle(HYDROData_ShapesGroup) aRef = Handle(HYDROData_ShapesGroup)::DownCast( createHandle( a0 ) ); @@ -155,7 +155,7 @@ public: /** * Removes reference geometry group from calculation case. */ - void RemoveGeometryGroup( HYDROData_ShapesGroup theGroup ) [void ( const Handle_HYDROData_ShapesGroup& )]; + void RemoveGeometryGroup( HYDROData_ShapesGroup theGroup ) [void ( opencascade::handle& )]; %MethodCode Handle(HYDROData_ShapesGroup) aRef = Handle(HYDROData_ShapesGroup)::DownCast( createHandle( a0 ) ); @@ -180,7 +180,7 @@ public: /** * Sets reference boundary polyline object for calculation case. */ - void SetBoundaryPolyline( HYDROData_PolylineXY thePolyline ) [void ( const Handle_HYDROData_PolylineXY& )]; + void SetBoundaryPolyline( HYDROData_PolylineXY thePolyline ) [void ( opencascade::handle& )]; %MethodCode Handle(HYDROData_PolylineXY) aRef = Handle(HYDROData_PolylineXY)::DownCast( createHandle( a0 ) ); @@ -199,7 +199,7 @@ public: /** * Returns reference boundary polyline object of calculation case. */ - HYDROData_PolylineXY GetBoundaryPolyline() const [Handle_HYDROData_PolylineXY ()]; + HYDROData_PolylineXY GetBoundaryPolyline() const [opencascade::handle ()]; %MethodCode Handle(HYDROData_PolylineXY) aRef; @@ -215,7 +215,38 @@ public: * Remove reference boundary polyline object from calculation case. */ void RemoveBoundaryPolyline(); + + void SetLandCoverMap( HYDROData_LandCoverMap theLandCoverMap ) [void ( const opencascade::handle& )]; + %MethodCode + Handle(HYDROData_LandCoverMap) aRef = + Handle(HYDROData_LandCoverMap)::DownCast( createHandle( a0 ) ); + if ( !aRef.IsNull() ) + { + Py_BEGIN_ALLOW_THREADS + if ( sipSelfWasArg ) { + sipCpp->HYDROData_CalculationCase::SetLandCoverMap( aRef ); + } else { + sipCpp->SetLandCoverMap( aRef ); + } + Py_END_ALLOW_THREADS + } + %End + void SetStricklerTable( HYDROData_StricklerTable theStricklerTable ) [void ( const opencascade::handle& )]; + %MethodCode + Handle(HYDROData_StricklerTable) aRef = + Handle(HYDROData_StricklerTable)::DownCast( createHandle( a0 ) ); + if ( !aRef.IsNull() ) + { + Py_BEGIN_ALLOW_THREADS + if ( sipSelfWasArg ) { + sipCpp->HYDROData_CalculationCase::SetStricklerTable( aRef ); + } else { + sipCpp->SetStricklerTable( aRef ); + } + Py_END_ALLOW_THREADS + } + %End /** * Add new one child region for calculation case. @@ -223,7 +254,7 @@ public: * The label of theZone is changed during this operation * because of new region becomes the new parent for this zone. */ - HYDROData_Region AddNewRegion( HYDROData_Zone theZone ) [Handle_HYDROData_Region ( const Handle_HYDROData_Zone& )]; + HYDROData_Region AddNewRegion( HYDROData_Zone theZone ) [opencascade::handle ( opencascade::handle& )]; %MethodCode Handle(HYDROData_Zone) aRef = Handle(HYDROData_Zone)::DownCast( createHandle( a0 ) ); @@ -244,7 +275,7 @@ public: * Add new one reference region for calculation case. * The label of theRegion is changed in case if old parent is not this calculation. */ - bool AddRegion( HYDROData_Region theRegion ) [bool ( const Handle_HYDROData_Region& )]; + bool AddRegion( HYDROData_Region theRegion ) [bool ( opencascade::handle& )]; %MethodCode Handle(HYDROData_Region) aRef = Handle(HYDROData_Region)::DownCast( createHandle( a0 ) ); @@ -270,7 +301,7 @@ public: /** * Removes reference region from calculation case. */ - void RemoveRegion( HYDROData_Region theRegion ) [void ( const Handle_HYDROData_Region& )]; + void RemoveRegion( HYDROData_Region theRegion ) [void ( opencascade::handle& )]; %MethodCode Handle(HYDROData_Region) aRef = Handle(HYDROData_Region)::DownCast( createHandle( a0 ) ); @@ -295,12 +326,12 @@ public: /** * Returns all reference geometry groups of calculation case. */ - HYDROData_SequenceOfObjects GetSplittedGroups() const; + HYDROData_SequenceOfObjects GetSplitGroups() const; /** * Removes all reference geometry groups from calculation case. */ - void RemoveSplittedGroups(); + void RemoveSplitGroups(); /** @@ -358,7 +389,7 @@ public: double GetAltitudeForPoint( const double theCoordX, const double theCoordY, HYDROData_Region theRegion ) const - [double ( const gp_XY&, const Handle_HYDROData_Region& )]; + [double ( const gp_XY&, opencascade::handle& )]; %MethodCode gp_XY aPnt( a0, a1 ); Handle(HYDROData_Region) aRefRegion = @@ -379,7 +410,7 @@ public: double GetAltitudeForPoint( const double theCoordX, const double theCoordY, HYDROData_Zone theZone ) const - [double ( const gp_XY&, const Handle_HYDROData_Zone& )]; + [double ( const gp_XY&, opencascade::handle& )]; %MethodCode gp_XY aPnt( a0, a1 ); Handle(HYDROData_Zone) aRefZone = @@ -399,8 +430,9 @@ public: */ NCollection_Sequence GetAltitudesForPoints( const NCollection_Sequence& theCoordsX, const NCollection_Sequence& theCoordsY, - HYDROData_Region theRegion ) const - [NCollection_Sequence ( const NCollection_Sequence&, const Handle_HYDROData_Region& )]; + HYDROData_Region theRegion, + int theMethod = 0) const + [NCollection_Sequence ( const NCollection_Sequence&, opencascade::handle&, int)]; %MethodCode NCollection_Sequence aPnts; @@ -414,16 +446,59 @@ public: Handle(HYDROData_Region) aRefRegion = Handle(HYDROData_Region)::DownCast( createHandle( a2 ) ); - + int aMethod = a3; + NCollection_Sequence aRes; Py_BEGIN_ALLOW_THREADS - aRes = sipSelfWasArg ? sipCpp->HYDROData_CalculationCase::GetAltitudesForPoints( aPnts, aRefRegion ) : - sipCpp->GetAltitudesForPoints( aPnts, aRefRegion ); + aRes = sipSelfWasArg ? sipCpp->HYDROData_CalculationCase::GetAltitudesForPoints( aPnts, aRefRegion, aMethod ) : + sipCpp->GetAltitudesForPoints( aPnts, aRefRegion, aMethod ); Py_END_ALLOW_THREADS sipRes = new NCollection_Sequence( aRes ); %End + std::vector GetStricklerCoefficientForPoints( const NCollection_Sequence& theCoordsX, + const NCollection_Sequence& theCoordsY, + double DefValue, + bool UseMax ) const + [std::vector ( const NCollection_Sequence&, double, bool)]; + %MethodCode + std::vector aPnts; + int aLen = qMin( a0->Length(), a1->Length() ); + for ( int i = 1; i <= aLen; ++i ) + { + gp_XY aPnt( a0->Value( i ), a1->Value( i ) ); + aPnts.push_back( aPnt ); + } + std::vector aRes; + Py_BEGIN_ALLOW_THREADS + aRes = sipSelfWasArg ? sipCpp->HYDROData_CalculationCase::GetStricklerCoefficientForPoints( aPnts, a2, a3 ) : + sipCpp->GetStricklerCoefficientForPoints( aPnts, a2, a3 ); + Py_END_ALLOW_THREADS + sipRes = new std::vector( aRes ); + %End + + + std::vector GetStricklerTypeForPoints( const NCollection_Sequence& theCoordsX, + const NCollection_Sequence& theCoordsY ) const + [std::vector( const NCollection_Sequence& )]; + %MethodCode + std::vector aPnts; + int aLen = qMin( a0->Length(), a1->Length() ); + for ( int i = 1; i <= aLen; ++i ) + { + gp_XY aPnt( a0->Value( i ), a1->Value( i ) ); + aPnts.push_back( aPnt ); + } + std::vector aRes; + Py_BEGIN_ALLOW_THREADS + aRes = sipSelfWasArg ? sipCpp->HYDROData_CalculationCase::GetStricklerTypeForPoints( aPnts ) : + sipCpp->GetStricklerTypeForPoints( aPnts ); + Py_END_ALLOW_THREADS + sipRes = new std::vector( aRes ); + %End + + /** * Returns altitudes for given points on given zone. * \param thePoints the points to examine @@ -432,8 +507,9 @@ public: */ NCollection_Sequence GetAltitudesForPoints( const NCollection_Sequence& theCoordsX, const NCollection_Sequence& theCoordsY, - HYDROData_Zone theZone ) const - [NCollection_Sequence ( const NCollection_Sequence&, const Handle_HYDROData_Zone& )]; + HYDROData_Zone theZone, + int theMethod = 0) const + [NCollection_Sequence ( const NCollection_Sequence&, opencascade::handle&, int )]; %MethodCode NCollection_Sequence aPnts; @@ -447,11 +523,12 @@ public: Handle(HYDROData_Zone) aRefZone = Handle(HYDROData_Zone)::DownCast( createHandle( a2 ) ); + int aMethod = a3; NCollection_Sequence aRes; Py_BEGIN_ALLOW_THREADS - aRes = sipSelfWasArg ? sipCpp->HYDROData_CalculationCase::GetAltitudesForPoints( aPnts, aRefZone ) : - sipCpp->GetAltitudesForPoints( aPnts, aRefZone ); + aRes = sipSelfWasArg ? sipCpp->HYDROData_CalculationCase::GetAltitudesForPoints( aPnts, aRefZone, aMethod ) : + sipCpp->GetAltitudesForPoints( aPnts, aRefZone, aMethod ); Py_END_ALLOW_THREADS sipRes = new NCollection_Sequence( aRes ); @@ -464,7 +541,7 @@ public: */ HYDROData_Region GetRegionFromPoint( const double theCoordX, const double theCoordY ) const - [Handle_HYDROData_Region ( const gp_XY& )]; + [opencascade::handle ( const gp_XY& )]; %MethodCode Handle(HYDROData_Region) aRes; @@ -485,7 +562,7 @@ public: */ HYDROData_Zone GetZoneFromPoint( const double theCoordX, const double theCoordY ) const - [Handle_HYDROData_Zone ( const gp_XY& )]; + [opencascade::handle ( const gp_XY& )]; %MethodCode Handle(HYDROData_Zone) aRes; @@ -508,7 +585,7 @@ public: PointClassification GetPointClassification( const double theCoordX, const double theCoordY, HYDROData_Zone theZone ) const - [PointClassification ( const gp_XY&, const Handle_HYDROData_Zone& )]; + [PointClassification ( const gp_XY&, opencascade::handle& )]; %MethodCode gp_XY aPnt( a0, a1 ); @@ -529,12 +606,10 @@ public: HYDROData_Entity theObject2, HYDROData_Zone::MergeType theMergeType, HYDROData_CalculationCase::DataTag theDataTag ) - [void ( const Handle_HYDROData_Entity&, HYDROData_PriorityType, const Handle_HYDROData_Entity&, HYDROData_Zone::MergeType, HYDROData_CalculationCase::DataTag )]; + [void ( const opencascade::handle&, HYDROData_PriorityType, opencascade::handle&, HYDROData_Zone::MergeType, HYDROData_CalculationCase::DataTag )]; %MethodCode - Handle(HYDROData_Entity) anObject1 = - Handle(HYDROData_Entity)::DownCast( createHandle( a0 ) ); - Handle(HYDROData_Entity) anObject2 = - Handle(HYDROData_Entity)::DownCast( createHandle( a2 ) ); + Handle(HYDROData_Entity) anObject1 = createHandle( a0 ); + Handle(HYDROData_Entity) anObject2 = createHandle( a2 ); Py_BEGIN_ALLOW_THREADS sipSelfWasArg ? sipCpp->HYDROData_CalculationCase::AddRule( anObject1, a1, anObject2, a3, a4 ) :