From b1de8503b218f4f34e0b500e3cfc373d4cd2fb39 Mon Sep 17 00:00:00 2001
From: Daniel Scheffler <danschef@gfz-potsdam.de>
Date: Tue, 15 Jun 2021 21:56:15 +0200
Subject: [PATCH] Improved parameter titles and fixed that Polymer root
directory was not optional.
Signed-off-by: Daniel Scheffler <danschef@gfz-potsdam.de>
---
enpt_enmapboxapp/_enpt_alg_base.py | 16 +++++++++-------
enpt_enmapboxapp/enpt_algorithm.py | 3 ---
2 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/enpt_enmapboxapp/_enpt_alg_base.py b/enpt_enmapboxapp/_enpt_alg_base.py
index 5310225..df74c46 100644
--- a/enpt_enmapboxapp/_enpt_alg_base.py
+++ b/enpt_enmapboxapp/_enpt_alg_base.py
@@ -300,10 +300,10 @@ class _EnPTBaseAlgorithm(QgsProcessingAlgorithm):
name=self.P_mode_ac,
description="Atmospheric correction mode",
options=['land - SICOR (developed for land surfaces) is applied to land AND water surfaces',
- 'water - POLYMER (developed for water surfaces) is applied to water only; '
+ 'water - POLYMER (developed for water surfaces) is applied to water only; \n'
'land surfaces are not included in the L2A product',
- 'combined - SICOR is applied to land and POLYMER is applied to water surfaces; '
- 'NOTE that this may result in edge effects, e.g., at coastlines*/'],
+ 'combined - SICOR is applied to land and POLYMER is applied to water surfaces; \n'
+ 'NOTE that this may result in edge effects, e.g., at coastlines'],
defaultValue=2))
self.addParameter(
@@ -311,13 +311,14 @@ class _EnPTBaseAlgorithm(QgsProcessingAlgorithm):
name=self.P_polymer_root,
description='Polymer root directory (that contains the subdirectory for ancillary data)',
behavior=QgsProcessingParameterFile.Folder,
- defaultValue=self._get_default_polymer_root()),
+ defaultValue=self._get_default_polymer_root(),
+ optional=True),
advanced=True)
self.addParameter(
QgsProcessingParameterNumber(
name=self.P_threads,
- description='Number of threads for multiprocessing'
+ description='Number of threads for multiprocessing when running ACwater/Polymer \n'
"('0: no threads', '-1: automatic', '>0: number of threads')",
type=QgsProcessingParameterNumber.Integer,
defaultValue=-1),
@@ -326,7 +327,7 @@ class _EnPTBaseAlgorithm(QgsProcessingAlgorithm):
self.addParameter(
QgsProcessingParameterNumber(
name=self.P_blocksize,
- description='Block size for multiprocessing',
+ description='Block size for multiprocessing when running ACwater/Polymer',
type=QgsProcessingParameterNumber.Integer,
defaultValue=100),
advanced=True)
@@ -334,7 +335,8 @@ class _EnPTBaseAlgorithm(QgsProcessingAlgorithm):
self.addParameter(
QgsProcessingParameterBoolean(
name=self.P_auto_download_ecmwf,
- description='Automatically download ECMWF data for atmospheric correction',
+ description='Automatically download ECMWF data for atmospheric correction '
+ 'of water surfaces in ACwater/Polymer',
defaultValue=False),
advanced=True)
diff --git a/enpt_enmapboxapp/enpt_algorithm.py b/enpt_enmapboxapp/enpt_algorithm.py
index d48ebd1..432195e 100644
--- a/enpt_enmapboxapp/enpt_algorithm.py
+++ b/enpt_enmapboxapp/enpt_algorithm.py
@@ -88,9 +88,6 @@ class EnPTAlgorithm(_EnPTBaseAlgorithm):
]:
parameters[n] = opts[parameters[n]]
- feedback.pushInfo("The log messages of the EnMAP processing tool are written to the *.log file "
- "in the specified output folder.")
-
# remove all parameters not to be forwarded to the EnPT CLI
parameters = {k: v for k, v in parameters.items()
if k not in ['anaconda_root']
--
GitLab