sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-18 00:03:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix docs

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
python/core/auto_generated/mesh/qgsmeshlayerinterpolator.sip.in
View File

@ -24,8 +24,8 @@ namespace QgsMeshUtils
QgsRasterBlock *exportRasterBlock( QgsRasterBlock *exportRasterBlock(
const QgsMeshLayer &layer, const QgsMeshLayer &layer,
const QgsMeshDatasetIndex &datasetIndex, const QgsMeshDatasetIndex &datasetIndex,
const QgsCoordinateReferenceSystem &destination, const QgsCoordinateReferenceSystem &destinationCrs,
const QgsCoordinateTransformContext &context, const QgsCoordinateTransformContext &transformContext,
double mapUnitsPerPixel, double mapUnitsPerPixel,
const QgsRectangle &extent, const QgsRectangle &extent,
QgsRasterBlockFeedback *feedback = 0 QgsRasterBlockFeedback *feedback = 0
@ -33,10 +33,13 @@ namespace QgsMeshUtils
%Docstring %Docstring
Exports mesh layer's dataset values as raster block 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 layer: mesh layer
:param datasetIndex: index from layer defining group and dataset (time) to export :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 destinationCrs: destination/map CRS. Used to create triangular mesh from native mesh
:param context: Transform context to transform layer CRS to destination CRS :param transformContext: Transform context to transform layer CRS to destination CRS
:param mapUnitsPerPixel: map units per pixel for block :param mapUnitsPerPixel: map units per pixel for block
:param extent: extent of block in destination CRS :param extent: extent of block in destination CRS
:param feedback: optional raster feedback object for cancelation/preview :param feedback: optional raster feedback object for cancelation/preview

6
src/core/mesh/qgsmeshlayerinterpolator.cpp
View File

@ -154,8 +154,8 @@ QgsRasterBlock *QgsMeshLayerInterpolator::block( int, const QgsRectangle &extent
QgsRasterBlock *QgsMeshUtils::exportRasterBlock( QgsRasterBlock *QgsMeshUtils::exportRasterBlock(
const QgsMeshLayer &layer, const QgsMeshLayer &layer,
const QgsMeshDatasetIndex &datasetIndex, const QgsMeshDatasetIndex &datasetIndex,
const QgsCoordinateReferenceSystem &destination, const QgsCoordinateReferenceSystem &destinationCrs,
const QgsCoordinateTransformContext &context, const QgsCoordinateTransformContext &transformContext,
double mapUnitsPerPixel, double mapUnitsPerPixel,
const QgsRectangle &extent, const QgsRectangle &extent,
QgsRasterBlockFeedback *feedback ) QgsRasterBlockFeedback *feedback )
@ -176,7 +176,7 @@ QgsRasterBlock *QgsMeshUtils::exportRasterBlock(
widthPixel, widthPixel,
heightPixel, heightPixel,
0 ); 0 );
QgsCoordinateTransform transform( layer.crs(), destination, context ); QgsCoordinateTransform transform( layer.crs(), destinationCrs, transformContext );
QgsRenderContext renderContext; QgsRenderContext renderContext;
renderContext.setCoordinateTransform( transform ); renderContext.setCoordinateTransform( transform );

11
src/core/mesh/qgsmeshlayerinterpolator.h
View File

@ -84,10 +84,13 @@ namespace QgsMeshUtils
/** /**
* Exports mesh layer's dataset values as raster block * 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 layer mesh layer
* \param datasetIndex index from layer defining group and dataset (time) to export * \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 destinationCrs destination/map CRS. Used to create triangular mesh from native mesh
* \param context Transform context to transform layer CRS to destination CRS * \param transformContext Transform context to transform layer CRS to destination CRS
* \param mapUnitsPerPixel map units per pixel for block * \param mapUnitsPerPixel map units per pixel for block
* \param extent extent of block in destination CRS * \param extent extent of block in destination CRS
* \param feedback optional raster feedback object for cancelation/preview * \param feedback optional raster feedback object for cancelation/preview
@ -98,8 +101,8 @@ namespace QgsMeshUtils
CORE_EXPORT QgsRasterBlock *exportRasterBlock( CORE_EXPORT QgsRasterBlock *exportRasterBlock(
const QgsMeshLayer &layer, const QgsMeshLayer &layer,
const QgsMeshDatasetIndex &datasetIndex, const QgsMeshDatasetIndex &datasetIndex,
const QgsCoordinateReferenceSystem &destination, const QgsCoordinateReferenceSystem &destinationCrs,
const QgsCoordinateTransformContext &context, const QgsCoordinateTransformContext &transformContext,
double mapUnitsPerPixel, double mapUnitsPerPixel,
const QgsRectangle &extent, const QgsRectangle &extent,
QgsRasterBlockFeedback *feedback = nullptr QgsRasterBlockFeedback *feedback = nullptr