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 bd3aab3d3e2cbbb82345eb0fbf0c1deb16a9e2f6..e67faaea7759c13d080875ba1c55cd3f76e2c120 100644 (file)
--- a/src/HYDROPy/HYDROData_Profile.sip
+++ b/src/HYDROPy/HYDROData_Profile.sip
@@ -1,8 +1,4 @@
-// Copyright (C) 2007-2015  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
@@ -38,12 +34,12 @@ 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:
@@ -97,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;
@@ -176,13 +172,14 @@ public:
    */
   static int ImportFromFile( HYDROData_Document             theDoc,
                              const TCollection_AsciiString& theFileName,
-                             NCollection_Sequence<int>&     theBadProfilesIds )
-  [int ( const Handle_HYDROData_Document&,
+                             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
 
@@ -193,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:
   /**