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

Support multiple segmentation layers #5683

Merged
merged 73 commits into from
Sep 8, 2021
Merged

Support multiple segmentation layers #5683

merged 73 commits into from
Sep 8, 2021

Commits on Aug 12, 2021

  1. [WIP] don't crash when multiple segmentation layers exist; start intr… 

    …oducing getActiveSegmentationLayer() methods
    @philippotto
    philippotto committed Aug 12, 2021
    Configuration menu
    Copy the full SHA
    1dd401c View commit details
    Browse the repository at this point in the history

Commits on Aug 23, 2021

  1. [WIP] fix all flow errors

    @philippotto
    philippotto committed Aug 23, 2021
    Configuration menu
    Copy the full SHA
    cb08c87 View commit details
    Browse the repository at this point in the history

  2. [WIP]: implement and use getVisibleSegmentationLayer, getSomeSegmenta… 

    …tionLayer and getEnforcedSomeSegmentationLayer everywhere
    @philippotto
    philippotto committed Aug 23, 2021
    Configuration menu
    Copy the full SHA
    5d31282 View commit details
    Browse the repository at this point in the history

  3. [WIP]: implement and use getFirstSegmentationLayer which only needs a… 

    … dataset reference and fits some cases better
    @philippotto
    philippotto committed Aug 23, 2021
    Configuration menu
    Copy the full SHA
    16abedc View commit details
    Browse the repository at this point in the history

  4. remove deprecated functions

    @philippotto
    philippotto committed Aug 23, 2021
    Configuration menu
    Copy the full SHA
    9bd7a88 View commit details
    Browse the repository at this point in the history

  5. fix wrong parameter

    @philippotto
    philippotto committed Aug 23, 2021
    Configuration menu
    Copy the full SHA
    8cd8144 View commit details
    Browse the repository at this point in the history

  6. fix isColorLayer

    @philippotto
    philippotto committed Aug 23, 2021
    Configuration menu
    Copy the full SHA
    1acd9cf View commit details
    Browse the repository at this point in the history

  7. adapt shader code to multiple segmentation layers

    @philippotto
    philippotto committed Aug 23, 2021
    Configuration menu
    Copy the full SHA
    c5fbede View commit details
    Browse the repository at this point in the history

  8. fix cell hovering

    @philippotto
    philippotto committed Aug 23, 2021
    Configuration menu
    Copy the full SHA
    7947f30 View commit details
    Browse the repository at this point in the history

Commits on Aug 24, 2021

  1. support mappings for multiple segmentation layers

    @philippotto
    philippotto committed Aug 24, 2021
    Configuration menu
    Copy the full SHA
    6d4886c View commit details
    Browse the repository at this point in the history

  2. fix reducer for initial changes of mapping objects

    @philippotto
    philippotto committed Aug 24, 2021
    Configuration menu
    Copy the full SHA
    1bf928f View commit details
    Browse the repository at this point in the history

  3. fix runtime exceptions

    @philippotto
    philippotto committed Aug 24, 2021
    Configuration menu
    Copy the full SHA
    1cafe08 View commit details
    Browse the repository at this point in the history

  4. make shader code and materials compatible with mappings (only one map… 

    …ping can be active at given time)
    @philippotto
    philippotto committed Aug 24, 2021
    Configuration menu
    Copy the full SHA
    715df28 View commit details
    Browse the repository at this point in the history

  5. fix some mapping issues

    @philippotto
    philippotto committed Aug 24, 2021
    Configuration menu
    Copy the full SHA
    4581384 View commit details
    Browse the repository at this point in the history

Commits on Aug 25, 2021

  1. Merge branch 'master' of github.com:scalableminds/webknossos into mul… 

    …tiple-segmentations
    @philippotto
    philippotto committed Aug 25, 2021
    Configuration menu
    Copy the full SHA
    422fb67 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of github.com:scalableminds/webknossos into mul… 

    …tiple-segmentations
    @philippotto
    philippotto committed Aug 25, 2021
    Configuration menu
    Copy the full SHA
    c3d36f4 View commit details
    Browse the repository at this point in the history

  3. fix hovered segment id in status bar

    @philippotto
    philippotto committed Aug 25, 2021
    Configuration menu
    Copy the full SHA
    c738945 View commit details
    Browse the repository at this point in the history

  4. fix multiple mapping bugs (e.g., race condition when activating a map… 

    …ping)
    @philippotto
    philippotto committed Aug 25, 2021
    Configuration menu
    Copy the full SHA
    74898de View commit details
    Browse the repository at this point in the history

  5. fix wrong attachment of mapping-related textures

    @philippotto
    philippotto committed Aug 25, 2021
    Configuration menu
    Copy the full SHA
    8228b32 View commit details
    Browse the repository at this point in the history

