From 20eddb87d5b771ea4c7ccf37b03a6db052023ff6 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Mon, 27 Jul 2020 04:23:16 +0000 Subject: [PATCH] Fix loading batch settings with date/time values --- python/plugins/processing/gui/BatchPanel.py | 15 ++++++++++++++- python/plugins/processing/gui/HistoryDialog.py | 2 ++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/python/plugins/processing/gui/BatchPanel.py b/python/plugins/processing/gui/BatchPanel.py index d298130c5e63..a69ca66e3952 100644 --- a/python/plugins/processing/gui/BatchPanel.py +++ b/python/plugins/processing/gui/BatchPanel.py @@ -37,7 +37,19 @@ QMenu, QAction ) -from qgis.PyQt.QtGui import QPalette + +# adding to this list? also update the HistoryDialog.py executeAlgorithm imports!! + +from qgis.PyQt.QtCore import ( + QTime, # NOQA - must be here for saved file evaluation + QDate, # NOQA - must be here for saved file evaluation + QDateTime # NOQA - must be here for saved file evaluation +) +from qgis.PyQt.QtGui import ( + QPalette, + QColor, # NOQA - must be here for saved file evaluation +) + from qgis.PyQt.QtCore import ( QDir, QFileInfo, @@ -49,6 +61,7 @@ QgsSettings, QgsProperty, # NOQA - must be here for saved file evaluation QgsProject, + QgsFeatureRequest, # NOQA - must be here for saved file evaluation QgsProcessingFeatureSourceDefinition, # NOQA - must be here for saved file evaluation QgsCoordinateReferenceSystem, # NOQA - must be here for saved file evaluation QgsProcessingParameterDefinition, diff --git a/python/plugins/processing/gui/HistoryDialog.py b/python/plugins/processing/gui/HistoryDialog.py index 962ed8bf074a..561927ec5dd0 100644 --- a/python/plugins/processing/gui/HistoryDialog.py +++ b/python/plugins/processing/gui/HistoryDialog.py @@ -120,7 +120,9 @@ def executeAlgorithm(self): if isinstance(item, TreeLogEntryItem): if item.isAlg: script = 'import processing\n' + # adding to this list? Also update the BatchPanel.py imports!! script += 'from qgis.core import QgsProcessingOutputLayerDefinition, QgsProcessingFeatureSourceDefinition, QgsProperty, QgsCoordinateReferenceSystem, QgsFeatureRequest\n' + script += 'from qgis.PyQt.QtCore import QDate, QTime, QDateTime\n' script += 'from qgis.PyQt.QtGui import QColor\n' script += item.entry.text.replace('processing.run(', 'processing.execAlgorithmDialog(') self.close()