Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Units fixes web #3196

Merged
merged 4 commits into from Nov 19, 2014
Merged

Units fixes web #3196

merged 4 commits into from Nov 19, 2014

Conversation

will-moore
Copy link
Member

A couple of fixes found so far for units changes in develop:

Fixes display of ROIs in web image viewer http://trac.openmicroscopy.org.uk/ome/ticket/12640

Also display of channel labels in images where label is derived from wavelength. To test this, find an image with channel emission wavelength and re-import or remove any existing channel name via editing channels.

@joshmoore
Copy link
Member

>       set_if('strokeWidth', shape.getStrokeWidth().getValue())
E       AttributeError: 'NoneType' object has no attribute 'getValue'
omeroweb/webgateway/marshal.py:276: AttributeError

I also wonder if we should all use the same #FIXME test so that we can find all these assumptions during the next step.

@jburel jburel added the develop label Nov 18, 2014
@gusferguson
Copy link

Tested using http://trout.openmicroscopy.org/merge/webclient/userdata/?experimenter=5 user-4 read-write-1 and read-only-1.

Image cited in ticket 12640 and other images behave as expected. No issues with ROI viewing or channel names.
Good to merge.

@joshmoore
Copy link
Member

--no-rebase

joshmoore added a commit that referenced this pull request Nov 19, 2014
@joshmoore joshmoore merged commit 1d73bb1 into ome:develop Nov 19, 2014
@joshmoore joshmoore deleted the units_fixes_web branch November 19, 2014 11:56
@sbesson sbesson added this to the 5.1.0-m2 milestone Nov 26, 2014
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.

None yet

5 participants