Commits on Aug 26, 2021

  1. fix callHandlerOnSubscribe behavior in listenToStoreProperty if initi… 

    …al value is null
    @philippotto
    philippotto committed Aug 26, 2021
    Configuration menu
    Copy the full SHA
    b036111 View commit details
    Browse the repository at this point in the history

  2. update threeJS to 110 so that we can use to avoid discarded updates; … 

    …fix switching between mappings of multiple segmentation layers by adapting getSegmentationLayerWithMappingSupport logic
    @philippotto
    philippotto committed Aug 26, 2021
    Configuration menu
    Copy the full SHA
    648b24e View commit details
    Browse the repository at this point in the history

  3. support volume annotation in dataset with multiple segmentation layers

    @philippotto
    philippotto committed Aug 26, 2021
    Configuration menu
    Copy the full SHA
    d1c7884 View commit details
    Browse the repository at this point in the history

  4. adapt more volume code to multiple segmentation layers

    @philippotto
    philippotto committed Aug 26, 2021
    Configuration menu
    Copy the full SHA
    e4b1c5a View commit details
    Browse the repository at this point in the history

Commits on Aug 27, 2021

  1. remove outdated comment

    @philippotto
    philippotto committed Aug 27, 2021
    Configuration menu
    Copy the full SHA
    2933c23 View commit details
    Browse the repository at this point in the history

  2. adapt UI for creation of explorative so that fallback layer can be ch… 

    …osen
    @philippotto
    philippotto committed Aug 27, 2021
    Configuration menu
    Copy the full SHA
    f494249 View commit details
    Browse the repository at this point in the history

  3. change back-end route from boolean withFallback to optional string fa… 

    …llbackLayerName
    @philippotto
    philippotto committed Aug 27, 2021
    Configuration menu
    Copy the full SHA
    7f07bfa View commit details
    Browse the repository at this point in the history

  4. clean up GET parameter construction

    @philippotto
    philippotto committed Aug 27, 2021
    Configuration menu
    Copy the full SHA
    4d9a3fe View commit details
    Browse the repository at this point in the history

  5. further clean up in CreateExplorativeModal logic

    @philippotto
    philippotto committed Aug 27, 2021
    Configuration menu
    Copy the full SHA
    577b426 View commit details
    Browse the repository at this point in the history

  6. fix creation of volume tracing when viewing dataset and only show rem… 

    …ove button for fallback layer
    @philippotto
    philippotto committed Aug 27, 2021
    Configuration menu
    Copy the full SHA
    cc55fb8 View commit details
    Browse the repository at this point in the history

  7. ensure that only one segmentation layer is visible

    @philippotto
    philippotto committed Aug 27, 2021
    Configuration menu
    Copy the full SHA
    c21b34c View commit details
    Browse the repository at this point in the history

  8. remove activeSegmentationLayerIndex code, as it's not needed anymore

    @philippotto
    philippotto committed Aug 27, 2021
    Configuration menu
    Copy the full SHA
    3d2b6e3 View commit details
    Browse the repository at this point in the history

  9. trigger agglomeration warning for correct segmentation layer

    @philippotto
    philippotto committed Aug 27, 2021
    Configuration menu
    Copy the full SHA
    6d1d126 View commit details
    Browse the repository at this point in the history

  10. adapt data export to multiple segmentation layers

    @philippotto
    philippotto committed Aug 27, 2021
    Configuration menu
    Copy the full SHA
    0923f22 View commit details
    Browse the repository at this point in the history

  11. remove unused isRefreshingIsosurfaces store property

    @philippotto
    philippotto committed Aug 27, 2021
    Configuration menu
    Copy the full SHA
    0517184 View commit details
    Browse the repository at this point in the history

