Initial merge of branch 'BR_HYDRO_IMPS_2016' into BR_PORTING_OCCT_7

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

diff --git a/src/HYDROPy/HYDROData_LandCoverMap.sip b/src/HYDROPy/HYDROData_LandCoverMap.sip
index 734565ea0617d573b65305ec7e4c11cd90255e0f..7f9d15428832ab0337b15312a573bf5157027f43 100644 (file)
--- a/src/HYDROPy/HYDROData_LandCoverMap.sip
+++ b/src/HYDROPy/HYDROData_LandCoverMap.sip
@@ -55,18 +55,35 @@ public:
   DBFStatus ImportDBF( const QString& theDBFFileName, 
     const QString& theFieldName, 
     const QStringList& DBFValues,
-    const QStringList& StricklerTypes,
-    const QList<int>& theIndices );
+    const QStringList& StricklerTypes );
  
   void ExportDBF( const QString& theDBFFileName,
     const QString& theFieldName, 
     const QStringList& theDBFValues,
     const QStringList& theStricklerTypes ) const;
+ 
+  bool ImportSHP( const QString& theFileName, const QList<int>& theIndices = QList<int>() );
+
+  bool ExportSHP( const QString& theFileName ) const;
 
-  bool ExportTelemac( const QString& theFileName, double theDeflection ) const;
+  bool ExportTelemac( const QString& theFileName, double theDeflection,
+                      HYDROData_StricklerTable theTable ) const
+  [bool( const QString&, double, const opencascade::handle<HYDROData_StricklerTable>& )];
+  %MethodCode
+    Handle(HYDROData_StricklerTable) aRef =
+      Handle(HYDROData_StricklerTable)::DownCast( createHandle( a2 ) );
+    if ( !aRef.IsNull() )
+    {
+      Py_BEGIN_ALLOW_THREADS
+         QString messStat;
+      sipRes = sipSelfWasArg ? sipCpp->HYDROData_LandCoverMap::ExportTelemac( *a0, a1, aRef, messStat ):
+                               sipCpp->ExportTelemac( *a0, a1, aRef, messStat );
+      Py_END_ALLOW_THREADS
+    }
+  %End
 
   bool Add( HYDROData_Object theObject, const QString& theType )
-  [bool ( const Handle_HYDROData_Object&, const QString& )];
+  [bool ( const opencascade::handle<HYDROData_Object>&, const QString& )];
   %MethodCode
     Handle(HYDROData_Object) aRef =
       Handle(HYDROData_Object)::DownCast( createHandle( a0 ) );
@@ -80,7 +97,7 @@ public:
   %End
 
   bool Add( HYDROData_PolylineXY thePolyline, const QString& theType )
-  [bool ( const Handle_HYDROData_PolylineXY&, const QString& )];
+  [bool ( const opencascade::handle<HYDROData_PolylineXY>&, const QString& )];
   %MethodCode
     Handle(HYDROData_PolylineXY) aRef =
       Handle(HYDROData_PolylineXY)::DownCast( createHandle( a0 ) );
@@ -94,7 +111,7 @@ public:
   %End
 
   bool Split( HYDROData_PolylineXY thePolyline )
-  [bool ( const Handle_HYDROData_PolylineXY& )];
+  [bool ( const opencascade::handle<HYDROData_PolylineXY>& )];
   %MethodCode
     Handle(HYDROData_PolylineXY) aRef =
       Handle(HYDROData_PolylineXY)::DownCast( createHandle( a0 ) );