Rois from omero2 #190

will-moore · 2017-01-05T14:26:44Z

Previously opened as #165
Ported to new code layout by squashing commits etc.

This allows loading of ROIs from OMERO to add to figure panels as new Shapes.

To test:

In figure, pick a multi-plane image (also good to test with single plane image)
In the Info tab, open the image with iViewer and add some ROIs (if not already on the image). At least 1 of each type of shape and including an ROI with many shapes (more than 10).
Bonus: include rotated Ellipses (need to use Insight).
Save ROIs, go back to OMERO.figure, and in the right tab 'ROIs' click "Draw".
Test that drawing shapes manually works OK as before.
Click "Load ROIs from OMERO" - (NB: this should be disabled for images with NO ROIs).
Should see a list of ROIs / shapes, similar to view in webclient with ROIs expandable to show Shapes.
Expanding ROIs with many shapes will not render image for more than 10 at a time (to avoid loading too many image planes at once).
Hovering over each Shape row displays it on the image. Clicking on row sets the Z & T of the image to the Z & T of that shape. Clicking "Add" will add the Shape to the image.
Add Arrow, Line, Ellipse and Rectangle. Check they look same as in iViewer.
Click OK to close dialog and save shapes to image panel.
Open the "Draw" dialog for a different image to check the dialog is re-rendered correctly.

Follow up ideas:

Maybe option to filter shapes by current plane?
When Ellipses are added, x, y, rx, ry are recalculated from handles (to handle transforms) but this means that they are not detected as duplicates
Maybe add Z & T sliders?
Maybe show shapes on viewer when mouseover area!? - click to add?!
Do we allow shape to be added if previously added & moved? Don't want duplicate IDs!

waxenegger · 2017-02-02T12:17:38Z

Great stuff @will-moore. I like the drawing and rotation abilities.

That seems to all work as you described it, tried a rotated ellipse as well.

After changing stroke width and color, I wanted more and change the fill color. Maybe another follow-up idea...

will-moore · 2017-02-09T10:03:17Z

To test the upgrade of Shapes json format from 5.2.x format to 5.3.x (ellipse.cx -> ellipse.x etc) we need to:

create some ellipses in a new figure without this PR.
File > export as JSON, check that "version": 1
Maybe take a screenshot and/or make a copy of JSON.
Save the file.

Then I will Open this PR again...

With the PR merged, open the file from above
Check that ellipses are still shown as before
Check the JSON for "version":2
Ellipses in JSON should now be like
{"type":"Ellipse","x":115.1,"y":119.1,"radiusX":82.8,"radiusY":41.4,"rotation":50.3 ...}

bramalingam · 2017-02-22T17:47:56Z

Created figure without this PR on eel.merge,
http://web-dev-merge.openmicroscopy.org/figure/file/17602
(user-1)

Lots of ellipses and I have a copy of the JSON file as well : yes it is "version":1:

{"version":1,"panels":[{"labels":[],"height":94.18951612903223,"channels":....

will-moore · 2017-02-23T00:08:45Z

After upgrade, we also need to test that figure export script works, as TIFF and PDF.
(will need to manually upload the script).

jburel · 2017-02-28T10:44:52Z

Description needs updated. arrows are correct now in iviewer
Shapes like rectangle have a fill color, this ignores in figure. This could be used to "mask" areas so might be useful to have the option to turn on/off
Listing the shapes that I cannot add clutters the right-hand size for no reason. I will not display them by default
When added to the main image, it is annoying to have to go back to the Drawing window just to move the shapes. This is even more obvious if I click on copy/paste, the count increases but I cannot do anything. This part of the workflow needs review

will-moore · 2017-02-28T13:47:59Z

@jburel

I've never supported "fill" of shapes in figure, mostly because I've never seen a figure with filled shapes. I guess we could add this sometime, but its not a high priority feature at the moment.
Listing shapes you cannot add was what @pwalczysko and I decided in Rois from omero #165 (comment). It's kinda like a disabled option in a menu. It shows you that the option/shape is not "missing", it's just not supported.
Moving shapes on an Image when in the full figure view is not really viable since we use selection and drag in that view to move the image panels. It's like in webclient/Insight: you can't adjust rendering or ROIs on thumbnails - you have to do it in a full viewer (but you can copy and paste rendering settings between thumbnails).

jburel · 2017-02-28T13:51:54Z

For the shape listing. In that case we should list the supported ones at the top. I had a large number of points and 2 rectangles and I had to scroll down since the rectangles were not visible
I don't think the argument Copy/paste is valid. Since the copied shapes overlap the existing shapes and user cannot manipulate it. This is not practical at all

Let's discuss

will-moore · 2017-03-03T15:34:18Z

After discussion with @jburel, TODOs:

Change "Draw" button to "Edit" in right panel
Add extra text to the top of dialog (& rename "Draw.." to "Edit..."
Move "Load ROIs from OMERO" button to toolbar and rename "Load ROIs" with longer text in tooltip.
This button should be disabled when clicked (to avoid repeat loading). Could also be used to refresh ROIs (maybe in a future PR)
Don't show preview 'thumbnail' for each Shape
If 'Adding' a shape that is already there, offset the new one (same as when pasting duplicates).
For detecting duplicate Ellipses, compare coordinates and assume duplicate if very similar.

bramalingam · 2017-03-03T16:54:30Z

Tried exporting,
http://web-dev-merge.openmicroscopy.org/figure/file/17602

A figure file which was created before this PR was opened.
#190 (comment)

And got the following exceptions when I tried to export as pdf,

No handlers could be found for logger "figure_to_pdf"
/usr/lib64/python2.6/site-packages/reportlab/lib/utils.py:653: DeprecationWarning: tostring() is deprecated. Please call tobytes() instead.
self._data = im.tostring()
Traceback (most recent call last):
File "./script", line 1665, in
run_script()
File "./script", line 1651, in run_script
file_annotation = export_figure(conn, script_params)
File "./script", line 1609, in export_figure
return fig_export.build_figure()
File "./script", line 690, in build_figure
self.add_panels_to_page(panels_json, image_ids, page)
File "./script", line 1311, in add_panels_to_page
self.add_rois(panel, page) # This does nothing for TIFF export
File "./script", line 823, in add_rois
self.page_height)
File "./script", line 130, in init
self.draw_ellipse(shape)
File "./script", line 319, in draw_ellipse
c = self.panel_to_page_coords(shape['x'], shape['y'])
KeyError: 'x'

And for conversion to tiff,

No handlers could be found for logger "figure_to_pdf"
Traceback (most recent call last):
File "./script", line 1665, in
run_script()
File "./script", line 1651, in run_script
file_annotation = export_figure(conn, script_params)
File "./script", line 1609, in export_figure
return fig_export.build_figure()
File "./script", line 690, in build_figure
self.add_panels_to_page(panels_json, image_ids, page)
File "./script", line 1307, in add_panels_to_page
image, pil_img = self.draw_panel(panel, page, i)
File "./script", line 1140, in draw_panel
self.paste_image(pil_img, img_name, panel, page, dpi)
File "./script", line 1503, in paste_image
ShapeToPilExport(pil_img, panel, crop)
File "./script", line 381, in init
self.draw_ellipse(shape)
File "./script", line 518, in draw_ellipse
ctr = self.get_panel_coords(shape['x'], shape['y'])
KeyError: 'x'

bramalingam · 2017-03-03T16:58:43Z

Same errors, looks like an issue with getting the panel coordinates! Is this related to/caused by my width and height PR (we handled the page-wise x,y coordinate management in that PR)? #169

jburel · 2017-03-04T21:01:50Z

see also https://trello.com/c/zGuNePnu/4-load-rois-from-omero

will-moore · 2017-03-23T15:56:57Z

@bramalingam I'm trying to understand the bug you found.
The Ellipses that are giving you errors on the figure seem to come from OMERO (ID matches an Ellipse on that image in OMERO). Can you remember how you created that figure, since if the figure was created without this PR merged, you shouldn't have been able to load ROIs from OMERO. Maybe that came from a previously created figure?

{"rotation":60.65125478487214,"strokeWidth":1,"type":"Ellipse","strokeColor":"#c3c4c4","id":1751}

I just tried this:

With this PR in, I created a figure, added an Ellipse from OMERO (version 2).
Without this PR in, I opened that figure and Saved it (version 1).
With this PR in, I opened the saved figure (updated itself to version 2) but the Ellipse had lost it's x, y, radiusX and radiusY as above.

Does this sound feasible?

will-moore · 2017-03-23T16:00:42Z

To try reproduce the upgrade issue above, closing this PR so we can create figures without it merged.

This simplifies the code a lot and now we don't have to worry about loading too many planes or not loading planes for some shapes etc

We do this so that any transform matrix that is in the shape json can be resolved to correct coordinates first, before comparing with existing shapes.

…ing: Also handles selection of new shapes

will-moore · 2017-03-24T15:26:21Z

Recent changes to test:

Change "Draw" button to "Edit" in right panel
Add extra text to the top of "Edit ROIs" dialog "Draw and Edit..." etc
Move "Load ROIs from OMERO" button to toolbar and rename "Load ROIs" with longer text in tooltip.
Check button is disabled with suitable tooltip when image has no ROIs.
When clicked, button is disabled while loading then updates to "Refresh ROIs" to allow re-loading.
Thumbnail previews for shapes in the Shapes table have been removed.
If 'Adding' a shape that is already there (click 'Add' repeatedly), offset the new one (same as when pasting duplicates).
This should work for all supported shapes (line/arrow, rectangle, ellipse).

waxenegger · 2017-03-27T08:33:47Z

Checked the most recent changes and they all work.

will-moore · 2017-03-27T12:58:21Z

@bramalingam Can you try testing the upgrade of shapes again?
@jburel Do you want to check that workflow is behaving as we discussed above?

bramalingam · 2017-03-27T15:21:26Z

Rechecked the following scenario,

Created Figure with ROI's without this PR. ( json should contain "version 1")
fetched this branch and opened the same Figure, and exported as pdf.

Can no longer see the exception seen in : #190 (comment)

and can see version 2 in the json as well.

jburel · 2017-03-28T13:52:11Z

Looking at http://web-dev-merge.openmicroscopy.org/figure/file/17602/

Select the image in the top left corner
Go to the label tab
Click Edit
In the ROI dialog.
- If I mouse over a shape an "independent shape" The shape is added then removed from the display when I move the mouse away
- If I mouse over a shape which is part of a roi with multiple shapes. The shape is added (if on the correct plane) but it is not removed from the display when I move the mouse away

jburel · 2017-03-28T14:03:57Z

RFE: A "undo" the copy paste for example will be nice (not in this PR)

jburel · 2017-03-28T14:15:06Z

Open the "ROI dialog", the tooltip of the Load ROIs button always indicates the number of rois of the first image I opened
I will remove the number from the tooltip.

will-moore · 2017-03-28T23:03:56Z

@jburel - I can't reproduce the tooltip bug #190 (comment)

will-moore · 2017-03-29T11:34:06Z

As discussed with @bramalingam, when you "OK" the ROI dialog, the Z and T position of the dialog get saved to your figure.
If you don't want to change the Z/T, then you can 'revert' to the original Z/T using new buttons:

bramalingam · 2017-03-30T15:40:02Z

The above functionality works as expected.

2 separate points to consider:

Display of the ROI/Shape ids from OMERO, and
Size/width of the rows/columns in the ROI table.

Also, an edge case workflow where an ellipse ROI/shape has its centre outside the bounds of the viewport, throws a not so informative dialog box. Maybe update the text in the dialog box or handle ellipse's better when there are near the edges of the image? (Can be ignored as well, because in a user workflow I wouldn't expect the ROI's around the edges to be useful in many ways)

will-moore · 2017-03-31T12:50:59Z

Added IDs to the ROI/Shapes table to look more like iViewer cc @waxenegger

waxenegger · 2017-04-03T09:54:38Z

Latest commits work as as intended. Shape Id is showing and tooltip gives me coordinates.

jburel · 2017-04-05T20:48:03Z

similar to iviewer: I am not sure about the shape/roi ID.
Especially with the high number

jburel · 2017-04-06T10:17:11Z

Few comments:

Remove the id of ROI/shapes from table. Move to tooltip
Improve message when trying to add a shape to a zoomed image.

jburel · 2017-04-11T14:26:01Z

@will-moore I cannot reproduce the roi count issue, I don't think it was ever a problem

will-moore added 7 commits November 3, 2016 16:57

Rebased and squash all commits from PR ome#165

d0b9338

Merge remote-tracking branch 'origin/master' into rois_from_omero2

7548031

flake8 fixes

a282607

Tweak styles on ROI/shapes table

f7d1689

Limit rendering of new planes in ROI dialog

383a9e0

Delete static figure.js and templates.js

5d02956

Merge remote-tracking branch 'origin/master' into rois_from_omero2

2326c04

snoopycrimecop mentioned this pull request Jan 30, 2017

Missing channel_slider_template.html from PR #166 #194

Merged

Removing channel_slider_template.html. See PR ome#194

8268dd0

will-moore closed this Feb 9, 2017

will-moore reopened this Feb 22, 2017

Update Figure_To_Pdf.py script to use ellipse 'x', 'radiusX' etc

b004509

Merge remote-tracking branch 'origin/master' into rois_from_omero2

0784a93

will-moore closed this Mar 23, 2017

will-moore added 3 commits March 23, 2017 16:13

Rename dialog & button to 'Edit' ROIs

4ea08f6

Move 'Load ROIs' button to toolbar, disable when clicked

597069f

Remove ROI shape viewports from roi_loader_view

30b8843

This simplifies the code a lot and now we don't have to worry about loading too many planes or not loading planes for some shapes etc

will-moore added 3 commits March 24, 2017 14:24

shape-editor pasteShapesJson() creates temp shape to compare coords

23c10e1

We do this so that any transform matrix that is in the shape json can be resolved to correct coordinates first, before comparing with existing shapes.

Use pasteShapesJson() when adding from OMERO for auto offset if exist…

fd69a19

…ing: Also handles selection of new shapes

Fix rendering of 'Load/refresh ROIs' button

3389d72

will-moore reopened this Mar 24, 2017

Save Z/T from ROI dialog, unless 'revertZ/T' clicked

33ca19b

will-moore added 2 commits March 31, 2017 10:57

Add IDs to ROI/Shape table

89168b8

Add shape coords in tooltip to ROI/Shapes table

0619189

will-moore added 2 commits April 7, 2017 00:17

Add ID to shape tooltip and improve error message

75d7a38

Don't show ROI/Shape IDs in table

d3d0d3b

snoopycrimecop mentioned this pull request Apr 6, 2017

3rd party versions cleanup #202

Closed

jburel merged commit 398f0db into ome:master Apr 11, 2017

will-moore mentioned this pull request Jun 13, 2017

Ellipse x y radius x radius y ome/shape-editor#6

Merged

jburel added this to the 3.0.0 milestone Jun 28, 2017

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rois from omero2 #190

Rois from omero2 #190

will-moore commented Jan 5, 2017 •

edited

Loading

waxenegger commented Feb 2, 2017 •

edited

Loading

will-moore commented Feb 9, 2017 •

edited

Loading

bramalingam commented Feb 22, 2017 •

edited

Loading

will-moore commented Feb 23, 2017

jburel commented Feb 28, 2017 •

edited by will-moore

Loading

will-moore commented Feb 28, 2017

jburel commented Feb 28, 2017 •

edited

Loading

will-moore commented Mar 3, 2017

bramalingam commented Mar 3, 2017

bramalingam commented Mar 3, 2017 •

edited

Loading

jburel commented Mar 4, 2017

will-moore commented Mar 23, 2017

will-moore commented Mar 23, 2017

will-moore commented Mar 24, 2017

waxenegger commented Mar 27, 2017

will-moore commented Mar 27, 2017

bramalingam commented Mar 27, 2017

jburel commented Mar 28, 2017

jburel commented Mar 28, 2017

jburel commented Mar 28, 2017

will-moore commented Mar 28, 2017

will-moore commented Mar 29, 2017

bramalingam commented Mar 30, 2017

will-moore commented Mar 31, 2017

waxenegger commented Apr 3, 2017

jburel commented Apr 5, 2017

jburel commented Apr 6, 2017

jburel commented Apr 11, 2017

Rois from omero2 #190

Rois from omero2 #190

Conversation

will-moore commented Jan 5, 2017 • edited Loading

waxenegger commented Feb 2, 2017 • edited Loading

will-moore commented Feb 9, 2017 • edited Loading

bramalingam commented Feb 22, 2017 • edited Loading

will-moore commented Feb 23, 2017

jburel commented Feb 28, 2017 • edited by will-moore Loading

will-moore commented Feb 28, 2017

jburel commented Feb 28, 2017 • edited Loading

will-moore commented Mar 3, 2017

bramalingam commented Mar 3, 2017

bramalingam commented Mar 3, 2017 • edited Loading

jburel commented Mar 4, 2017

will-moore commented Mar 23, 2017

will-moore commented Mar 23, 2017

will-moore commented Mar 24, 2017

waxenegger commented Mar 27, 2017

will-moore commented Mar 27, 2017

bramalingam commented Mar 27, 2017

jburel commented Mar 28, 2017

jburel commented Mar 28, 2017

jburel commented Mar 28, 2017

will-moore commented Mar 28, 2017

will-moore commented Mar 29, 2017

bramalingam commented Mar 30, 2017

will-moore commented Mar 31, 2017

waxenegger commented Apr 3, 2017

jburel commented Apr 5, 2017

jburel commented Apr 6, 2017

jburel commented Apr 11, 2017

will-moore commented Jan 5, 2017 •

edited

Loading

waxenegger commented Feb 2, 2017 •

edited

Loading

will-moore commented Feb 9, 2017 •

edited

Loading

bramalingam commented Feb 22, 2017 •

edited

Loading

jburel commented Feb 28, 2017 •

edited by will-moore

Loading

jburel commented Feb 28, 2017 •

edited

Loading

bramalingam commented Mar 3, 2017 •

edited

Loading