Skip to content

Commit e49cc78

Browse files
committed
Make html output in basic stats algorithm optional
1 parent cb41ef1 commit e49cc78

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

python/plugins/processing/algs/qgis/BasicStatistics.py

+4-3
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ def __init__(self):
9494
self.tr('Field to calculate statistics on'),
9595
None, self.INPUT_LAYER, QgsProcessingParameterTableField.Any))
9696

97-
self.addParameter(QgsProcessingParameterFileOutput(self.OUTPUT_HTML_FILE, self.tr('Statistics'), self.tr('HTML files (*.html)')))
97+
self.addParameter(QgsProcessingParameterFileOutput(self.OUTPUT_HTML_FILE, self.tr('Statistics'), self.tr('HTML files (*.html)'), None, True))
9898
self.addOutput(QgsProcessingOutputHtml(self.OUTPUT_HTML_FILE, self.tr('Statistics')))
9999

100100
self.addOutput(QgsProcessingOutputNumber(self.COUNT, self.tr('Count')))
@@ -149,9 +149,10 @@ def processAlgorithm(self, parameters, context, feedback):
149149
d, results = self.calcStringStats(features, feedback, field, count)
150150
data.extend(d)
151151

152-
self.createHTML(output_file, data)
152+
if output_file:
153+
self.createHTML(output_file, data)
154+
results[self.OUTPUT_HTML_FILE] = output_file
153155

154-
results[self.OUTPUT_HTML_FILE] = output_file
155156
return results
156157

157158
def calcNumericStats(self, features, feedback, field, count):

python/plugins/processing/gui/DestinationSelectionPanel.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ def textChanged(self):
9191

9292
def skipOutput(self):
9393
self.leText.setPlaceholderText(self.SKIP_OUTPUT)
94+
self.leText.setText('')
9495
self.use_temporary = False
9596

9697
def selectOutput(self):
@@ -99,8 +100,7 @@ def selectOutput(self):
99100
else:
100101
popupMenu = QMenu()
101102

102-
if isinstance(self.parameter, QgsProcessingParameterFeatureSink) \
103-
and self.parameter.flags() & QgsProcessingParameterDefinition.FlagOptional:
103+
if self.parameter.flags() & QgsProcessingParameterDefinition.FlagOptional:
104104
actionSkipOutput = QAction(
105105
self.tr('Skip output'), self.btnSelect)
106106
actionSkipOutput.triggered.connect(self.skipOutput)

0 commit comments

Comments
 (0)