8000 `plotly_relayouting` event: live updates during panning/zooming by antoinerg · Pull Request #3888 · plotly/plotly.js · GitHub
[go: up one dir, main page]
Skip to content

plotly_relayouting event: live updates during panning/zooming #3888

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 11 commits into from
May 23, 2019
Merged

plotly_relayouting event: live updates during panning/zooming #3888

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
f8203a3
plotly_relayouting for cartesian plots
antoinerg May 21, 2019
4b0a0fd
plotly_relayouting for geo plots
antoinerg May 21, 2019
4520a21
plotly_relayouting for ternary plots
antoinerg May 22, 2019
6852981
plotly_relayouting for polar plots
antoinerg May 22, 2019
e268cda
plotly_relayouting for mapbox plots
antoinerg May 22, 2019
7a66daf
plotly_relayouting for gl3d plots
antoinerg May 22, 2019
2545746
improve coverage of plotly_relayouting for geo plots
antoinerg May 22, 2019
082f1d2
improve tests of plotly_relayouting for gl3d plots
antoinerg May 22, 2019
12658db
improve coverage of plotly_relayouting for polar plots
antoinerg May 22, 2019
b0ae7f8
Merge branch 'master' into event-drag
etpinard May 23, 2019
a76a52a
cartesian_interact: update assert values due to timing change
antoinerg May 23, 2019
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
10000
Prev Previous commit
Next Next commit
plotly_relayouting for polar plots
  • Loading branch information
@antoinerg
antoinerg committed May 22, 2019
commit 68529816f037e623faed786da9a1aa8cd959d11f
27 changes: 22 additions & 5 deletions src/plots/polar/polar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -836,6 +836,10 @@ proto.updateMainDrag = function(fullLayout) {
corners.attr('d', cpath);
dragBox.transitionZoombox(zb, corners, dimmed, lum);
dimmed = true;

var updateObj = {};
computeZoomUpdates(updateObj);
gd.emit('plotly_relayouting', updateObj);
}

function zoomMove(dx, dy) {
Expand Down Expand Up @@ -889,16 +893,22 @@ proto.updateMainDrag = function(fullLayout) {
dragBox.removeZoombox(gd);

if(r0 === null || r1 === null) return;
var updateObj = {};
computeZoomUpdates(updateObj);

dragBox.showDoubleClickNotifier(gd);

Registry.call('_guiRelayout', gd, updateObj);
}

function computeZoomUpdates(update) {
var rl = radialAxis._rl;
var m = (rl[1] - rl[0]) / (1 - innerRadius / radius) / radius;
var newRng = [
rl[0] + (r0 - innerRadius) * m,
rl[0] + (r1 - innerRadius) * m
];
Registry.call('_guiRelayout', gd, _this.id + '.radialaxis.range', newRng);
update[_this.id + '.radialaxis.range'] = newRng;
}

function zoomClick(numClicks, evt) {
Expand Down Expand Up @@ -1236,18 +1246,25 @@ proto.updateAngularDrag = function(fullLayout) {
clearGlCanvases(gd);
redrawReglTraces(gd);
}
}

function doneFn() {
scatterTextPoints.select('text').attr('transform', null);
var update = {};
computeRotationUpdates(update);
gd.emit('plotly_relayouting', update);
}

var updateObj = {};
function computeRotationUpdates(updateObj) {
updateObj[_this.id + '.angularaxis.rotation'] = rot1;

if(_this.vangles) {
updateObj[_this.id + '.radialaxis.angle'] = rrot1;
}
}

function doneFn() {
scatterTextPoints.select('text').attr('transform', null);

var updateObj = {};
computeRotationUpdates(updateObj);
Registry.call('_guiRelayout', gd, updateObj);
}

Expand Down
64 changes: 64 additions & 0 deletions test/jasmine/tests/polar_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1247,6 +1247,70 @@ describe('Test polar interactions:', function() {
});
});
});

describe('plotly_relayouting', function() {
afterEach(destroyGraphDiv);

['zoom'].forEach(function(dragmode) {
function _drag(p0, dp, nsteps) {
var node = d3.select('.polar > .draglayer > .maindrag').node();
return drag(node, dp[0], dp[1], null, p0[0], p0[1], nsteps);
}

it('should emit plotly_relayouting events on ' + dragmode, function(done) {
var events = []; var path = [[150, 250], [175, 250]]; var relayoutCallback;
var fig = Lib.extendDeep({}, require('@mocks/polar_scatter.json'));
fig.layout.dragmode = dragmode;

var gd = createGraphDiv();
Plotly.plot(gd, fig)
.then(function() {
relayoutCallback = jasmine.createSpy('relayoutCallback');
gd.on('plotly_relayout', relayoutCallback);
gd.on('plotly_relayouting', function(e) {
events.push(e);
});
return _drag(path[0], path[1]);
})
.then(function() {
expect(events.length).toEqual(path.length - 1);
expect(events[0]['polar.radialaxis.range']).toBeCloseToArray([6, 11], 0.1);
expect(relayoutCallback).toHaveBeenCalledTimes(1);
})
.catch(failTest)
.then(done);
});
});
it('should emit plotly_relayouting events on angular drag', function(done) {
var events = []; var relayoutCallback;
var fig = Lib.extendDeep({}, require('@mocks/polar_scatter.json'));

function _drag(p0, dp, nsteps) {
var node = d3.select('.polar > .draglayer > .angulardrag').node();
return drag(node, dp[0], dp[1], null, p0[0], p0[1], nsteps);
}

var dragPos0 = [360, 180];

var gd = createGraphDiv();
Plotly.plot(gd, fig)
.then(function() {
relayoutCallback = jasmine.createSpy('relayoutCallback');
gd.on('plotly_relayout', relayoutCallback);
gd.on('plotly_relayouting', function(e) {
events.push(e);
});
return _drag(dragPos0, [0, -110], 10);
})
.then(function() {
expect(events.length).toEqual(10);
expect(events.splice(-1, 1)[0]['polar.angularaxis.rotation']).toBeCloseTo(29, 0);
expect(relayoutCallback).toHaveBeenCalledTimes(1);
})
.catch(failTest)
.then(done);
});
});
});

describe('Test polar *gridshape linear* interactions', function() {
Expand Down
0