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
Various minor import fixes #777
Various minor import fixes #777
Conversation
Fixes ticket #11509.
Fixes #11286.
Channels are now detected correctly. If the original file passed to setId is a "d" channel (i.e. original image), then only "d" channels will be included in the used file list. If the file passed to setId is an "o" channel (i.e. analysis results), then only "o" channels will be included in the used file list. Fixes #11148.
For linescans in particular, the Z size is stored in the 'size' field, not the 'start' attribute. Fixes ticket #11513.
This allows datasets with thousands of files to be opened without causing the JVM to run out of file handles. Fixes ticket #10971.
String well = getWellName(filename); | ||
int start = well.indexOf(channelCharacter) + 1; | ||
if (start == 0) { | ||
start = well.indexOf(channelCharacter) + 1; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is that going to be any different?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Fixed now.
After importing the 10000 TIFFs into ImageJ (ticket 10971) I don't get an error, but scrolling through the Z sections gives me an "File not found: Frame3_000416.tif" after element number 415. Is this expected? The import finished without the bug described in 10971. |
For ticket 11513, the dimensions are reported OK:
|
For ticket 11148, the screen imports fine in Insight and no images land in the Orphaned images folder. |
For ticket 11286, I still get an NPE (FlexReader.java:625) when trying to import the .flex file. Only happens in Fiji though. ImageJ is fine. |
For 11509, the image scale is reported as 0.74 x 0.74 microns. Seems fine. |
@melissalinkert All in all, looks good to merge. I couldn't get through testing ticket 11286 in Fiji. Maybe someone else will be better than me at that. |
@bpindelski: testing PRs in Fiji requires replacing about a dozen different jars and then being careful not to run the updater - dropping loci_tools.jar into the plugins folder isn't going to work. As long as ticket 11286 works in ImageJ, that's sufficient as far as I'm concerned. |
Also, the "File not found" images for ticket 10971 are expected; those files were exported from somewhere else, and most of the images actually are just plain gray with the text "File not found" and the plane number. |
@melissalinkert That explains it all then (-: Thanks. |
Retested importing a Cellomics screen. All looks fine. Good to merge. |
One more commit added to take care of: http://hudson.openmicroscopy.org.uk/view/Bio-Formats/job/BIOFORMATS-full-repository-develop/553/ |
Code change looks good and |
Various minor import fixes
--rebased-to #815 |
To test, verify that builds are green and the issues reported in the following tickets are resolved:
http://trac.openmicroscopy.org.uk/ome/ticket/10971
http://trac.openmicroscopy.org.uk/ome/ticket/11513
http://trac.openmicroscopy.org.uk/ome/ticket/11148
http://trac.openmicroscopy.org.uk/ome/ticket/11265
http://trac.openmicroscopy.org.uk/ome/ticket/11286
http://trac.openmicroscopy.org.uk/ome/ticket/11509