Skip to content

Scatterpolargl fixes #3098

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 8 commits into from
Oct 24, 2018
Merged

Scatterpolargl fixes #3098

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
4b6cf3d
make sure old scenes on polar subplot are destroyed
etpinard Oct 11, 2018
e66b508
bring scatterpolargl axis expansion on-par with scatterpolar
etpinard Oct 11, 2018
f79c64c
no need to set 'stash.count'
etpinard Oct 12, 2018
8c94a08
use correct variable names
etpinard Oct 12, 2018
25fb7dc
compute scatterpolargl style opts during calc
etpinard Oct 12, 2018
cab319d
add another svg <-> gl test
etpinard Oct 12, 2018
4382fc7
Merge branch 'master' into scatterpolargl-2-scatterpolar
etpinard Oct 23, 2018
7c0526a
aj-proof '++' expressions
etpinard Oct 24, 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
15 changes: 7 additions & 8 deletions src/traces/scatterpolargl/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ var subTypes = require('../scatter/subtypes');

var TOO_MANY_POINTS = require('../scattergl/constants').TOO_MANY_POINTS;

function calc(container, trace) {
var layout = container._fullLayout;
function calc(gd, trace) {
var fullLayout = gd._fullLayout;
Copy link
Collaborator

@alexcjohnson alexcjohnson Oct 24, 2018

Choose a reason for hiding this comment

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

ha yeah, that's certainly clearer! 🍰

var subplotId = trace.subplot;
var radialAxis = layout[subplotId].radialaxis;
var angularAxis = layout[subplotId].angularaxis;
var radialAxis = fullLayout[subplotId].radialaxis;
var angularAxis = fullLayout[subplotId].angularaxis;
var rArray = radialAxis.makeCalcdata(trace, 'r');
var thetaArray = angularAxis.makeCalcdata(trace, 'theta');
var len = trace._length;
Expand All @@ -46,13 +46,12 @@ function calc(container, trace) {
return [{x: false, y: false, t: stash, trace: trace}];
}

function plot(container, subplot, cdata) {
function plot(gd, subplot, cdata) {
if(!cdata.length) return;

var radialAxis = subplot.radialAxis;
var angularAxis = subplot.angularAxis;

var scene = ScatterGl.sceneUpdate(container, subplot);
var scene = ScatterGl.sceneUpdate(gd, subplot);

cdata.forEach(function(cdscatter, traceIndex) {
if(!cdscatter || !cdscatter[0] || !cdscatter[0].trace) return;
Expand Down Expand Up @@ -141,7 +140,7 @@ function plot(container, subplot, cdata) {
stash.positions = positions;
});

return ScatterGl.plot(container, subplot, cdata);
return ScatterGl.plot(gd, subplot, cdata);
}

function hoverPoints(pointData, xval, yval, hovermode) {
Expand Down