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
- DataTag_LandCover, ///< reference land covers
- DataTag_CustomLandCoverRules, ///< custom rules for land covers priority
- DataTag_AssignmentLandCoverMode, ///< assignment mode of land covers priority
- DataTag_ChildLandCoverRegion, ///< child land cover regions
- DataTag_LandCoverRegion ///< reference land cover regions
+ DataTag_LandCover_Obsolete, ///< reference land covers
+ DataTag_CustomLandCoverRules_Obsolete, ///< custom rules for land covers priority
+ DataTag_AssignmentLandCoverMode_Obsolete, ///< assignment mode of land covers priority
+ DataTag_ChildLandCoverRegion_Obsolete, ///< child land cover regions
+ DataTag_LandCoverRegion_Obsolete ///< reference land cover regions
};
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<HYDROData_Object>& )];
%MethodCode
Handle(HYDROData_Object) aRef =
Handle(HYDROData_Object)::DownCast( createHandle( a0 ) );
/**
* Removes reference geometry object from calculation case.
*/
- void RemoveGeometryObject( HYDROData_Object theObject ) [void ( const Handle_HYDROData_Object& )];
+ void RemoveGeometryObject( HYDROData_Object theObject )
+ [void ( const opencascade::handle<HYDROData_Object>& )];
%MethodCode
Handle(HYDROData_Object) aRef =
Handle(HYDROData_Object)::DownCast( createHandle( a0 ) );
/**
* 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<HYDROData_ShapesGroup>& )];
%MethodCode
Handle(HYDROData_ShapesGroup) aRef =
Handle(HYDROData_ShapesGroup)::DownCast( createHandle( a0 ) );
/**
* 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<HYDROData_ShapesGroup>& )];
%MethodCode
Handle(HYDROData_ShapesGroup) aRef =
Handle(HYDROData_ShapesGroup)::DownCast( createHandle( a0 ) );
/**
* 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<HYDROData_PolylineXY>& )];
%MethodCode
Handle(HYDROData_PolylineXY) aRef =
Handle(HYDROData_PolylineXY)::DownCast( createHandle( a0 ) );
/**
* Returns reference boundary polyline object of calculation case.
*/
- HYDROData_PolylineXY GetBoundaryPolyline() const [Handle_HYDROData_PolylineXY ()];
+ HYDROData_PolylineXY GetBoundaryPolyline() const [opencascade::handle<HYDROData_PolylineXY> ()];
%MethodCode
Handle(HYDROData_PolylineXY) aRef;
* Remove reference boundary polyline object from calculation case.
*/
void RemoveBoundaryPolyline();
+
+ void SetLandCoverMap( HYDROData_LandCoverMap theLandCoverMap ) [void ( const opencascade::handle<HYDROData_LandCoverMap>& )];
+ %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<HYDROData_StricklerTable>& )];
+ %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.
* 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, const bool theLandCover ) [Handle_HYDROData_Region ( const Handle_HYDROData_Zone&, const bool )];
+ HYDROData_Region AddNewRegion( HYDROData_Zone theZone ) [opencascade::handle<HYDROData_Region> ( opencascade::handle<HYDROData_Zone>& )];
%MethodCode
Handle(HYDROData_Zone) aRef =
Handle(HYDROData_Zone)::DownCast( createHandle( a0 ) );
if ( !aRef.IsNull() )
{
Py_BEGIN_ALLOW_THREADS
- aRes = sipSelfWasArg ? sipCpp->HYDROData_CalculationCase::AddNewRegion( aRef, a1 ) :
- sipCpp->AddNewRegion( aRef, a1 );
+ aRes = sipSelfWasArg ? sipCpp->HYDROData_CalculationCase::AddNewRegion( aRef ) :
+ sipCpp->AddNewRegion( aRef );
Py_END_ALLOW_THREADS
}
* 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, const bool theLandCover ) [bool ( const Handle_HYDROData_Region&, const bool )];
+ bool AddRegion( HYDROData_Region theRegion ) [bool ( opencascade::handle<HYDROData_Region>& )];
%MethodCode
Handle(HYDROData_Region) aRef =
Handle(HYDROData_Region)::DownCast( createHandle( a0 ) );
if ( !aRef.IsNull() )
{
Py_BEGIN_ALLOW_THREADS
- sipRes = sipSelfWasArg ? sipCpp->HYDROData_CalculationCase::AddRegion( aRef, a1 ):
- sipCpp->AddRegion( aRef, a1 );
+ sipRes = sipSelfWasArg ? sipCpp->HYDROData_CalculationCase::AddRegion( aRef ):
+ sipCpp->AddRegion( aRef );
Py_END_ALLOW_THREADS
}
%End
/**
* Returns all reference regions of calculation case.
*/
- HYDROData_SequenceOfObjects GetRegions( const bool theLandCover ) const;
+ HYDROData_SequenceOfObjects GetRegions() const;
/**
* Updates names of regions to correct order.
/**
* Removes reference region from calculation case.
*/
- void RemoveRegion( HYDROData_Region theRegion, const bool theLandCover ) [void ( const Handle_HYDROData_Region&, const bool )];
+ void RemoveRegion( HYDROData_Region theRegion ) [void ( opencascade::handle<HYDROData_Region>& )];
%MethodCode
Handle(HYDROData_Region) aRef =
Handle(HYDROData_Region)::DownCast( createHandle( a0 ) );
{
Py_BEGIN_ALLOW_THREADS
if ( sipSelfWasArg ) {
- sipCpp->HYDROData_CalculationCase::RemoveRegion( aRef, a1 );
+ sipCpp->HYDROData_CalculationCase::RemoveRegion( aRef );
} else {
- sipCpp->RemoveRegion( aRef, a1 );
+ sipCpp->RemoveRegion( aRef );
}
Py_END_ALLOW_THREADS
}
/**
* Removes all reference regions from calculation case.
*/
- void RemoveRegions( const bool theLandCover );
+ void RemoveRegions();
/**
* 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();
/**
public:
// Public methods to work with Calculation services
+ /**
+ * Returns strickler coefficient for given point.
+ * \param thePoint the point to examine
+ * \return result strickler coefficient
+ */
+ double GetStricklerCoefficientForPoint( const double theCoordX,
+ const double theCoordY ) const [double ( const gp_XY& ) ];
+ %MethodCode
+ gp_XY aPnt( a0, a1 );
+
+ Py_BEGIN_ALLOW_THREADS
+ sipRes = sipSelfWasArg ? sipCpp->HYDROData_CalculationCase::GetStricklerCoefficientForPoint( aPnt ) :
+ sipCpp->GetStricklerCoefficientForPoint( aPnt );
+ Py_END_ALLOW_THREADS
+ %End
+
/**
* Returns altitude for given point.
* \param thePoint the point to examine
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<HYDROData_Region>& )];
%MethodCode
gp_XY aPnt( a0, a1 );
Handle(HYDROData_Region) aRefRegion =
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<HYDROData_Zone>& )];
%MethodCode
gp_XY aPnt( a0, a1 );
Handle(HYDROData_Zone) aRefZone =
*/
NCollection_Sequence<double> GetAltitudesForPoints( const NCollection_Sequence<double>& theCoordsX,
const NCollection_Sequence<double>& theCoordsY,
- HYDROData_Region theRegion ) const
- [NCollection_Sequence<double> ( const NCollection_Sequence<gp_XY>&, const Handle_HYDROData_Region& )];
+ HYDROData_Region theRegion,
+ int theMethod = 0) const
+ [NCollection_Sequence<double> ( const NCollection_Sequence<gp_XY>&, opencascade::handle<HYDROData_Region>&, int)];
%MethodCode
NCollection_Sequence<gp_XY> aPnts;
Handle(HYDROData_Region) aRefRegion =
Handle(HYDROData_Region)::DownCast( createHandle( a2 ) );
-
+ int aMethod = a3;
+
NCollection_Sequence<double> 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<double>( aRes );
%End
+ std::vector<double> GetStricklerCoefficientForPoints( const NCollection_Sequence<double>& theCoordsX,
+ const NCollection_Sequence<double>& theCoordsY,
+ double DefValue,
+ bool UseMax ) const
+ [std::vector<double> ( const NCollection_Sequence<gp_XY>&, double, bool)];
+ %MethodCode
+ std::vector<gp_XY> 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<double> 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<double>( aRes );
+ %End
+
+
+ std::vector<int> GetStricklerTypeForPoints( const NCollection_Sequence<double>& theCoordsX,
+ const NCollection_Sequence<double>& theCoordsY ) const
+ [std::vector<int>( const NCollection_Sequence<gp_XY>& )];
+ %MethodCode
+ std::vector<gp_XY> 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<int> aRes;
+ Py_BEGIN_ALLOW_THREADS
+ aRes = sipSelfWasArg ? sipCpp->HYDROData_CalculationCase::GetStricklerTypeForPoints( aPnts ) :
+ sipCpp->GetStricklerTypeForPoints( aPnts );
+ Py_END_ALLOW_THREADS
+ sipRes = new std::vector<int>( aRes );
+ %End
+
+
/**
* Returns altitudes for given points on given zone.
* \param thePoints the points to examine
*/
NCollection_Sequence<double> GetAltitudesForPoints( const NCollection_Sequence<double>& theCoordsX,
const NCollection_Sequence<double>& theCoordsY,
- HYDROData_Zone theZone ) const
- [NCollection_Sequence<double> ( const NCollection_Sequence<gp_XY>&, const Handle_HYDROData_Zone& )];
+ HYDROData_Zone theZone,
+ int theMethod = 0) const
+ [NCollection_Sequence<double> ( const NCollection_Sequence<gp_XY>&, opencascade::handle<HYDROData_Zone>&, int )];
%MethodCode
NCollection_Sequence<gp_XY> aPnts;
Handle(HYDROData_Zone) aRefZone =
Handle(HYDROData_Zone)::DownCast( createHandle( a2 ) );
+ int aMethod = a3;
NCollection_Sequence<double> 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<double>( aRes );
* \return result region
*/
HYDROData_Region GetRegionFromPoint( const double theCoordX,
- const double theCoordY,
- const bool theLandCover ) const
- [Handle_HYDROData_Region ( const gp_XY&, const bool )];
+ const double theCoordY ) const
+ [opencascade::handle<HYDROData_Region> ( const gp_XY& )];
%MethodCode
Handle(HYDROData_Region) aRes;
gp_XY aPnt( a0, a1 );
Py_BEGIN_ALLOW_THREADS
- aRes = sipSelfWasArg ? sipCpp->HYDROData_CalculationCase::GetRegionFromPoint( aPnt, a2 ) :
- sipCpp->GetRegionFromPoint( aPnt, a2 );
+ aRes = sipSelfWasArg ? sipCpp->HYDROData_CalculationCase::GetRegionFromPoint( aPnt ) :
+ sipCpp->GetRegionFromPoint( aPnt );
Py_END_ALLOW_THREADS
sipRes = (HYDROData_Region*)createPointer( aRes );
* \return result zone
*/
HYDROData_Zone GetZoneFromPoint( const double theCoordX,
- const double theCoordY,
- const bool theLandCover ) const
- [Handle_HYDROData_Zone ( const gp_XY&, const bool )];
+ const double theCoordY ) const
+ [opencascade::handle<HYDROData_Zone> ( const gp_XY& )];
%MethodCode
Handle(HYDROData_Zone) aRes;
gp_XY aPnt( a0, a1 );
Py_BEGIN_ALLOW_THREADS
- aRes = sipSelfWasArg ? sipCpp->HYDROData_CalculationCase::GetZoneFromPoint( aPnt, a2 ) :
- sipCpp->GetZoneFromPoint( aPnt, a2 );
+ aRes = sipSelfWasArg ? sipCpp->HYDROData_CalculationCase::GetZoneFromPoint( aPnt ) :
+ sipCpp->GetZoneFromPoint( aPnt );
Py_END_ALLOW_THREADS
sipRes = (HYDROData_Zone*)createPointer( aRes );
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<HYDROData_Zone>& )];
%MethodCode
gp_XY aPnt( a0, a1 );
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_Entity>&, HYDROData_PriorityType, opencascade::handle<HYDROData_Entity>&, 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 ) :
