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

Inputs for sliders #166

Merged

jburel merged 5 commits into ome:master from will-moore:inputs_for_sliders

Dec 14, 2016

Member

will-moore commented Aug 22, 2016 •

edited

Loading

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).

This was referenced Aug 22, 2016

OMERO Meeting Topics #155

Closed

RFE: Histogram #32

Closed

Member

snoopycrimecop commented Aug 22, 2016

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

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

Member Author

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 closed this

Member

jburel commented Sep 5, 2016

see also #168 for possible conflicts.


          Inputs for channels sliders

0e777a3

will-moore reopened this

will-moore force-pushed the inputs_for_sliders branch from ba2487b to 0e777a3 Compare

October 25, 2016 22:15


          Fix background of zoom slider

b698006

gusferguson commented Oct 26, 2016

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

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


          Merge remote-tracking branch 'origin/master' into inputs_for_sliders

jburel reviewed

View reviewed changes

omero_figure/static/figure/figure.js

+                          self.listenTo(m, 'change:channels', self.render);
+                      });
+                      // this.$el = $("#channel_sliders");

Member

jburel Dec 14, 2016

could remove commented out code

jburel reviewed

View reviewed changes

omero_figure/static/figure/figure.js

+                  events: {
+                      "keyup .ch_start": "handle_channel_input",
+                      // "blur .ch_start": "handle_channel_input",

Member

jburel Dec 14, 2016

same

jburel reviewed

View reviewed changes

omero_figure/static/figure/figure.js

+                      "keyup .ch_start": "handle_channel_input",
+                      // "blur .ch_start": "handle_channel_input",
+                      "keyup .ch_end": "handle_channel_input",
+                      // "blur .ch_end": "handle_channel_input",

Member

jburel Dec 14, 2016

same

jburel reviewed

View reviewed changes

omero_figure/static/figure/figure.js

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

Member

jburel Dec 14, 2016

space before { not consistent with rest of file

Member Author

will-moore Dec 14, 2016

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

View reviewed changes

omero_figure/static/figure/figure.js

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

Member

jburel Dec 14, 2016

space

will-moore added 2 commits

December 14, 2016 14:24


          Add missing channel_slider_view.js


          Remove commented-out lines in figure.js

b5f42b6

Member

jburel commented Dec 14, 2016

Thanks for cleanup

jburel merged commit 6e3ea7d into ome:master

will-moore added a commit to will-moore/figure that referenced this pull request


          Missing channel_slider_template.html from PR ome#166

e4f0c1f

will-moore mentioned this pull request

Missing channel_slider_template.html from PR #166 #194

Merged

will-moore added a commit to will-moore/figure that referenced this pull request


          Missing channel_slider_template.html from PR ome#166

0e3fa6d

snoopycrimecop added a commit to snoopycrimecop/omero-figure that referenced this pull request


          merge master -Dorg -Ssuccess-only

5f86b8a

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


          merge master -Dorg -Ssuccess-only: PR 194 (Missing channel_slider_tem…

d9f980b

…plate.html from PR ome#166)

snoopycrimecop added a commit to snoopycrimecop/omero-figure that referenced this pull request


          merge master -Dorg -Ssuccess-only

60bf1ed

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


          merge master -Dorg -Ssuccess-only: PR 194 (Missing channel_slider_tem…

b7699fe

…plate.html from PR ome#166)

snoopycrimecop added a commit to snoopycrimecop/omero-figure that referenced this pull request


          merge master -Dorg -Ssuccess-only

e6ade4b

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


          merge master -Dorg -Ssuccess-only: PR 194 (Missing channel_slider_tem…

1111e47

…plate.html from PR ome#166)

snoopycrimecop added a commit to snoopycrimecop/omero-figure that referenced this pull request


          merge master -Dorg -Ssuccess-only

7e6fbc8

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


          Merge pull request #194 from will-moore/Missing_channel_slider_template

ca56f85

Missing channel_slider_template.html from PR #166

jburel added this to the 3.0.0 milestone

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

Labels

None yet