[processing] don't show cancel button in the task manager for algorithms that can not be cancelled (refs #20441) #9026
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
that can not be cancelled (refs #20441)
nyalldawson
reviewed
Jan 29, 2019
| @@ -23,7 +23,7 @@ | |||
| #include "qgsvectorlayer.h" | |||
|
|
|||
| QgsProcessingAlgRunnerTask::QgsProcessingAlgRunnerTask( const QgsProcessingAlgorithm *algorithm, const QVariantMap ¶meters, QgsProcessingContext &context, QgsProcessingFeedback *feedback ) | |||
| : QgsTask( tr( "Executing “%1”" ).arg( algorithm->displayName() ), QgsTask::CanCancel ) | |||
| : QgsTask( tr( "Executing “%1”" ).arg( algorithm->displayName() ), algorithm->flags() & QgsProcessingAlgorithm::FlagNoThreading ? QgsTask::CanCancel : QgsTask::Flag() ) | |||
There was a problem hiding this comment.
Isn't this logic backwards?
There was a problem hiding this comment.
This looks strange for me too. Don't know why, but backwards (and correct) condition
algorithm->flags() & QgsProcessingAlgorithm::FlagNoThreading ? QgsTask::Flag() : QgsTask::CanCancel
does not work for me, for example, with GDAL algorithms I still have a cancel button in the task manager.
There was a problem hiding this comment.
Actually the flag tested is wrong - it should be FlagCanCancel
nyalldawson
approved these changes
Jan 29, 2019
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
While for these algorithms we have "Cancel" button disabled (see https://issues.qgis.org/issues/18600), in the task manager UI cancel button still present. This causes some confusion, when user clicks on this button and nothing happens.
Partially fixes https://issues.qgis.org/issues/20441.
Checklist
fixes #11111in the commit message next to the description[FEATURE]in the commit message[needs-docs]in the commit message and contain sufficient information in the commit message to be documentedscripts/prepare-commit.shscript before each commit