Skip to content
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

Improvement in how gl2d refs to fullLayout are updated #1319

Merged
merged 3 commits into from
Jan 19, 2017
+50 −53
Merged

Improvement in how gl2d refs to fullLayout are updated #1319

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ee6d7d8
rm useless Fx.supplyDefaults call in doModeBar subroutine
etpinard Jan 17, 2017
ce1cc44
replace scene2d.updateFx with scene2d.updateRefs
etpinard Jan 17, 2017
c8b53dd
attach scene2d relayoutCallback onto proto
etpinard Jan 18, 2017
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
8 changes: 2 additions & 6 deletions src/plot_api/subroutines.js
View file
Original file line number Diff line number Diff line change
@@ -295,7 +295,6 @@ exports.doModeBar = function(gd) {
var subplotIds, i;

ModeBar.manage(gd);
Plotly.Fx.supplyLayoutDefaults(gd.layout, gd._fullLayout, gd._fullData);
Plotly.Fx.init(gd);

subplotIds = Plots.getSubplotIds(fullLayout, 'gl3d');
@@ -304,11 +303,8 @@ exports.doModeBar = function(gd) {
scene.updateFx(fullLayout.dragmode, fullLayout.hovermode);
}

subplotIds = Plots.getSubplotIds(fullLayout, 'gl2d');
for(i = 0; i < subplotIds.length; i++) {
var scene2d = fullLayout._plots[subplotIds[i]]._scene2d;
scene2d.updateFx(fullLayout);
}
// no need to do this for gl2d subplots,
// Plots.linkSubplots takes care of it all.

subplotIds = Plots.getSubplotIds(fullLayout, 'geo');
for(i = 0; i < subplotIds.length; i++) {
7 changes: 7 additions & 0 deletions src/plots/gl2d/camera.js
View file
Original file line number Diff line number Diff line change
@@ -91,6 +91,7 @@ function createCamera(scene) {
updateRange(1, result.boxStart[1], result.boxEnd[1]);
unSetAutoRange();
result.boxEnabled = false;
scene.relayoutCallback();
}
break;

@@ -110,11 +111,16 @@ function createCamera(scene) {

scene.setRanges(dataBox);

result.panning = true;
result.lastInputTime = Date.now();
unSetAutoRange();
scene.cameraChanged();
scene.handleAnnotations();
}
else if(result.panning) {
result.panning = false;
scene.relayoutCallback();
}
break;
}

@@ -154,6 +160,7 @@ function createCamera(scene) {
unSetAutoRange();
scene.cameraChanged();
scene.handleAnnotations();
scene.relayoutCallback();
break;
}

56 changes: 24 additions & 32 deletions src/plots/gl2d/scene2d.js
View file
Original file line number Diff line number Diff line change
@@ -34,9 +34,8 @@ function Scene2D(options, fullLayout) {
this.id = options.id;
this.staticPlot = !!options.staticPlot;

this.fullLayout = fullLayout;
this.fullData = null;
this.updateAxes(fullLayout);
this.updateRefs(fullLayout);

this.makeFramework();

@@ -278,45 +277,41 @@ function compareTicks(a, b) {
return false;
}

proto.updateAxes = function(options) {
proto.updateRefs = function(newFullLayout) {
this.fullLayout = newFullLayout;

var spmatch = Axes.subplotMatch,
xaxisName = 'xaxis' + this.id.match(spmatch)[1],
yaxisName = 'yaxis' + this.id.match(spmatch)[2];

this.xaxis = options[xaxisName];
this.yaxis = options[yaxisName];
};

proto.updateFx = function(options) {
var fullLayout = this.fullLayout;

fullLayout.dragmode = options.dragmode;
fullLayout.hovermode = options.hovermode;

this.graphDiv._fullLayout = fullLayout;
this.xaxis = this.fullLayout[xaxisName];
this.yaxis = this.fullLayout[yaxisName];
};

function relayoutCallback(scene) {
var xrange = scene.xaxis.range,
yrange = scene.yaxis.range;
proto.relayoutCallback = function() {
var graphDiv = this.graphDiv,
xaxis = this.xaxis,
yaxis = this.yaxis,
layout = graphDiv.layout;

// Update the layout on the DIV
scene.graphDiv.layout.xaxis.autorange = scene.xaxis.autorange;
scene.graphDiv.layout.xaxis.range = xrange.slice(0);
scene.graphDiv.layout.yaxis.autorange = scene.yaxis.autorange;
scene.graphDiv.layout.yaxis.range = yrange.slice(0);
// update user layout
layout.xaxis.autorange = xaxis.autorange;
layout.xaxis.range = xaxis.range.slice(0);
layout.yaxis.autorange = yaxis.autorange;
layout.yaxis.range = yaxis.range.slice(0);

// Make a meaningful value to be passed on to the possible 'plotly_relayout' subscriber(s)
// make a meaningful value to be passed on to the possible 'plotly_relayout' subscriber(s)
// scene.camera has no many useful projection or scale information
// helps determine which one is the latest input (if async)
var update = {
lastInputTime: scene.camera.lastInputTime
lastInputTime: this.camera.lastInputTime
};
update[scene.xaxis._name] = xrange.slice();
update[scene.yaxis._name] = yrange.slice();

scene.graphDiv.emit('plotly_relayout', update);
}
update[xaxis._name] = xaxis.range.slice(0);
update[yaxis._name] = yaxis.range.slice(0);

graphDiv.emit('plotly_relayout', update);
};

proto.cameraChanged = function() {
var camera = this.camera;
@@ -331,8 +326,6 @@ proto.cameraChanged = function() {
this.glplotOptions.dataBox = camera.dataBox;
this.glplot.update(this.glplotOptions);
this.handleAnnotations();

relayoutCallback(this);
}
};

@@ -374,8 +367,7 @@ proto.destroy = function() {
proto.plot = function(fullData, calcData, fullLayout) {
var glplot = this.glplot;

this.fullLayout = fullLayout;
this.updateAxes(fullLayout);
this.updateRefs(fullLayout);
this.updateTraces(fullData, calcData);

var width = fullLayout.width,
4 changes: 4 additions & 0 deletions src/plots/plots.js
View file
Original file line number Diff line number Diff line change
@@ -630,6 +630,10 @@ plots.linkSubplots = function(newFullData, newFullLayout, oldFullData, oldFullLa

if(oldSubplot) {
plotinfo = newSubplots[id] = oldSubplot;

if(plotinfo._scene2d) {
plotinfo._scene2d.updateRefs(newFullLayout);
}
}
else {
plotinfo = newSubplots[id] = {};
28 changes: 13 additions & 15 deletions test/jasmine/tests/gl_plot_interact_test.js
View file
Original file line number Diff line number Diff line change
@@ -236,6 +236,13 @@ describe('Test gl plot interactions', function() {

it('should respond to drag interactions', function(done) {

function mouseTo(p0, p1) {
mouseEvent('mousemove', p0[0], p0[1]);
mouseEvent('mousedown', p0[0], p0[1], { buttons: 1 });
mouseEvent('mousemove', p1[0], p1[1], { buttons: 1 });
mouseEvent('mouseup', p1[0], p1[1]);
}

jasmine.addMatchers(customMatchers);

var precision = 5;
@@ -263,14 +270,10 @@ describe('Test gl plot interactions', function() {
expect(gd.layout.yaxis.range).toBeCloseToArray(originalY, precision);

setTimeout(function() {

mouseEvent('mousemove', 200, 200);

relayoutCallback.calls.reset();

// Drag scene along the X axis

mouseEvent('mousemove', 220, 200, {buttons: 1});
mouseTo([200, 200], [220, 200]);

expect(gd.layout.xaxis.autorange).toBe(false);
expect(gd.layout.yaxis.autorange).toBe(false);
@@ -279,36 +282,31 @@ describe('Test gl plot interactions', function() {
expect(gd.layout.yaxis.range).toBeCloseToArray(originalY, precision);

// Drag scene back along the X axis

mouseEvent('mousemove', 200, 200, {buttons: 1});
mouseTo([220, 200], [200, 200]);

expect(gd.layout.xaxis.range).toBeCloseToArray(originalX, precision);
expect(gd.layout.yaxis.range).toBeCloseToArray(originalY, precision);

// Drag scene along the Y axis

mouseEvent('mousemove', 200, 150, {buttons: 1});
mouseTo([200, 200], [200, 150]);

expect(gd.layout.xaxis.range).toBeCloseToArray(originalX, precision);
expect(gd.layout.yaxis.range).toBeCloseToArray(newY, precision);

// Drag scene back along the Y axis

mouseEvent('mousemove', 200, 200, {buttons: 1});
mouseTo([200, 150], [200, 200]);

expect(gd.layout.xaxis.range).toBeCloseToArray(originalX, precision);
expect(gd.layout.yaxis.range).toBeCloseToArray(originalY, precision);

// Drag scene along both the X and Y axis

mouseEvent('mousemove', 220, 150, {buttons: 1});
mouseTo([200, 200], [220, 150]);

expect(gd.layout.xaxis.range).toBeCloseToArray(newX, precision);
expect(gd.layout.yaxis.range).toBeCloseToArray(newY, precision);

// Drag scene back along the X and Y axis

mouseEvent('mousemove', 200, 200, {buttons: 1});
mouseTo([220, 150], [200, 200]);

expect(gd.layout.xaxis.range).toBeCloseToArray(originalX, precision);
expect(gd.layout.yaxis.range).toBeCloseToArray(originalY, precision);