Skip to content

Commit

Permalink
Rename count to __count
Browse files Browse the repository at this point in the history
  • Loading branch information
m-kuhn authored and nyalldawson committed Sep 14, 2020
1 parent d2c60cc commit d41e8e1
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions python/plugins/processing/gui/AlgorithmExecutor.py
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ def execute_in_place_run(alg, parameters, context=None, feedback=None, raise_exc


feedback.setProgress(int((current + 1) * step)) feedback.setProgress(int((current + 1) * step))


results, ok = {'count': current + 1}, True results, ok = {'__count': current + 1}, True


else: # Traditional 'run' with delete and add features cycle else: # Traditional 'run' with delete and add features cycle


Expand Down Expand Up @@ -246,7 +246,7 @@ def execute_in_place_run(alg, parameters, context=None, feedback=None, raise_exc
raise QgsProcessingException(tr("Error adding processed features back into the layer.")) raise QgsProcessingException(tr("Error adding processed features back into the layer."))
new_ids = set([f.id() for f in active_layer.getFeatures(req)]) new_ids = set([f.id() for f in active_layer.getFeatures(req)])
new_feature_ids += list(new_ids - old_ids) new_feature_ids += list(new_ids - old_ids)
results['count'] = len(new_feature_ids) results['__count'] = len(new_feature_ids)


active_layer.endEditCommand() active_layer.endEditCommand()


Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/gui/ProcessingToolbox.py
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ def executeAlgorithm(self):
feedback = MessageBarProgress(algname=alg.displayName()) feedback = MessageBarProgress(algname=alg.displayName())
ok, results = execute_in_place(alg, parameters, feedback=feedback) ok, results = execute_in_place(alg, parameters, feedback=feedback)
if ok: if ok:
iface.messageBar().pushSuccess('', self.tr('{algname} completed. %n feature(s) processed.', n=results['count']).format(algname=alg.displayName())) iface.messageBar().pushSuccess('', self.tr('{algname} completed. %n feature(s) processed.', n=results['__count']).format(algname=alg.displayName()))
feedback.close() feedback.close()
# MessageBarProgress handles errors # MessageBarProgress handles errors
return return
Expand Down

0 comments on commit d41e8e1

Please sign in to comment.