From 1b11ba43a27396d506eb45f13440b52b2d01883c Mon Sep 17 00:00:00 2001 From: Peter Petrik Date: Mon, 21 Jan 2019 08:49:43 +0100 Subject: [PATCH] fix docs --- .../mesh/qgsmeshlayerinterpolator.sip.in | 11 +++++++---- src/core/mesh/qgsmeshlayerinterpolator.cpp | 6 +++--- src/core/mesh/qgsmeshlayerinterpolator.h | 11 +++++++---- 3 files changed, 17 insertions(+), 11 deletions(-) diff --git a/python/core/auto_generated/mesh/qgsmeshlayerinterpolator.sip.in b/python/core/auto_generated/mesh/qgsmeshlayerinterpolator.sip.in index 2a5467fb266..799f601ffc3 100644 --- a/python/core/auto_generated/mesh/qgsmeshlayerinterpolator.sip.in +++ b/python/core/auto_generated/mesh/qgsmeshlayerinterpolator.sip.in @@ -24,8 +24,8 @@ namespace QgsMeshUtils QgsRasterBlock *exportRasterBlock( const QgsMeshLayer &layer, const QgsMeshDatasetIndex &datasetIndex, - const QgsCoordinateReferenceSystem &destination, - const QgsCoordinateTransformContext &context, + const QgsCoordinateReferenceSystem &destinationCrs, + const QgsCoordinateTransformContext &transformContext, double mapUnitsPerPixel, const QgsRectangle &extent, QgsRasterBlockFeedback *feedback = 0 @@ -33,10 +33,13 @@ namespace QgsMeshUtils %Docstring Exports mesh layer's dataset values as raster block +The function always fetches native mesh and dataset data +from data provider and calculates triangular mesh + :param layer: mesh layer :param datasetIndex: index from layer defining group and dataset (time) to export -:param destination: destination/map CRS. Used to create triangular mesh from native mesh -:param context: Transform context to transform layer CRS to destination CRS +:param destinationCrs: destination/map CRS. Used to create triangular mesh from native mesh +:param transformContext: Transform context to transform layer CRS to destination CRS :param mapUnitsPerPixel: map units per pixel for block :param extent: extent of block in destination CRS :param feedback: optional raster feedback object for cancelation/preview diff --git a/src/core/mesh/qgsmeshlayerinterpolator.cpp b/src/core/mesh/qgsmeshlayerinterpolator.cpp index 74978ea098f..cc5cd02b3a3 100644 --- a/src/core/mesh/qgsmeshlayerinterpolator.cpp +++ b/src/core/mesh/qgsmeshlayerinterpolator.cpp @@ -154,8 +154,8 @@ QgsRasterBlock *QgsMeshLayerInterpolator::block( int, const QgsRectangle &extent QgsRasterBlock *QgsMeshUtils::exportRasterBlock( const QgsMeshLayer &layer, const QgsMeshDatasetIndex &datasetIndex, - const QgsCoordinateReferenceSystem &destination, - const QgsCoordinateTransformContext &context, + const QgsCoordinateReferenceSystem &destinationCrs, + const QgsCoordinateTransformContext &transformContext, double mapUnitsPerPixel, const QgsRectangle &extent, QgsRasterBlockFeedback *feedback ) @@ -176,7 +176,7 @@ QgsRasterBlock *QgsMeshUtils::exportRasterBlock( widthPixel, heightPixel, 0 ); - QgsCoordinateTransform transform( layer.crs(), destination, context ); + QgsCoordinateTransform transform( layer.crs(), destinationCrs, transformContext ); QgsRenderContext renderContext; renderContext.setCoordinateTransform( transform ); diff --git a/src/core/mesh/qgsmeshlayerinterpolator.h b/src/core/mesh/qgsmeshlayerinterpolator.h index 38721fe77e6..92b83c3cd71 100644 --- a/src/core/mesh/qgsmeshlayerinterpolator.h +++ b/src/core/mesh/qgsmeshlayerinterpolator.h @@ -84,10 +84,13 @@ namespace QgsMeshUtils /** * Exports mesh layer's dataset values as raster block * + * The function always fetches native mesh and dataset data + * from data provider and calculates triangular mesh + * * \param layer mesh layer * \param datasetIndex index from layer defining group and dataset (time) to export - * \param destination destination/map CRS. Used to create triangular mesh from native mesh - * \param context Transform context to transform layer CRS to destination CRS + * \param destinationCrs destination/map CRS. Used to create triangular mesh from native mesh + * \param transformContext Transform context to transform layer CRS to destination CRS * \param mapUnitsPerPixel map units per pixel for block * \param extent extent of block in destination CRS * \param feedback optional raster feedback object for cancelation/preview @@ -98,8 +101,8 @@ namespace QgsMeshUtils CORE_EXPORT QgsRasterBlock *exportRasterBlock( const QgsMeshLayer &layer, const QgsMeshDatasetIndex &datasetIndex, - const QgsCoordinateReferenceSystem &destination, - const QgsCoordinateTransformContext &context, + const QgsCoordinateReferenceSystem &destinationCrs, + const QgsCoordinateTransformContext &transformContext, double mapUnitsPerPixel, const QgsRectangle &extent, QgsRasterBlockFeedback *feedback = nullptr