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.

Sign up for GitHub

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

Populate metadata Image dtype #184

Merged
merged 6 commits into from
Jun 25, 2021
Merged

Populate metadata Image dtype #184

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2c4d0ea
Add 'Image' to OBJECT_TYPES
will-moore Feb 24, 2021
6ffeb46
Update Populate_Metadata description to mention ROIs
will-moore Mar 19, 2021
ffb5050
Update omero/import_scripts/Populate_Metadata.py
will-moore Mar 22, 2021
5f955c8
Test for Image support from omero-metadata
will-moore Jun 16, 2021
1d54b11
Revert previous commit. Test for ImageWrapper if needed
will-moore Jun 16, 2021
b30a032
noqa for import ImageWrapper
will-moore Jun 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions omero/import_scripts/Populate_Metadata.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
'Screen',
'Dataset',
'Project',
'Image',
)
DEPRECATED = ""

Expand Down Expand Up @@ -106,6 +107,12 @@ def populate_metadata(client, conn, script_params):
object_ids = script_params["IDs"]
object_id = object_ids[0]
data_type = script_params["Data_Type"]

if data_type == "Image":
try:
from omero_metadata.populate import ImageWrapper # noqa: F401
except ImportError:
return "Please update omero-metadata to support Image type"
file_ann_id = None
if "File_Annotation" in script_params:
file_ann_id = int(script_params["File_Annotation"])
Expand Down Expand Up @@ -136,11 +143,11 @@ def run_script():
client = scripts.client(
'Populate_Metadata.py',
"""
This script processes a CSV file, attached to a container,
converting it to an OMERO.table, with one row per Image or Well.
This script processes a CSV file, using it to
'populate' an OMERO.table, with one row per Image, Well or ROI.
The table data can then be displayed in the OMERO clients.
For full details of the supported CSV format, see
https://github.com/ome/omero-metadata/
https://github.com/ome/omero-metadata/#populate
""" + DEPRECATED,
scripts.String(
"Data_Type", optional=False, grouping="1",
Expand Down