Inputs for sliders #166
Merged
Inputs for sliders #166
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Conflicting PR. Removed from build FIGURE-merge#224. See the console output for more details.
|
|
Conflicting with #160 LUTs changes to background styles of sliders. |
|
see also #168 for possible conflicts. |
will-moore
force-pushed
the
inputs_for_sliders
branch
from
ba2487b
to
0e777a3
Compare
|
Tested with http://web-dev-merge.openmicroscopy.org/figure/ user-3 Safari. Behaves as expected. |
jburel
reviewed
Dec 14, 2016
| self.listenTo(m, 'change:channels', self.render); | ||
| }); | ||
|
|
||
| // this.$el = $("#channel_sliders"); |
jburel
reviewed
Dec 14, 2016
|
|
||
| events: { | ||
| "keyup .ch_start": "handle_channel_input", | ||
| // "blur .ch_start": "handle_channel_input", |
jburel
reviewed
Dec 14, 2016
| "keyup .ch_start": "handle_channel_input", | ||
| // "blur .ch_start": "handle_channel_input", | ||
| "keyup .ch_end": "handle_channel_input", | ||
| // "blur .ch_end": "handle_channel_input", |
jburel
reviewed
Dec 14, 2016
|
|
||
| // Comare channels from each Panel Model to see if they are | ||
| // compatible, and compile a summary json. | ||
| var chData = this.models.map(function(m){ |
There was a problem hiding this comment.
space before { not consistent with rest of file
There was a problem hiding this comment.
When declaring anonymous functions in-line, I am reasonably consistent with not having a space here. If I was going to fix this throughout the codebase, it would make sense to do that in a separate PR.
jburel
reviewed
Dec 14, 2016
| return m.get('channels'); | ||
| }); | ||
| // images are compatible if all images have same channel count | ||
| var allSameCount = chData.reduce(function(prev, channels){ |
|
Thanks for cleanup |
will-moore
added a commit
to will-moore/figure
that referenced
this pull request
Jan 27, 2017
will-moore
added a commit
to will-moore/figure
that referenced
this pull request
Jan 27, 2017
snoopycrimecop
added a commit
to snoopycrimecop/omero-figure
that referenced
this pull request
Jan 30, 2017
Repository: ome/omero-figure Already up-to-date. Merged PRs: # PR 190 will-moore 'Rois from omero2' # PR 193 bramalingam 'Xywh width height button' Conflicting PRs (not included): # PR 194 will-moore 'Missing channel_slider_template.html from PR ome#166' Generated by FIGURE-merge#361 (https://ci.openmicroscopy.org/job/FIGURE-merge/361/)
snoopycrimecop
added a commit
to snoopycrimecop/omero-figure
that referenced
this pull request
Jan 31, 2017
…plate.html from PR ome#166)
snoopycrimecop
added a commit
to snoopycrimecop/omero-figure
that referenced
this pull request
Jan 31, 2017
Repository: ome/omero-figure Already up-to-date. Merged PRs: # PR 190 will-moore 'Rois from omero2' # PR 193 bramalingam 'Xywh width height button' # PR 194 will-moore 'Missing channel_slider_template.html from PR ome#166' Generated by FIGURE-merge#362 (https://ci.openmicroscopy.org/job/FIGURE-merge/362/)
snoopycrimecop
added a commit
to snoopycrimecop/omero-figure
that referenced
this pull request
Feb 1, 2017
…plate.html from PR ome#166)
snoopycrimecop
added a commit
to snoopycrimecop/omero-figure
that referenced
this pull request
Feb 1, 2017
Repository: ome/omero-figure Already up-to-date. Merged PRs: # PR 190 will-moore 'Rois from omero2' # PR 193 bramalingam 'Xywh width height button' # PR 194 will-moore 'Missing channel_slider_template.html from PR ome#166' Generated by FIGURE-merge#363 (https://ci.openmicroscopy.org/job/FIGURE-merge/363/)
snoopycrimecop
added a commit
to snoopycrimecop/omero-figure
that referenced
this pull request
Feb 2, 2017
…plate.html from PR ome#166)
snoopycrimecop
added a commit
to snoopycrimecop/omero-figure
that referenced
this pull request
Feb 2, 2017
Repository: ome/omero-figure Already up-to-date. Merged PRs: # PR 190 will-moore 'Rois from omero2' # PR 193 bramalingam 'Xywh width height button' # PR 194 will-moore 'Missing channel_slider_template.html from PR ome#166' Generated by FIGURE-merge#364 (https://ci.openmicroscopy.org/job/FIGURE-merge/364/)
jburel
added a commit
that referenced
this pull request
Feb 2, 2017
Missing channel_slider_template.html from PR #166
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
See https://trello.com/c/AozomHkL/125-sliders-allow-typing-in-values
For the channel sliders, we now allow users to type in the value they want (as in webclient & Insight).
This allows greater accuracy and you can also enter values outside of the slider range.
We now show the existing Average value (in light grey) if selected images have different values for start/end.
This allows user to edit existing value instead of '-' as before.
We use "number" fields, so you can't ender non-numeric characters. Most browsers also support mousewheel scrolling to edit the value.
To test:
Select a single image or multiple images: