Crop rotation fixes #410

will-moore · 2020-12-08T22:16:15Z

Fixes #408 - copy rotated crop region and paste to ROI.
Also fixes #324

Rectangle ROIs don't support rotation, but this fixes the issue above by creating a Polygon to simulate a rotated Rectangle.

To test:

Copy & Paste to duplicate a panel, then zoom in to crop, and rotate one of them.
Copy the Crop region and Paste it as a new Shape on the un-zoomed panel - The new Shape (Polygon) should match the crop region:

Copy the rotated Crop region, select the uncropped (unrotated) Panel and click Paste to paste the rotated crop region. The rotation should also be applied to the panel so that both images show the same rotated viewport.
Crop the rotated panel using the "Crop" button. The 'initial' crop region should match the current viewport (see screenshot) and the updated crop region should be correctly applied to the panel.

imagesc-bot · 2020-12-20T09:51:49Z

This pull request has been mentioned on Image.sc Forum. There might be relevant details there:

https://forum.image.sc/t/omero-figure-box-annotations-rotated-incorrectly/45787/4

pwalczysko · 2021-01-08T18:21:28Z

Copy the rotated Crop region, select the uncropped (unrotated) Panel and click Paste to paste the rotated crop region. The rotation should also be applied to the panel so that both images show the same rotated viewport.

Up till this point all worked. The above one I am not sure what to do with - where is the unrotated uncropped Panel ? I just used it in the previous step, and pasted the ROI on it, and it (the ROI, not the panel onto which I pasted) was rotated.... as I would expect. This seems to me like a repetition of the previous test, but now, surprisingly, a new result expectation (rotation of the unrotated panel) seems not reasonable - certainly there is some misunderstanding.

will-moore · 2021-01-11T09:18:15Z

Copy the rotated Crop region, select the uncropped (unrotated) Panel and click Paste to paste the rotated crop region.

This means to use the "Paste" button at the bottom of the "Preview" Tab, to apply the same crop and rotation to the selected panel. This is NOT Pasting to create a new ROI as in previous steps.

pwalczysko · 2021-01-11T18:03:15Z

Copy the rotated Crop region, select the uncropped (unrotated) Panel and click Paste to paste the rotated crop region.

This means to use the "Paste" button at the bottom of the "Preview" Tab, to apply the same crop and rotation to the selected panel. This is NOT Pasting to create a new ROI as in previous steps.

Thanks, got this one, and it works as expected.

pwalczysko · 2021-01-11T18:06:15Z

Crop the rotated panel using the "Crop" button. The 'initial' crop region should match the current viewport (see screenshot) and the updated crop region should be correctly applied to the panel.

Sorry, struggling with this one too. Using the Crop button is clear, but should I first rotate and then Crop ? This means I should not zoom first ? Should I copy and paste the ROI somewhere ? If I do as told here, I am ending up with see screenshot below, how do I get the ROI displayed on the rotated image as shown on yours ?

pwalczysko · 2021-01-12T11:23:03Z

Crop the rotated panel using the "Crop" button. The 'initial' crop region should match the current viewport (see screenshot) and the updated crop region should be correctly applied to the panel.

After clarification, I was able to verify the above workflow too, it works fine.

Nevertheless, in this workflow, if the ROI does not come from the zoomed-in region but, is copied from another place in Figure (screenshot 1 below) or comes from OMERO (screenshot 2 below), this workflow still fails, as the copied or "from OMERO" ROIs are displayed unrotated.

