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

Inputs for sliders #166

Merged
merged 5 commits into from Dec 14, 2016

Conversation

Projects
None yet
4 participants
@will-moore
Member

will-moore commented Aug 22, 2016

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:

  • Where start/end values for a channel are same in all images, text is black.
  • Editing values with slider of by typing in input and hitting enter will update value in all images to the same value (text will become black).
  • Can input values outside of slider range. Slider range should expand as needed.
  • Check that you can't input a "start" value greater than the "end" value and vice versa (will get alert message on enter).

screen shot 2016-08-22 at 11 50 42

This was referenced Aug 22, 2016

@snoopycrimecop

This comment has been minimized.

Show comment
Hide comment
@snoopycrimecop

snoopycrimecop Aug 22, 2016

Member

Conflicting PR. Removed from build FIGURE-merge#224. See the console output for more details.
Possible conflicts:

  • PR #158 dominikl 'Label markdown'
    • static/figure/figure.js
    • static/figure/js/views/right_panel_view.js
  • PR #160 will-moore 'Luts'
    • static/figure/figure.js
    • static/figure/js/views/right_panel_view.js
  • PR #162 dominikl 'Import from json'
    • static/figure/figure.js
  • PR #165 will-moore 'Rois from omero'
    • static/figure/figure.js
Member

snoopycrimecop commented Aug 22, 2016

Conflicting PR. Removed from build FIGURE-merge#224. See the console output for more details.
Possible conflicts:

  • PR #158 dominikl 'Label markdown'
    • static/figure/figure.js
    • static/figure/js/views/right_panel_view.js
  • PR #160 will-moore 'Luts'
    • static/figure/figure.js
    • static/figure/js/views/right_panel_view.js
  • PR #162 dominikl 'Import from json'
    • static/figure/figure.js
  • PR #165 will-moore 'Rois from omero'
    • static/figure/figure.js
@will-moore

This comment has been minimized.

Show comment
Hide comment
@will-moore

will-moore Aug 23, 2016

Member

Conflicting with #160 LUTs changes to background styles of sliders.
Need to wait for that to be merged to fix conflicts.

Member

will-moore commented Aug 23, 2016

Conflicting with #160 LUTs changes to background styles of sliders.
Need to wait for that to be merged to fix conflicts.

@will-moore will-moore closed this Aug 23, 2016

@jburel

This comment has been minimized.

Show comment
Hide comment
@jburel

jburel Sep 5, 2016

Member

see also #168 for possible conflicts.

Member

jburel commented Sep 5, 2016

see also #168 for possible conflicts.

@will-moore will-moore reopened this Oct 25, 2016

@gusferguson

This comment has been minimized.

Show comment
Hide comment
@gusferguson

gusferguson Oct 26, 2016

@will-moore

Tested with http://web-dev-merge.openmicroscopy.org/figure/ user-3 Safari.

Behaves as expected.
Mousewheel scrolling works in Safari.
Good to merge.

gusferguson commented Oct 26, 2016

@will-moore

Tested with http://web-dev-merge.openmicroscopy.org/figure/ user-3 Safari.

Behaves as expected.
Mousewheel scrolling works in Safari.
Good to merge.

// Comare channels from each Panel Model to see if they are
// compatible, and compile a summary json.
var chData = this.models.map(function(m){

This comment has been minimized.

@jburel

jburel Dec 14, 2016

Member

space before { not consistent with rest of file

@jburel

jburel Dec 14, 2016

Member

space before { not consistent with rest of file

This comment has been minimized.

@will-moore

will-moore Dec 14, 2016

Member

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.

@will-moore

will-moore Dec 14, 2016

Member

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.

return m.get('channels');
});
// images are compatible if all images have same channel count
var allSameCount = chData.reduce(function(prev, channels){

This comment has been minimized.

@jburel

jburel Dec 14, 2016

Member

space

@jburel

jburel Dec 14, 2016

Member

space

@jburel

This comment has been minimized.

Show comment
Hide comment
@jburel

jburel Dec 14, 2016

Member

Thanks for cleanup

Member

jburel commented Dec 14, 2016

Thanks for cleanup

@jburel jburel merged commit 6e3ea7d into ome:master Dec 14, 2016

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details

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

merge master -Dorg -Ssuccess-only
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 #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

snoopycrimecop added a commit to snoopycrimecop/omero-figure that referenced this pull request Jan 31, 2017

merge master -Dorg -Ssuccess-only
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 #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

snoopycrimecop added a commit to snoopycrimecop/omero-figure that referenced this pull request Feb 1, 2017

merge master -Dorg -Ssuccess-only
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 #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

snoopycrimecop added a commit to snoopycrimecop/omero-figure that referenced this pull request Feb 2, 2017

merge master -Dorg -Ssuccess-only
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 #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

@jburel jburel added this to the 3.0.0 milestone Jun 28, 2017

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment