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.

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

allow all resolutions if there is no volume annotation in the nml #6116

Merged
merged 7 commits into from
Mar 23, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 .circleci/slack-notification.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ if [ "${CIRCLE_BRANCH}" == "master" ] ; then
author=${author/valentin-pinkau/<@valentin>}
author=${author/youri-k/<@youri>}
author=${author/Dagobert42/<@Arthur>}
author=${author/leowe/<@leowe>}
channel="webknossos-bots"
commitmsg="$(git log --format=%s -n 1)"
pullregex="(.*)#([0-9]+)(.*)"
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.unreleased.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ For upgrade instructions, please check the [migration guide](MIGRATIONS.released
- Fix occasionally "disappearing" data. [#6055](https://github.com/scalableminds/webknossos/pull/6055)
- Fixed a bug where remote-origin headers were omitted in error case. [#6098](https://github.com/scalableminds/webknossos/pull/6098)
- Increased the timeouts for some internal operations like downsampling volume annotations. [#6103](https://github.com/scalableminds/webknossos/pull/6103)
- Fixed a bug that led to an error when drag-'n-dropping an empty volume annotation in the dataset view. [#6116](https://github.com/scalableminds/webknossos/pull/6116)
- Fixed a bug where there was a suggested change in the `datasource-config.json` was shown for resolution `1` instead of `[1,1,1]` or vice-versa. [#6104](https://github.com/scalableminds/webknossos/pull/6104)

### Removed
Expand Down
2 changes: 1 addition & 1 deletion frontend/javascripts/messages.js
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,7 @@ instead. Only enable this option if you understand its effect. All layers will n
"annotation.finish": "Are you sure you want to permanently finish this annotation?",
"annotation.was_finished": "Annotation was archived",
"annotation.no_fallback_data_included":
"This download does only include the volume data annotated in this annotation. The fallback volume data is excluded.",
"This download only includes the volume data annotated in this annotation. The fallback volume data is excluded.",
"annotation.was_re_opened": "Annotation was reopened",
"annotation.delete": "Do you really want to reset and cancel this annotation?",
"annotation.was_edited": "Successfully updated annotation",
Expand Down
6 changes: 3 additions & 3 deletions util/src/main/scala/com/scalableminds/util/io/PathUtils.scala
Original file line number Diff line number Diff line change
Expand Up @@ -60,16 +60,16 @@ trait PathUtils extends LazyLogging {
} catch {
case _: AccessDeniedException =>
val errorMsg = s"Error access denied. Directory: ${directory.toAbsolutePath}"
logger.error(errorMsg)
logger.warn(errorMsg)
Failure(errorMsg)
case _: NoSuchFileException =>
val errorMsg = s"No such directory. Directory: ${directory.toAbsolutePath}"
logger.error(errorMsg)
logger.warn(errorMsg)
Failure(errorMsg)
case ex: Exception =>
val errorMsg =
s"Error: ${ex.getClass.getCanonicalName} - ${ex.getMessage}. Directory: ${directory.toAbsolutePath}"
logger.error(ex.getClass.getCanonicalName)
logger.warn(ex.getClass.getCanonicalName)
Failure(errorMsg)
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ class VolumeTracingService @Inject()(
def initializeWithData(tracingId: String,
tracing: VolumeTracing,
initialData: File,
resolutionRestrictions: ResolutionRestrictions): Box[Set[Vec3Int]] = {
resolutionRestrictions: ResolutionRestrictions): Fox[Set[Vec3Int]] = {
if (tracing.version != 0L) {
return Failure("Tracing has already been edited.")
}
Expand All @@ -202,6 +202,9 @@ class VolumeTracingService @Inject()(
saveBucket(dataLayer, bucketPosition, bytes, tracing.version)
}
}
// if none of the tracings contained any volume data, use the dataset’s full resolution list
if (savedResolutions.isEmpty) return getRequiredMags(tracing).map(_.toSet)

unzipResult.map(_ => savedResolutions.toSet)
}

Expand Down