sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-11-12 00:06:54 -05:00
Code Issues Packages Projects Releases Wiki Activity

add more feedback cancellation and fix doc

Browse Source
This commit is contained in:
vcloarec 2020-08-27 18:07:25 -04:00
parent 0f70883b6d
commit abd5fad9dd
3 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
python/core/auto_generated/qgsprovidermetadata.sip.in
View File

@ -228,7 +228,7 @@ Creates a new instance of the raster data provider.
const QString &driverName, const QString &driverName,
const QgsCoordinateReferenceSystem &crs ) const; const QgsCoordinateReferenceSystem &crs ) const;
%Docstring %Docstring
Creates mesh data source (depending of the provider) Creates mesh data source, that is the mesh frame stored in file, memory or with other way (depending of the provider)
.. versionadded:: 3.16 .. versionadded:: 3.16
%End %End

15
src/analysis/processing/qgsalgorithmtinmeshcreation.cpp
View File

@ -85,6 +85,9 @@ bool QgsTinMeshCreationAlgorithm::prepareAlgorithm( const QVariantMap &parameter
for ( const QVariant &layer : layersList ) for ( const QVariant &layer : layersList )
{ {
if ( feedback && feedback->isCanceled() )
return false;
if ( layer.type() != QVariant::Map ) if ( layer.type() != QVariant::Map )
continue; continue;
const QVariantMap layerMap = layer.toMap(); const QVariantMap layerMap = layer.toMap();
@ -112,6 +115,7 @@ bool QgsTinMeshCreationAlgorithm::prepareAlgorithm( const QVariantMap &parameter
if ( mVerticesLayer.isEmpty() && mBreakLinesLayer.isEmpty() ) if ( mVerticesLayer.isEmpty() && mBreakLinesLayer.isEmpty() )
return false; return false;
return true; return true;
} }
@ -124,10 +128,21 @@ QVariantMap QgsTinMeshCreationAlgorithm::processAlgorithm( const QVariantMap &pa
triangulation.setCrs( destinationCrs ); triangulation.setCrs( destinationCrs );
for ( Layer &l : mVerticesLayer ) for ( Layer &l : mVerticesLayer )
{
if ( feedback && feedback->isCanceled() )
break;
triangulation.addVertices( l.fit, l.attributeIndex, l.transform, feedback, l.featureCount ); triangulation.addVertices( l.fit, l.attributeIndex, l.transform, feedback, l.featureCount );
}
for ( Layer &l : mBreakLinesLayer ) for ( Layer &l : mBreakLinesLayer )
{
if ( feedback && feedback->isCanceled() )
break;
triangulation.addBreakLines( l.fit, l.attributeIndex, l.transform, feedback, l.featureCount ); triangulation.addBreakLines( l.fit, l.attributeIndex, l.transform, feedback, l.featureCount );
}
if ( feedback && feedback->isCanceled() )
return QVariantMap();
const QString fileName = parameterAsFile( parameters, QStringLiteral( "OUTPUT_MESH" ), context ); const QString fileName = parameterAsFile( parameters, QStringLiteral( "OUTPUT_MESH" ), context );
int driverIndex = parameterAsEnum( parameters, QStringLiteral( "MESH_FORMAT" ), context ); int driverIndex = parameterAsEnum( parameters, QStringLiteral( "MESH_FORMAT" ), context );

2
src/core/qgsprovidermetadata.h
View File

@ -292,7 +292,7 @@ class CORE_EXPORT QgsProviderMetadata : public QObject
const QStringList &createOptions = QStringList() ) SIP_FACTORY; const QStringList &createOptions = QStringList() ) SIP_FACTORY;
/** /**
* Creates mesh data source (depending of the provider) * Creates mesh data source, that is the mesh frame stored in file, memory or with other way (depending of the provider)
* \since QGIS 3.16 * \since QGIS 3.16
*/ */
virtual bool createMeshData( virtual bool createMeshData(