Skip to content

bulk annotations right panel#3863

Closed
will-moore wants to merge 15 commits intoome:developfrom
will-moore:bulk_annotations_right_panel
Closed

bulk annotations right panel#3863
will-moore wants to merge 15 commits intoome:developfrom
will-moore:bulk_annotations_right_panel

Conversation

@will-moore
Copy link
Copy Markdown
Member

See https://trello.com/c/MGeMSVXY/239-hdf-table-data-display-for-selected-wells-in-web

Load and display bulk annotations in metadata General tab.
Uses the same code as in the full image viewer.
Bulk annotations can be added as described: https://github.com/openmicroscopy/ome-internal/blob/master/testing_scenarios/BulkAnnotations.txt

NB: Bulk annotations are not filtered by owner as other annotations are. Is this needed?

screen shot 2015-06-09 at 14 15 18

@pwalczysko
Copy link
Copy Markdown
Member

On the data mentioned in https://www.openmicroscopy.org/private/ome-internal/testing_scenarios/BulkAnnotations.html
Nevertheless, I have a slight formatting issue, the BULK ANNOTATIONS header is creeping into the first line of the annotation when done on trout merge.
https://trout.openmicroscopy.org/merge/webclient/?show=well-313305 login as user-4

screen shot 2015-06-10 at 10 38 42

@pwalczysko
Copy link
Copy Markdown
Member

I think the question about the filtering (Show all etc.) is for @eleanorwilliams

@eleanorwilliams
Copy link
Copy Markdown

From the IDR point of view, I guess no it doesn't matter if you can't filter by owner as everything will have one owner, but as a general part of Omero, yes it would be good to be able to only search in your own bulk annotations.

@jburel
Copy link
Copy Markdown
Member

jburel commented Jun 10, 2015

Probably not required to have the term "Bulk Annotations".

@joshmoore
Copy link
Copy Markdown
Member

What will be the alternative? I'd suggest we synchronize including what shows up via populate_metadata and other CLI components.

@jburel
Copy link
Copy Markdown
Member

jburel commented Jun 10, 2015

The source does not really matter, it is displayed as non editable (at the moment) key-value list. Since it is under the "annotations" section I will probably not add a header
@gusferguson what do you think?

@joshmoore
Copy link
Copy Markdown
Member

Some actions I can think of it (eventually) mattering for are:

  • download the related HDF5
  • find other objects which are related in the same way (i.e. go up to plate/screen)
  • switch between similar sources (i.e. a second bulk annotation)

@will-moore
Copy link
Copy Markdown
Member Author

@pwalczysko Fixed the layout issue (not sure why I didn't see this before).

Also added test for populate_metadata.py cc @joshmoore.

@pwalczysko
Copy link
Copy Markdown
Member

Note that in case the plate is inside a screen, I am still experiencing the bug https://trac.openmicroscopy.org/ome/ticket/12211. In Web, the Keywords are actually populated, but the values are not. See screenshot.
screen shot 2015-06-10 at 16 28 12

@joshmoore
Copy link
Copy Markdown
Member

./components/tools/OmeroWeb/omeroweb/webgateway/views.py:2305:80: E501 line too long (84 > 79 characters)

@jburel
Copy link
Copy Markdown
Member

jburel commented Jun 10, 2015

@pwalczysko: The error is due to populate metadata itself (we already have a ticket).

@gusferguson
Copy link
Copy Markdown

@jburel @will-moore - I agree that the Bulk Annotation header adds nothing as it is a meaningless term. And it appears to be getting in the way of the layout too.

@jburel
Copy link
Copy Markdown
Member

jburel commented Jun 11, 2015

The new feature will have to be tested with large tables since it will probably lead to the application to be frozen.
Problem was seen in insight when reading roi and analysis results.

@will-moore
Copy link
Copy Markdown
Member Author

Integration tests not run because "the training script failed"

https://ci.openmicroscopy.org/job/OMERO-5.1-merge-integration/

python lib/python/omero/util/populate_metadata.py -k 1b23204c-788a-42ba-9c96-4a815dc114b6 Plate:219 bulk_annotation.csv
Traceback (most recent call last):
  File "lib/python/omero/util/populate_metadata.py", line 33, in <module>
     import omero.clients
  ImportError: No module named omero.clients

@sbesson
Copy link
Copy Markdown
Member

sbesson commented Jun 12, 2015

@will-moore: the call above it likely failing because the PYTHONPATH is not set by the script

@will-moore
Copy link
Copy Markdown
Member Author

I will not try to fix https://trac.openmicroscopy.org/ome/ticket/12211 here since that is not related to this PR. The layout issue reported above is fixed.
I think we need some name for his section of the annotations, even if we don't use "Bulk Annotations". Maybe "Table Data"? Probably a tooltip should mention the name of the table file, ID and where it's attached?

@joshmoore
Copy link
Copy Markdown
Member

@will-moore : something like that, yes, please.

@will-moore will-moore force-pushed the bulk_annotations_right_panel branch from 99e3174 to 5061a9a Compare June 15, 2015 08:50
@will-moore
Copy link
Copy Markdown
Member Author

Renamed the title to "Tables" and added a tooltip on it (see screenshot)

screen shot 2015-06-15 at 12 27 12

@joshmoore
Copy link
Copy Markdown
Member

--rebased-to #3875

@joshmoore
Copy link
Copy Markdown
Member

./components/tools/OmeroWeb/omeroweb/webgateway/views.py:2320:80: E501 line too long (91 > 79 characters)
./components/tools/OmeroWeb/omeroweb/webgateway/views.py:2321:80: E501 line too long (97 > 79 characters)

@sbesson sbesson closed this Jun 19, 2015
@sbesson sbesson reopened this Jun 19, 2015
@joshmoore joshmoore mentioned this pull request Jun 19, 2015
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Without something like joshmoore@f12a950, I'm thinking that this is causing the recent failures of merge-integration (like https://ci.openmicroscopy.org/view/Failing/job/OMERO-5.1-merge-integration/592/). If there are no objections, I'd suggest with close this in favor of gh-3875.

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If this is merged in to the Metadata branch instead of develop, we'll still have the same problem later when we try to merge Metadata back into develop. Does joshmoore@f12a950 help? Can we get that into develop?

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

f12a950 should help, but that would require pulling in the rest of that branch. The point of the spaces is to prevent us from needing to prematurely merge everything. If all the test runs are transferred to the other build, then the theory is when we open metadata --> develop, things should remain green.

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK, cool.

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.

7 participants