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

[processing] Add flag to indicate whether an algorithm is safe

Browse Source 
to run in a background thread
This commit is contained in:
Nyall Dawson 2017-12-05 13:42:16 +10:00
parent 5babec5e07
commit 40e47e0fe7
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
python/core/processing/qgsprocessingalgorithm.sip
View File

@ -44,6 +44,7 @@ Abstract base class for processing algorithms.
FlagSupportsBatch, FlagSupportsBatch,
FlagCanCancel, FlagCanCancel,
FlagRequiresMatchingCrs, FlagRequiresMatchingCrs,
FlagCanRunInBackground,
FlagDeprecated, FlagDeprecated,
}; };
typedef QFlags<QgsProcessingAlgorithm::Flag> Flags; typedef QFlags<QgsProcessingAlgorithm::Flag> Flags;

7
python/plugins/processing/gui/AlgorithmDialog.py
View File

@ -53,7 +53,7 @@ from processing.core.ProcessingResults import resultsList
from processing.gui.ParametersPanel import ParametersPanel from processing.gui.ParametersPanel import ParametersPanel
from processing.gui.BatchAlgorithmDialog import BatchAlgorithmDialog from processing.gui.BatchAlgorithmDialog import BatchAlgorithmDialog
from processing.gui.AlgorithmDialogBase import AlgorithmDialogBase from processing.gui.AlgorithmDialogBase import AlgorithmDialogBase
from processing.gui.AlgorithmExecutor import executeIterating from processing.gui.AlgorithmExecutor import executeIterating, execute
from processing.gui.Postprocessing import handleAlgorithmResults from processing.gui.Postprocessing import handleAlgorithmResults
from processing.tools import dataobjects from processing.tools import dataobjects
@ -243,9 +243,14 @@ class AlgorithmDialog(QgsProcessingAlgorithmDialogBase):
self.cancelButton().setEnabled(False) self.cancelButton().setEnabled(False)
self.finish(ok, results, context, feedback) self.finish(ok, results, context, feedback)
if self.algorithm().flags() & QgsProcessingAlgorithm.FlagCanRunInBackground:
task = QgsProcessingAlgRunnerTask(self.algorithm(), parameters, context, feedback) task = QgsProcessingAlgRunnerTask(self.algorithm(), parameters, context, feedback)
task.executed.connect(on_complete) task.executed.connect(on_complete)
QgsApplication.taskManager().addTask(task) QgsApplication.taskManager().addTask(task)
else:
self.setWindowModality(Qt.ApplicationModal)
ok, results = execute(self.algorithm(), parameters, context, feedback)
on_complete(ok, results)
except AlgorithmDialogBase.InvalidParameterValue as e: except AlgorithmDialogBase.InvalidParameterValue as e:
try: try:

1
src/core/processing/qgsprocessingalgorithm.h
View File

@ -72,6 +72,7 @@ class CORE_EXPORT QgsProcessingAlgorithm
FlagSupportsBatch = 1 << 3, //!< Algorithm supports batch mode FlagSupportsBatch = 1 << 3, //!< Algorithm supports batch mode
FlagCanCancel = 1 << 4, //!< Algorithm can be canceled FlagCanCancel = 1 << 4, //!< Algorithm can be canceled
FlagRequiresMatchingCrs = 1 << 5, //!< Algorithm requires that all input layers have matching coordinate reference systems FlagRequiresMatchingCrs = 1 << 5, //!< Algorithm requires that all input layers have matching coordinate reference systems
FlagCanRunInBackground = 1 << 6, //!< Algorithm is safe to run in a background thread
FlagDeprecated = FlagHideFromToolbox | FlagHideFromModeler, //!< Algorithm is deprecated FlagDeprecated = FlagHideFromToolbox | FlagHideFromModeler, //!< Algorithm is deprecated
}; };
Q_DECLARE_FLAGS( Flags, Flag ) Q_DECLARE_FLAGS( Flags, Flag )