Rename labels #64
Rename labels #64
Conversation
docker-compose.yml
Outdated
| volumes: | ||
| - "omero:/OMERO" | ||
|
|
||
| omeroweb: |
There was a problem hiding this comment.
You could probably remove this and save the download time?
There was a problem hiding this comment.
Ack, crud. That wasn't supposed to be included here. I'll push it away, but it's very useful for testing and since it's only downloading once not particularly a problem (unless you mean in travis, and there it's not used at all)
joshmoore
force-pushed
the
rename-labels
branch
from
31f0309
to
7f560ab
Compare
| ├── .zgroup # The labels group is a container which holds a list | ||
| ├── .zattrs # of labels to make the objects easily discoverable, | ||
| │ # All labels will be listed in `.zattrs` e.g. `{ "labels": [ "original/0" ] }` | ||
| │ # Each dimension of the label `(t, c, z, y, x)` should be either the same as the |
There was a problem hiding this comment.
| │ # Each dimension of the label `(t, c, z, y, x)` should be either the same as the | |
| │ # Each dimension of the label `(t, c, z, y, x)` must be either the same as the |
Is there a situation where the dimension would be something else?
|
|
||
| ``` | ||
| { | ||
| "masks": [ | ||
| "labels": [ | ||
| "orphaned/0" |
There was a problem hiding this comment.
| "orphaned/0" | |
| "original/0" |
Match the example above? Or was this intentionally different to indicate something else?
There was a problem hiding this comment.
I think we probably need a few examples. Not also that the omero-{cli,ms}-zarr currently use the unimaginative "0" as the default name. To not need to fight with travis again, I'd propose we have a round of "label-naming" after things have settled a bit.
| @@ -763,7 +775,7 @@ private void returnImageMasksDirectory(HttpServerResponse response, List<String> | |||
| final ImmutableList.Builder<String> contents = ImmutableList.builder(); | |||
| contents.add(".zattrs"); | |||
| if (labeledMasks != null) { | |||
| contents.add("labeled/"); | |||
| contents.add(DEFAULT_LABEL_NAME); | |||
There was a problem hiding this comment.
Part of me says we should support both but the removal was unintentional. Thanks.
src/main/java/org/openmicroscopy/ms/zarr/RequestHandlerForImage.java
Outdated
Show resolved
Hide resolved
| this.patternForImageMasksDir = Pattern.compile(path + LABEL_GROUP + "/"); | ||
| this.patternForMaskDir = Pattern.compile(path + LABEL_GROUP + "/(\\d+)/"); | ||
| this.patternForMaskChunkDir = Pattern.compile(path + LABEL_GROUP + "/(\\d+)/(\\d+([/.]\\d+)*)/"); | ||
| this.patternForMaskLabeledDir = Pattern.compile(path + LABEL_GROUP + "/" + DEFAULT_LABEL_NAME + "/"); |
There was a problem hiding this comment.
Works okay in this case but among these may want to consider \\Q…\\E as in Configuration.getRegexForNetPath if there is any risk of a regex metacharacter someday appearing, e.g., if later allowing these to be configurable. Not a blocker though.
|
Useful discussion on PR but nothing that need block merging. |
see: #59
Also renames the single produced array to
0/to match omero-cli-zarr