Merge branch 'BR_H2018_3' into BR_2018_V8_5

[modules/hydro.git] / src / HYDROPy / HYDROData_Image.sip

diff --git a/src/HYDROPy/HYDROData_Image.sip b/src/HYDROPy/HYDROData_Image.sip
index 1ad52b97f88992994850e574a097a0c831d6f8b3..64935d935ef9e507ccffb6e3495592004d93ab59 100644 (file)
--- a/src/HYDROPy/HYDROData_Image.sip
+++ b/src/HYDROPy/HYDROData_Image.sip
@@ -196,7 +196,7 @@ public:
                            const QPointF&  thePointB,
                            const QPointF&  thePointC = QPoint( INT_MIN, INT_MIN ),
                            const bool      theIsUpdate = true )
-  [void ( const Handle_HYDROData_Image&, const QPointF&, const QPointF&, const QPointF&, const bool )];
+  [void ( const opencascade::handle<HYDROData_Image>&, const QPointF&, const QPointF&, const QPointF&, const bool )];
   %MethodCode
     Handle(HYDROData_Image) aRefImage =
       Handle(HYDROData_Image)::DownCast( createHandle( a0 ) );
@@ -221,7 +221,7 @@ public:
                            QPointF&        thePointA /Out/,
                            QPointF&        thePointB /Out/,
                            QPointF&        thePointC /Out/ ) const
-  [bool ( const Handle_HYDROData_Image&, QPointF&, QPointF&, QPointF& )];
+  [bool ( const opencascade::handle<HYDROData_Image>&, QPointF&, QPointF&, QPointF& )];
   %MethodCode
     Handle(HYDROData_Image) aRefImage =
       Handle(HYDROData_Image)::DownCast( createHandle( a0 ) );
@@ -239,12 +239,11 @@ public:
    */
   bool HasReferencePoints() const;
 
-
   /**
    * Stores the reference image for transformation
    * \param theRefImage reference image
    */
-  void SetTrsfReferenceImage( HYDROData_Image theRefImage ) [void ( const Handle_HYDROData_Image& )];
+  void SetTrsfReferenceImage( HYDROData_Image theRefImage ) [void ( const opencascade::handle<HYDROData_Image>& )];
   %MethodCode
     Handle(HYDROData_Image) aRefImage =
       Handle(HYDROData_Image)::DownCast( createHandle( a0 ) );
@@ -260,7 +259,7 @@ public:
   /**
    * Returns the reference image for transformation
    */
-  HYDROData_Image GetTrsfReferenceImage() const [Handle_HYDROData_Image ()];
+  HYDROData_Image GetTrsfReferenceImage() const [opencascade::handle<HYDROData_Image> ()];
   %MethodCode
     Handle(HYDROData_Image) aRefImage;
     
@@ -299,7 +298,7 @@ public:
    * Appends reference to other object (image or polyline).
    * \param theReferenced the object referenced by this
    */
-  void AppendReference( HYDROData_Entity theReferenced ) [void ( const Handle_HYDROData_Entity& )];
+  void AppendReference( HYDROData_Entity theReferenced ) [void ( const opencascade::handle<HYDROData_Entity>& )];
   %MethodCode
     Handle(HYDROData_Entity) aRef = createHandle( a0 );
     if ( !aRef.IsNull() )
@@ -316,7 +315,7 @@ public:
    * \param theIndex number of reference [0; NbReference)
    * \returns the referenced object, or Null if index is invalid
    */
-  HYDROData_Entity Reference( const int theIndex ) const [Handle_HYDROData_Entity ()];
+  HYDROData_Entity Reference( const int theIndex ) const [opencascade::handle<HYDROData_Entity> ()];
   %MethodCode
     Handle(HYDROData_Entity) aRef;
     
@@ -335,7 +334,7 @@ public:
    * \param theReferenced the object referenced by this
    */
   void ChangeReference( const int theIndex, HYDROData_Entity theReferenced )
-  [void ( const int, const Handle_HYDROData_Entity& )];
+  [void ( const int, const opencascade::handle<HYDROData_Entity>& )];
   %MethodCode
     Handle(HYDROData_Entity) aRef = createHandle( a1 );
     if ( !aRef.IsNull() )
@@ -385,16 +384,16 @@ public:
   
 
   /**
-   * Marks the image as self-splitted.
-   * \param theFlag is true for self-splitted image
+   * Marks the image as self-split.
+   * \param theFlag is true for self-split image
    */
-  void SetIsSelfSplitted(bool theFlag);
+  void SetIsSelfSplit(bool theFlag);
 
   /**
-   * Checks that the image is self-splitted.
-   * \returns true if image is self-splitted
+   * Checks that the image is self-split.
+   * \returns true if image is self-split
    */
-  bool IsSelfSplitted() const;
+  bool IsSelfSplit() const;
 
 protected: