Skip to content

Commit

Permalink
Merge branch 'release_23.2' into release_24.0
Browse files Browse the repository at this point in the history
  • Loading branch information
mvdbeek committed Apr 4, 2024
2 parents 661d93a + 173b326 commit d308444
Showing 1 changed file with 9 additions and 8 deletions.
17 changes: 9 additions & 8 deletions lib/galaxy/workflow/steps.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"""

import math
from itertools import chain

from galaxy.util.topsort import (
CycleError,
Expand Down Expand Up @@ -58,16 +59,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

0 comments on commit d308444

Please sign in to comment.