Commits on Aug 30, 2021

  1. fix passing fallbackLayerName when creating explorational

    @philippotto
    philippotto committed Aug 30, 2021
    Configuration menu
    Copy the full SHA
    51d1ed1 View commit details
    Browse the repository at this point in the history

  2. make mesh management dependent on concrete segmentation layer

    @philippotto
    philippotto committed Aug 30, 2021
    Configuration menu
    Copy the full SHA
    fb3ce1e View commit details
    Browse the repository at this point in the history

  3. fix ad-hoc and precomputed mesh usages

    @philippotto
    philippotto committed Aug 30, 2021
    Configuration menu
    Copy the full SHA
    6d7c811 View commit details
    Browse the repository at this point in the history

  4. rename mesh/isosurface variables to ...ByLayer where appropriate

    @philippotto
    philippotto committed Aug 30, 2021
    Configuration menu
    Copy the full SHA
    ae0ed59 View commit details
    Browse the repository at this point in the history

  5. get rid of getEnforcedSomeSegmentationLayer function

    @philippotto
    philippotto committed Aug 30, 2021
    Configuration menu
    Copy the full SHA
    1fb21ca View commit details
    Browse the repository at this point in the history

  6. add better typing for mesh view and remove some dead code

    @philippotto
    philippotto committed Aug 30, 2021
    Configuration menu
    Copy the full SHA
    1d357ac View commit details
    Browse the repository at this point in the history

  7. change getResolutionInfoOfSomeSegmentationLayer to getResolutionInfoO… 

    …fVisibleSegmentationLayer
    @philippotto
    philippotto committed Aug 30, 2021
    Configuration menu
    Copy the full SHA
    6a84c71 View commit details
    Browse the repository at this point in the history

  8. remove some usages of getFirstSegmentationLayer

    @philippotto
    philippotto committed Aug 30, 2021
    Configuration menu
    Copy the full SHA
    fe793d4 View commit details
    Browse the repository at this point in the history

  9. fix default 'Create Annotation' link for fallback layers

    @philippotto
    philippotto committed Aug 30, 2021
    Configuration menu
    Copy the full SHA
    59e58d2 View commit details
    Browse the repository at this point in the history

  10. fix linting

    @philippotto
    philippotto committed Aug 30, 2021
    Configuration menu
    Copy the full SHA
    77a76da View commit details
    Browse the repository at this point in the history

  11. use correct segmentation layer in version view

    @philippotto
    philippotto committed Aug 30, 2021
    Configuration menu
    Copy the full SHA
    f0841d5 View commit details
    Browse the repository at this point in the history

  12. remove redundant if-null check

    @philippotto
    philippotto committed Aug 30, 2021
    Configuration menu
    Copy the full SHA
    811b962 View commit details
    Browse the repository at this point in the history

  13. make 3-shortcut work better with multiple segmentation layers

    @philippotto
    philippotto committed Aug 30, 2021
    Configuration menu
    Copy the full SHA
    bf0af45 View commit details
    Browse the repository at this point in the history

  14. fix unit tests

    @philippotto
    philippotto committed Aug 30, 2021
    Configuration menu
    Copy the full SHA
    cc578a7 View commit details
    Browse the repository at this point in the history

  15. improve the api_latest functions

    @philippotto
    philippotto committed Aug 30, 2021
    Configuration menu
    Copy the full SHA
    6727777 View commit details
    Browse the repository at this point in the history

  16. further improvements of api_latest

    @philippotto
    philippotto committed Aug 30, 2021
    Configuration menu
    Copy the full SHA
    5f4466e View commit details
    Browse the repository at this point in the history

  17. format back-end code

    @philippotto
    philippotto committed Aug 30, 2021
    Configuration menu
    Copy the full SHA
    1d62c82 View commit details
    Browse the repository at this point in the history

Commits on Aug 31, 2021

  1. fail if non-existing fallback layer is selected, add fallbackLayerNam… 

    …e to makeHybrid route
    @fm3
    fm3 committed Aug 31, 2021
    Configuration menu
    Copy the full SHA
    797abe2 View commit details
    Browse the repository at this point in the history

  2. legacy api

    @fm3
    fm3 committed Aug 31, 2021
    Configuration menu
    Copy the full SHA
    2473b1e View commit details
    Browse the repository at this point in the history

  3. only allow volume annotation in actual tracing layer

    @philippotto
    philippotto committed Aug 31, 2021
    Configuration menu
    Copy the full SHA
    af27ad9 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'multiple-segmentations' of github.com:scalableminds/web… 

    …knossos into multiple-segmentations
    @philippotto
    philippotto committed Aug 31, 2021
    Configuration menu
    Copy the full SHA
    9c07917 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master' of github.com:scalableminds/webknossos into mul… 

    …tiple-segmentations
    @philippotto
    philippotto committed Aug 31, 2021
    Configuration menu
    Copy the full SHA
    af2fed4 View commit details
    Browse the repository at this point in the history

  6. resolve todo affecting features.publicDemoDatasetUrl

    @philippotto
    philippotto committed Aug 31, 2021
    Configuration menu
    Copy the full SHA
    01d3030 View commit details
    Browse the repository at this point in the history

  7. use currently visible segmentation layer as fallback layer when creat… 

    …ing an annotation from view mode or when making a hybrid
    @philippotto
    philippotto committed Aug 31, 2021
    Configuration menu
    Copy the full SHA
    a701fe5 View commit details
    Browse the repository at this point in the history

  8. rename activeMapping to activeMappingByLayer

    @philippotto
    philippotto committed Aug 31, 2021
    Configuration menu
    Copy the full SHA
    8bf6bb7 View commit details
    Browse the repository at this point in the history

  9. fix CI

    @philippotto
    philippotto committed Aug 31, 2021
    Configuration menu
    Copy the full SHA
    fa2b031 View commit details
    Browse the repository at this point in the history

Commits on Sep 1, 2021

  1. integrate some PR feedback

    @philippotto
    philippotto committed Sep 1, 2021
    Configuration menu
    Copy the full SHA
    1fc3df6 View commit details
    Browse the repository at this point in the history

  2. Apply suggestions from code review 

    Co-authored-by: Daniel <[email protected]>
    @philippotto @daniel-wer
    philippotto and daniel-wer authored Sep 1, 2021
    Configuration menu
    Copy the full SHA
    987ebf4 View commit details
    Browse the repository at this point in the history

  3. rename getRequestedOrVisibleSegmentationLayer, getRequestedOrVisibleS… 

    …egmentationLayerEnforced and getNameOfRequestedOrVisibleSegmentationLayer
    @philippotto
    philippotto committed Sep 1, 2021
    Configuration menu
    Copy the full SHA
    d6b8183 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'multiple-segmentations' of github.com:scalableminds/web… 

    …knossos into multiple-segmentations
    @philippotto
    philippotto committed Sep 1, 2021
    Configuration menu
    Copy the full SHA
    41a3695 View commit details
    Browse the repository at this point in the history

Commits on Sep 2, 2021

  1. integrate further PR feedback

    @philippotto
    philippotto committed Sep 2, 2021
    Configuration menu
    Copy the full SHA
    d1696b3 View commit details
    Browse the repository at this point in the history

  2. improve docstrings in api_latest

    @philippotto
    philippotto committed Sep 2, 2021
    Configuration menu
    Copy the full SHA
    15341b5 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' of github.com:scalableminds/webknossos into mul… 

    …tiple-segmentations
    @philippotto
    philippotto committed Sep 2, 2021
    Configuration menu
    Copy the full SHA
    eb4ebf7 View commit details
    Browse the repository at this point in the history

Commits on Sep 6, 2021

  1. remove other segmentation layers for volume annotations without fallb… 

    …ack data
    @philippotto
    philippotto committed Sep 6, 2021
    Configuration menu
    Copy the full SHA
    dc69e67 View commit details
    Browse the repository at this point in the history

  2. update changelog

    @philippotto
    philippotto committed Sep 6, 2021
    Configuration menu
    Copy the full SHA
    3c35e4a View commit details
    Browse the repository at this point in the history

Commits on Sep 8, 2021

  1. make getVolumeTracingLayerName backwards compatible

    @philippotto
    philippotto committed Sep 8, 2021
    Configuration menu
    Copy the full SHA
    0b1dd3b View commit details
    Browse the repository at this point in the history

  2. fix merger mode for hybrids and for skeleton-only annotations

    @philippotto
    philippotto committed Sep 8, 2021
    Configuration menu
    Copy the full SHA
    de2ad94 View commit details
    Browse the repository at this point in the history

  3. fix segmentationOpacity dictated by recommended settings in tasks whe… 

    …n there is no volume layer and when there are multiple segmentation layers
    @philippotto
    philippotto committed Sep 8, 2021
    Configuration menu
    Copy the full SHA
    a45c81c View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' into multiple-segmentations

    @philippotto
    philippotto authored Sep 8, 2021
    Configuration menu
    Copy the full SHA
    de5c234 View commit details
    Browse the repository at this point in the history