Skip to content

Limit bbox of volume tracings to that of fallback layer #7580

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

Merged
merged 7 commits into from
May 19, 2025
Merged

Limit bbox of volume tracings to that of fallback layer #7580

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
389135d
Limit bbox of volume tracings to that of fallback layer
fm3 Jan 23, 2024
9eabeaf
fix pr num
fm3 Jan 23, 2024
f986575
Merge branch 'master' into volume-fallback-bbox
fm3 Jan 29, 2024
f883a00
Merge branch 'master' into volume-fallback-bbox
fm3 Mar 20, 2025
2a186fc
Merge branch 'master' into volume-fallback-bbox
fm3 May 19, 2025
203193b
Merge branch 'master' into volume-fallback-bbox
MichaelBuessemeyer May 19, 2025
2b7b941
Merge branch 'master' into volume-fallback-bbox
fm3 May 19, 2025
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
1 change: 1 addition & 0 deletions CHANGELOG.unreleased.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ For upgrade instructions, please check the [migration guide](MIGRATIONS.released
- When loading data from a data layer that has data stored beyond the bounding box specified in the datasource-properties.json, data outside of the bounding box is now zeroed. (the layer is “clipped”). [#8551](https://github.com/scalableminds/webknossos/pull/8551)
- Updated to Typescript from version `5.5` to `5.8`. [#8613](https://github.com/scalableminds/webknossos/pull/8613)
- Updated Voxelytics log streaming to also include the `log_path` attribute. [#8615](https://github.com/scalableminds/webknossos/pull/8615)
- When creating or uploading a non-task volume annotation layer with a fallback segmentation layer, the annotation layer’s bounding box will now be limited to that layer’s, instead of the whole dataset’s. [#7580](https://github.com/scalableminds/webknossos/pull/7580)

### Fixed
- When selecting a skeleton node in a viewport, its tree is focused and scrolled to in the skeleton tab, even if its parent group was collapsed before. [#8585](https://github.com/scalableminds/webknossos/pull/8585)
Expand Down
3 changes: 2 additions & 1 deletion app/controllers/AnnotationIOController.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,8 @@ class AnnotationIOController @Inject()(
case _ => None
}.headOption
val bbox =
if (volumeTracing.boundingBox.isEmpty) boundingBoxToProto(dataSource.boundingBox)
if (volumeTracing.boundingBox.isEmpty)
boundingBoxToProto(fallbackLayerOpt.map(_.boundingBox).getOrElse(dataSource.boundingBox))
else volumeTracing.boundingBox

for {
Expand Down
2 changes: 1 addition & 1 deletion app/models/annotation/AnnotationService.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ class AnnotationService @Inject()(
} yield
VolumeTracing(
None,
boundingBoxToProto(boundingBox.getOrElse(dataSource.boundingBox)),
boundingBoxToProto(boundingBox.orElse(fallbackLayer.map(_.boundingBox)).getOrElse(dataSource.boundingBox)),
System.currentTimeMillis(),
dataSource.id.directoryName,
vec3IntToProto(startPosition.getOrElse(dataSource.center)),
Expand Down
Loading