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

[23.2] Fix saving workflows with freehand_comments only #17901

Merged
merged 2 commits into from
Apr 4, 2024
Merged

[23.2] Fix saving workflows with freehand_comments only #17901

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
023178d
Fix saving workflows with freehand_comments only
mvdbeek Apr 4, 2024
b825f79
Reduce for loop nesting
mvdbeek Apr 4, 2024
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
17 changes: 9 additions & 8 deletions lib/galaxy/workflow/steps.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
workflow steps.
"""
import math
from itertools import chain

from galaxy.util.topsort import (
CycleError,
Expand Down Expand Up @@ -57,16 +58,16 @@ def order_workflow_steps(steps, comments):
else:
sortable_comments.append(comment)

# consider comments to find normalization position
min_left_comments = min(comment.position[0] for comment in sortable_comments)
min_top_comments = min(comment.position[1] for comment in sortable_comments)
min_left = min(min_left_comments, min_left)
min_top = min(min_top_comments, min_top)
if sortable_comments:
# consider comments to find normalization position
min_left_comments = min(comment.position[0] for comment in sortable_comments)
min_top_comments = min(comment.position[1] for comment in sortable_comments)
min_left = min(min_left_comments, min_left)
min_top = min(min_top_comments, min_top)

# normalize comments by min_left and min_top
for comment_list in [sortable_comments, freehand_comments]:
for comment in comment_list:
comment.position = [comment.position[0] - min_left, comment.position[1] - min_top]
for comment in chain(sortable_comments, freehand_comments):
comment.position = [comment.position[0] - min_left, comment.position[1] - min_top]

# order by Euclidean distance to the origin
sortable_comments.sort(key=lambda comment: math.sqrt(comment.position[0] ** 2 + comment.position[1] ** 2))
Expand Down
Loading