X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROPy%2FHYDROData_Profile.sip;h=11c9a2a8286ca0d417a246385a95797e1fcd38f9;hb=f58865bdfb548ebba53ecb264f17ef357fa4c409;hp=e25057b4a69038d6925c5aba701de423e21031a7;hpb=697a6aa753b5cca692ca982a10662a674c34658a;p=modules%2Fhydro.git

diff --git a/src/HYDROPy/HYDROData_Profile.sip b/src/HYDROPy/HYDROData_Profile.sip
index e25057b4..11c9a2a8 100644
--- a/src/HYDROPy/HYDROData_Profile.sip
+++ b/src/HYDROPy/HYDROData_Profile.sip
@@ -26,15 +26,14 @@
 
 class HYDROData_Profile : public HYDROData_Object
 {
+%TypeHeaderCode
+#include "HYDROData_Profile.h"
+%End
 public:
 
   typedef gp_XYZ                       ProfilePoint;
   typedef NCollection_Sequence<gp_XYZ> ProfilePoints;
 
-%TypeHeaderCode
-#include "HYDROData_Profile.h"
-%End
-
 public:
   /**
    * Returns default filling color for new profile.
@@ -129,13 +128,13 @@ public:
    * Replace current profile parametric points by new one.
    * \param thePoints the list with new points in parametric form
    */
-  void SetParametricPoints( const HYDROData_ProfileUZ::PointsList& thePoints );
+  void SetParametricPoints( const HYDROData_IPolyline::PointsList& thePoints );
 
   /**
    * Returns profile points in parametric form.
    * \return points list
    */
-  HYDROData_ProfileUZ::PointsList GetParametricPoints() const;
+  HYDROData_IPolyline::PointsList GetParametricPoints() const;
 
 
   /**
@@ -143,14 +142,14 @@ public:
    * First and last points will be automatically updated.
    * \param thePoints the list with new profile points
    */
-  void SetProfilePoints( const ProfilePoints thePoints );
+  void SetProfilePoints( const HYDROData_Profile::ProfilePoints thePoints );
 
   /**
    * Returns profile points.
    * Empty sequence is returned if first or last point was not set.
    * \return profile points list
    */
-  ProfilePoints GetProfilePoints() const;
+  HYDROData_Profile::ProfilePoints GetProfilePoints() const;
 
 
 public:
@@ -175,24 +174,18 @@ public:
    * \param theFileName the path to file
    * \return \c number of successfully imported profiles
    */
-  /*static int ImportFromFile( HYDROData_Document theDoc,
-                             const TCollection_AsciiString&    theFileName,
-                             NCollection_Sequence<int>&        theBadProfilesIds )
-  [int ImportFromFile( const Handle(HYDROData_Document)& ,
-                              const TCollection_AsciiString&    ,
-                              NCollection_Sequence<int>&         )];
-  MethodCode
-    Handle(HYDROData_Document) aRef =
-      Handle(HYDROData_Document)::DownCast( createHandle( a0 ) );
-    if ( !aRef.IsNull() )
-    {
-      Py_BEGIN_ALLOW_THREADS
-      sipRes = sipSelfWasArg ? sipCpp->HYDROData_Profile::ImportFromFile( aRef, a1, a2 ):
-                               sipCpp->ImportFromFile( aRef, a1, a2 );
-      Py_END_ALLOW_THREADS
-    }
-  End
-*/
+  static int ImportFromFile( HYDROData_Document             theDoc,
+                             const TCollection_AsciiString& theFileName,
+                             NCollection_Sequence<int>&     theBadProfilesIds )
+  [int ( const Handle_HYDROData_Document&,
+         const TCollection_AsciiString&,
+         NCollection_Sequence<int>& )];
+  %MethodCode
+    Py_BEGIN_ALLOW_THREADS
+    sipRes = HYDROData_Profile::ImportFromFile( a0, *a1, *a2 );
+    Py_END_ALLOW_THREADS
+  %End
+
   /**
    * Imports Profile data from file.
    * \param theFileName the path to file