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

Jump to bottom

Improve segment proofreading in 3D viewport #7742

Merged
merged 79 commits into from
May 2, 2024
Merged

Improve segment proofreading in 3D viewport #7742

merged 79 commits into from
May 2, 2024

Commits on Apr 9, 2024

  1. allow to activate segment via mesh in 3D viewport

    @philippotto
    philippotto committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    7922723 View commit details
    Browse the repository at this point in the history

  2. annotate chunk infos with unmappedSegmentId

    @fm3
    fm3 committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    b95060e View commit details
    Browse the repository at this point in the history

Commits on Apr 11, 2024

  1. don't merge mesh chunks and highlight them individually on hover

    @philippotto
    philippotto committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    563bc68 View commit details
    Browse the repository at this point in the history

  2. refactor triggering the context menu by moving data into the store an… 

    …d avoiding passing around lambda
    @philippotto
    philippotto committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    e6643d5 View commit details
    Browse the repository at this point in the history

  3. rename context info vars since they are scoped now anyway

    @philippotto
    philippotto committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    b04b5bc View commit details
    Browse the repository at this point in the history

  4. dont pass all props to generic context menu container

    @philippotto
    philippotto committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    fc87795 View commit details
    Browse the repository at this point in the history

Commits on Apr 12, 2024

  1. store active unmapped segment id in store

    @philippotto
    philippotto committed Apr 12, 2024
    Configuration menu
    Copy the full SHA
    6901bdf View commit details
    Browse the repository at this point in the history

  2. prepare context menu actions

    @philippotto
    philippotto committed Apr 12, 2024
    Configuration menu
    Copy the full SHA
    31c945f View commit details
    Browse the repository at this point in the history

  3. clean up typing

    @philippotto
    philippotto committed Apr 12, 2024
    Configuration menu
    Copy the full SHA
    8379359 View commit details
    Browse the repository at this point in the history

  4. rename segmentationId to segmentId

    @philippotto
    philippotto committed Apr 12, 2024
    Configuration menu
    Copy the full SHA
    76a8d3a View commit details
    Browse the repository at this point in the history

  5. only avoid merging mesh chunks when in proofreading mode

    @philippotto
    philippotto committed Apr 12, 2024
    Configuration menu
    Copy the full SHA
    ddbc2ea View commit details
    Browse the repository at this point in the history

  6. fix changing colors of merged or unmerged mesh chunks

    @philippotto
    philippotto committed Apr 12, 2024
    Configuration menu
    Copy the full SHA
    338cb50 View commit details
    Browse the repository at this point in the history

  7. clean up

    @philippotto
    philippotto committed Apr 12, 2024
    Configuration menu
    Copy the full SHA
    a2b6da3 View commit details
    Browse the repository at this point in the history

Commits on Apr 15, 2024

  1. adapt editable mapping actions to use segment ids

    @fm3
    fm3 committed Apr 15, 2024
    Configuration menu
    Copy the full SHA
    37128a0 View commit details
    Browse the repository at this point in the history

  2. small fix in DEV_INSTALL.md

    @fm3
    fm3 committed Apr 15, 2024
    Configuration menu
    Copy the full SHA
    ce5ed0e View commit details
    Browse the repository at this point in the history

  3. use new id based split/merge REST interface for proofreading

    @philippotto
    philippotto committed Apr 15, 2024
    Configuration menu
    Copy the full SHA
    c0cc672 View commit details
    Browse the repository at this point in the history

  4. implement split/merge/cut-from-neighbors for 3D viewport (mesh reload… 

    …ing is disabled for now, though)
    @philippotto
    philippotto committed Apr 15, 2024
    Configuration menu
    Copy the full SHA
    9fb28c4 View commit details
    Browse the repository at this point in the history

