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

Make QgsProcessingAlgRunnerTask work correctly

Browse Source 
It now safely can execute algorithms in background threads
without issues
This commit is contained in:
Nyall Dawson 2017-06-30 15:58:42 +10:00
parent e5b156b86a
commit e1184cd69a
3 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
python/core/processing/qgsprocessingalgrunnertask.sip
View File

@ -33,6 +33,15 @@ class QgsProcessingAlgRunnerTask : QgsTask
virtual void cancel(); virtual void cancel();
signals:
void executed( bool successful, const QVariantMap &results );
%Docstring
Emitted when the algorithm has finished execution. If the algorithm completed
execution without errors then ``successful`` will be true. The ``results`` argument
contains the results reported by the algorithm.
%End
protected: protected:
virtual bool run(); virtual bool run();

14
src/core/processing/qgsprocessingalgrunnertask.cpp
View File

@ -24,7 +24,6 @@
QgsProcessingAlgRunnerTask::QgsProcessingAlgRunnerTask( const QgsProcessingAlgorithm *algorithm, const QVariantMap &parameters, QgsProcessingContext &context, QgsProcessingFeedback *feedback ) QgsProcessingAlgRunnerTask::QgsProcessingAlgRunnerTask( const QgsProcessingAlgorithm *algorithm, const QVariantMap &parameters, QgsProcessingContext &context, QgsProcessingFeedback *feedback )
: QgsTask( tr( "Running %1" ).arg( algorithm->name() ), QgsTask::CanCancel ) : QgsTask( tr( "Running %1" ).arg( algorithm->name() ), QgsTask::CanCancel )
, mParameters( parameters )
, mContext( context ) , mContext( context )
, mFeedback( feedback ) , mFeedback( feedback )
, mAlgorithm( algorithm->create() ) , mAlgorithm( algorithm->create() )
@ -34,6 +33,8 @@ QgsProcessingAlgRunnerTask::QgsProcessingAlgRunnerTask( const QgsProcessingAlgor
mOwnedFeedback.reset( new QgsProcessingFeedback() ); mOwnedFeedback.reset( new QgsProcessingFeedback() );
mFeedback = mOwnedFeedback.get(); mFeedback = mOwnedFeedback.get();
} }
if ( !mAlgorithm->prepare( parameters, context, mFeedback ) )
cancel();
} }
void QgsProcessingAlgRunnerTask::cancel() void QgsProcessingAlgRunnerTask::cancel()
@ -47,7 +48,7 @@ bool QgsProcessingAlgRunnerTask::run()
bool ok = false; bool ok = false;
try try
{ {
mResults = mAlgorithm->run( mParameters, mContext, mFeedback, &ok ); ok = mAlgorithm->runPrepared( mContext, mFeedback );
} }
catch ( QgsProcessingException & ) catch ( QgsProcessingException & )
{ {
@ -59,12 +60,9 @@ bool QgsProcessingAlgRunnerTask::run()
void QgsProcessingAlgRunnerTask::finished( bool result ) void QgsProcessingAlgRunnerTask::finished( bool result )
{ {
Q_UNUSED( result ); Q_UNUSED( result );
if ( !mResults.isEmpty() ) if ( result )
{ {
QgsMapLayer *layer = QgsProcessingUtils::mapLayerFromString( mResults.value( "OUTPUT_LAYER" ).toString(), mContext ); mResults = mAlgorithm->postProcess( mContext, mFeedback );
if ( layer )
{
mContext.project()->addMapLayer( mContext.temporaryLayerStore()->takeMapLayer( layer ) );
}
} }
emit executed( result, mResults );
} }

10
src/core/processing/qgsprocessingalgrunnertask.h
View File

@ -49,6 +49,15 @@ class CORE_EXPORT QgsProcessingAlgRunnerTask : public QgsTask
virtual void cancel() override; virtual void cancel() override;
signals:
/**
* Emitted when the algorithm has finished execution. If the algorithm completed
* execution without errors then \a successful will be true. The \a results argument
* contains the results reported by the algorithm.
*/
void executed( bool successful, const QVariantMap &results );
protected: protected:
virtual bool run() override; virtual bool run() override;
@ -56,7 +65,6 @@ class CORE_EXPORT QgsProcessingAlgRunnerTask : public QgsTask
private: private:
QVariantMap mParameters;
QVariantMap mResults; QVariantMap mResults;
QgsProcessingContext &mContext; QgsProcessingContext &mContext;
QgsProcessingFeedback *mFeedback = nullptr; QgsProcessingFeedback *mFeedback = nullptr;