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

Fix some remaining issues

Browse Source
This commit is contained in:
Matthias Kuhn 2020-05-05 23:43:36 +02:00
parent 0afe134076
commit 2dafee528b
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
python/plugins/processing/tests/OtbAlgorithmsTest.py
View File

@ -43,7 +43,7 @@ from qgis.testing import start_app, unittest
from processing.core.ProcessingConfig import ProcessingConfig, Setting from processing.core.ProcessingConfig import ProcessingConfig, Setting
from processing.gui.AlgorithmDialog import AlgorithmDialog from processing.gui.AlgorithmDialog import AlgorithmDialog
from processing.gui.BatchAlgorithmDialog import BatchAlgorithmDialog from processing.gui.BatchAlgorithmDialog import BatchAlgorithmDialog
from processing.gui.wrappers import WidgetWrapperFactory, from processing.gui.wrappers import WidgetWrapperFactory
from processing.modeler.ModelerParametersDialog import ModelerParametersDialog from processing.modeler.ModelerParametersDialog import ModelerParametersDialog
from processing.algs.otb.OtbAlgorithm import OtbAlgorithm from processing.algs.otb.OtbAlgorithm import OtbAlgorithm
from processing.algs.otb.OtbAlgorithmProvider import OtbAlgorithmProvider from processing.algs.otb.OtbAlgorithmProvider import OtbAlgorithmProvider

4
scripts/parse_dash_results.py
View File

@ -158,7 +158,7 @@ class ResultHandler(QDialog):
images = {} images = {}
for img in measurement_img: for img in measurement_img:
m = re.search('Rendered Image (.*?)(\s|$)', img['role']) m = re.search(r'Rendered Image (.*?)(\s|$)', img['role'])
test_name = m.group(1) test_name = m.group(1)
rendered_image = 'displayImage.php?imgid={}'.format(img['imgid']) rendered_image = 'displayImage.php?imgid={}'.format(img['imgid'])
images[test_name] = '{}/{}'.format(dash_url, rendered_image) images[test_name] = '{}/{}'.format(dash_url, rendered_image)
@ -286,7 +286,7 @@ class ResultHandler(QDialog):
def get_control_image_path(self, test_name): def get_control_image_path(self, test_name):
if os.path.isfile(test_name): if os.path.isfile(test_name):
return path return test_name
# else try and find matching test image # else try and find matching test image
script_folder = os.path.dirname(os.path.realpath(sys.argv[0])) script_folder = os.path.dirname(os.path.realpath(sys.argv[0]))