From: asl Date: Tue, 17 Nov 2015 04:59:30 +0000 (+0300) Subject: compilation on Linux X-Git-Tag: v1.5~36 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=02d681fe376366b37e833eb115b5f7129ea13cad;p=modules%2Fhydro.git compilation on Linux --- diff --git a/src/HYDROData/HYDROData_LandCoverMap.h b/src/HYDROData/HYDROData_LandCoverMap.h index d88e65d2..656a482e 100644 --- a/src/HYDROData/HYDROData_LandCoverMap.h +++ b/src/HYDROData/HYDROData_LandCoverMap.h @@ -91,7 +91,7 @@ public: HYDRODATA_EXPORT virtual const ObjectKind GetKind() const; HYDRODATA_EXPORT bool ImportSHP( const QString& theSHPFileName, - const QList& theIndices = QList()); + const QList& theIndices = QList() ); HYDRODATA_EXPORT bool ExportSHP( const QString& theSHPFileName ) const; diff --git a/src/HYDROPy/HYDROData_LandCoverMap.sip b/src/HYDROPy/HYDROData_LandCoverMap.sip index d8e3706a..a502140d 100644 --- a/src/HYDROPy/HYDROData_LandCoverMap.sip +++ b/src/HYDROPy/HYDROData_LandCoverMap.sip @@ -52,9 +52,6 @@ public: HYDROData_LandCoverMap(); ~HYDROData_LandCoverMap(); - bool ImportSHP( const QString& theSHPFileName ); - void ExportSHP( const QString& theSHPFileName ) const; - DBFStatus ImportDBF( const QString& theDBFFileName, const QString& theFieldName, const QStringList& DBFValues, @@ -65,12 +62,12 @@ public: const QStringList& theDBFValues, const QStringList& theStricklerTypes ) const; - bool ImportSHP( const QString& theFileName); + bool ImportSHP( const QString& theFileName, const QList& theIndices = QList() ); - bool ExportSHP( const QString& theFileName) const; + bool ExportSHP( const QString& theFileName ) const; bool ExportTelemac( const QString& theFileName, double theDeflection, - HYDROData_StricklerTable theTable ) const + HYDROData_StricklerTable theTable ) const [bool( const QString&, double, const Handle_HYDROData_StricklerTable& )]; %MethodCode Handle(HYDROData_StricklerTable) aRef =