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

Fix groups in multicomponent tree splitter #4735

Merged
merged 4 commits into from
Jul 30, 2020
Merged

Fix groups in multicomponent tree splitter #4735

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9b6144a
Fix groups in multicomponent tree splitter
fm3 Jul 27, 2020
5c0ff3c
changelog
fm3 Jul 27, 2020
97a747a
Merge branch 'master' into fix-multicomponent-split
fm3 Jul 27, 2020
3f94c73
Merge branch 'master' into fix-multicomponent-split
fm3 Jul 29, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions CHANGELOG.unreleased.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@ For upgrade instructions, please check the [migration guide](MIGRATIONS.released
[Commits](https://github.com/scalableminds/webknossos/compare/20.07.0...HEAD)

### Added
- Added the possibility to delete datasets on disk from webKnossos. Use with care. [#4696]()(https://github.com/scalableminds/webknossos/pull/4696)
- Added the possibility to delete datasets on disk from webKnossos. Use with care. [#4696](https://github.com/scalableminds/webknossos/pull/4696)

### Changed
- When d/f switching is turned off and a slice is copied with the shortcut `v`, the previous slice used as the source will always be slice - 1 and `shift + v` will always take slice + 1 as the slice to copy from. [#4728](https://github.com/scalableminds/webknossos/pull/4728)
- Disabled the autofill feature of the brush when using this tool to erase data. [#4729](https://github.com/scalableminds/webknossos/pull/4729)

### Fixed
-
- Fixed tree groups when uploading NMLs with multi-component trees. [#4735](https://github.com/scalableminds/webknossos/pull/4735)

### Removed
-
2 changes: 1 addition & 1 deletion .../scalableminds/webknossos/tracingstore/tracings/skeleton/MultiComponentTreeSplitter.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ object MultiComponentTreeSplitter {
val newTreeGroup = TreeGroup(tree.name, largestGroupId, List())
val parentTreeGroupIdOpt: Option[Int] = tree.groupId
parentTreeGroupIdOpt.foreach { parentTreeGroupId =>
treeGroupsMutable = addTreeGroupAsChild(treeGroups, parentTreeGroupId, newTreeGroup)
treeGroupsMutable = addTreeGroupAsChild(treeGroupsMutable, parentTreeGroupId, newTreeGroup)
}
if (parentTreeGroupIdOpt.isEmpty) {
treeGroupsMutable = newTreeGroup +: treeGroupsMutable
Expand Down