Commits on Apr 16, 2024

  1. nvm in DEV_INSTALL.md

    @fm3
    fm3 committed Apr 16, 2024
    Configuration menu
    Copy the full SHA
    96ef5ce View commit details
    Browse the repository at this point in the history

  2. add verbose type definition to avoid inconvenient property extraction… 

    … and spread
    @philippotto
    philippotto committed Apr 16, 2024
    Configuration menu
    Copy the full SHA
    232c19c View commit details
    Browse the repository at this point in the history

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

    …ter-mesh-context-menu
    @philippotto
    philippotto committed Apr 16, 2024
    Configuration menu
    Copy the full SHA
    bac6590 View commit details
    Browse the repository at this point in the history

  4. add agglomerateIdForSegmentId route for editable mappings

    @fm3
    fm3 committed Apr 16, 2024
    Configuration menu
    Copy the full SHA
    993e9e7 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'better-mesh-context-menu' of github.com:scalableminds/w… 

    …ebknossos into better-mesh-context-menu
    @philippotto
    philippotto committed Apr 16, 2024
    Configuration menu
    Copy the full SHA
    5887ddd View commit details
    Browse the repository at this point in the history

  6. WIP: segment to position route

    @fm3
    fm3 committed Apr 16, 2024
    Configuration menu
    Copy the full SHA
    9aa64b8 View commit details
    Browse the repository at this point in the history

  7. agglomerate_to_segments_offsets

    @fm3
    fm3 committed Apr 16, 2024
    Configuration menu
    Copy the full SHA
    33294a9 View commit details
    Browse the repository at this point in the history

  8. reactivate mesh reloading for split/merge/mincut and fix bug in cut-f… 

    …rom-all-neighbors
    @philippotto
    philippotto committed Apr 16, 2024
    Configuration menu
    Copy the full SHA
    f9a1dc8 View commit details
    Browse the repository at this point in the history

  9. change opacity for whole agglomerate when hovering supervoxel

    @philippotto
    philippotto committed Apr 16, 2024
    Configuration menu
    Copy the full SHA
    ce32463 View commit details
    Browse the repository at this point in the history

  10. reloading mesh in 3D viewport will not merge chunks when in proofread… 

    …ing mode; the user is also told what to do when trying to proofread with merged mesh chunks
    @philippotto
    philippotto committed Apr 16, 2024
    Configuration menu
    Copy the full SHA
    9594cc6 View commit details
    Browse the repository at this point in the history

  11. simplify mergeChunks logic when reloading mesh by always considering … 

    …isProofreadingActive
    @philippotto
    philippotto committed Apr 16, 2024
    Configuration menu
    Copy the full SHA
    4902a6f View commit details
    Browse the repository at this point in the history

  12. Merge branch 'better-mesh-context-menu' of github.com:scalableminds/w… 

    …ebknossos into better-mesh-context-menu
    @philippotto
    philippotto committed Apr 16, 2024
    Configuration menu
    Copy the full SHA
    35e4dda View commit details
    Browse the repository at this point in the history

  13. fix linting

    @philippotto
    philippotto committed Apr 16, 2024
    Configuration menu
    Copy the full SHA
    31f9ddc View commit details
    Browse the repository at this point in the history

  14. Revert "WIP: segment to position route" 

    This reverts commit 9aa64b8.
    @philippotto
    philippotto committed Apr 16, 2024
    Configuration menu
    Copy the full SHA
    5a472cd View commit details
    Browse the repository at this point in the history

  15. when proofread-clicking a segment; don't reload mesh if it already ex… 

    …ists; however, do reload if its chunks were merged before
    @philippotto
    philippotto committed Apr 16, 2024
    Configuration menu
    Copy the full SHA
    cb13b45 View commit details
    Browse the repository at this point in the history

  16. fix unhighlighting supervoxel in 3D viewport when activating another … 

    …mesh in a data viewport
    @philippotto
    philippotto committed Apr 16, 2024
    Configuration menu
    Copy the full SHA
    01ea2bb View commit details
    Browse the repository at this point in the history

  17. misc clean up

    @philippotto
    philippotto committed Apr 16, 2024
    Configuration menu
    Copy the full SHA
    40a311e View commit details
    Browse the repository at this point in the history

  18. don't show proofreading cross in data viewports when a supervoxel is … 

    …highlighted in the 3D viewport
    @philippotto
    philippotto committed Apr 16, 2024
    Configuration menu
    Copy the full SHA
    825b90f View commit details
    Browse the repository at this point in the history

  19. fix type error

    @philippotto
    philippotto committed Apr 16, 2024
    Configuration menu
    Copy the full SHA
    9dd2b6f View commit details
    Browse the repository at this point in the history

  20. allow deselecting active super voxel in 3d viewport

    @philippotto
    philippotto committed Apr 16, 2024
    Configuration menu
    Copy the full SHA
    30c041a View commit details
    Browse the repository at this point in the history

Commits on Apr 18, 2024

  1. Merge branch 'better-mesh-context-menu' of github.com:scalableminds/w… 

    …ebknossos into better-mesh-context-menu
    @fm3
    fm3 committed Apr 18, 2024
    Configuration menu
    Copy the full SHA
    2c356af View commit details
    Browse the repository at this point in the history

  2. add route to query segment position from agglomerate file

    @fm3
    fm3 committed Apr 18, 2024
    Configuration menu
    Copy the full SHA
    2531d6d View commit details
    Browse the repository at this point in the history

  3. integrate new positionForSegment route to fix incorrect segment posit… 

    …ions after splitting an agglomerate
    @philippotto
    philippotto committed Apr 18, 2024
    Configuration menu
    Copy the full SHA
    84b46f6 View commit details
    Browse the repository at this point in the history

