Feature range slider #336
There are no files selected for viewing
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| /** | ||
| * Copyright 2012-2016, Plotly, Inc. | ||
| * All rights reserved. | ||
| * | ||
| * This source code is licensed under the MIT license found in the | ||
| * LICENSE file in the root directory of this source tree. | ||
| */ | ||
|
|
||
| 'use strict'; | ||
|
|
||
| var colorAttributes = require('../color/attributes'); | ||
|
|
||
| module.exports = { | ||
| visible: { | ||
| valType: 'boolean', | ||
| dflt: false, | ||
| description: 'Determines whether or not the range slider will be visible.' | ||
| }, | ||
| bordercolor: { | ||
| valType: 'color', | ||
| dflt: colorAttributes.defaultLine, | ||
| role: 'style', | ||
| description: 'Sets the border color of the range slider.' | ||
| }, | ||
| borderwidth: { | ||
| valType: 'integer', | ||
| dflt: 0, | ||
| role: 'style', | ||
| description: 'Sets the border color of the range slider.' | ||
| }, | ||
| backgroundcolor: { | ||
|
There was a problem hiding this comment. this should be |
||
| valType: 'color', | ||
| dflt: colorAttributes.background, | ||
| role: 'style', | ||
| description: 'Sets the background color of the range slider.' | ||
| }, | ||
| height: { | ||
|
There was a problem hiding this comment.
We're using @chriddyp @cldougl @cpsievert thoughts? There was a problem hiding this comment. +1 for consistency ( There was a problem hiding this comment. let's go with |
||
| valType: 'number', | ||
| dflt: 0.15, | ||
| min: 0, | ||
| max: 1, | ||
| role: 'style', | ||
| description: [ | ||
| 'The height of the range slider as a fraction of the', | ||
| 'total plot area height.' | ||
| ].join(' ') | ||
| } | ||
| }; |
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,248 @@ | ||
| /** | ||
| * Copyright 2012-2016, Plotly, Inc. | ||
| * All rights reserved. | ||
| * | ||
| * This source code is licensed under the MIT license found in the | ||
| * LICENSE file in the root directory of this source tree. | ||
| */ | ||
|
|
||
| 'use strict'; | ||
|
|
||
|
|
||
| var Plotly = require('../../plotly'); | ||
| var Lib = require('../../lib'); | ||
|
|
||
| var svgNS = require('../../constants/xmlns_namespaces').svg; | ||
|
|
||
| var helpers = require('./helpers'); | ||
| var rangePlot = require('./range_plot'); | ||
|
|
||
|
|
||
| module.exports = function createSlider(gd, minStart, maxStart) { | ||
| var fullLayout = gd._fullLayout, | ||
| sliderContainer = fullLayout._infolayer.selectAll('g.range-slider'), | ||
| options = fullLayout.xaxis.rangeslider, | ||
| width = fullLayout._size.w, | ||
| height = (fullLayout.height - fullLayout.margin.b - fullLayout.margin.t) * options.height, | ||
| handleWidth = 2, | ||
| offsetShift = Math.floor(options.borderwidth / 2), | ||
| x = fullLayout.margin.l, | ||
| y = fullLayout.height - height - fullLayout.margin.b; | ||
|
|
||
| minStart = minStart || 0; | ||
| maxStart = maxStart || width; | ||
|
|
||
| var slider = document.createElementNS(svgNS, 'g'); | ||
| helpers.setAttributes(slider, { | ||
| 'class': 'range-slider', | ||
| 'data-min': minStart, | ||
| 'data-max': maxStart, | ||
| 'pointer-events': 'all', | ||
| 'transform': 'translate(' + x + ',' + y + ')' | ||
| }); | ||
|
|
||
|
|
||
| var sliderBg = document.createElementNS(svgNS, 'rect'), | ||
| borderCorrect = options.borderwidth % 2 === 0 ? options.borderwidth : options.borderwidth - 1; | ||
| helpers.setAttributes(sliderBg, { | ||
| 'fill': options.backgroundcolor, | ||
| 'stroke': options.bordercolor, | ||
| 'stroke-width': options.borderwidth, | ||
| 'height': height + borderCorrect, | ||
| 'width': width + borderCorrect, | ||
| 'transform': 'translate(-' + offsetShift + ', -' + offsetShift + ')', | ||
| 'shape-rendering': 'crispEdges' | ||
| }); | ||
|
|
||
|
|
||
| var maskMin = document.createElementNS(svgNS, 'rect'); | ||
| helpers.setAttributes(maskMin, { | ||
| 'x': 0, | ||
| 'width': minStart, | ||
| 'height': height, | ||
| 'fill': 'rgba(0,0,0,0.4)' | ||
| }); | ||
|
|
||
|
|
||
| var maskMax = document.createElementNS(svgNS, 'rect'); | ||
| helpers.setAttributes(maskMax, { | ||
| 'x': maxStart, | ||
| 'width': width - maxStart, | ||
| 'height': height, | ||
| 'fill': 'rgba(0,0,0,0.4)' | ||
| }); | ||
|
|
||
|
|
||
| var grabberMin = document.createElementNS(svgNS, 'g'), | ||
| grabAreaMin = document.createElementNS(svgNS, 'rect'), | ||
| handleMin = document.createElementNS(svgNS, 'rect'); | ||
| helpers.setAttributes(grabberMin, { 'transform': 'translate(' + (minStart - handleWidth - 1) + ')' }); | ||
| helpers.setAttributes(grabAreaMin, { | ||
| 'width': 10, | ||
| 'height': height, | ||
| 'x': -6, | ||
| 'fill': 'transparent', | ||
| 'cursor': 'col-resize' | ||
| }); | ||
| helpers.setAttributes(handleMin, { | ||
| 'width': handleWidth, | ||
| 'height': height / 2, | ||
| 'y': height / 4, | ||
| 'rx': 1, | ||
| 'fill': 'white', | ||
| 'stroke': '#666', | ||
| 'shape-rendering': 'crispEdges' | ||
| }); | ||
| helpers.appendChildren(grabberMin, [handleMin, grabAreaMin]); | ||
|
|
||
|
|
||
| var grabberMax = document.createElementNS(svgNS, 'g'), | ||
| grabAreaMax = document.createElementNS(svgNS, 'rect'), | ||
| handleMax = document.createElementNS(svgNS, 'rect'); | ||
| helpers.setAttributes(grabberMax, { 'transform': 'translate(' + maxStart + ')' }); | ||
| helpers.setAttributes(grabAreaMax, { | ||
| 'width': 10, | ||
| 'height': height, | ||
| 'x': -2, | ||
| 'fill': 'transparent', | ||
| 'cursor': 'col-resize' | ||
| }); | ||
| helpers.setAttributes(handleMax, { | ||
| 'width': handleWidth, | ||
| 'height': height / 2, | ||
| 'y': height / 4, | ||
| 'rx': 1, | ||
| 'fill': 'white', | ||
| 'stroke': '#666', | ||
| 'shape-rendering': 'crispEdges' | ||
| }); | ||
| helpers.appendChildren(grabberMax, [handleMax, grabAreaMax]); | ||
|
|
||
|
|
||
| var slideBox = document.createElementNS(svgNS, 'rect'); | ||
| helpers.setAttributes(slideBox, { | ||
| 'x': minStart, | ||
| 'width': maxStart - minStart, | ||
| 'height': height, | ||
| 'cursor': 'ew-resize', | ||
| 'fill': 'transparent' | ||
| }); | ||
|
|
||
|
|
||
| slider.addEventListener('mousedown', function(event) { | ||
| var target = event.target, | ||
| startX = event.clientX, | ||
| offsetX = startX - slider.getBoundingClientRect().left, | ||
| minVal = slider.getAttribute('data-min'), | ||
| maxVal = slider.getAttribute('data-max'); | ||
|
|
||
| window.addEventListener('mousemove', mouseMove); | ||
| window.addEventListener('mouseup', mouseUp); | ||
|
|
||
| function mouseMove(e) { | ||
| var delta = +e.clientX - startX; | ||
|
|
||
| switch(target) { | ||
| case slideBox: | ||
| slider.style.cursor = 'ew-resize'; | ||
| setPixelRange(+maxVal + delta, +minVal + delta); | ||
| break; | ||
|
|
||
| case grabAreaMin: | ||
| slider.style.cursor = 'col-resize'; | ||
| setPixelRange(+minVal + delta, +maxVal); | ||
| break; | ||
|
|
||
| case grabAreaMax: | ||
| slider.style.cursor = 'col-resize'; | ||
| setPixelRange(+minVal, +maxVal + delta); | ||
| break; | ||
|
|
||
| default: | ||
| slider.style.cursor = 'ew-resize'; | ||
| setPixelRange(offsetX, offsetX + delta); | ||
| break; | ||
| } | ||
| } | ||
|
|
||
| function mouseUp() { | ||
| window.removeEventListener('mousemove', mouseMove); | ||
| window.removeEventListener('mouseup', mouseUp); | ||
| slider.style.cursor = 'auto'; | ||
| } | ||
| }); | ||
|
|
||
|
|
||
| function setRange(min, max) { | ||
| min = min || -Infinity; | ||
| max = max || Infinity; | ||
|
|
||
| var rangeMin = fullLayout.xaxis.range[0], | ||
| rangeMax = fullLayout.xaxis.range[1], | ||
| range = rangeMax - rangeMin, | ||
| pixelMin = (min - rangeMin) / range * width, | ||
| pixelMax = (max - rangeMin) / range * width; | ||
|
|
||
| setPixelRange(pixelMin, pixelMax); | ||
| } | ||
|
|
||
|
|
||
| function setPixelRange(min, max) { | ||
|
|
||
| min = Lib.constrain(min, 0, width); | ||
| max = Lib.constrain(max, 0, width); | ||
|
|
||
| if(max < min) { | ||
| var temp = max; | ||
| max = min; | ||
| min = temp; | ||
| } | ||
|
|
||
| helpers.setAttributes(slider, { | ||
| 'data-min': min, | ||
| 'data-max': max | ||
| }); | ||
|
|
||
| helpers.setAttributes(slideBox, { | ||
| 'x': min, | ||
| 'width': max - min | ||
| }); | ||
|
|
||
| helpers.setAttributes(maskMin, { 'width': min }); | ||
| helpers.setAttributes(maskMax, { | ||
| 'x': max, | ||
| 'width': width - max | ||
| }); | ||
|
|
||
| helpers.setAttributes(grabberMin, { 'transform': 'translate(' + (min - handleWidth - 1) + ')' }); | ||
| helpers.setAttributes(grabberMax, { 'transform': 'translate(' + max + ')' }); | ||
|
|
||
| // call to set range on plot here | ||
| var rangeMin = fullLayout.xaxis.range[0], | ||
| rangeMax = fullLayout.xaxis.range[1], | ||
| range = rangeMax - rangeMin, | ||
| dataMin = min / width * range + rangeMin, | ||
| dataMax = max / width * range + rangeMin; | ||
|
|
||
| Plotly.relayout(gd, 'xaxis.range', [dataMin, dataMax]); | ||
| } | ||
|
|
||
|
|
||
| var rangePlots = rangePlot(gd, width, height); | ||
|
|
||
| helpers.appendChildren(slider, [ | ||
| sliderBg, | ||
| rangePlots, | ||
| maskMin, | ||
| maskMax, | ||
| slideBox, | ||
| grabberMin, | ||
| grabberMax | ||
| ]); | ||
|
|
||
| sliderContainer.data([0]) | ||
| .enter().append(function() { | ||
| options.setRange = setRange; | ||
| return slider; | ||
| }); | ||
| }; |
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| /** | ||
| * Copyright 2012-2016, Plotly, Inc. | ||
| * All rights reserved. | ||
| * | ||
| * This source code is licensed under the MIT license found in the | ||
| * LICENSE file in the root directory of this source tree. | ||
| */ | ||
|
|
||
| 'use strict'; | ||
|
|
||
| var Lib = require('../../lib'); | ||
|
|
||
| module.exports = { | ||
| 'linear': function(val) { return val; }, | ||
| 'log': function(val) { return Math.log(val)/Math.log(10); }, | ||
| 'date': function(val) { return Lib.dateTime2ms(val); }, | ||
| 'category': function(_, i) { return i; } | ||
| }; | ||
|
There was a problem hiding this comment. These should probably be swapped out for the There was a problem hiding this comment. Looks like you're looking for |
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| /** | ||
| * Copyright 2012-2016, Plotly, Inc. | ||
| * All rights reserved. | ||
| * | ||
| * This source code is licensed under the MIT license found in the | ||
| * LICENSE file in the root directory of this source tree. | ||
| */ | ||
|
|
||
| 'use strict'; | ||
|
|
||
| var Lib = require('../../lib'); | ||
| var attributes = require('./attributes'); | ||
|
|
||
|
|
||
| module.exports = function supplyLayoutDefaults(layoutIn, layoutOut) { | ||
|
|
||
| if(!layoutIn.xaxis || !layoutOut.xaxis) return; | ||
|
|
||
| var containerIn = layoutIn.xaxis.rangeslider || {}, | ||
| containerOut = layoutOut.xaxis.rangeslider = {}; | ||
|
|
||
| if(!containerIn.visible) return; | ||
|
There was a problem hiding this comment. use |
||
|
|
||
| function coerce(attr, dflt) { | ||
| return Lib.coerce(containerIn, containerOut, | ||
| attributes, attr, dflt); | ||
| } | ||
|
|
||
| coerce('visible'); | ||
| coerce('height'); | ||
| coerce('backgroundcolor'); | ||
| coerce('bordercolor'); | ||
| coerce('borderwidth'); | ||
|
|
||
| if(containerOut.visible) { | ||
| layoutOut.yaxis.fixedrange = true; | ||
| } | ||
| }; |
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| /** | ||
| * Copyright 2012-2016, Plotly, Inc. | ||
| * All rights reserved. | ||
| * | ||
| * This source code is licensed under the MIT license found in the | ||
| * LICENSE file in the root directory of this source tree. | ||
| */ | ||
|
|
||
| 'use strict'; | ||
|
|
||
| exports.setAttributes = function setAttributes(el, attributes) { | ||
| for(var key in attributes) { | ||
| el.setAttribute(key, attributes[key]); | ||
| } | ||
| }; | ||
|
|
||
|
|
||
| exports.appendChildren = function appendChildren(el, children) { | ||
| for(var i = 0; i < children.length; i++) { | ||
| if(children[i]) { | ||
| el.appendChild(children[i]); | ||
| } | ||
| } | ||
| }; |
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
A blank range slider (
layout.xaxis.rangeslider = {}) should be considered visible.