Popup on shapes #248

will-moore · 2019-03-11T09:21:40Z

This addresses:

Show ROIs "Pins" in iViewer #220
A request from @jrswedlow I think to allow editing of shape Label on the image itself (instead of the right panel).

This shows a transient 'tooltip-like' popup when you mouse over (or within 5 pixels) of a shape, to show the shape Label (IF it has one). This tracks the mouse.

When you click on the shape, a more stable popup shows you the shape coordinates and a text-box for editing the shape Label:

You also see this while dragging, editing and creating a shape, which can help if you want to know the coordinates. Could maybe also add the Length OR Area.

To test.... NB: since this is quite a big change, we probably want to assess this for a while before merging. Need to see whether the popup gets in the way at-all or is annoying to have it all the time. And what info should it show?

Draw a new shape - while drawing, the Edit popup should show above the mid-point of the shape (shouldn't get in the way of drawing) and the coordinates and Length/Area should update.
When shape has been drawn, you can edit the Label in the popup. Hit Enter to save the label.
NB: you can do this while still in Drawing mode and then draw another shape (without having to switch out of draw mode to edit shape label)
Mousing over shapes will show the label in a transient smaller "hover" tooltip that tracks the mouse pointer (IF the shape has a Label) and should increase the thickness of the stroke width to indicate which shape is being 'hovered'.
Check how the hover tooltip looks with very short and very long labels (e.g. big paragraph).
Clicking a shape to select it will hide the transient "hover" tooltip and show the Edit popup.
Undo / Redo or editing the shape label in the Right panel "Comment" box will update the label in the Popup, if visible.
Change of Z/T index should hide the popup if the current shape isn't visible on the new plane. Same for delete or hiding of shape.
For multiple selection, popup will show for most-recently selected shape.
If multiple shapes are selected, some can be individually de-selected without hiding the popup on another shape.
Do we want to add a 'X' button on the popup to hide it without de-selecting shape?

Doesn't seem to get called?

src/viewers/viewer/source/Regions.js

pwalczysko · 2019-03-18T17:17:05Z

I think user would ask immediately: How do I switch that off ? It is nice that it is there, but maybe I do not want those popups as you rightly remark ?

pwalczysko · 2019-03-18T17:18:46Z

I do not understand, once I clicked onto a ROI with intention to edit the popup, how do I get rid of it ? It stays there forever, whilst I am driving with my mouse over other ROIs already.
Do not see and Close button in the corner or similar.

pwalczysko · 2019-03-18T17:21:09Z

Will test the smaller features tomorrow.

will-moore · 2019-04-03T13:31:31Z

Addressed some points above:

You don't need to hit Enter to save text now. It's saved when you stop or pause typing (after 0.5 secs). Is this delay about right?
When you select a Label, the text is now displayed correctly in the popup, allowing you to edit it.
When multiple shapes are selected at once, we don't show the popup. But if multiple shapes are selected and you select 1 more (e.g. with Ctrl-Click on shapes table or Shift-click on the image) the popup will show for that shape.
The PolyLine coordinates are now shown as "points:.. " instead of x1, y1, x2, y2.
You can now select and Copy the coordinates (and Area/Length), including the whole Points string.

pwalczysko · 2019-04-12T10:56:02Z

the bird's eye view bug #248 (comment) is fixed now.

The new features listed in #248 (comment) work as described. Quite happy about them.

The only point is the position of the popup with respect to a ROI in cases when the ROIs are lines or arrows pointing at 45 degrees angle. In such cases the popup is too far from the ROI. Discussed a solution with @will-moore in the office, where for lines and arrows the position of the popup could be at the topmost end of the ROI, instead of using the centre of the top of bounding box (used for all shapes now)

jburel · 2019-07-16T08:20:05Z

Entering text work and the right-hand panel is updated. Hitting enter after entering text could close the dialog.

jburel · 2019-07-16T08:26:33Z

@pwalczysko do you want to over the last set of changes?

jburel · 2019-07-16T13:42:36Z

Having the dialog popping up every time a shape is selected is a bit annoying.
A general control should be available to turn it on/off

pwalczysko · 2019-07-16T14:10:14Z

@jburel discussed the solution of #248 (comment) in the office - I guess @will-moore will come up with a solution commit soon.

Otherwise, all is good here, and this is ready to go FMPOV

will-moore · 2019-07-16T14:11:12Z

@jburel - you can turn off the popups with a right-click menu on the image. But as discussed with @pwalczysko this isn't obvious to find it.
We decided that when you click X to hide a popup, they will say "To turn on the pop-up again, right-click on the image and choose 'show popups" and then we don't show them again till they do that.
I seem to remember the context menu can't get access to the current "show popups" flag, so I'll have to see if there's a way to handle this...

jburel · 2019-07-17T05:41:00Z

I certainly did not think to right click on the image to turn the dialog on/off.

will-moore · 2019-07-18T09:37:43Z

As @pwalczysko noticed on images with many ROIs (where they are paginated). After moving to a new plane, the shapes don't appear selected in the table, clicking on shapes doesn't select on first click, picking line colour doesn't show up on shape.

ShapeEditPopup.showPopupForShape() was calling regions.renderFeature(f) when Z/T changes and with paginated ROIs being destroyed and created on Z/T switch it seems that regions.viewer_ can be undefined at this time.

will-moore · 2019-07-18T10:45:43Z

To test last fixes:

When you click X to hide the popup, you get a message saying how to turn them on again.
Fixed the issues with many paginated ROIs. After switching Z/T, shape selection, picking colors etc should continue to work.

Known issue (I think this is not related to this PR): If your line color-picker is showing a color (e.g. red) and you select a shape where the line has no color. Then you click the color-picker and don't choose a different color but just click "choose" to select red, the shape doesn't update because no color change is detected.

@decorator

We need this since viewers/viewer/controls/ShapeEditPopup.js imports Ui from '../../../utils/ui'. Importing this class that uses @decorator syntax seems to require reflect-metadata for karma to run in ChromeHeadless

pwalczysko · 2019-07-19T13:08:04Z

Maybe ...To re-enable popups, right-click on the image and use the context menu.

pwalczysko · 2019-07-19T13:15:41Z

RFE: If not technically too difficult: Slightly unexpected is that when I re-enable the popups, the ROI which is selected already, does not obtain a popup. Only new selection do. I think better would be the behaviour where the popups would come immediately back after I re-enabled them.

pwalczysko · 2019-07-19T14:04:57Z

Two RFEs otherwise looks good.

pwalczysko · 2019-08-06T10:19:35Z

Works as expected. Ready to merge FMPOV

jburel · 2019-08-08T08:51:53Z

The popup now gives an indication on how to re-activate it, pointing at the right-click menu.

will-moore added 14 commits March 7, 2019 13:27

Show ID, coords and Label on mouseover

3746166

Just show shape label (if any)

89ad7fc

Only use hitTolerance:5 if needed

5bb01c4

Add popup for editing shape text

1aad3e1

ShapeEditPopup shows coords and updates on modify or translate

cb1a23b

Move ShapeEditPopup() creation to Viewer. Show on Draw

3d35763

Move unused Translate.js handleDragEvent_(event)

e22b8ff

Doesn't seem to get called?

Update Text change from ol3 to regions_info shape

534269c

Add text changes to History to enable Undo

a1da3f6

Use regions-edit.js Right panel to handle onCommentChange

e905e74

Revert previous attempts to handle Comment change from popup

18ca248

Update the Popup text on edit, undo & redo

cfac62f

Only save popup Text to shape on Enter key

fcf004f

Allow editing Label for newly created shapes

842ecd3

will-moore marked this pull request as ready for review March 14, 2019 04:44

Fix babel-loader parsing to fix travis

e727430

will-moore force-pushed the popup_on_shapes branch from 55c52eb to e727430 Compare March 14, 2019 05:58

Show thicker outline for shapes when hovering over them

6c6ea86

will-moore closed this Mar 14, 2019

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

90138f5

will-moore reopened this Mar 18, 2019

will-moore added 5 commits March 18, 2019 04:49

Update popup visibility of change of Z/T or shape visibility

0921072

Reduce code duplication, use updatePopupCoordinates()

c1f920f

regions.getLengthAndAreaForShape() supports Geometry OR Feature argument

8991383

Show Area or Length in Shape popup

bc6ee51

on Modify shape, update geometry before displaying coords in popup

d1c480b

mtbc reviewed Mar 18, 2019

View reviewed changes

src/viewers/viewer/source/Regions.js Outdated Show resolved Hide resolved

will-moore added 2 commits April 3, 2019 13:23

Show 'points:' coords for PolyLine

cdcdce9

Allow select and copy of coords and Area from shape popup

a012287

will-moore added 2 commits April 18, 2019 12:26

Popup coords named same as OME model, e.g RadiusX etc

583ff67

Popup for Line touches top-most end of line

76ba362

Fix typo

1fa790d

Closing popup disables them, with dialog on how to enable again

52df14f

will-moore force-pushed the popup_on_shapes branch from 90d77c8 to 52df14f Compare July 18, 2019 09:22

will-moore added 2 commits July 18, 2019 11:04

Doc string typo fix

340e85f

Fix Z/T switch when ROIs are paginated

5ff0845

ShapeEditPopup.showPopupForShape() was calling regions.renderFeature(f) when Z/T changes and with paginated ROIs being destroyed and created on Z/T switch it seems that regions.viewer_ can be undefined at this time.

will-moore added 2 commits July 18, 2019 14:50

Add reflect-metadata requirement for unit-tests

022e5f5

We need this since viewers/viewer/controls/ShapeEditPopup.js imports Ui from '../../../utils/ui'. Importing this class that uses @decorator syntax seems to require reflect-metadata for karma to run in ChromeHeadless

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

56d9e4e

will-moore added 2 commits August 5, 2019 22:13

Update 're-enable popups' modal dialog message

e3315a7

On enable-popup, show popup

e1275a6

jburel merged commit 7bfdd56 into ome:master Aug 8, 2019

will-moore mentioned this pull request Oct 11, 2019

Show ROIs "Pins" in iViewer #220

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Popup on shapes #248

Popup on shapes #248

will-moore commented Mar 11, 2019 •

edited

Loading

pwalczysko commented Mar 18, 2019

pwalczysko commented Mar 18, 2019

pwalczysko commented Mar 18, 2019

will-moore commented Apr 3, 2019

pwalczysko commented Apr 12, 2019

jburel commented Jul 16, 2019 •

edited

Loading

jburel commented Jul 16, 2019

jburel commented Jul 16, 2019

pwalczysko commented Jul 16, 2019

will-moore commented Jul 16, 2019

jburel commented Jul 17, 2019

will-moore commented Jul 18, 2019

will-moore commented Jul 18, 2019

pwalczysko commented Jul 19, 2019

pwalczysko commented Jul 19, 2019

pwalczysko commented Jul 19, 2019

pwalczysko commented Aug 6, 2019

jburel commented Aug 8, 2019

Popup on shapes #248

Popup on shapes #248

Conversation

will-moore commented Mar 11, 2019 • edited Loading

pwalczysko commented Mar 18, 2019

pwalczysko commented Mar 18, 2019

pwalczysko commented Mar 18, 2019

will-moore commented Apr 3, 2019

pwalczysko commented Apr 12, 2019

jburel commented Jul 16, 2019 • edited Loading

jburel commented Jul 16, 2019

jburel commented Jul 16, 2019

pwalczysko commented Jul 16, 2019

will-moore commented Jul 16, 2019

jburel commented Jul 17, 2019

will-moore commented Jul 18, 2019

will-moore commented Jul 18, 2019

pwalczysko commented Jul 19, 2019

pwalczysko commented Jul 19, 2019

pwalczysko commented Jul 19, 2019

pwalczysko commented Aug 6, 2019

jburel commented Aug 8, 2019

will-moore commented Mar 11, 2019 •

edited

Loading

jburel commented Jul 16, 2019 •

edited

Loading