Commits on Apr 19, 2024

  1. fix that initial mesh in proofreading mode wasn't always using availa… 

    …ble mesh file
    @philippotto
    philippotto committed Apr 19, 2024
    Configuration menu
    Copy the full SHA
    cf2cab6 View commit details
    Browse the repository at this point in the history

  2. use → instead of -> in context menu label

    @philippotto
    philippotto committed Apr 19, 2024
    Configuration menu
    Copy the full SHA
    24f659a View commit details
    Browse the repository at this point in the history

  3. don't expose the term super-voxel in view mode; switch from activate … 

    …to select
    @philippotto
    philippotto committed Apr 19, 2024
    Configuration menu
    Copy the full SHA
    7e0684e View commit details
    Browse the repository at this point in the history

Commits on Apr 22, 2024

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

    …ter-mesh-context-menu
    @philippotto
    philippotto committed Apr 22, 2024
    Configuration menu
    Copy the full SHA
    4c720bb View commit details
    Browse the repository at this point in the history

  2. fix merge error

    @philippotto
    philippotto committed Apr 22, 2024
    Configuration menu
    Copy the full SHA
    e9f2218 View commit details
    Browse the repository at this point in the history

  3. don't expose supervoxel id in context menu

    @philippotto
    philippotto committed Apr 22, 2024
    Configuration menu
    Copy the full SHA
    a58987f View commit details
    Browse the repository at this point in the history

  4. fix incorrectly placed } after resolving merge conflicts 🤦

    @philippotto
    philippotto committed Apr 22, 2024
    Configuration menu
    Copy the full SHA
    12fa17d View commit details
    Browse the repository at this point in the history

  5. move code into segment mesh controller and ensure selected super voxe… 

    …l stays highlighted after proofread operation
    @philippotto
    philippotto committed Apr 22, 2024
    Configuration menu
    Copy the full SHA
    8ac0164 View commit details
    Browse the repository at this point in the history

Commits on Apr 23, 2024

  1. tell user to either use 3d viewport OR data viewports for proofreadin… 

    …g operation
    @philippotto
    philippotto committed Apr 23, 2024
    Configuration menu
    Copy the full SHA
    752cd91 View commit details
    Browse the repository at this point in the history

  2. check that active segment is registered to avoid merging/splitting fr… 

    …om an unused segment id (which is the default when creating a new annotation)
    @philippotto
    philippotto committed Apr 23, 2024
    Configuration menu
    Copy the full SHA
    7ed2ac0 View commit details
    Browse the repository at this point in the history

  3. update changelog

    @philippotto
    philippotto committed Apr 23, 2024
    Configuration menu
    Copy the full SHA
    53ed40c View commit details
    Browse the repository at this point in the history

  4. improve typing

    @philippotto
    philippotto committed Apr 23, 2024
    Configuration menu
    Copy the full SHA
    6cc18d3 View commit details
    Browse the repository at this point in the history

  5. misc code improvements

    @philippotto
    philippotto committed Apr 23, 2024
    Configuration menu
    Copy the full SHA
    958ecf4 View commit details
    Browse the repository at this point in the history

Commits on Apr 26, 2024

  1. incorporate PR feedback

    @philippotto
    philippotto committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    9132116 View commit details
    Browse the repository at this point in the history

  2. don't depend on flycam prop in CameraController

    @philippotto
    philippotto committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    c1abe45 View commit details
    Browse the repository at this point in the history

  3. fix that SegmentsView.render() was called on each position and mouse … 

    …move
    @philippotto
    philippotto committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    d6f2d1c View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' of github.com:scalableminds/webknossos into bet… 

    …ter-mesh-context-menu
    @philippotto
    philippotto committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    b08f29d View commit details
    Browse the repository at this point in the history

  5. allow to select supervoxel/mesh in 3D viewport with ctrl + click

    @philippotto
    philippotto committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    35ea170 View commit details
    Browse the repository at this point in the history

  6. update docs

    @philippotto
    philippotto committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    854cc81 View commit details
    Browse the repository at this point in the history

Commits on Apr 29, 2024

  1. disable split option when rightclicking the active supervoxel

    @philippotto
    philippotto committed Apr 29, 2024
    Configuration menu
    Copy the full SHA
    996004b View commit details
    Browse the repository at this point in the history

