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.

Sign up for GitHub

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

Jump to bottom

Image viewer split 11285 #1462

Merged
merged 4 commits into from Sep 13, 2013
Merged

Image viewer split 11285 #1462

merged 4 commits into from Sep 13, 2013

Conversation

will-moore
Copy link
Member

This allows more than 1 channel to be active when showing split-view layout in the web image viewer (similar behaviour as Insight).

To test:

  • Open multi-channel image in web image viewer - show Color mode.
  • Go to 'Split Channel' viewing option.
  • Change to greyscale - Current channels stay on (in grey) & merged panel is shown.
  • Change to 'Normal' viewing option.
  • Only a single greyscale channel should be shown - buttons will toggle channel as normal.
  • Try to play with different combinations of channels & viewing option to check that switching between them gives predictable behaviour.
    screen shot 2013-09-09 at 23 20 54

@will-moore
Copy link
Member Author

cc @cneves @chris-allan Significant change to web image viewer (and Blitz Gateway).

@ximenesuk
Copy link
Contributor

The functionality all looks fine and good to merge in that respect. In testing I did notice this issue with channel labels, #11445

@will-moore
Copy link
Member Author

@ximenesuk Could you confirm whether the channel labels issue is fixed now?
@cneves @chris-allan Could you look at this PR if you have any objections to changes in the image viewer / split-view rendering?

chris-allan
chris-allan reviewed Sep 13, 2013
View reviewed changes
components/tools/OmeroPy/src/omero/gateway/__init__.py
@@ -7002,7 +7002,7 @@ def splitChannelDims (self, border=2):
return rv

def _renderSplit_channelLabel (self, channel):
return str(channel.getEmissionWave())
return str(channel.getLabel())
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this change also to align with OMERO.insight's display?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@chris-allan Yes - Insight uses Channel Names for split view panels:

screen shot 2013-09-13 at 10 38 46

@cneves
Copy link
Member

cneves commented Sep 13, 2013

Reviewed, thumbs up on merging this in.

@chris-allan
Copy link
Member

Cool. Also thumbs up merging this in.

joshmoore added a commit that referenced this pull request Sep 13, 2013
@joshmoore
Merge pull request #1462 from will-moore/image_viewer_split_11285
5910c15 
Image viewer split 11285
@joshmoore joshmoore merged commit 5910c15 into ome:dev_4_4 Sep 13, 2013
@will-moore will-moore deleted the image_viewer_split_11285 branch September 17, 2013 12:43
@will-moore will-moore mentioned this pull request Sep 17, 2013
Merged
@sbesson
Copy link
Member

sbesson commented Sep 17, 2013

--rebased-to #1509

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
dev_4_4
Projects
None yet
Milestone
4.4.9
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@will-moore @ximenesuk @cneves @chris-allan @sbesson @joshmoore