Skip to content

Rangeslider allow zoom on oppaxis #2364

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

Merged
merged 44 commits into from
Mar 7, 2018
Merged

Rangeslider allow zoom on oppaxis #2364

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
519e1a7
better visual cue of zoom on oppaxis with rangeslider
TomDemulierChevret Feb 14, 2018
044e633
add a new attributes to rangeslider to switch back to the old behaviour
TomDemulierChevret Feb 16, 2018
f335258
fix check when using new data
TomDemulierChevret Feb 16, 2018
707f432
fix default value rangeslider test
TomDemulierChevret Feb 16, 2018
6a7f652
renammed new attributes to "fixedyrange"
TomDemulierChevret Feb 16, 2018
fc4f082
Introduce new attributes to axes to allow to specifiy fixed range to …
TomDemulierChevret Feb 19, 2018
92c6550
Fix broken test from attribute removal
TomDemulierChevret Feb 19, 2018
b30167c
Add missing gl attribute
TomDemulierChevret Feb 19, 2018
91caff1
Merge branch 'master' into rangeslider-allow-zoom-on-oppaxis
TomDemulierChevret Feb 19, 2018
3dd91b5
Renammed new attributes for more clarity and portability
TomDemulierChevret Feb 20, 2018
00fd1d7
Coerce of new attributes is only made for y axis
TomDemulierChevret Feb 20, 2018
5e0486a
Merge remote-tracking branch 'upstream/master' into rangeslider-allow…
TomDemulierChevret Feb 20, 2018
32488f1
Changed rangeslidermode values for more clarity
TomDemulierChevret Feb 20, 2018
bc2a40a
Switch to new rangeslider range opts (default missing)
TomDemulierChevret Feb 28, 2018
d3b6071
Added default attributes
TomDemulierChevret Feb 28, 2018
b496641
Remove old attributes
TomDemulierChevret Feb 28, 2018
149ef70
Add autorange computation
TomDemulierChevret Feb 28, 2018
54d8b58
Merge remote-tracking branch 'upstream/master' into rangeslider-allow…
TomDemulierChevret Feb 28, 2018
dd48914
Add missing check
TomDemulierChevret Feb 28, 2018
a8a3ee5
Add missing catch to test to retrieve the tracebacks
TomDemulierChevret Mar 2, 2018
0ae2831
Change yAxis rangeslider rangeOpts computation + fix yAxis rangeslide…
TomDemulierChevret Mar 2, 2018
8764e4d
Add missing check
TomDemulierChevret Mar 2, 2018
a17d3a8
Fix rangeslider test
TomDemulierChevret Mar 2, 2018
e85e3d0
Renamed parameter to keep name consistency across the file
TomDemulierChevret Mar 2, 2018
0dd8562
Merge remote-tracking branch 'upstream/master' into rangeslider-allow…
TomDemulierChevret Mar 2, 2018
3929be6
Changes requested by @alexcjohnson
TomDemulierChevret Mar 2, 2018
e2ad33d
Changes requested by @alexcjohnson
TomDemulierChevret Mar 2, 2018
df85f35
Changes requested by @etpinard
TomDemulierChevret Mar 5, 2018
fe83e07
Default range for 'fixed' rangemode value is now the range of the axe
TomDemulierChevret Mar 5, 2018
3b6b81a
Changes requested by @etpinard
TomDemulierChevret Mar 6, 2018
9de4e3e
Changes requested by @etpinard
TomDemulierChevret Mar 6, 2018
f2819c8
Changes requested by @etpinard
TomDemulierChevret Mar 6, 2018
df96a13
Merge branch 'master' into rangeslider-allow-zoom-on-oppaxis
TomDemulierChevret Mar 6, 2018
9c66f81
Add test for new attributes default and coerce
TomDemulierChevret Mar 7, 2018
f092c44
Add interaction test for new attributes
TomDemulierChevret Mar 7, 2018
041ce3d
Fixed autorange test precision
TomDemulierChevret Mar 7, 2018
23c8401
Fixed autorange test precision
TomDemulierChevret Mar 7, 2018
73560f6
Merge branch 'master' into rangeslider-allow-zoom-on-oppaxis
alexcjohnson Mar 7, 2018
c556f8c
rename range_attributes file -> oppaxis_attributes
etpinard Mar 7, 2018
43f15a7
add rangeslider.yaxis? to schema flagging it with _isSubplotObj
etpinard Mar 7, 2018
ccb6091
fix rangeslider.y.rangemode=auto and add a test image
alexcjohnson Mar 7, 2018
6a88b24
Merge branch 'rangeslider-allow-zoom-on-oppaxis' of github.com:TomDem…
alexcjohnson Mar 7, 2018
95b8c10
test turning on autorange via rangeslider attrs
alexcjohnson Mar 7, 2018
4f54f62
drop rangeslider style attributes to editType: plot and test
alexcjohnson Mar 7, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Add missing check
  • Loading branch information
