-
Notifications
You must be signed in to change notification settings - Fork 27
Add Split Segments Toolkit and Draw Mode for Skeleton Tool #8434
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
Changes from 1 commit
Commits
Show all changes
93 commits
Select commit
Hold shift + click to select a range
4945585
tmp: prototype tps surface for splitting segments
philippotto dcfa9ed
temporarily disable some CI checks
philippotto b5c4d42
also implement delauny and splines approach
philippotto ab08454
add missing saga
philippotto 667fa5e
change default to splines
philippotto d1691ec
experiment with automatic ordering of points and flipping
philippotto a60c90f
fix typo
philippotto 6f960e0
show spline on each section; don't cross surface in floodfill
philippotto 00ab1b0
fix some stuff
philippotto f2504bf
allow to continously place skeleton nodes like in a draw tool
philippotto 4f950f1
prototype workflow mode
philippotto f5a9cb5
Merge branch 'master' of github.com:scalableminds/webknossos into tps…
philippotto 573f1b7
start introducing tool workspaces
philippotto 8800265
some clean up
philippotto 6bad426
fix ts errors
philippotto c05b06d
linting
philippotto 71b584b
only generate bent surface when split workspace is active
philippotto 6c6bcdb
remove lots of unused code (from old delauney and tps based approaches)
philippotto 0c6ae1b
don't show edges if tree was created in split-workspace; more clean up
philippotto 92c7c18
rename some stuff
philippotto 26a1c1b
linting
philippotto 664c8d7
move file
philippotto fa80d3c
fix bug
philippotto 9ec00b5
wip: add badge dot to workspace dropdown
philippotto 5dcef90
Merge branch 'master' of github.com:scalableminds/webknossos into tps…
philippotto f6f3bb9
fix missing type import
philippotto 97c35cd
refactor annotation tool enums
philippotto 85696f4
remove AnnotationToolType in favor of AnnotationTool
philippotto a4bc77b
rename control classes to ....ToolController; clean up tool label code
philippotto 4ec5a0d
linting
philippotto 833db7d
make use of hasOverwriteCapabilities properties etc
philippotto d2c9baa
rename tool workspace to toolkit
philippotto 72ffdd1
use toolkit collection in toolbar
philippotto 0488b7d
fix cycling of tools
philippotto cfc5527
fix some cyclic imports
philippotto a8d0e54
fix more cyclic dependencies and multiple bugs
philippotto 0230fe0
tune toolkit view
philippotto c5c05ac
clean up
philippotto 906843a
lint
philippotto 6a22e96
ensure that changing active toolkit won't leave a tool activated that…
philippotto 1cde4f0
refactor disable/re-enable tool logic to saga
philippotto b497b17
lint
philippotto 546c9e5
remove verb-nurbs
philippotto 1c27181
remove unnecessary global
philippotto 2621179
fix yarn.lock (hopefully)
philippotto 8ebe2c0
fix tests
philippotto 240cf66
improve typing
philippotto f39d88c
merge tool saga into annotation tool saga
philippotto 8b59a87
fix one tool spec; skip the other one for now
philippotto fd834d2
misc fixes for new skeleton brush mode
philippotto 052c85e
fix tool cycling in view mode
philippotto 27ab3ad
further clean up
philippotto 4b3eb62
more clean up
philippotto 6b96886
Merge branch 'master' of github.com:scalableminds/webknossos into tps…
philippotto abd87d6
update changelog
philippotto 38a232d
automatically switch to default toolkit if in view mode
philippotto 6e80117
sort imports
philippotto fd778e0
Merge branch 'master' of github.com:scalableminds/webknossos into tps…
philippotto 5bfd5c3
make 2D floodfills possible on single section with new split boundary…
philippotto e69977b
forbid floodfill in other viewports if split toolkit is active
philippotto 2315786
update surface on create tree and undo/redo
philippotto 8692405
hide edges automatically for the active tree when the split tool is a…
philippotto 7a867fe
Merge branch 'master' of github.com:scalableminds/webknossos into tps…
philippotto 6408e56
fix spec
philippotto 4bb5587
wip: indicator for different tool behavior
philippotto 2f700cd
Merge branch 'master' of github.com:scalableminds/webknossos into tps…
philippotto 3fa7455
remove commented code
philippotto 89bbe1d
Update frontend/javascripts/oxalis/view/action-bar/toolkit_switcher_v…
philippotto 0ed911d
Merge branch 'tps-split' of github.com:scalableminds/webknossos into …
philippotto 98a2070
incorporate feedback
philippotto 5767138
listen to more actions
philippotto 7b7e752
add comments
philippotto 87122a9
debounce saga
philippotto 3454e58
iterate on ui
philippotto 2c42d98
use fake enums for toolkit strings
philippotto ea64de6
clean up getPoints parameter
philippotto 13cf9f4
update docs
philippotto 429f82a
fix incorrect highlighting when measurement tool is active
philippotto c5b7c6b
refactor switch statement to record look up
philippotto 28ee8ef
remove superfluous hint in tooltip
philippotto 3b40430
add skeleton pen mode to docs
philippotto 035aa53
Update docs/proofreading/split_segments_toolkit.md
philippotto 06d26c5
Update docs/skeleton_annotation/tools.md
philippotto dbfb1bf
Update docs/proofreading/split_segments_toolkit.md
philippotto 34510d0
Update docs/proofreading/split_segments_toolkit.md
philippotto d10ac1d
Update docs/proofreading/split_segments_toolkit.md
philippotto 6cad801
Update docs/proofreading/split_segments_toolkit.md
philippotto 87ef13d
use ordered list in docs
philippotto 83b570e
Merge branch 'master' of github.com:scalableminds/webknossos into tps…
philippotto de74025
proof-read -> proofread; misc
philippotto 99fd8c0
pr feedback
philippotto 4e304ca
split toolbar_view into several files and move into action-bar/tools …
philippotto 82bab40
Merge branch 'master' into tps-split
philippotto File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
why is this now 49?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
there should be 50 points on the spline. this means that the line will be divided into 49 "sections". if threejs' getPoints function would require the point count, this would not be necessary. however, it requests a division count.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ah, ok a little unexpected. Thanks for the clarification 👍 (was unable to find the docs for
getPoints
in the catmull curve -> it is inherited as I just noticed 🙈)There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
yeah, I only saw it because my code editor showed the functions signature (thanks to TS).