Skip to content

Commit

Permalink
Make parseOmeroMetadata public
Browse files Browse the repository at this point in the history
  • Loading branch information
dominikl committed Dec 5, 2024
1 parent 5f305e0 commit 3d1ccf5
Showing 1 changed file with 2 additions and 7 deletions.
9 changes: 2 additions & 7 deletions src/loci/formats/in/ZarrReader.java
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@
import java.util.Hashtable;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.stream.Stream;

import javax.xml.parsers.ParserConfigurationException;
Expand All @@ -68,17 +67,13 @@
import loci.formats.FormatReader;
import loci.formats.FormatTools;
import loci.formats.MetadataTools;
import loci.formats.in.DynamicMetadataOptions;
import loci.formats.in.MetadataOptions;
import loci.formats.meta.MetadataStore;
import loci.formats.ome.OMEXMLMetadata;
import loci.formats.services.JZarrServiceImpl;
import ome.xml.meta.MetadataConverter;
import ome.xml.meta.MetadataRoot;
import ome.xml.model.MapAnnotation;
import ome.xml.model.OME;
import ome.xml.model.Plate;
import ome.xml.model.Screen;
import ome.xml.model.StructuredAnnotations;
import ome.xml.model.primitives.NonNegativeInteger;
import ome.xml.model.primitives.PositiveInteger;
Expand Down Expand Up @@ -205,7 +200,7 @@ protected void initFile(String id) throws FormatException, IOException {
int attrIndex = 0;
if (attr != null && !attr.isEmpty()) {
parseResolutionCount(zarrRootPath, "", attr);
parseOmeroMetadata(zarrRootPath, attr);
parseOmeroMetadata(attr);
if (saveAnnotations()) {
String jsonAttr;
try {
Expand Down Expand Up @@ -920,7 +915,7 @@ private void parseImageLabels(String root, Map<String, Object> attr) throws IOEx
}
}

private void parseOmeroMetadata(String root, Map<String, Object> attr) throws IOException, FormatException {
public void parseOmeroMetadata(Map<String, Object> attr) throws IOException, FormatException {
Map<String, Object> omeroMetadata = (Map<String, Object>) attr.get("omero");
if (omeroMetadata != null) {
Integer id = (Integer) omeroMetadata.get("id");
Expand Down

0 comments on commit 3d1ccf5

Please sign in to comment.