Skip to content

Roi popupmenu fix#4612

Merged
sbesson merged 4 commits intoome:regionsfrom
dominikl:roi_popupmenu_fix
May 6, 2016
Merged

Roi popupmenu fix#4612
sbesson merged 4 commits intoome:regionsfrom
dominikl:roi_popupmenu_fix

Conversation

@dominikl
Copy link
Copy Markdown
Member

The ROI context menu didn't work properly when triggered by right click on the ROIs in the image viewer. See respective point on checklist on the Trello card - ROI Folders Insight Bugs/RFEs This PR fixes the problems.

Test: Check that the ROI context menu triggered from the image viewer works like the context menu triggered from the ROI table (and that both work like expected).

@gusferguson
Copy link
Copy Markdown

@dominikl

Tested using OMERO.insight-5.3.0-m2-99-8fc6db6-ice35-b113-mac regions-omero.docker.openmicroscopy.org DB: user-14

Behaves as expected.
Good to merge.

-  "Create folder" active on single selection
- "Remove folder" only active when ROI is in a folder
@dominikl
Copy link
Copy Markdown
Member Author

dominikl commented May 4, 2016

Sorry, @pwalczysko discovered a few more inconsistencies. Has to be re-reviewed, because I added the the bugfix commit to this PR, otherwise I would create merge conflicts.

Test (Last three items on Trello checkbox):

  • Check that "Create Folder" item is enabled on all items (ROIs, Shapes and Folders), for single item selection as well as multi-selection.
  • Check that "Remove from Folder" is only enabled when a ROI is selected which is in a folder.

@pwalczysko
Copy link
Copy Markdown
Member

All works as expected, including the bugs fixed by the last commits #4612 (comment) and also tested the Default loading of the folders - also as expected.

Ready to merge.


/**
* Instantiate the popup menu
* @param controller class which has interface ROIActionController that
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.

/home/slave/workspace/OMERO-build/src/components/insight/SRC/org/openmicroscopy/shoola/agents/measurement/util/roimenu/ROIPopupMenu.java:89: warning - @param argument "controller" is not a parameter name.

@dominikl
Copy link
Copy Markdown
Member Author

dominikl commented May 6, 2016

Thanks @sbesson . Just fixed the comment, no re-testing necessary.

@sbesson sbesson merged commit 24a9245 into ome:regions May 6, 2016
@sbesson sbesson added this to the 5.3.0 milestone May 10, 2016
@dominikl dominikl deleted the roi_popupmenu_fix branch May 3, 2017 09:37
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.

5 participants