Screenshot 1 (ROI copied from somewhere else in Figure and pasted (option "From Clipboard")

Screenshot 2 (ROI from OMERO in Crop dialog, ROI should be rotated as the image is rotated)

pwalczysko · 2021-01-12T11:26:54Z

Would it be possible to fix also the Edit ROI panel view for rotated images ?

Workflow: Rotate an image in Figure. Click on "Labels" tab and "Edit" in the "ROI" row. Observe that the view in the Edit ROI dialog is unrotated, the image inside the panel on the canvas is rotated though.

pwalczysko · 2021-01-12T11:32:35Z

In summary, 3 RFEs : 2 RFEs regarding the crop dialog and rotation #410 (comment) and one regarding the Edit ROI dialog #410 (comment)

will-moore · 2021-01-22T10:39:23Z

@pwalczysko I'm afraid fixing the "Edit ROIs" dialog to handle rotated images isn't easy since we'd need drawing tools to allow you to draw rotated Rectangles which I don't have (hand-coded drawing tools).

But the other 2 RFEs above should be fixed:

Open the crop dialog, having either copied a Crop Region from another Panel (with or without rotation) OR having copied a Rectangle. Also nice to have Rectangle ROIs saved on the Image in OMERO, and/or Rectangle ROIs on the Figure panel (see screenshot)
Check that each of these thumbnails shows the correct region of the image.
Clicking either the Rectangle ROIs from OMERO or the Rectangle on the figure panel (top and bottom sections of thumbnails) will set the Panel rotation to zero. Clicking the "clipboard" thumbnail will apply a rotation IF you copied the crop region from a Panel that was rotated.
When you hit "OK", any rotation that got applied should be saved (so that the crop region you selected was correctly applied to the image).

pwalczysko · 2021-01-22T11:51:22Z

@pwalczysko I'm afraid fixing the "Edit ROIs" dialog to handle rotated images isn't easy since we'd need drawing tools to allow you to draw rotated Rectangles which I don't have (hand-coded drawing tools).

I think this is fine. I would suggest a (couple of) short video(s) for the solution of the rotation and crop workflows would be very handy, as these workflows are very popular, but as the testing shows, not easy to get right on the first try.

Would you like to list for testing next week with my name ?

pwalczysko · 2021-01-25T11:29:00Z

But the other 2 RFEs above should be fixed:

Open the crop dialog, having either copied a Crop Region from another Panel (with or without rotation) OR having copied a Rectangle. Also nice to have Rectangle ROIs saved on the Image in OMERO, and/or Rectangle ROIs on the Figure panel (see screenshot)
Check that each of these thumbnails shows the correct region of the image.
Clicking either the Rectangle ROIs from OMERO or the Rectangle on the figure panel (top and bottom sections of thumbnails) will set the Panel rotation to zero. Clicking the "clipboard" thumbnail will apply a rotation IF you copied the crop region from a Panel that was rotated.
When you hit "OK", any rotation that got applied should be saved (so that the crop region you selected was correctly applied to the image).

This works as expected. Ready to merge fmpov.

will-moore · 2021-01-26T13:19:35Z

That last commit fixes an issue I noticed while preparing a demo movie: If you paste the crop region from a panel with 0 rotation, it didn't apply it to the new panel (it didn't remove the rotation on the target panel).

will-moore · 2021-01-29T09:22:41Z

I made a demo movie for this PR:

crop_demo.mp4

pwalczysko · 2021-01-29T10:51:10Z

@will-moore great movie, thanks, these are precisely the workflows which were picked upon in the recent workshop again, and the difference of those two Paste buttons is nicely shown

jburel · 2021-01-29T10:52:56Z

This could probably go to the official youtube channel otherwise it will be lost

will-moore · 2021-02-01T10:33:51Z

Yes, can make the video more "public" when we release.
The last commit needs a test before merging: Copy the crop region from a non-rotated image (zero rotation) and paste as a crop region onto a rotated image. The rotation should be set to zero.

pwalczysko · 2021-02-01T11:53:54Z

Copy the crop region from a non-rotated image (zero rotation) and paste as a crop region onto a rotated image. The rotation should be set to zero.

Tested
When I use the Paste buttion from Labels pane, the rotation is not set to zero. When I use the Paste button from Preview pane, the rotation is not set to zero. I guess this is the expected behaviour ?

will-moore · 2021-02-01T12:06:05Z

When I use the Paste button from Preview pane, the rotation is not set to zero. I guess this is the expected behaviour ?

No. When I use the Paste button from Preview pane, the rotation should be set to zero.

pwalczysko · 2021-02-01T12:14:24Z

When I use the Paste button from Preview pane, the rotation is not set to zero. I guess this is the expected behaviour ?

No. When I use the Paste button from Preview pane, the rotation should be set to zero.

