Skip to content

When merging volume tracings, also merge segment lists #6882

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

Merged
merged 7 commits into from
Mar 6, 2023

Conversation

fm3
Copy link
Member

@fm3 fm3 commented Feb 28, 2023

When merging volume annotations, their segment lists are now also merged. This needs information from the actual data merging (now passed as MergedVolumeStats) because the segment ids are changed during the merge process.

The PR also adresses a bug where initialDataMultiple failed, because it tried looking up the resolution list from uploaded zipfiles, which failed due to a match error on path regex, and then it tried to look up the resolution list remotely, which failed because postgres does at that time not yet have an entry for the currently created annotation.

Also slipped in here, sorry for the small unrelated change: GlobalAccessContext in JobsController to yield a readable error message when a user tries to run a globalizeFloodfill job on a dataset of a different organization.

URL of deployed dev instance (used for testing):

Steps to test:

  • Create two volume annotations for the same dataset (without fallback layer is easier to test)
  • Draw some segments
  • From one of the annotations, merge the other in (menu→merge, select annotation id, UNCHECK the »merge into active« checkbox), result should have segment list from both annotations, ids should be uniqueified
  • Download two volume annotations for the same dataset, reupload both together (drag’n’drop in dashboard)
  • Result should show data, but no segment list, compare Segment lists for Merged Volume Annotations created from multiple zips in upload #6887

Issues:


@fm3 fm3 changed the title WIP: When merging volume tracings, also merge segment lists When merging volume tracings, also merge segment lists Mar 2, 2023
@fm3 fm3 marked this pull request as ready for review March 2, 2023 12:38
@fm3 fm3 requested a review from frcroth March 2, 2023 12:38
@fm3
Copy link
Member Author

fm3 commented Mar 2, 2023

@frcroth I realize that this touches a lot of code that you are not yet familiar with. If you feel lost in the review, maybe we could go through the code together :)

@@ -170,9 +170,9 @@ class VolumeTracingService @Inject()(
val resolutionSet = resolutionSetFromZipfile(dataZip)
if (resolutionSet.nonEmpty) resolutionSets.add(resolutionSet)
}
// if none of the tracings contained any volume data do not save buckets, use full resolution list
// if none of the tracings contained any volume data do not save buckets, use full resolution list, as alraedy initialized on wk-side
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
// if none of the tracings contained any volume data do not save buckets, use full resolution list, as alraedy initialized on wk-side
// if none of the tracings contained any volume data do not save buckets, use full resolution list, as already initialized on wk-side

@fm3 fm3 enabled auto-merge (squash) March 6, 2023 09:19
@fm3 fm3 merged commit f1a70e4 into master Mar 6, 2023
@fm3 fm3 deleted the merge-volume-segment-list branch March 6, 2023 09:35
hotzenklotz added a commit that referenced this pull request Mar 6, 2023
…come_header_UI

* 'master' of github.com:scalableminds/webknossos: (34 commits)
  Slim down view mode dropdown by using icons (#6900)
  Logging on password reset/change (#6901)
  When merging volume tracings, also merge segment lists (#6882)
  avoid spinner when switching tabs in dashboard (#6894)
  Upgrade Antd to v4.24 (#6865)
  Support n5 end-chunks with chunksize differing from metadata chunksize (#6890)
  Implement http range requests for HttpsSeekableByteChannel (#6869)
  new GH action for adding issues to project board
  Fix links in Changelog (#6881)
  adds dedicated explore method for zarr datasets with a datasource-properties.json (#6879)
  Release 23.03.0 (#6880)
  Fix superUser being wrongly marked as organization owners (#6876)
  Followups for OME-TIFF export (#6874)
  Fix reload-precomputed-mesh functionality (#6875)
  Adds OME-TIFF export (#6838)
  Add evolutions 99,100 to migration guide (#6871)
  Add link to imprint and privacy to help menu (#6870)
  Annotation Locking Mechanism (#6819)
  Update deprecated antd <Menu> (#6860)
  Add functions to get and set segment colors to the frontend API (#6853)
  ...
hotzenklotz added a commit that referenced this pull request Mar 13, 2023
…pdown-menu

* 'master' of github.com:scalableminds/webknossos:
  Avoid SQL error when fetching view config for zero-layer dataset (#6912)
  Fix date formatting for VX reports (#6908)
  Fix rare crash when viewing shared annotation (#6892)
  Slim down view mode dropdown by using icons (#6900)
  Logging on password reset/change (#6901)
  When merging volume tracings, also merge segment lists (#6882)
  avoid spinner when switching tabs in dashboard (#6894)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

When merging volume annotations, also merge segment list
2 participants