Commits on Apr 30, 2024

  1. fix hovering across chunks when proofreading tool is not active

    @philippotto
    philippotto committed Apr 30, 2024
    Configuration menu
    Copy the full SHA
    0f094db View commit details
    Browse the repository at this point in the history

  2. trigger loading of draco loader before downloading actual mesh chunks

    @philippotto
    philippotto committed Apr 30, 2024
    Configuration menu
    Copy the full SHA
    92b9f13 View commit details
    Browse the repository at this point in the history

  3. when splitting off all neighbors of a super-voxel, keep the id of tha… 

    …t super-voxel instead of one random other partner

This fixes a problem where selecting a super-voxel and then splitting
off all neighbors wouldn't recognize the active super-voxel afterwards
in the 3D viewport. The highlighting still worked because the unmapped
id doesn't change, but the (mapped) segment id changed which led to
problems.
    @philippotto
    philippotto committed Apr 30, 2024
    Configuration menu
    Copy the full SHA
    0a797ff View commit details
    Browse the repository at this point in the history

  4. throttle addMeshFromGeometries

    @philippotto
    philippotto committed Apr 30, 2024
    Configuration menu
    Copy the full SHA
    5cef66e View commit details
    Browse the repository at this point in the history

  5. guard against selecting super voxel in 3D and then merging/splitting … 

    …with a partner selected in data viewport
    @philippotto
    philippotto committed Apr 30, 2024
    Configuration menu
    Copy the full SHA
    737b43b View commit details
    Browse the repository at this point in the history

  6. Merge branch 'master' of github.com:scalableminds/webknossos into bet… 

    …ter-mesh-context-menu
    @philippotto
    philippotto committed Apr 30, 2024
    Configuration menu
    Copy the full SHA
    2eed075 View commit details
    Browse the repository at this point in the history

Commits on May 2, 2024

  1. also show hovered segment id in status bar when hovering in 3D viewport

    @philippotto
    philippotto committed May 2, 2024
    Configuration menu
    Copy the full SHA
    aabb65f View commit details
    Browse the repository at this point in the history

  2. use debounce instead of throttle for updating user settings and incre… 

    …ase timeout to 2500ms to avoid frequent network requests (e.g., when holding down CTRL)
    @philippotto
    philippotto committed May 2, 2024
    Configuration menu
    Copy the full SHA
    dcb91eb View commit details
    Browse the repository at this point in the history

  3. show proper shortcut infos in the status bar when proofreading in 3D … 

    …viewport
    @philippotto
    philippotto committed May 2, 2024
    Configuration menu
    Copy the full SHA
    2557572 View commit details
    Browse the repository at this point in the history

  4. also allow to deselect a super-voxel by ctrl+clicking again

    @philippotto
    philippotto committed May 2, 2024
    Configuration menu
    Copy the full SHA
    0a348a3 View commit details
    Browse the repository at this point in the history

  5. add debug logging

    @philippotto
    philippotto committed May 2, 2024
    Configuration menu
    Copy the full SHA
    5076ca7 View commit details
    Browse the repository at this point in the history

  6. disable most ci checks

    @philippotto
    philippotto committed May 2, 2024
    Configuration menu
    Copy the full SHA
    cfa13a4 View commit details
    Browse the repository at this point in the history

  7. improve error message when mesh chunks could not be loaded

    @philippotto
    philippotto committed May 2, 2024
    Configuration menu
    Copy the full SHA
    bcf8885 View commit details
    Browse the repository at this point in the history

  8. remove debug logging

    @philippotto
    philippotto committed May 2, 2024
    Configuration menu
    Copy the full SHA
    bb05407 View commit details
    Browse the repository at this point in the history

  9. Revert "disable most ci checks" 

    This reverts commit cfa13a4.
    @philippotto
    philippotto committed May 2, 2024
    Configuration menu
    Copy the full SHA
    7d6df70 View commit details
    Browse the repository at this point in the history

  10. move potential explanation for mesh failure to console instead of toast

    @philippotto
    philippotto committed May 2, 2024
    Configuration menu
    Copy the full SHA
    1f2f172 View commit details
    Browse the repository at this point in the history

  11. Merge branch 'master' into better-mesh-context-menu

    @MichaelBuessemeyer
    MichaelBuessemeyer authored May 2, 2024
    Configuration menu
    Copy the full SHA
    24a1c8b View commit details
    Browse the repository at this point in the history

  12. fix missing invocation

    @philippotto
    philippotto committed May 2, 2024
    Configuration menu
    Copy the full SHA
    da07293 View commit details
    Browse the repository at this point in the history

  13. Merge branch 'better-mesh-context-menu' of github.com:scalableminds/w… 

    …ebknossos into better-mesh-context-menu
    @philippotto
    philippotto committed May 2, 2024
    Configuration menu
    Copy the full SHA
    419a28b View commit details
    Browse the repository at this point in the history