Yes, the rotation on Pate is indeed set to zero. Sorry, typo (in my original report, there are two "no"s for both of the panes, in truth, I shoiuld have written "y" for the Preview pane, as this is what I saw.

Sorry

src/js/views/crop_modal_view.js

pwalczysko · 2021-02-09T11:29:47Z

Inside the Crop dialog, copied a Rrectangle ROI from another panel which was rotated so that it is in Clipboard now.

the desciption above says

Clicking the "clipboard" thumbnail will apply a rotation IF you copied the crop region from a Panel that was rotated.

But when I click the Clipboard thumb it does not apply any rotation, instead, it unrotates the main panel in the Crop dialog and pastes the ROI correctly. Did this behaviour change (i.e. unitended change) or is it a misunderstanding ?

will-moore · 2021-02-09T11:39:38Z

You copied a Rectangle ROI, but my text says "IF you copied the crop region..."
Rectangles can't have any rotation, but a crop region can.
The behaviour hasn't changed.

Does the thumbnail representation that you clicked look like the crop outline that is generated when you click it?

pwalczysko · 2021-02-09T11:47:10Z

You copied a Rectangle ROI, but my text says "IF you copied the crop region..."
Rectangles can't have any rotation, but a crop region can.
The behaviour hasn't changed.

Does the thumbnail representation that you clicked look like the crop outline that is generated when you click it?

thanks for explaining.
No, the crop outline looks differently, the crop dialog is not showing the right thing now imho when Clipboard is selected.

pwalczysko · 2021-02-09T11:50:01Z

Compare the situation inside Crop dialog described in previous comment with the situation when I paste the crop region without using the Crop dialog on the same image.

This behaviour seems right here, whereas the Crop dialog above #410 (comment) shows the wrong thumb and when thumb is clicked, a wrong rotation and position is shown in main panel.

will-moore · 2021-02-12T15:45:51Z

Sorry @pwalczysko I can't seem to reproduce the bug you're seeing.
Can you point me at an example figure and exact steps to reproduce? Thanks.

pwalczysko · 2021-02-12T16:19:16Z

The image used is (user-3)

https://merge-ci.openmicroscopy.org/web/webclient/?show=image-140172

The figure saved is

https://merge-ci.openmicroscopy.org/web/figure/file/70451

We clarified the workflow on a call - basically, taking the crop region from the zoomed in image, then selecting the non-zoomed non-rotated original image in the same figure and clicking on Crop button. In the crop dialog, the thumb of the Clipboard is wrong, as well as when this wrong thumb is applied onto the image, it is not where it should be either.

pwalczysko · 2021-02-16T12:02:53Z

The problem #410 (comment) is fixed now.

Ready to merge fmpov.

Rotate rect to Polygon if crop region rotated

75d3883

will-moore changed the title ~~Rotate rect to Polygon if crop region rotated~~ ROI rectangle inset rotation fix Dec 8, 2020

will-moore added 3 commits December 15, 2020 13:50

Handle image rotation in crop dialog

18756c7

Use common rotate_point()

131a451

Handle rotation in pasteCropRegion

ce463af

will-moore changed the title ~~ROI rectangle inset rotation fix~~ Crop rotation fixes Dec 15, 2020

Handle rotation for picking ROIs or Clipboard in Crop dialog

2157612

Fix paste crop with 0 rotation

e12fb24

jburel reviewed Feb 5, 2021

View reviewed changes

src/js/views/crop_modal_view.js Outdated Show resolved Hide resolved

Refactor to avoid duplicate rotation code in crop dialog

88cafb4

Fix crop dialog after copying rotated crop region

0f2462b

snoopycrimecop mentioned this pull request Feb 23, 2021

strokeWidth handling #426

Merged

jburel merged commit 169ca90 into ome:master Feb 23, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Crop rotation fixes #410

Crop rotation fixes #410

will-moore commented Dec 8, 2020 •

edited

Loading

imagesc-bot commented Dec 20, 2020

pwalczysko commented Jan 8, 2021 •

edited

Loading

will-moore commented Jan 11, 2021

pwalczysko commented Jan 11, 2021

pwalczysko commented Jan 11, 2021

pwalczysko commented Jan 12, 2021

pwalczysko commented Jan 12, 2021

pwalczysko commented Jan 12, 2021

will-moore commented Jan 22, 2021

pwalczysko commented Jan 22, 2021 •

edited

Loading

pwalczysko commented Jan 25, 2021

will-moore commented Jan 26, 2021

will-moore commented Jan 29, 2021

pwalczysko commented Jan 29, 2021

jburel commented Jan 29, 2021

will-moore commented Feb 1, 2021

pwalczysko commented Feb 1, 2021

will-moore commented Feb 1, 2021

pwalczysko commented Feb 1, 2021

pwalczysko commented Feb 9, 2021

will-moore commented Feb 9, 2021

pwalczysko commented Feb 9, 2021

pwalczysko commented Feb 9, 2021

will-moore commented Feb 12, 2021

pwalczysko commented Feb 12, 2021 •

edited

Loading

pwalczysko commented Feb 16, 2021

Crop rotation fixes #410

Crop rotation fixes #410

Conversation

will-moore commented Dec 8, 2020 • edited Loading

imagesc-bot commented Dec 20, 2020

pwalczysko commented Jan 8, 2021 • edited Loading

will-moore commented Jan 11, 2021

pwalczysko commented Jan 11, 2021

pwalczysko commented Jan 11, 2021

pwalczysko commented Jan 12, 2021

pwalczysko commented Jan 12, 2021

pwalczysko commented Jan 12, 2021

will-moore commented Jan 22, 2021

pwalczysko commented Jan 22, 2021 • edited Loading

pwalczysko commented Jan 25, 2021

will-moore commented Jan 26, 2021

will-moore commented Jan 29, 2021

pwalczysko commented Jan 29, 2021

jburel commented Jan 29, 2021

will-moore commented Feb 1, 2021

pwalczysko commented Feb 1, 2021

will-moore commented Feb 1, 2021

pwalczysko commented Feb 1, 2021

pwalczysko commented Feb 9, 2021

will-moore commented Feb 9, 2021

pwalczysko commented Feb 9, 2021

pwalczysko commented Feb 9, 2021

will-moore commented Feb 12, 2021

pwalczysko commented Feb 12, 2021 • edited Loading

pwalczysko commented Feb 16, 2021

will-moore commented Dec 8, 2020 •

edited

Loading

pwalczysko commented Jan 8, 2021 •

edited

Loading

pwalczysko commented Jan 22, 2021 •

edited

Loading

pwalczysko commented Feb 12, 2021 •

edited

Loading