Salome HOME
projects
/
modules
/
hydro.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'BR_H2018_3' into BR_2018_V8_5
[modules/hydro.git]
/
src
/
HYDROPy
/
HYDROData_Stream.sip
diff --git
a/src/HYDROPy/HYDROData_Stream.sip
b/src/HYDROPy/HYDROData_Stream.sip
index e9e5b02d65ed6f9b601afbffe670e8a8e45bd423..cb233c5c8f03c41143c9cc5766f7dbae654ecdca 100644
(file)
--- a/
src/HYDROPy/HYDROData_Stream.sip
+++ b/
src/HYDROPy/HYDROData_Stream.sip
@@
-27,25
+27,20
@@
class HYDROData_Stream : public HYDROData_NaturalObject
%End
public:
%End
public:
- /**
- * Update the shape presentations of stream.
- */
- void UpdatePrs();
-
/**
* Returns default filling color for new stream.
*/
/**
* Returns default filling color for new stream.
*/
-
static QColor DefaultFillingColor()
;
+
virtual QColor DefaultFillingColor() const
;
/**
* Returns default border color for new stream.
*/
/**
* Returns default border color for new stream.
*/
-
static QColor DefaultBorderColor()
;
+
virtual QColor DefaultBorderColor() const
;
/**
* Returns true if given polyline can be used as stream axis.
*/
/**
* Returns true if given polyline can be used as stream axis.
*/
- static bool IsValidAsAxis( HYDROData_PolylineXY theAxis )
+ static bool IsValidAsAxis( HYDROData_PolylineXY theAxis )
[bool ( const Handle_HYDROData_PolylineXY& )];
%MethodCode
Handle(HYDROData_PolylineXY) aRef =
[bool ( const Handle_HYDROData_PolylineXY& )];
%MethodCode
Handle(HYDROData_PolylineXY) aRef =
@@
-58,14
+53,14
@@
public:
}
%End
}
%End
-public:
+public:
// Public methods to work with Stream data fields
/**
* Sets reference hydraulic axis object for stream.
*/
bool SetHydraulicAxis( HYDROData_PolylineXY theAxis )
// Public methods to work with Stream data fields
/**
* Sets reference hydraulic axis object for stream.
*/
bool SetHydraulicAxis( HYDROData_PolylineXY theAxis )
- [bool ( const
Handle_HYDROData_PolylineXY
& )];
+ [bool ( const
opencascade::handle<HYDROData_PolylineXY>
& )];
%MethodCode
Handle(HYDROData_PolylineXY) aRef =
Handle(HYDROData_PolylineXY)::DownCast( createHandle( a0 ) );
%MethodCode
Handle(HYDROData_PolylineXY) aRef =
Handle(HYDROData_PolylineXY)::DownCast( createHandle( a0 ) );
@@
-82,15
+77,15
@@
public:
* Returns reference hydraulic axis object of stream.
*/
HYDROData_PolylineXY GetHydraulicAxis() const
* Returns reference hydraulic axis object of stream.
*/
HYDROData_PolylineXY GetHydraulicAxis() const
- [
Handle_HYDROData_PolylineXY
()];
+ [
opencascade::handle<HYDROData_PolylineXY>
()];
%MethodCode
Handle(HYDROData_PolylineXY) aRef;
%MethodCode
Handle(HYDROData_PolylineXY) aRef;
-
+
Py_BEGIN_ALLOW_THREADS
Py_BEGIN_ALLOW_THREADS
- aRef = sipSelfWasArg ? sipCpp->HYDROData_Stream::GetHydraulicAxis() :
+ aRef = sipSelfWasArg ? sipCpp->HYDROData_Stream::GetHydraulicAxis() :
sipCpp->GetHydraulicAxis();
Py_END_ALLOW_THREADS
sipCpp->GetHydraulicAxis();
Py_END_ALLOW_THREADS
-
+
sipRes = (HYDROData_PolylineXY*)createPointer( aRef );
%End
sipRes = (HYDROData_PolylineXY*)createPointer( aRef );
%End
@@
-103,7
+98,7
@@
public:
* Add new one reference profile object for stream.
*/
bool AddProfile( HYDROData_Profile theProfile )
* Add new one reference profile object for stream.
*/
bool AddProfile( HYDROData_Profile theProfile )
- [bool ( const
Handle_HYDROData_Profile
& )];
+ [bool ( const
opencascade::handle<HYDROData_Profile>
& )];
%MethodCode
Handle(HYDROData_Profile) aRef =
Handle(HYDROData_Profile)::DownCast( createHandle( a0 ) );
%MethodCode
Handle(HYDROData_Profile) aRef =
Handle(HYDROData_Profile)::DownCast( createHandle( a0 ) );
@@
-125,7
+120,7
@@
public:
* Removes reference profile object from stream.
*/
bool RemoveProfile( HYDROData_Profile theProfile )
* Removes reference profile object from stream.
*/
bool RemoveProfile( HYDROData_Profile theProfile )
- [bool ( const
Handle_HYDROData_Profile
& )];
+ [bool ( const
opencascade::handle<HYDROData_Profile>
& )];
%MethodCode
Handle(HYDROData_Profile) aRef =
Handle(HYDROData_Profile)::DownCast( createHandle( a0 ) );
%MethodCode
Handle(HYDROData_Profile) aRef =
Handle(HYDROData_Profile)::DownCast( createHandle( a0 ) );
@@
-152,23
+147,23
@@
public:
* Returns reference bottom polyline object of stream.
*/
HYDROData_Polyline3D GetBottomPolyline() const
* Returns reference bottom polyline object of stream.
*/
HYDROData_Polyline3D GetBottomPolyline() const
- [
Handle_HYDROData_Polyline3D
()];
+ [
opencascade::handle<HYDROData_Polyline3D>
()];
%MethodCode
Handle(HYDROData_Polyline3D) aRef;
%MethodCode
Handle(HYDROData_Polyline3D) aRef;
-
+
Py_BEGIN_ALLOW_THREADS
Py_BEGIN_ALLOW_THREADS
- aRef = sipSelfWasArg ? sipCpp->HYDROData_Stream::GetBottomPolyline() :
+ aRef = sipSelfWasArg ? sipCpp->HYDROData_Stream::GetBottomPolyline() :
sipCpp->GetBottomPolyline();
Py_END_ALLOW_THREADS
sipCpp->GetBottomPolyline();
Py_END_ALLOW_THREADS
-
+
sipRes = (HYDROData_Polyline3D*)createPointer( aRef );
%End
sipRes = (HYDROData_Polyline3D*)createPointer( aRef );
%End
-
+
/**
* Sets reference bottom polyline object for stream.
*/
bool SetBottomPolyline( HYDROData_Polyline3D theBottom )
/**
* Sets reference bottom polyline object for stream.
*/
bool SetBottomPolyline( HYDROData_Polyline3D theBottom )
- [bool ( const
Handle_HYDROData_Polyline3D
& )];
+ [bool ( const
opencascade::handle<HYDROData_Polyline3D>
& )];
%MethodCode
Handle(HYDROData_Polyline3D) aRef =
Handle(HYDROData_Polyline3D)::DownCast( createHandle( a0 ) );
%MethodCode
Handle(HYDROData_Polyline3D) aRef =
Handle(HYDROData_Polyline3D)::DownCast( createHandle( a0 ) );
@@
-188,9
+183,19
@@
public:
*/
virtual bool Interpolate( HYDROData_IProfilesInterpolator* theInterpolator );
*/
virtual bool Interpolate( HYDROData_IProfilesInterpolator* theInterpolator );
+ /**
+ * Set vertical slicing step for profiles interpolation.
+ */
+ void SetDDZ( double theDDZ );
+
+ /**
+ * Set horizontal step for profiles interpolation.
+ */
+ void SetSpatialStep( double theSpatialStep );
+
protected:
/**
protected:
/**
- * Creates new object in the internal data structure. Use higher level objects
+ * Creates new object in the internal data structure. Use higher level objects
* to create objects with real content.
*/
HYDROData_Stream();
* to create objects with real content.
*/
HYDROData_Stream();