From e21917fc95a996d4226068eb38354ea58e4f4c66 Mon Sep 17 00:00:00 2001 From: asl Date: Thu, 22 Oct 2015 12:29:31 +0300 Subject: [PATCH] SIP files revision --- src/HYDROPy/HYDROData.sip | 55 ++++++++-------- src/HYDROPy/HYDROData_AltitudeObject.sip | 9 --- src/HYDROPy/HYDROData_Application.sip | 11 +--- src/HYDROPy/HYDROData_ArtificialObject.sip | 13 ---- src/HYDROPy/HYDROData_Bathymetry.sip | 53 ++------------- src/HYDROPy/HYDROData_CalculationCase.sip | 3 +- src/HYDROPy/HYDROData_Zone.sip | 77 +--------------------- 7 files changed, 38 insertions(+), 183 deletions(-) diff --git a/src/HYDROPy/HYDROData.sip b/src/HYDROPy/HYDROData.sip index e0235298..84f94621 100644 --- a/src/HYDROPy/HYDROData.sip +++ b/src/HYDROPy/HYDROData.sip @@ -47,40 +47,39 @@ %Include CAS/gp_XYZ.sip %Include CAS/NCollection_Sequence.sip %Include CAS/TCollection_AsciiString.sip -%Include HYDROData_SequenceOfObjects.sip -%Include HYDROData_IInterpolator.sip -%Include HYDROData_Entity.sip -%Include HYDROData_ShapesGroup.sip -%Include HYDROData_SplittedShapesGroup.sip -%Include HYDROData_IPolyline.sip -%Include HYDROData_IAltitudeObject.sip + %Include HYDROData_AltitudeObject.sip -%Include HYDROData_ObstacleAltitude.sip -%Include HYDROData_StreamAltitude.sip -%Include HYDROData_Object.sip -%Include HYDROData_Profile.sip -%Include HYDROData_Polyline3D.sip -%Include HYDROData_ProfileUZ.sip -%Include HYDROData_PolylineXY.sip +%Include HYDROData_Application.sip %Include HYDROData_ArtificialObject.sip -%Include HYDROData_Obstacle.sip +%Include HYDROData_Bathymetry.sip +%Include HYDROData_CalculationCase.sip %Include HYDROData_Channel.sip -%Include HYDROData_Digue.sip -%Include HYDROData_NaturalObject.sip %Include HYDROData_Confluence.sip -%Include HYDROData_River.sip -%Include HYDROData_Stream.sip +%Include HYDROData_Digue.sip +%Include HYDROData_Document.sip +%Include HYDROData_Entity.sip +%Include HYDROData_IAltitudeObject.sip +%Include HYDROData_IInterpolator.sip %Include HYDROData_Image.sip -%Include HYDROData_PolylineXY.sip -%Include HYDROData_Bathymetry.sip %Include HYDROData_ImmersibleZone.sip -%Include HYDROData_Zone.sip -%Include HYDROData_Region.sip -%Include HYDROData_CalculationCase.sip +%Include HYDROData_IPolyline.sip %Include HYDROData_IProfilesInterpolator.sip +%Include HYDROData_LandCoverMap.sip +%Include HYDROData_NaturalObject.sip +%Include HYDROData_Object.sip +%Include HYDROData_Obstacle.sip +%Include HYDROData_ObstacleAltitude.sip +%Include HYDROData_PolylineXY.sip +%Include HYDROData_Polyline3D.sip +%Include HYDROData_Profile.sip +%Include HYDROData_ProfileUZ.sip +%Include HYDROData_Region.sip +%Include HYDROData_River.sip +%Include HYDROData_SequenceOfObjects.sip +%Include HYDROData_ShapesGroup.sip +%Include HYDROData_SplittedShapesGroup.sip +%Include HYDROData_Stream.sip +%Include HYDROData_StreamAltitude.sip %Include HYDROData_StricklerTable.sip - -%Include HYDROData_Document.sip -%Include HYDROData_Application.sip - +%Include HYDROData_Zone.sip diff --git a/src/HYDROPy/HYDROData_AltitudeObject.sip b/src/HYDROPy/HYDROData_AltitudeObject.sip index da99346b..3ad15bd3 100644 --- a/src/HYDROPy/HYDROData_AltitudeObject.sip +++ b/src/HYDROPy/HYDROData_AltitudeObject.sip @@ -28,15 +28,6 @@ class HYDROData_AltitudeObject : public HYDROData_IAltitudeObject %End protected: - - /** - * Creates new object in the internal data structure. Use higher level objects - * to create objects with real content. - */ HYDROData_AltitudeObject(); - - /** - * Destructs properties of the object and object itself, removes it from the document. - */ ~HYDROData_AltitudeObject(); }; diff --git a/src/HYDROPy/HYDROData_Application.sip b/src/HYDROPy/HYDROData_Application.sip index d9499915..c34c8976 100644 --- a/src/HYDROPy/HYDROData_Application.sip +++ b/src/HYDROPy/HYDROData_Application.sip @@ -27,16 +27,9 @@ class HYDROData_Application #include %End -public: // useful methods inside of the package - - //! Retuns the application: one per process +public: static HYDROData_Application* GetApplication(); -public: // Redefined OCAF methods - //! Return name of resource (i.e. "Standard") const char* ResourcesName(); - //! Constructor - //! Use method GetInstance() method to obtain - //! the static instance of the object (or derive your own application) HYDROData_Application(); -}; \ No newline at end of file +}; diff --git a/src/HYDROPy/HYDROData_ArtificialObject.sip b/src/HYDROPy/HYDROData_ArtificialObject.sip index 87526ec3..0720b6c3 100644 --- a/src/HYDROPy/HYDROData_ArtificialObject.sip +++ b/src/HYDROPy/HYDROData_ArtificialObject.sip @@ -52,20 +52,7 @@ class HYDROData_ArtificialObject : public HYDROData_Object /Abstract/ } %End -public: - - protected: - - /** - * Creates new object in the internal data structure. Use higher level objects - * to create objects with real content. - */ HYDROData_ArtificialObject(); - - /** - * Destructs properties of the object and object itself, removes it from the document. - */ virtual ~HYDROData_ArtificialObject(); - }; diff --git a/src/HYDROPy/HYDROData_Bathymetry.sip b/src/HYDROPy/HYDROData_Bathymetry.sip index d9e4e108..e2302918 100644 --- a/src/HYDROPy/HYDROData_Bathymetry.sip +++ b/src/HYDROPy/HYDROData_Bathymetry.sip @@ -44,62 +44,19 @@ class HYDROData_Bathymetry : public HYDROData_IAltitudeObject %End public: - // Public methods to work with Bathymetry altitudes. - - /** - * Replace current altitude points by new one. - * \param thePoints the altitude points list - */ - virtual void SetAltitudePoints( const HYDROData_Bathymetry::AltitudePoints& ); - - /** - * Returns altitude points list. - * \return points list - */ + virtual void SetAltitudePoints( const HYDROData_Bathymetry::AltitudePoints& ); HYDROData_Bathymetry::AltitudePoints GetAltitudePoints() const; - /** - * Remove all altitude points. - */ - void RemoveAltitudePoints(); - + void RemoveAltitudePoints(); public: - // Public methods to work with files. - - /** - * Set flag indicating needs to invert altitude values - * \param theIsInverted new invert value - * \param theIsUpdate flag indicating necessity to update points - */ - void SetAltitudesInverted( const bool theIsInverted, - const bool theIsUpdate = true ); - - /** - * Returns flag indicating needs to invert altitude values. - */ - bool IsAltitudesInverted() const; - - /** - * Imports Bathymetry data from file. The supported file types: - * - xyz - * \param theFileName the path to file - * \return \c true if file has been successfully read - */ - bool ImportFromFile( const TCollection_AsciiString& theFileName ); + void SetAltitudesInverted( const bool theIsInverted, const bool theIsUpdate = true ); + bool IsAltitudesInverted() const; + bool ImportFromFile( const TCollection_AsciiString& theFileName ); protected: - - /** - * Creates new object in the internal data structure. Use higher level objects - * to create objects with real content. - */ HYDROData_Bathymetry(); - - /** - * Destructs properties of the object and object itself, removes it from the document. - */ ~HYDROData_Bathymetry(); }; diff --git a/src/HYDROPy/HYDROData_CalculationCase.sip b/src/HYDROPy/HYDROData_CalculationCase.sip index c1ebd5ce..9ed40198 100644 --- a/src/HYDROPy/HYDROData_CalculationCase.sip +++ b/src/HYDROPy/HYDROData_CalculationCase.sip @@ -108,7 +108,8 @@ public: /** * Removes reference geometry object from calculation case. */ - void RemoveGeometryObject( HYDROData_Object theObject ) [void ( const Handle_HYDROData_Object& )]; + void RemoveGeometryObject( HYDROData_Object theObject ) + [void ( const Handle_HYDROData_Object& )]; %MethodCode Handle(HYDROData_Object) aRef = Handle(HYDROData_Object)::DownCast( createHandle( a0 ) ); diff --git a/src/HYDROPy/HYDROData_Zone.sip b/src/HYDROPy/HYDROData_Zone.sip index 31e1dd2c..070354cd 100644 --- a/src/HYDROPy/HYDROData_Zone.sip +++ b/src/HYDROPy/HYDROData_Zone.sip @@ -52,25 +52,12 @@ public: public: - /** - * Sets the merging type for conflict altitudes. - * By default it is set to Merge_ZMIN. - */ void SetMergeType( const MergeType& theType ); - - /** - * Returns the merging type for conflict altitudes. - */ MergeType GetMergeType() const; - - /** - * Sets the reference altitude to resolve the conflict. - * This object is used only in case of "Merge_Object" merge type. - */ - void SetMergeAltitude( HYDROData_IAltitudeObject theAltitude ) [void (const Handle_HYDROData_IAltitudeObject&)]; + void SetMergeAltitude( HYDROData_IAltitudeObject theAltitude ) + [void (const Handle_HYDROData_IAltitudeObject&)]; %MethodCode - Handle(HYDROData_IAltitudeObject) aRefAltitude = Handle(HYDROData_IAltitudeObject)::DownCast( createHandle( a0 ) ); if ( !aRefAltitude.IsNull() ) @@ -80,47 +67,29 @@ public: sipCpp->SetMergeObject( aRefAltitude ); Py_END_ALLOW_THREADS } - %End - /** - * Returns the reference altitude to resolve the conflict. - */ HYDROData_IAltitudeObject GetMergeAltitude() const [Handle_HYDROData_IAltitudeObject ()]; %MethodCode - Handle(HYDROData_IAltitudeObject) aRefAltitude; - Py_BEGIN_ALLOW_THREADS Handle(HYDROData_Entity) aRefObject = sipSelfWasArg ? sipCpp->HYDROData_Zone::GetMergeObject() : sipCpp->GetMergeObject(); aRefAltitude = Handle(HYDROData_IAltitudeObject)::DownCast( aRefObject ); Py_END_ALLOW_THREADS - sipRes = (HYDROData_IAltitudeObject*)createPointer( aRefAltitude ); - %End - /** - * Removes the reference altitude for resolving the conflict. - */ void RemoveMergeAltitude(); %MethodCode - Py_BEGIN_ALLOW_THREADS sipSelfWasArg ? sipCpp->HYDROData_Zone::RemoveMergeObject() : sipCpp->RemoveMergeObject(); Py_END_ALLOW_THREADS - %End - /** - * Sets the reference object to resolve the conflict. - * This object is used only in case of "Merge_Object" merge type. - */ void SetMergeObject( HYDROData_Entity theObject ) [void (const Handle_HYDROData_Entity&)]; %MethodCode - Handle(HYDROData_Entity) aRefObject = Handle(HYDROData_Entity)::DownCast( createHandle( a0 ) ); if ( !aRefObject.IsNull() ) @@ -130,34 +99,20 @@ public: sipCpp->SetMergeObject( aRefObject ); Py_END_ALLOW_THREADS } - %End - /** - * Returns the reference object to resolve the conflict. - */ HYDROData_Entity GetMergeObject() const [Handle_HYDROData_Entity ()]; %MethodCode - Handle(HYDROData_Entity) aRefObject; - Py_BEGIN_ALLOW_THREADS aRefObject = sipSelfWasArg ? sipCpp->HYDROData_Zone::GetMergeObject() : sipCpp->GetMergeObject(); Py_END_ALLOW_THREADS - sipRes = (HYDROData_Entity*)createPointer( aRefObject ); - %End - /** - * Removes the reference object for resolving the conflict. - */ void RemoveMergeObject(); - /** - * Add new one object for zone. - */ void AddObject( HYDROData_Entity theObject ) [void (const Handle_HYDROData_Entity&)]; %MethodCode @@ -173,42 +128,14 @@ public: %End - /** - * Returns all objects of zone. - */ HYDROData_SequenceOfObjects GetObjects() const; - /** - * Removes all objects from zone. - */ void RemoveObjects(); - - - /** - * Sets the interpolator for zone. By default it is NULL and original - * interpolation algorithms are used to calculate points altitudes. - * If you set interpolator it won't be stored in the data model structure, - * it will be deleted during that time as this zone will be freed. - */ void SetInterpolator( HYDROData_IInterpolator* theInter ); - - /** - * * Returns the interpolator of zone object. - */ HYDROData_IInterpolator* GetInterpolator() const; protected: - /** - * Creates new object in the internal data structure. Use higher level objects - * to create objects with real content. - */ HYDROData_Zone(); - - /** - * Destructs properties of the object and object itself, removes it from the document. - */ ~HYDROData_Zone(); }; - - -- 2.39.2