@TomDemulierChevret
TomDemulierChevret committed Feb 28, 2018
commit dd48914e78b5a54a4050cf3fe838b113b88dc49b
38 changes: 20 additions & 18 deletions src/components/rangeslider/defaults.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,26 +45,28 @@ module.exports = function handleDefaults(layoutIn, layoutOut, axName) {
coerce('range');

var subplots = layoutOut._subplots;
var yIds = subplots.yaxis;
var yNames = Lib.simpleMap(yIds, axisIds.id2name);
for(var i = 0; i < yNames.length; i++) {
var yName = yNames[i];
if(!containerIn[yName]) {
containerIn[yName] = {};
}
if(!containerOut[yName]) {
containerOut[yName] = {};
}
if(subplots) {
var yIds = subplots.yaxis;
var yNames = Lib.simpleMap(yIds, axisIds.id2name);
Copy link
Collaborator

Choose a reason for hiding this comment

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

This is a bit tricky actually - we don't want all y axes, we only want the ones that apply to this x axis. It might be sufficient to look at subplots.cartesian, filtering on the x axis ID and taking the y axis IDs (note that you can't do this with subplotId.indexOf(xId) !== -1 because x is a valid ID - you have to do something like subplotId.substr(0, subplotId.indexOf('y')) === xId, like here)

I say might because I'm not sure what happens with rangesliders now if we have overlaying x axes... that would be very weird and confusing, so I think I'd be OK ignoring the y data for these axes, but we should confirm that.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Couldn't we just use : layoutOut[yName].anchor === axisIds.name2id(axName) in the for loop ?

Copy link
Collaborator

Choose a reason for hiding this comment

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

In principle you can have a y axis shared across several x axes, or positioned as a free axis, and not anchored to the one with the range slider, so unfortunately I don't think that will work.

for(var i = 0; i < yNames.length; i++) {
var yName = yNames[i];
if(!containerIn[yName]) {
containerIn[yName] = {};
}
if(!containerOut[yName]) {
containerOut[yName] = {};
}
Copy link
Collaborator

Choose a reason for hiding this comment

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

Do we need to push {} back to containerIn? I know we have many examples to the contrary 🙈 but we try not to modify the inputs any more than we have to. Also at this point we know containerOut[yName] doesn't exist yet. So ideally this section would look something like (would require changing coerceRange but should actually make it simpler):

rangeContainerIn = containerIn[yName] || {};
rangeContainerOut = containerOut[yName] = {};

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Indeed, it is not required anymore (it was in one of the first version).


if(containerIn[yName].range && layoutOut[yName].isValidRange(containerIn[yName].range)) {
coerceRange(yName, 'rangemode', 'fixed');
} else {
coerceRange(yName, 'rangemode', 'auto');
}
if(containerIn[yName].range && layoutOut[yName].isValidRange(containerIn[yName].range)) {
coerceRange(yName, 'rangemode', 'fixed');
} else {
coerceRange(yName, 'rangemode', 'auto');
}

layoutOut[yName].cleanRange('rangeslider.' + yName + '.range');
coerceRange(yName, 'range', layoutOut[yName].rangeslider[yName].range.slice());
delete layoutOut[yName].rangeslider;
layoutOut[yName].cleanRange('rangeslider.' + yName + '.range');
coerceRange(yName, 'range', layoutOut[yName].rangeslider[yName].range.slice());
delete layoutOut[yName].rangeslider;
}
}

// to map back range slider (auto) range
Expand Down
2 changes: 1 addition & 1 deletion src/plots/cartesian/axes.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -370,7 +370,7 @@ axes.doAutoRange = function(ax) {

if(ax.rangeslider) {
var anchorAxis = ax._anchorAxis;
if(ax.rangeslider[anchorAxis._name].rangemode === 'auto') {
if(ax.rangeslider[anchorAxis._name] && ax.rangeslider[anchorAxis._name].rangemode === 'auto') {
hasDeps = (anchorAxis._min && anchorAxis._max && anchorAxis._min.length && anchorAxis._max.length);
ax.rangeslider[anchorAxis._name].range = hasDeps ? axes.getAutoRange(anchorAxis) : anchorAxis.range.slice();
axIn = ax._input;
Expand Down