-
Notifications
You must be signed in to change notification settings - Fork 24
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
Persist tree visibility #3942
Persist tree visibility #3942
Conversation
@youri-k Could you add an extra "toggleTreeUpdateAction" instead of re-using the "updateTreeGroup" action? Due to how we are doing the compactation of the actions in the front-end, this would really help :) |
…bknossos into persist-tree-visibility
persist-tree-visibility
@philippotto The route should work. I'm currently doing further testing. |
@daniel-wer I think you can already review this PR if you feel like it. I'll add some tests in the mean time :) |
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.
You solved this complicated issue very well in this PR! I especially like that you pointed out the compactToggleActions
function for the high-level understanding in a comment. The function is extremely readable and makes it easy to understand what's happening 👍
I'll go on and test now :)
frontend/javascripts/oxalis/model/helpers/compaction/compact_update_actions.js
Outdated
Show resolved
Hide resolved
frontend/javascripts/oxalis/model/helpers/compaction/compact_toggle_actions.js
Show resolved
Hide resolved
frontend/javascripts/oxalis/model/helpers/compaction/compact_toggle_actions.js
Outdated
Show resolved
Hide resolved
frontend/javascripts/oxalis/model/helpers/compaction/compact_toggle_actions.js
Outdated
Show resolved
Hide resolved
I encountered some issues during testing:
TypeError: Cannot read property 'isVisible' of undefined
at eval (VM8089 compact_toggle_actions.js:115)
at arrayAggregator (VM7013 lodash.js:497)
at Function.eval [as partition] (VM7013 lodash.js:4829)
at isCommonAncestorToggler (VM8089 compact_toggle_actions.js:115)
at compactToggleActions (VM8089 compact_toggle_actions.js:169)
at compactUpdateActions (VM8088 compact_update_actions.js:135)
at saveTracingTypeAsync (VM8084 save_saga.js:277)
at saveTracingTypeAsync.next (<anonymous>)
at next (VM7995 proc.js:321)
at currCb (VM7995 proc.js:398)
|
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.
I'll approve once the mentioned issues are resolved :)
…oggle_actions.js Co-Authored-By: philippotto <[email protected]>
Thanks for the thorough testing and your feedback! In the meantime, I added some tests and extracted the @youri-k Here's the backend todo list, we just discussed:
|
…bknossos into persist-tree-visibility
…bknossos into persist-tree-visibility
backend:
|
…bknossos into persist-tree-visibility
…bknossos into persist-tree-visibility
…bknossos into persist-tree-visibility
The PR should be ready for another round of review, @daniel-wer.
I couldn't reproduce this. Maybe this was unintentionally fixed in the meantime? Can you please try to reproduce this again to ensure that I didn't miss anything? :) |
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.
Backend LGTM, added a comment regarding a possible minor refactoring
} | ||
|
||
childIter(Seq(rootGroup)) | ||
} |
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.
I think it should be possible to do this in one function (without the nested childIter), just start the match etc. directly on rootGroup
. Also, I would then just call it group
instead of rootGroup
/currentGroup
. (Since this is not actually used for the root group case of the tracings)
@@ -63,7 +63,7 @@ case class UpdateTreeSkeletonAction(id: Int, | |||
branchPoints = branchPoints.map(convertBranchPoint), | |||
comments = comments.map(convertComment), | |||
name = name, | |||
groupId = groupId | |||
groupId = groupId, |
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.
is there a special reason for this change?
I can still reproduce this. Try toggling the root group in this tracing: https://persisttreevisibility.webknossos.xyz/annotations/Explorational/5cab0f9b0100001c00084973#612,702,502,0,2.000,176 Apart from that, this is looking all good! 👍 |
Ah, thanks for the repro 👍 I fixed it now :) |
* master: (43 commits) update screenshots (#4038) docker: don't set sbt/ivy cache (#4034) Slow down brush size change for small sizes (#4012) voulme tool bar now depends only on the active tool (#4029) Allow user to adapt GPU memory consumption to allow for better quality (#4015) Updates the Docs (#4020) hiding pricing and features in iframe (#4019) Fix sitemap for publication detail view (#4024) Add sitemap.xml (#4006) Allow empty trees (#4010) Prefer annotation zoom over dataset zoom (#3992) Add details view for publications (#3994) remove enzyme test (#3997) Tensorflow segmentation (#3461) ensure that max zoom step is not exceeded when changing viewport area (#3996) allow isosurfaces for hybrid tracings when setting window.allowIsosurfaces (#3998) re-fetch buckets if fetching them failed (#3999) Only re-compute bounding sphere of skeletons if something changed (#3995) Fix dropdown login padding (#3988) Persist tree visibility (#3942) ...
Remaining Todo
[ ] frontend: apply update tree group visibility action in skeleton.jsURL of deployed dev instance (used for testing):
Steps to test:
Issues: