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

Zeiss CZI: add support for slides #2481

Merged
merged 13 commits into from
Aug 2, 2016

Conversation

melissalinkert
Copy link
Member

See https://trello.com/c/OHKk0BiI/161-jpeg-xr.

This adds more polished support for slide data from Axio Scan.Z1 systems. Slides should now be detected as a complete full-resolution image (instead of each tile being a separate series), pyramid sub-resolutions are detected, and label/overview images are detected.

This is excluded for now, pending conclusion of m5 and a configuration PR. Further testing instructions will be added once the configuration PR is set - I'm just in the process of importing the 13 files for which configurations have changed, verifying that the new behavior is correct, and assembling supporting screenshots.

Pyramid detection is not enabled (yet), so mosaics are always stitched
for now.

Conflicts:
	components/formats-gpl/src/loci/formats/in/ZeissCZIReader.java
Conflicts:
	components/formats-gpl/src/loci/formats/in/ZeissCZIReader.java
Multiple resolutions are now required for a pyramid to be detected.
This prevents OME-XML validation errors when an ImageInstrumentRef is
present without the corresponding Instrument.
Some non-slide large images will have resolutions which are a power of 3
smaller.  As we only support power-of-2, these resolutions must be
ignored.
This should speed up repeated calls to getOptimalTile*(), as iterating
over potentially all SubBlocks for each call is no longer necessary.
@melissalinkert
Copy link
Member Author

Additional commits have been added to reduce the number of existing files affected by this PR to just three. A configuration PR is now open (https://github.com/openmicroscopy/data_repo_config/pull/117), so removing the exclude label.

The list of files to test and corresponding screenshots in Zen are in the config PR - double-checking the configuration changes and comparing ImageJ vs. Zen should be sufficient.

@dgault
Copy link
Member

dgault commented Aug 2, 2016

The code changes here make sense and look good. The slide data now appears to be handled and stored correctly. Additionally this also allows enables us to fix other issues such as #2467 by enabling use of coreIndex as opposed to seriesIndex.

Ive tested comparisons with affected files between the Zen screenshots provided and importing through Bio-Formats via Fiji. The results of the testing can be found on the associated configuration PR.

With all tests passing both this and the configuration PR look good to merge.

@sbesson
Copy link
Member

sbesson commented Aug 2, 2016

Thanks, merging this and the configuration PR. In terms of documentation, we should be able to add pyramid = yes to the format-pages.txt file. Is there anything else that needs updating.

@sbesson sbesson merged commit 1382e58 into ome:develop Aug 2, 2016
@hflynn hflynn mentioned this pull request Aug 15, 2016
@sbesson sbesson added this to the 5.2.0 milestone Aug 17, 2016
@melissalinkert melissalinkert deleted the czi-slides-develop branch January 9, 2017 15:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants