X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROPy%2FHYDROData_Image.sip;h=64935d935ef9e507ccffb6e3495592004d93ab59;hb=e35b4caf3341d2cece2b7921f349acd17fb89351;hp=b6728fb9383c64733dfd51f276bad79c4a5734b9;hpb=d5042386ce5c1842d2f837e8afb46f813160bbff;p=modules%2Fhydro.git

diff --git a/src/HYDROPy/HYDROData_Image.sip b/src/HYDROPy/HYDROData_Image.sip
index b6728fb9..64935d93 100644
--- a/src/HYDROPy/HYDROData_Image.sip
+++ b/src/HYDROPy/HYDROData_Image.sip
@@ -1,12 +1,8 @@
-// Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
+// Copyright (C) 2014-2015  EDF-R&D
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
 // License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License, or (at your option) any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -200,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 ) );
@@ -225,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 ) );
@@ -243,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 ) );
@@ -264,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;
     
@@ -303,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() )
@@ -320,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;
     
@@ -339,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() )
@@ -389,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: