Merge branch 'BR_H2018_3' into BR_2018_V8_5

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

diff --git a/src/HYDROPy/HYDROData_Profile.sip b/src/HYDROPy/HYDROData_Profile.sip
index 41ec2f786f4bfaf63a1c8fb66e5646dad204482a..e67faaea7759c13d080875ba1c55cd3f76e2c120 100644 (file)
--- a/src/HYDROPy/HYDROData_Profile.sip
+++ b/src/HYDROPy/HYDROData_Profile.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
@@ -26,25 +22,24 @@
 
 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.
    */
-  static QColor DefaultFillingColor();
+  virtual QColor DefaultFillingColor() const;
 
   /**
    * Returns default border color for new profile.
    */
-  static QColor DefaultBorderColor();
+  virtual QColor DefaultBorderColor() const;
 
 
 public:
@@ -98,7 +93,7 @@ public:
    * \return profile U,Z
    */
   HYDROData_ProfileUZ GetProfileUZ( const bool theIsCreate = true ) const 
-    [Handle_HYDROData_ProfileUZ ( const bool theIsCreate = true )];
+    [opencascade::handle<HYDROData_ProfileUZ> ( const bool theIsCreate = true )];
   %MethodCode
 
     Handle(HYDROData_ProfileUZ) aRefProfileUZ;
@@ -143,14 +138,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,15 +170,16 @@ public:
    * \param theFileName the path to file
    * \return \c number of successfully imported profiles
    */
-  static int ImportFromFile( const HYDROData_Document theDoc,
-                             const TCollection_AsciiString&    theFileName,
-                             NCollection_Sequence<int>&        theBadProfilesIds )
-  [int ( const Handle_HYDROData_Document& ,
-         const TCollection_AsciiString&    ,
-         NCollection_Sequence<int>&         )];
+  static int ImportFromFile( HYDROData_Document             theDoc,
+                             const TCollection_AsciiString& theFileName,
+                             NCollection_Sequence<int>&     theBadProfilesIds,
+                             bool isToProject = true )
+  [int ( const opencascade::handle<HYDROData_Document>&,
+         const TCollection_AsciiString&,
+         NCollection_Sequence<int>& )];
   %MethodCode
     Py_BEGIN_ALLOW_THREADS
-    sipRes = HYDROData_Profile::ImportFromFile( a0, *a1, a2 );
+    sipRes = HYDROData_Profile::ImportFromFile( a0, *a1, *a2, a3 );
     Py_END_ALLOW_THREADS
   %End
 
@@ -194,7 +190,8 @@ public:
    * \return \c true if file has been successfully read
    */
   virtual bool ImportFromFile( const TCollection_AsciiString& theFileName,
-                               bool*                          theIsRead = 0 );
+                                                          bool isToProject = true,
+                               bool* isNotEmpty = 0 );
 
 protected:
   /**