-
Notifications
You must be signed in to change notification settings - Fork 101
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
Use reader-supplied plate names by default #4992
Conversation
The user specified name is typically non-null, even if the user did not explicitly enter a plate name. This attempts to distinguish between "real" user specified names and default names based upon the imported file name. The default names appear to come from ome.formats.importer.ImportFixture, but changes were not made there so as to not affect non-SPW imports.
This removes the automatic setting of user-specified names in the importer, so that later calls to retrieve the user-specified name are guaranteed to return only what the user actually specified (or null by default). Plate and Image names supplied by the reader are trusted when the user has not specified a name. The name(s) will be set to the relative path of the imported file only if both the user- and reader-specified names are null. The issue of 255 character limits on name fields has not been addressed here, but a comment has been added so that it's easier to go back to later.
Full list of plate-based readers for testing:
|
@pwalczysko now that almost everybody is back |
@jburel : Sure. will do. |
you can use the CLI option |
@jburel Ta. Started to work on the testing template sheet for this. Will have to delete all the non-matching lines as well as add the lines asked for in this PR (e.g. CellH5) to the sheet. Will also try to adjust import testing template. Changing the folder these sheets are pointing to to |
I managed to find the original dataset for |
Datasets for |
@melissalinkert : Thank you. Deleted CellVoyager from the testing sheet. |
@melissalinkert : |
@melissalinkert : ditto for |
@pwalczysko I think bfconvert the probably the best choice in the absence of any decent OME-TIFF plate examples. |
@melissalinkert : |
@melissalinkert : So the 3 remaining formats which need to be sorted out are |
There are |
@mtbc : Thank you, but no, unfortunately after import the |
For For For |
@melissalinkert : Great, thank you. So on https://docs.google.com/spreadsheets/d/1CewWxkNMF-mLhM-zeiC7gqPmQfl93KYNb6QjHXh-4L0/edit#gid=1959616916 we should be sorted regarding the necessary data, cc @jburel I will just implement better the workflow into the spreadsheet and we can test next wekk. |
Yes, that's correct.
I think the correct behavior would be to fall back to the relative file path - if an empty name is shown in Insight/web, then an additional fix is needed. |
Albeit I agree that this should be the correct behaviour, this will complicate our testing a bit. I suppose many of the files we are going to use for the testing have an empty Name attribute... |
Metamorph removed from the testing sheet, as discussed with @melissalinkert . |
👍 I don't see why this PR's effects would be format-specific. |
I think this is a good opportunity to review some formats (we have not done that for a long time) and see if we need to improve/add documentation |
Bug: Cellworx: Bug was first noticed by @dominikl on [line 6](https://docs.google.com/spreadsheets/d/1CewWxkNMF-mLhM-zeiC7gqPmQfl93KYNb6QjHXh-4L0/edit#gid=19596169160 of the testing sheet. The bug repeats both with Insight with Options checkbox unchecked (which works for the other formats) as well as on CLI. The bug was then fully confirmed by me. Interestingly, the "Name" parameter on plate in the showinf output changes with changing the name of the containing folder (Dom copied the file into his locla folder "Cellworx" and since then the showinf "Name" was reporting "Cellworx". |
Bug: Line 11 of the testing sheet - in case of the empty string in an OME-XML format omero is supposed to fall back to behaviour before this PR - but for OME-XML plate format this is not the case. Note that this behaviour was not tested on other formats at all, because of the lack of appropriate data. |
Note: (maybe treat as a separate bug): Further to #4992 (comment), this behaviour is analogical for the screen, i.e. the |
This should result in plate names defaulting to the relative file name if a reader sets the plate name to an empty string.
7508291 should fix the empty plate name bug noted in #4992 (comment). #4992 (comment) is specific to the CellWorx reader and will need to be fixed in a separate Bio-Formats PR. |
Failed checks, snoopy says the PR was excluded. |
Travis fixed now, so should hopefully be in tomorrow's build. |
Yes, the PR is in. |
So to summarize, three separate PRs were advertised as a follow-up
Do we need to document the first and third bullet point here ? |
The CellWorX follow-up PR is now open: ome/bioformats#2731 I have the CellVoyager work in progress and expect to have a PR open by the end of this week to target Bio-Formats 5.3.3. If the work is delayed for some reason, I will open a card instead. |
PR ome/bioformats#2731 has been merged and will be available in 5.3.3 |
Tested Metamorph-Tiffs and CellWorX formats. The PR in its current status looks good to merge, if the CellVoyager PR can be regarded as a Bio-Formats reader specific issue. @jburel @melissalinkert |
The CellVoyager PR was tested as well, and it works as expected. (Bioformats version: 5.4.0-SNAPSHOT revision: 03de64c8b4762583d44ddad180167bab6fb4ba70 date: 14 March 2017) |
What this PR does
This changes how Plates are named during import, so that the reader-supplied name is used whenever possible. If neither the reader nor the user supply a Plate name, then the relative file path is used as a fallback. Naming of Image-based datasets should not have changed, but needs to be tested.
Testing this PR
Without this PR, import one plate in each of a few different formats (e.g. InCell, ScanR, Flex). Verify that the plate names in OMERO all match the relative file path of the import file. Also import a non-plate dataset in each of a few different formats (e.g. Imaris HDF, SVS).
With this PR, import the same set of plate and non-plate datasets as in the original test. The Plate names should now match the
Name
attribute onPlate
as shown byshowinf -nopix -omexml
on the corresponding file. The Image names (for non-plate datasets) should be the same as before.Finally, with this PR, import the same set of plate datasets only, but specify a plate name of your choice during import. Verify that the Plate names match your chosen names and not what is shown by
showinf -nopix -omexml
.Related reading
See https://trello.com/c/XMfgOciw/189-import-plate-image-name and ome/design#57.