Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[processing] Fix exception when algorithm has no output layers #60550

Merged
merged 2 commits into from
Feb 12, 2025
Merged

[processing] Fix exception when algorithm has no output layers #60550

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0180380
[processing] Fix exception when algorithm has no output layers
nyalldawson Feb 12, 2025
e5d1543
fix typo
alexbruy Feb 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 30 additions & 18 deletions python/plugins/processing/gui/Postprocessing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
QgsLayerTreeGroup,
QgsLayerTreeNode,
QgsLayerTreeRegistryBridge,
QgsProject,
)
from qgis.utils import iface

Expand Down Expand Up @@ -204,7 +205,9 @@ def handleAlgorithmResults(
)
i = 0

added_layers: list[tuple[Optional[QgsLayerTreeGroup], QgsLayerTreeLayer]] = []
added_layers: list[
tuple[Optional[QgsLayerTreeGroup], QgsLayerTreeLayer, QgsProject]
] = []
layers_to_post_process: list[
tuple[QgsMapLayer, QgsProcessingContext.LayerDetails]
] = []
Expand Down Expand Up @@ -241,7 +244,9 @@ def handleAlgorithmResults(
# we don't add the layer to the tree yet -- that's done
# later, after we've sorted all added layers
layer_tree_layer = create_layer_tree_layer(owned_map_layer, details)
added_layers.append((results_group, layer_tree_layer))
added_layers.append(
(results_group, layer_tree_layer, details.project)
)

if details.postProcessor():
# we defer calling the postProcessor set in the context
Expand Down Expand Up @@ -276,11 +281,17 @@ def handleAlgorithmResults(
current_selected_node = iface.layerTreeView().currentNode()
iface.layerTreeView().setUpdatesEnabled(False)

# store the current intersection point to restore it later
previous_insertion_point = (
details.project.layerTreeRegistryBridge().layerInsertionPoint()
)
for group, layer_node in sorted_layer_tree_layers:
for group, layer_node, project in sorted_layer_tree_layers:
if not project:
project = context.project()

# store the current insertion point to restore it later
previous_insertion_point = None
if project:
previous_insertion_point = (
project.layerTreeRegistryBridge().layerInsertionPoint()
)

layer_node.removeCustomProperty(SORT_ORDER_CUSTOM_PROPERTY)
insertion_point: Optional[QgsLayerTreeRegistryBridge.InsertionPoint] = None
if group is not None:
Expand All @@ -300,24 +311,25 @@ def handleAlgorithmResults(
insertion_point = QgsLayerTreeRegistryBridge.InsertionPoint(
current_selected_node, 0
)
elif context.project():
insertion_point = QgsLayerTreeRegistryBridge.InsertionPoint()
elif project:
insertion_point = QgsLayerTreeRegistryBridge.InsertionPoint(
project.layerTreeRoot(), 0
)

if insertion_point:
details.project.layerTreeRegistryBridge().setLayerInsertionPoint(
insertion_point
)
if project and insertion_point:
project.layerTreeRegistryBridge().setLayerInsertionPoint(insertion_point)

details.project.addMapLayer(layer_node.layer())
project.addMapLayer(layer_node.layer())

if not have_set_active_layer and iface is not None:
iface.setActiveLayer(layer_node.layer())
have_set_active_layer = True

# reset to the previous insertion point
details.project.layerTreeRegistryBridge().setLayerInsertionPoint(
previous_insertion_point
)
# reset to the previous insertion point
if project:
project.layerTreeRegistryBridge().setLayerInsertionPoint(
previous_insertion_point
)

# all layers have been added to the layer tree, so safe to call
# postProcessors now
Expand Down