diff --git a/python/plugins/processing/algs/gdal/gdal2xyz.py b/python/plugins/processing/algs/gdal/gdal2xyz.py index 29b37a6b868..82dac004455 100644 --- a/python/plugins/processing/algs/gdal/gdal2xyz.py +++ b/python/plugins/processing/algs/gdal/gdal2xyz.py @@ -29,8 +29,8 @@ from qgis.core import (QgsProcessing, QgsProcessingParameterRasterLayer, QgsProcessingParameterBand, QgsProcessingParameterBoolean, - QgsProcessingParameterFileDestination, - QgsProcessingOutputFile) + QgsProcessingParameterFileDestination + ) from processing.algs.gdal.GdalAlgorithm import GdalAlgorithm from processing.algs.gdal.GdalUtils import GdalUtils from processing.tools.system import isWindows @@ -58,7 +58,6 @@ class gdal2xyz(GdalAlgorithm): self.addParameter(QgsProcessingParameterFileDestination(self.OUTPUT, self.tr('XYZ ASCII file'), self.tr('CSV files (*.csv)'))) - self.addOutput(QgsProcessingOutputFile(self.OUTPUT, self.tr('XYZ ASCII file'))) def name(self): return 'gdal2xyz' diff --git a/python/plugins/processing/algs/gdal/gdalinfo.py b/python/plugins/processing/algs/gdal/gdalinfo.py index 1096afe9b5e..16a44a18562 100644 --- a/python/plugins/processing/algs/gdal/gdalinfo.py +++ b/python/plugins/processing/algs/gdal/gdalinfo.py @@ -30,8 +30,7 @@ import os from qgis.PyQt.QtGui import QIcon from qgis.core import (QgsProcessingParameterRasterLayer, QgsProcessingParameterBoolean, - QgsProcessingParameterFileDestination, - QgsProcessingOutputHtml) + QgsProcessingParameterFileDestination) from processing.algs.gdal.GdalAlgorithm import GdalAlgorithm from processing.algs.gdal.GdalUtils import GdalUtils @@ -69,7 +68,6 @@ class gdalinfo(GdalAlgorithm): self.addParameter(QgsProcessingParameterFileDestination(self.OUTPUT, self.tr('Layer information'), self.tr('HTML files (*.html)'))) - self.addOutput(QgsProcessingOutputHtml(self.OUTPUT, self.tr('Layer information'))) def name(self): return 'gdalinfo' diff --git a/python/plugins/processing/algs/gdal/ogrinfo.py b/python/plugins/processing/algs/gdal/ogrinfo.py index f1b2eeb5378..81766dba5a9 100644 --- a/python/plugins/processing/algs/gdal/ogrinfo.py +++ b/python/plugins/processing/algs/gdal/ogrinfo.py @@ -28,8 +28,7 @@ __revision__ = '$Format:%H$' from qgis.core import (QgsProcessingParameterVectorLayer, QgsProcessingParameterBoolean, - QgsProcessingParameterFileDestination, - QgsProcessingOutputHtml) + QgsProcessingParameterFileDestination) from processing.algs.gdal.GdalAlgorithm import GdalAlgorithm from processing.algs.gdal.GdalUtils import GdalUtils @@ -57,7 +56,6 @@ class ogrinfo(GdalAlgorithm): self.addParameter(QgsProcessingParameterFileDestination(self.OUTPUT, self.tr('Layer information'), self.tr('HTML files (*.html)'))) - self.addOutput(QgsProcessingOutputHtml(self.OUTPUT, self.tr('Layer information'))) def name(self): return 'ogrinfo' diff --git a/python/plugins/processing/algs/grass7/Grass7Algorithm.py b/python/plugins/processing/algs/grass7/Grass7Algorithm.py index 29722f797ed..2a5f7fa51cd 100644 --- a/python/plugins/processing/algs/grass7/Grass7Algorithm.py +++ b/python/plugins/processing/algs/grass7/Grass7Algorithm.py @@ -59,10 +59,6 @@ from qgis.core import (Qgis, QgsProcessingParameterFileDestination, QgsProcessingParameterFile, QgsProcessingParameterFolderDestination, - QgsProcessingOutputFolder, - QgsProcessingOutputVectorLayer, - QgsProcessingOutputRasterLayer, - QgsProcessingOutputHtml, QgsProcessingUtils) from qgis.utils import iface @@ -178,10 +174,6 @@ class Grass7Algorithm(QgsProcessingAlgorithm): for p in self.params: # We use createOutput argument for automatic output creation res = self.addParameter(p, True) - # File destinations are not automatically added as outputs - if (isinstance(p, QgsProcessingParameterFileDestination) - and p.defaultFileExtension().lower() == 'html'): - self.addOutput(QgsProcessingOutputHtml(p.name(), p.description())) def defineCharacteristicsFromFile(self): """ diff --git a/python/plugins/processing/algs/qgis/BarPlot.py b/python/plugins/processing/algs/qgis/BarPlot.py index e498c543645..134f50a956d 100644 --- a/python/plugins/processing/algs/qgis/BarPlot.py +++ b/python/plugins/processing/algs/qgis/BarPlot.py @@ -31,8 +31,7 @@ import plotly.graph_objs as go from qgis.core import (QgsProcessingParameterFeatureSource, QgsProcessingParameterField, - QgsProcessingParameterFileDestination, - QgsProcessingOutputHtml) + QgsProcessingParameterFileDestination) from processing.algs.qgis.QgisAlgorithm import QgisAlgorithm from processing.tools import vector @@ -65,8 +64,6 @@ class BarPlot(QgisAlgorithm): self.addParameter(QgsProcessingParameterFileDestination(self.OUTPUT, self.tr('Bar plot'), self.tr('HTML files (*.html)'))) - self.addOutput(QgsProcessingOutputHtml(self.OUTPUT, self.tr('Bar plot'))) - def name(self): return 'barplot' diff --git a/python/plugins/processing/algs/qgis/BasicStatistics.py b/python/plugins/processing/algs/qgis/BasicStatistics.py index 0cc21efb614..8c5684ac331 100644 --- a/python/plugins/processing/algs/qgis/BasicStatistics.py +++ b/python/plugins/processing/algs/qgis/BasicStatistics.py @@ -38,7 +38,6 @@ from qgis.core import (QgsStatisticalSummary, QgsProcessingParameterFeatureSource, QgsProcessingParameterField, QgsProcessingParameterFileDestination, - QgsProcessingOutputHtml, QgsProcessingOutputNumber) from processing.algs.qgis.QgisAlgorithm import QgisAlgorithm @@ -98,7 +97,6 @@ class BasicStatisticsForField(QgisAlgorithm): None, self.INPUT_LAYER, QgsProcessingParameterField.Any)) self.addParameter(QgsProcessingParameterFileDestination(self.OUTPUT_HTML_FILE, self.tr('Statistics'), self.tr('HTML files (*.html)'), None, True)) - self.addOutput(QgsProcessingOutputHtml(self.OUTPUT_HTML_FILE, self.tr('Statistics'))) self.addOutput(QgsProcessingOutputNumber(self.COUNT, self.tr('Count'))) self.addOutput(QgsProcessingOutputNumber(self.UNIQUE, self.tr('Number of unique values'))) diff --git a/python/plugins/processing/algs/qgis/BoxPlot.py b/python/plugins/processing/algs/qgis/BoxPlot.py index d3c3d51be03..0c3a8038cb9 100644 --- a/python/plugins/processing/algs/qgis/BoxPlot.py +++ b/python/plugins/processing/algs/qgis/BoxPlot.py @@ -32,7 +32,6 @@ from qgis.core import (QgsProcessingParameterFeatureSource, QgsProcessingParameterField, QgsProcessingParameterEnum, QgsProcessingParameterFileDestination, - QgsProcessingOutputHtml, QgsFeatureRequest) from processing.algs.qgis.QgisAlgorithm import QgisAlgorithm from processing.tools import vector @@ -76,7 +75,6 @@ class BoxPlot(QgisAlgorithm): options=msd, defaultValue=0)) self.addParameter(QgsProcessingParameterFileDestination(self.OUTPUT, self.tr('Box plot'), self.tr('HTML files (*.html)'))) - self.addOutput(QgsProcessingOutputHtml(self.OUTPUT, self.tr('Box plot'))) def name(self): return 'boxplot' diff --git a/python/plugins/processing/algs/qgis/MeanAndStdDevPlot.py b/python/plugins/processing/algs/qgis/MeanAndStdDevPlot.py index 5e44550a6de..c63beeceba2 100644 --- a/python/plugins/processing/algs/qgis/MeanAndStdDevPlot.py +++ b/python/plugins/processing/algs/qgis/MeanAndStdDevPlot.py @@ -31,8 +31,7 @@ import plotly.graph_objs as go from qgis.core import (QgsProcessingParameterFeatureSource, QgsProcessingParameterField, QgsProcessingUtils, - QgsProcessingParameterFileDestination, - QgsProcessingOutputHtml) + QgsProcessingParameterFileDestination) from processing.algs.qgis.QgisAlgorithm import QgisAlgorithm from processing.tools import vector @@ -64,7 +63,6 @@ class MeanAndStdDevPlot(QgisAlgorithm): self.tr('Value field'), parentLayerParameterName=self.INPUT)) self.addParameter(QgsProcessingParameterFileDestination(self.OUTPUT, self.tr('Plot'), self.tr('HTML files (*.html)'))) - self.addOutput(QgsProcessingOutputHtml(self.OUTPUT, self.tr('Plot'))) def name(self): return 'meanandstandarddeviationplot' diff --git a/python/plugins/processing/algs/qgis/NearestNeighbourAnalysis.py b/python/plugins/processing/algs/qgis/NearestNeighbourAnalysis.py index 85b07065be6..0b9731a4e1e 100644 --- a/python/plugins/processing/algs/qgis/NearestNeighbourAnalysis.py +++ b/python/plugins/processing/algs/qgis/NearestNeighbourAnalysis.py @@ -37,7 +37,6 @@ from qgis.core import (QgsFeatureRequest, QgsProcessing, QgsProcessingParameterFeatureSource, QgsProcessingParameterFileDestination, - QgsProcessingOutputHtml, QgsProcessingOutputNumber, QgsSpatialIndex) @@ -73,7 +72,6 @@ class NearestNeighbourAnalysis(QgisAlgorithm): self.tr('Input layer'), [QgsProcessing.TypeVectorPoint])) self.addParameter(QgsProcessingParameterFileDestination(self.OUTPUT_HTML_FILE, self.tr('Nearest neighbour'), self.tr('HTML files (*.html)'), None, True)) - self.addOutput(QgsProcessingOutputHtml(self.OUTPUT_HTML_FILE, self.tr('Nearest neighbour'))) self.addOutput(QgsProcessingOutputNumber(self.OBSERVED_MD, self.tr('Observed mean distance'))) diff --git a/python/plugins/processing/algs/qgis/PolarPlot.py b/python/plugins/processing/algs/qgis/PolarPlot.py index 5d918edef63..63be7543cd5 100644 --- a/python/plugins/processing/algs/qgis/PolarPlot.py +++ b/python/plugins/processing/algs/qgis/PolarPlot.py @@ -31,8 +31,7 @@ import numpy as np from qgis.core import (QgsProcessingParameterFeatureSource, QgsProcessingParameterField, - QgsProcessingParameterFileDestination, - QgsProcessingOutputHtml) + QgsProcessingParameterFileDestination) from processing.algs.qgis.QgisAlgorithm import QgisAlgorithm from processing.tools import vector @@ -62,7 +61,6 @@ class PolarPlot(QgisAlgorithm): self.tr('Value field'), parentLayerParameterName=self.INPUT)) self.addParameter(QgsProcessingParameterFileDestination(self.OUTPUT, self.tr('Polar plot'), self.tr('HTML files (*.html)'))) - self.addOutput(QgsProcessingOutputHtml(self.OUTPUT, self.tr('Polar plot'))) def name(self): return 'polarplot' diff --git a/python/plugins/processing/algs/qgis/RasterLayerHistogram.py b/python/plugins/processing/algs/qgis/RasterLayerHistogram.py index b9e3c0b7095..e0ba4b59534 100644 --- a/python/plugins/processing/algs/qgis/RasterLayerHistogram.py +++ b/python/plugins/processing/algs/qgis/RasterLayerHistogram.py @@ -31,8 +31,7 @@ import plotly.graph_objs as go from qgis.core import (QgsProcessingParameterRasterLayer, QgsProcessingParameterBand, QgsProcessingParameterNumber, - QgsProcessingParameterFileDestination, - QgsProcessingOutputHtml) + QgsProcessingParameterFileDestination) from processing.algs.qgis.QgisAlgorithm import QgisAlgorithm from processing.tools import raster @@ -64,7 +63,6 @@ class RasterLayerHistogram(QgisAlgorithm): self.tr('number of bins'), minValue=2, defaultValue=10)) self.addParameter(QgsProcessingParameterFileDestination(self.OUTPUT, self.tr('Histogram'), self.tr('HTML files (*.html)'))) - self.addOutput(QgsProcessingOutputHtml(self.OUTPUT, self.tr('Histogram'))) def name(self): return 'rasterlayerhistogram' diff --git a/python/plugins/processing/algs/qgis/RasterLayerStatistics.py b/python/plugins/processing/algs/qgis/RasterLayerStatistics.py index 492bbe514b6..db18cbc5a7e 100644 --- a/python/plugins/processing/algs/qgis/RasterLayerStatistics.py +++ b/python/plugins/processing/algs/qgis/RasterLayerStatistics.py @@ -32,7 +32,6 @@ from qgis.core import (QgsRectangle, QgsProcessingParameterRasterLayer, QgsProcessingParameterBand, QgsProcessingParameterFileDestination, - QgsProcessingOutputHtml, QgsProcessingOutputNumber) from processing.algs.qgis.QgisAlgorithm import QgisAlgorithm @@ -68,7 +67,6 @@ class RasterLayerStatistics(QgisAlgorithm): 1, self.INPUT)) self.addParameter(QgsProcessingParameterFileDestination(self.OUTPUT_HTML_FILE, self.tr('Statistics'), self.tr('HTML files (*.html)'), None, True)) - self.addOutput(QgsProcessingOutputHtml(self.OUTPUT_HTML_FILE, self.tr('Statistics'))) self.addOutput(QgsProcessingOutputNumber(self.MIN, self.tr('Minimum value'))) self.addOutput(QgsProcessingOutputNumber(self.MAX, self.tr('Maximum value'))) diff --git a/python/plugins/processing/algs/qgis/UniqueValues.py b/python/plugins/processing/algs/qgis/UniqueValues.py index 7b82f55ad7c..ab2956b2f09 100644 --- a/python/plugins/processing/algs/qgis/UniqueValues.py +++ b/python/plugins/processing/algs/qgis/UniqueValues.py @@ -42,8 +42,7 @@ from qgis.core import (QgsCoordinateReferenceSystem, QgsProcessingParameterFeatureSink, QgsProcessingOutputNumber, QgsProcessingOutputString, - QgsProcessingParameterFileDestination, - QgsProcessingOutputHtml) + QgsProcessingParameterFileDestination) from processing.algs.qgis.QgisAlgorithm import QgisAlgorithm @@ -81,7 +80,6 @@ class UniqueValues(QgisAlgorithm): self.addParameter(QgsProcessingParameterFeatureSink(self.OUTPUT, self.tr('Unique values'), optional=True, defaultValue='')) self.addParameter(QgsProcessingParameterFileDestination(self.OUTPUT_HTML_FILE, self.tr('HTML report'), self.tr('HTML files (*.html)'), None, True)) - self.addOutput(QgsProcessingOutputHtml(self.OUTPUT_HTML_FILE, self.tr('HTML report'))) self.addOutput(QgsProcessingOutputNumber(self.TOTAL_VALUES, self.tr('Total unique values'))) self.addOutput(QgsProcessingOutputString(self.UNIQUE_VALUES, self.tr('Unique values'))) diff --git a/python/plugins/processing/algs/qgis/VectorLayerHistogram.py b/python/plugins/processing/algs/qgis/VectorLayerHistogram.py index b87fec33329..cbc63040656 100644 --- a/python/plugins/processing/algs/qgis/VectorLayerHistogram.py +++ b/python/plugins/processing/algs/qgis/VectorLayerHistogram.py @@ -31,8 +31,7 @@ import plotly.graph_objs as go from qgis.core import (QgsProcessingParameterFeatureSource, QgsProcessingParameterField, QgsProcessingParameterNumber, - QgsProcessingParameterFileDestination, - QgsProcessingOutputHtml) + QgsProcessingParameterFileDestination) from processing.algs.qgis.QgisAlgorithm import QgisAlgorithm from processing.tools import vector @@ -63,7 +62,6 @@ class VectorLayerHistogram(QgisAlgorithm): self.tr('number of bins'), minValue=2, defaultValue=10)) self.addParameter(QgsProcessingParameterFileDestination(self.OUTPUT, self.tr('Histogram'), self.tr('HTML files (*.html)'))) - self.addOutput(QgsProcessingOutputHtml(self.OUTPUT, self.tr('Histogram'))) def name(self): return 'vectorlayerhistogram' diff --git a/python/plugins/processing/algs/qgis/VectorLayerScatterplot.py b/python/plugins/processing/algs/qgis/VectorLayerScatterplot.py index 4019728a077..a4383176380 100644 --- a/python/plugins/processing/algs/qgis/VectorLayerScatterplot.py +++ b/python/plugins/processing/algs/qgis/VectorLayerScatterplot.py @@ -31,8 +31,7 @@ import plotly.graph_objs as go from qgis.core import (QgsProcessingParameterFeatureSource, QgsProcessingParameterField, QgsProcessingUtils, - QgsProcessingParameterFileDestination, - QgsProcessingOutputHtml) + QgsProcessingParameterFileDestination) from processing.algs.qgis.QgisAlgorithm import QgisAlgorithm from processing.tools import vector @@ -66,7 +65,6 @@ class VectorLayerScatterplot(QgisAlgorithm): type=QgsProcessingParameterField.Numeric)) self.addParameter(QgsProcessingParameterFileDestination(self.OUTPUT, self.tr('Scatterplot'), self.tr('HTML files (*.html)'))) - self.addOutput(QgsProcessingOutputHtml(self.OUTPUT, self.tr('Scatterplot'))) def name(self): return 'vectorlayerscatterplot' diff --git a/python/plugins/processing/algs/qgis/VectorLayerScatterplot3D.py b/python/plugins/processing/algs/qgis/VectorLayerScatterplot3D.py index b0df450be99..df4878c0bfe 100644 --- a/python/plugins/processing/algs/qgis/VectorLayerScatterplot3D.py +++ b/python/plugins/processing/algs/qgis/VectorLayerScatterplot3D.py @@ -31,7 +31,6 @@ import plotly.graph_objs as go from qgis.core import (QgsProcessingParameterFeatureSource, QgsProcessingParameterField, QgsProcessingParameterFileDestination, - QgsProcessingOutputHtml, QgsProcessingUtils) from processing.algs.qgis.QgisAlgorithm import QgisAlgorithm @@ -72,7 +71,6 @@ class VectorLayerScatterplot3D(QgisAlgorithm): type=QgsProcessingParameterField.Numeric)) self.addParameter(QgsProcessingParameterFileDestination(self.OUTPUT, self.tr('Histogram'), self.tr('HTML files (*.html)'))) - self.addOutput(QgsProcessingOutputHtml(self.OUTPUT, self.tr('Histogram'))) def name(self): return 'scatter3dplot'