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.

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

After merge, remove segment item of id that doesn't exist anymore #7729

Merged
merged 9 commits into from
Apr 8, 2024

Conversation

philippotto
Copy link
Member

@philippotto philippotto commented Mar 27, 2024

  • When merging two segments, removes the segment from the segment list.
  • The active segment/item now always survives the merge operation (wasn't the case when merging agglomerate-skeleton or skeletons with a shortcut).

URL of deployed dev instance (used for testing):

Steps to test:

Part 1:

  • create a new annotation for a dataset that has an agglomerate mapping (e.g., test-agglomerate)
  • activate proofreading mode
  • click on two segments that should be merged so that they have an entry each in the segments tab
  • merge them with the context menu
  • the segment id that doesn't exist anymore in the data should also not exist anymore in the segments tab
  • repeat the above by loading agglomerate skeletons and merging them (make one node active and rightclick another node -> create edge)
    Part 2:
  • go into skeleton mode
  • create two trees
  • merge them with the ctrl+shift+alt shortcut --> active tree should survive
  • merge them with the context menu --> active tree should survive

Issues:


(Please delete unneeded items, merge only when none are left open)

@philippotto philippotto self-assigned this Mar 27, 2024
@philippotto philippotto marked this pull request as ready for review March 27, 2024 16:09
@philippotto philippotto changed the title [WIP] After merge, remove segment item of id that doesn't exist anymore After merge, remove segment item of id that doesn't exist anymore Mar 27, 2024
Copy link
Member

@daniel-wer daniel-wer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice one, LGTM 👍

CHANGELOG.unreleased.md Outdated Show resolved Hide resolved
philippotto and others added 2 commits April 8, 2024 15:31
@philippotto philippotto enabled auto-merge (squash) April 8, 2024 13:32
@philippotto philippotto merged commit 1649a35 into master Apr 8, 2024
2 checks passed
@philippotto philippotto deleted the remove-segment-after-merge branch April 8, 2024 13:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Proofreading] Remove segment from list after merge
2 participants