From: isn <isn@opencascade.com>
Date: Mon, 16 Nov 2015 09:07:07 +0000 (+0300)
Subject: Merge remote-tracking branch 'remotes/origin/BR_LAND_COVER_MAP' into BR_LCM_COMP
X-Git-Tag: v1.5~38^2~6
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=c85ae099df066af072edac2b16f8eafebed67e19;p=modules%2Fhydro.git

Merge remote-tracking branch 'remotes/origin/BR_LAND_COVER_MAP' into BR_LCM_COMP

Conflicts:
	src/HYDROData/HYDROData_LandCoverMap.h
---

c85ae099df066af072edac2b16f8eafebed67e19
diff --cc src/HYDROData/HYDROData_LandCoverMap.h
index caf89f64,15b697f4..7df0dcba
--- a/src/HYDROData/HYDROData_LandCoverMap.h
+++ b/src/HYDROData/HYDROData_LandCoverMap.h
@@@ -99,12 -105,9 +105,11 @@@ public
                                     const QStringList& theDBFValues,
                                     const QStringList& theStricklerTypes ) const;
  
-   bool ImportShp( const QString& theFileName, 
-                   const QList<int>& theIndices =  QList<int>());
- 
+   HYDRODATA_EXPORT bool ExportTelemac( const QString& theFileName,
+                                        double theDeflection,
+                                        const Handle_HYDROData_StricklerTable& theTable ) const;
 +  bool ExportShp( const QString& theFileName) const;
 +
-   HYDRODATA_EXPORT bool ExportTelemac( const QString& theFileName, double theDeflection ) const;
  
    HYDRODATA_EXPORT bool Add( const Handle( HYDROData_Object )&, const QString& theType );
    HYDRODATA_EXPORT bool Add( const Handle( HYDROData_PolylineXY )&, const QString& theType );
diff --cc src/HYDROPy/HYDROData_LandCoverMap.sip
index 5b351ccd,2fe2c10e..802811dd
--- a/src/HYDROPy/HYDROData_LandCoverMap.sip
+++ b/src/HYDROPy/HYDROData_LandCoverMap.sip
@@@ -61,12 -64,21 +64,25 @@@ public
      const QString& theFieldName, 
      const QStringList& theDBFValues,
      const QStringList& theStricklerTypes ) const;
 + 
 +  bool ImportShp( const QString& theFileName);
 +
 +  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 Handle_HYDROData_StricklerTable& )];
+   %MethodCode
+     Handle(HYDROData_StricklerTable) aRef =
+       Handle(HYDROData_StricklerTable)::DownCast( createHandle( a2 ) );
+     if ( !aRef.IsNull() )
+     {
+       Py_BEGIN_ALLOW_THREADS
+       sipRes = sipSelfWasArg ? sipCpp->HYDROData_LandCoverMap::ExportTelemac( *a0, a1, aRef ):
+                                sipCpp->ExportTelemac( *a0, a1, aRef );
+       Py_END_ALLOW_THREADS
+     }
+   %End
  
    bool Add( HYDROData_Object theObject, const QString& theType )
    [bool ( const Handle_HYDROData_Object&, const QString& )];