This commit is contained in:
Peter Petrik 2019-01-21 08:49:43 +01:00
parent 7423a74915
commit 1b11ba43a2
3 changed files with 17 additions and 11 deletions

View File

@ -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

View File

@ -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 );

View File

@ -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