Multiple scatter plot fixes#956

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
etpinard merged 6 commits into from
Sep 21, 2016
Merged

Multiple scatter plot fixes #956

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
eb7723c
scatter: make sure that restyle('mode', '') remove unwanted lines
etpinard Sep 20, 2016
fd656dd
scatter: make sure that restyle('mode', '') remove unwanted pt & text
etpinard Sep 20, 2016
f8ac787
drawing: fixup in translatePoint
etpinard Sep 20, 2016
ce762e8
scatter: call translatePoint on the merged selection
etpinard Sep 20, 2016
10ffd1e
test: add cases for restyle( 'mode', '*')
etpinard Sep 20, 2016
d810765
test: add cases for point translation on range relayout
etpinard Sep 20, 2016
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
4 changes: 2 additions & 2 deletions src/components/drawing/index.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -53,8 +53,8 @@ drawing.translatePoint = function(d, sel, xa, ya) {

if(isNumeric(x) && isNumeric(y)) {
// for multiline text this works better
if(this.nodeName === 'text') {
sel.node().attr('x', x).attr('y', y);
if(sel.node().nodeName === 'text') {
sel.attr('x', x).attr('y', y);
} else {
sel.attr('transform', 'translate(' + x + ',' + y + ')');
}
Expand Down
216 changes: 118 additions & 98 deletions src/traces/scatter/plot.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,7 +33,7 @@ module.exports = function plot(gd, plotinfo, cdscatter, transitionOpts, makeOnCo

selection = scatterlayer.selectAll('g.trace');

join = selection.data(cdscatter, function(d) {return d[0].trace.uid;});
join = selection.data(cdscatter, function(d) {return d[0].trace.uid;});

// Append new traces:
join.enter().append('g')
Expand DownExpand Up@@ -197,11 +197,19 @@ function plotOne(gd, idx, plotinfo, cdscatter, cdscatterAll, element, transition
// revpath is fullpath reversed, for fill-to-next
revpath = '',
// functions for converting a point array to a path
pathfn, revpathbase, revpathfn;
pathfn, revpathbase, revpathfn,
// variables used before and after the data join
pt0, lastSegment, pt1, thisPolygons;

// initialize line join data / method
var segments = [],
lineSegments = [],
makeUpdate = Lib.noop;

ownFillEl3 = trace._ownFill;

if(subTypes.hasLines(trace) || trace.fill !== 'none') {

if(tonext) {
// This tells .style which trace to use for fill information:
tonext.datum(cdscatter);
Expand DownExpand Up@@ -237,7 +245,7 @@ function plotOne(gd, idx, plotinfo, cdscatter, cdscatterAll, element, transition
return revpathbase(pts.reverse());
};

var segments = linePoints(cdscatter, {
segments = linePoints(cdscatter, {
xaxis: xa,
yaxis: ya,
connectGaps: trace.connectgaps,
Expand All@@ -250,24 +258,22 @@ function plotOne(gd, idx, plotinfo, cdscatter, cdscatterAll, element, transition
// polygons for hover on fill
// TODO: can we skip this if hoveron!=fills? That would mean we
// need to redraw when you change hoveron...
var thisPolygons = trace._polygons = new Array(segments.length);
thisPolygons = trace._polygons = new Array(segments.length);
for(i = 0; i < segments.length; i++) {
trace._polygons[i] = polygonTester(segments[i]);
}

var pt0, lastSegment, pt1;

if(segments.length) {
pt0 = segments[0][0];
lastSegment = segments[segments.length - 1];
pt1 = lastSegment[lastSegment.length - 1];
}

var lineSegments = segments.filter(function(s) {
lineSegments = segments.filter(function(s) {
return s.length > 1;
});

var makeUpdate = function(isEnter) {
makeUpdate = function(isEnter) {
return function(pts) {
thispath = pathfn(pts);
thisrevpath = revpathfn(pts);
Expand DownExpand Up@@ -303,66 +309,66 @@ function plotOne(gd, idx, plotinfo, cdscatter, cdscatterAll, element, transition
}
};
};
}

var lineJoin = tr.selectAll('.js-line').data(lineSegments);
var lineJoin = tr.selectAll('.js-line').data(lineSegments);

transition(lineJoin.exit())
.style('opacity', 0)
.remove();
transition(lineJoin.exit())
.style('opacity', 0)
.remove();

lineJoin.each(makeUpdate(false));
lineJoin.each(makeUpdate(false));

lineJoin.enter().append('path')
.classed('js-line', true)
.style('vector-effect', 'non-scaling-stroke')
.call(Drawing.lineGroupStyle)
.each(makeUpdate(true));
lineJoin.enter().append('path')
.classed('js-line', true)
.style('vector-effect', 'non-scaling-stroke')
.call(Drawing.lineGroupStyle)
.each(makeUpdate(true));

if(segments.length) {
if(ownFillEl3) {
if(pt0 && pt1) {
if(ownFillDir) {
if(ownFillDir === 'y') {
pt0[1] = pt1[1] = ya.c2p(0, true);
}
else if(ownFillDir === 'x') {
pt0[0] = pt1[0] = xa.c2p(0, true);
}

// fill to zero: full trace path, plus extension of
// the endpoints to the appropriate axis
// For the sake of animations, wrap the points around so that
// the points on the axes are the first two points. Otherwise
// animations get a little crazy if the number of points changes.
transition(ownFillEl3).attr('d', 'M' + pt1 + 'L' + pt0 + 'L' + fullpath.substr(1));
} else {
// fill to self: just join the path to itself
transition(ownFillEl3).attr('d', fullpath + 'Z');
if(segments.length) {
if(ownFillEl3) {
if(pt0 && pt1) {
if(ownFillDir) {
if(ownFillDir === 'y') {
pt0[1] = pt1[1] = ya.c2p(0, true);
}
else if(ownFillDir === 'x') {
pt0[0] = pt1[0] = xa.c2p(0, true);
}

// fill to zero: full trace path, plus extension of
// the endpoints to the appropriate axis
// For the sake of animations, wrap the points around so that
// the points on the axes are the first two points. Otherwise
// animations get a little crazy if the number of points changes.
transition(ownFillEl3).attr('d', 'M' + pt1 + 'L' + pt0 + 'L' + fullpath.substr(1));
} else {
// fill to self: just join the path to itself
transition(ownFillEl3).attr('d', fullpath + 'Z');
}
}
else if(trace.fill.substr(0, 6) === 'tonext' && fullpath && prevRevpath) {
// fill to next: full trace path, plus the previous path reversed
if(trace.fill === 'tonext') {
// tonext: for use by concentric shapes, like manually constructed
// contours, we just add the two paths closed on themselves.
// This makes strange results if one path is *not* entirely
// inside the other, but then that is a strange usage.
transition(tonext).attr('d', fullpath + 'Z' + prevRevpath + 'Z');
}
else {
// tonextx/y: for now just connect endpoints with lines. This is
// the correct behavior if the endpoints are at the same value of
// y/x, but if they *aren't*, we should ideally do more complicated
// things depending on whether the new endpoint projects onto the
// existing curve or off the end of it
transition(tonext).attr('d', fullpath + 'L' + prevRevpath.substr(1) + 'Z');
}
trace._polygons = trace._polygons.concat(prevPolygons);
}
else if(trace.fill.substr(0, 6) === 'tonext' && fullpath && prevRevpath) {
// fill to next: full trace path, plus the previous path reversed
if(trace.fill === 'tonext') {
// tonext: for use by concentric shapes, like manually constructed
// contours, we just add the two paths closed on themselves.
// This makes strange results if one path is *not* entirely
// inside the other, but then that is a strange usage.
transition(tonext).attr('d', fullpath + 'Z' + prevRevpath + 'Z');
}
else {
// tonextx/y: for now just connect endpoints with lines. This is
// the correct behavior if the endpoints are at the same value of
// y/x, but if they *aren't*, we should ideally do more complicated
// things depending on whether the new endpoint projects onto the
// existing curve or off the end of it
transition(tonext).attr('d', fullpath + 'L' + prevRevpath.substr(1) + 'Z');
}
trace._prevRevpath = revpath;
trace._prevPolygons = thisPolygons;
trace._polygons = trace._polygons.concat(prevPolygons);
}
trace._prevRevpath = revpath;
trace._prevPolygons = thisPolygons;
}


Expand All@@ -381,64 +387,78 @@ function plotOne(gd, idx, plotinfo, cdscatter, cdscatterAll, element, transition
}
}

function hideFilter() {
return false;
}

function makePoints(d) {
var join, selection;

var trace = d[0].trace,
s = d3.select(this),
showMarkers = subTypes.hasMarkers(trace),
showText = subTypes.hasText(trace);

if((!showMarkers && !showText) || trace.visible !== true) s.remove();
else {
if(showMarkers) {
selection = s.selectAll('path.point');
var keyFunc = getKeyFunc(trace),
markerFilter = hideFilter,
textFilter = hideFilter;

join = selection
.data(trace.marker.maxdisplayed ? visFilter : Lib.identity, getKeyFunc(trace));
if(showMarkers) {
markerFilter = trace.marker.maxdisplayed ? visFilter : Lib.identity;
}

var enter = join.enter().append('path')
.classed('point', true);
if(showText) {
textFilter = trace.marker.maxdisplayed ? visFilter : Lib.identity;
}

enter.call(Drawing.pointStyle, trace)
.call(Drawing.translatePoints, xa, ya, trace);
// marker points

if(hasTransition) {
enter.style('opacity', 0).transition()
.style('opacity', 1);
}
selection = s.selectAll('path.point');

join.each(function(d) {
var sel = transition(d3.select(this));
Drawing.translatePoint(d, sel, xa, ya);
Drawing.singlePointStyle(d, sel, trace);
});
join = selection.data(markerFilter, keyFunc);

if(hasTransition) {
join.exit().transition()
.style('opacity', 0)
.remove();
} else {
join.exit().remove();
}
}
if(showText) {
selection = s.selectAll('g');
var enter = join.enter().append('path')
.classed('point', true);

join = selection
.data(trace.marker.maxdisplayed ? visFilter : Lib.identity);
enter.call(Drawing.pointStyle, trace)
.call(Drawing.translatePoints, xa, ya, trace);

// each text needs to go in its own 'g' in case
// it gets converted to mathjax
join.enter().append('g')
.append('text')
.call(Drawing.translatePoints, xa, ya);
if(hasTransition) {
enter.style('opacity', 0).transition()
.style('opacity', 1);
}

selection
.call(Drawing.translatePoints, xa, ya);
join.each(function(d) {
var sel = transition(d3.select(this));
Drawing.translatePoint(d, sel, xa, ya);
Drawing.singlePointStyle(d, sel, trace);
});

join.exit().remove();
}
if(hasTransition) {
join.exit().transition()
.style('opacity', 0)
.remove();
} else {
join.exit().remove();
}

// text points

selection = s.selectAll('g');

join = selection.data(textFilter, keyFunc);

// each text needs to go in its own 'g' in case
// it gets converted to mathjax
join.enter().append('g')
.append('text');

join.each(function(d) {
var sel = d3.select(this).select('text');
Drawing.translatePoint(d, sel, xa, ya);

@rreusserrreusserSep 21, 2016

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

A small thing but should or could we enable transitions here? I can imagine it being a matter of just following the fancy d3 transitions-work-like-everything-else pattern that the points follow. I left this out previously (though it had other update problems.)

@etpinardetpinardSep 21, 2016

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

That will be for a future minor version bump (ref #933 (comment))

});

join.exit().remove();
}

// NB: selectAll is evaluated on instantiation:
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Multiple scatter plot fixes#956

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

etpinard
merged 6 commits into

from

Sep 21, 2016
 Merged


Multiple scatter plot fixes
#956
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
eb7723c

scatter: make sure that restyle('mode', '') remove unwanted lines


etpinard Sep 20, 2016
fd656dd

scatter: make sure that restyle('mode', '') remove unwanted pt & text


etpinard Sep 20, 2016
f8ac787

drawing: fixup in translatePoint


etpinard Sep 20, 2016
ce762e8

scatter: call translatePoint on the merged selection


etpinard Sep 20, 2016
10ffd1e

test: add cases for restyle( 'mode', '*')


etpinard Sep 20, 2016
d810765

test: add cases for point translation on range relayout


etpinard Sep 20, 2016

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


4 changes: 2 additions & 2 deletions
src/components/drawing/index.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,8 +53,8 @@ drawing.translatePoint = function(d, sel, xa, ya) {

 if(isNumeric(x) && isNumeric(y)) {
 // for multiline text this works better
 if(this.nodeName === 'text') {
 sel.node().attr('x', x).attr('y', y);
 if(sel.node().nodeName === 'text') {
 sel.attr('x', x).attr('y', y);
 } else {
 sel.attr('transform', 'translate(' + x + ',' + y + ')');
 }
Expand Down

216 changes: 118 additions & 98 deletions
src/traces/scatter/plot.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,7 +33,7 @@ module.exports = function plot(gd, plotinfo, cdscatter, transitionOpts, makeOnCo

 selection = scatterlayer.selectAll('g.trace');

 join = selection.data(cdscatter, function(d) {return d[0].trace.uid;});
 join = selection.data(cdscatter, function(d) {return d[0].trace.uid;});

 // Append new traces:
 join.enter().append('g')
Expand DownExpand Up@@ -197,11 +197,19 @@ function plotOne(gd, idx, plotinfo, cdscatter, cdscatterAll, element, transition
 // revpath is fullpath reversed, for fill-to-next
 revpath = '',
 // functions for converting a point array to a path
 pathfn, revpathbase, revpathfn;
 pathfn, revpathbase, revpathfn,
 // variables used before and after the data join
 pt0, lastSegment, pt1, thisPolygons;

 // initialize line join data / method
 var segments = [],
 lineSegments = [],
 makeUpdate = Lib.noop;

 ownFillEl3 = trace._ownFill;

 if(subTypes.hasLines(trace) || trace.fill !== 'none') {

 if(tonext) {
 // This tells .style which trace to use for fill information:
 tonext.datum(cdscatter);
Expand DownExpand Up@@ -237,7 +245,7 @@ function plotOne(gd, idx, plotinfo, cdscatter, cdscatterAll, element, transition
 return revpathbase(pts.reverse());
 };

var segments = linePoints(cdscatter, {
 segments = linePoints(cdscatter, {
 xaxis: xa,
 yaxis: ya,
 connectGaps: trace.connectgaps,
Expand All@@ -250,24 +258,22 @@ function plotOne(gd, idx, plotinfo, cdscatter, cdscatterAll, element, transition
 // polygons for hover on fill
 // TODO: can we skip this if hoveron!=fills? That would mean we
 // need to redraw when you change hoveron...
var thisPolygons = trace._polygons = new Array(segments.length);
 thisPolygons = trace._polygons = new Array(segments.length);
 for(i = 0; i < segments.length; i++) {
 trace._polygons[i] = polygonTester(segments[i]);
 }

 var pt0, lastSegment, pt1;

 if(segments.length) {
 pt0 = segments[0][0];
 lastSegment = segments[segments.length - 1];
 pt1 = lastSegment[lastSegment.length - 1];
 }

var lineSegments = segments.filter(function(s) {
 lineSegments = segments.filter(function(s) {
 return s.length > 1;
 });

var makeUpdate = function(isEnter) {
 makeUpdate = function(isEnter) {
 return function(pts) {
 thispath = pathfn(pts);
 thisrevpath = revpathfn(pts);
Expand DownExpand Up@@ -303,66 +309,66 @@ function plotOne(gd, idx, plotinfo, cdscatter, cdscatterAll, element, transition
 }
 };
 };
 }

var lineJoin = tr.selectAll('.js-line').data(lineSegments);
 var lineJoin = tr.selectAll('.js-line').data(lineSegments);

transition(lineJoin.exit())
.style('opacity', 0)
.remove();
 transition(lineJoin.exit())
 .style('opacity', 0)
 .remove();

lineJoin.each(makeUpdate(false));
 lineJoin.each(makeUpdate(false));

lineJoin.enter().append('path')
.classed('js-line', true)
.style('vector-effect', 'non-scaling-stroke')
.call(Drawing.lineGroupStyle)
.each(makeUpdate(true));
 lineJoin.enter().append('path')
 .classed('js-line', true)
 .style('vector-effect', 'non-scaling-stroke')
 .call(Drawing.lineGroupStyle)
 .each(makeUpdate(true));

 if(segments.length) {
 if(ownFillEl3) {
 if(pt0 && pt1) {
 if(ownFillDir) {
 if(ownFillDir === 'y') {
 pt0[1] = pt1[1] = ya.c2p(0, true);
 }
 else if(ownFillDir === 'x') {
 pt0[0] = pt1[0] = xa.c2p(0, true);
 }

 // fill to zero: full trace path, plus extension of
 // the endpoints to the appropriate axis
 // For the sake of animations, wrap the points around so that
 // the points on the axes are the first two points. Otherwise
 // animations get a little crazy if the number of points changes.
 transition(ownFillEl3).attr('d', 'M' + pt1 + 'L' + pt0 + 'L' + fullpath.substr(1));
 } else {
 // fill to self: just join the path to itself
 transition(ownFillEl3).attr('d', fullpath + 'Z');
 if(segments.length) {
 if(ownFillEl3) {
 if(pt0 && pt1) {
 if(ownFillDir) {
 if(ownFillDir === 'y') {
 pt0[1] = pt1[1] = ya.c2p(0, true);
 }
 else if(ownFillDir === 'x') {
 pt0[0] = pt1[0] = xa.c2p(0, true);
 }

 // fill to zero: full trace path, plus extension of
 // the endpoints to the appropriate axis
 // For the sake of animations, wrap the points around so that
 // the points on the axes are the first two points. Otherwise
 // animations get a little crazy if the number of points changes.
 transition(ownFillEl3).attr('d', 'M' + pt1 + 'L' + pt0 + 'L' + fullpath.substr(1));
 } else {
 // fill to self: just join the path to itself
 transition(ownFillEl3).attr('d', fullpath + 'Z');
 }
 }
 else if(trace.fill.substr(0, 6) === 'tonext' && fullpath && prevRevpath) {
 // fill to next: full trace path, plus the previous path reversed
 if(trace.fill === 'tonext') {
 // tonext: for use by concentric shapes, like manually constructed
 // contours, we just add the two paths closed on themselves.
 // This makes strange results if one path is *not* entirely
 // inside the other, but then that is a strange usage.
 transition(tonext).attr('d', fullpath + 'Z' + prevRevpath + 'Z');
 }
 else {
 // tonextx/y: for now just connect endpoints with lines. This is
 // the correct behavior if the endpoints are at the same value of
 // y/x, but if they *aren't*, we should ideally do more complicated
 // things depending on whether the new endpoint projects onto the
 // existing curve or off the end of it
 transition(tonext).attr('d', fullpath + 'L' + prevRevpath.substr(1) + 'Z');
 }
 trace._polygons = trace._polygons.concat(prevPolygons);
 }
 else if(trace.fill.substr(0, 6) === 'tonext' && fullpath && prevRevpath) {
 // fill to next: full trace path, plus the previous path reversed
 if(trace.fill === 'tonext') {
 // tonext: for use by concentric shapes, like manually constructed
 // contours, we just add the two paths closed on themselves.
 // This makes strange results if one path is *not* entirely
 // inside the other, but then that is a strange usage.
 transition(tonext).attr('d', fullpath + 'Z' + prevRevpath + 'Z');
 }
 else {
 // tonextx/y: for now just connect endpoints with lines. This is
 // the correct behavior if the endpoints are at the same value of
 // y/x, but if they *aren't*, we should ideally do more complicated
 // things depending on whether the new endpoint projects onto the
 // existing curve or off the end of it
 transition(tonext).attr('d', fullpath + 'L' + prevRevpath.substr(1) + 'Z');
 }
 trace._prevRevpath = revpath;
 trace._prevPolygons = thisPolygons;
 trace._polygons = trace._polygons.concat(prevPolygons);
 }
 trace._prevRevpath = revpath;
 trace._prevPolygons = thisPolygons;
 }


Expand All@@ -381,64 +387,78 @@ function plotOne(gd, idx, plotinfo, cdscatter, cdscatterAll, element, transition
 }
 }

 function hideFilter() {
 return false;
 }

 function makePoints(d) {
 var join, selection;

 var trace = d[0].trace,
 s = d3.select(this),
 showMarkers = subTypes.hasMarkers(trace),
 showText = subTypes.hasText(trace);

 if((!showMarkers && !showText) || trace.visible !== true) s.remove();
 else {
 if(showMarkers) {
 selection = s.selectAll('path.point');
 var keyFunc = getKeyFunc(trace),
 markerFilter = hideFilter,
 textFilter = hideFilter;

 join = selection
 .data(trace.marker.maxdisplayed ? visFilter : Lib.identity, getKeyFunc(trace));
 if(showMarkers) {
 markerFilter = trace.marker.maxdisplayed ? visFilter : Lib.identity;
 }

 var enter = join.enter().append('path')
 .classed('point', true);
 if(showText) {
 textFilter = trace.marker.maxdisplayed ? visFilter : Lib.identity;
 }

 enter.call(Drawing.pointStyle, trace)
 .call(Drawing.translatePoints, xa, ya, trace);
 // marker points

 if(hasTransition) {
 enter.style('opacity', 0).transition()
 .style('opacity', 1);
 }
 selection = s.selectAll('path.point');

 join.each(function(d) {
 var sel = transition(d3.select(this));
 Drawing.translatePoint(d, sel, xa, ya);
 Drawing.singlePointStyle(d, sel, trace);
 });
 join = selection.data(markerFilter, keyFunc);

 if(hasTransition) {
 join.exit().transition()
 .style('opacity', 0)
 .remove();
 } else {
 join.exit().remove();
 }
 }
 if(showText) {
 selection = s.selectAll('g');
 var enter = join.enter().append('path')
 .classed('point', true);

 join = selection
 .data(trace.marker.maxdisplayed ? visFilter : Lib.identity);
enter.call(Drawing.pointStyle, trace)
.call(Drawing.translatePoints, xa, ya, trace);

 // each text needs to go in its own 'g' in case
 // it gets converted to mathjax
 join.enter().append('g')
 .append('text')
 .call(Drawing.translatePoints, xa, ya);
 if(hasTransition) {
 enter.style('opacity', 0).transition()
 .style('opacity', 1);
 }

 selection
 .call(Drawing.translatePoints, xa, ya);
 join.each(function(d) {
 var sel = transition(d3.select(this));
 Drawing.translatePoint(d, sel, xa, ya);
 Drawing.singlePointStyle(d, sel, trace);
 });

 join.exit().remove();
 }
 if(hasTransition) {
 join.exit().transition()
 .style('opacity', 0)
 .remove();
 } else {
 join.exit().remove();
 }

 // text points

 selection = s.selectAll('g');

 join = selection.data(textFilter, keyFunc);

 // each text needs to go in its own 'g' in case
 // it gets converted to mathjax
 join.enter().append('g')
 .append('text');

 join.each(function(d) {
 var sel = d3.select(this).select('text');
 Drawing.translatePoint(d, sel, xa, ya);
@rreusserrreusserSep 21, 2016

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

A small thing but should or could we enable transitions here? I can imagine it being a matter of just following the fancy d3 transitions-work-like-everything-else pattern that the points follow. I left this out previously (though it had other update problems.)
@etpinardetpinardSep 21, 2016

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

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

That will be for a future minor version bump (ref #933 (comment))
 });

 join.exit().remove();
 }

 // NB: selectAll is evaluated on instantiation:
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Multiple scatter plot fixes#956

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

etpinard
merged 6 commits into

from

Sep 21, 2016
 Merged


Multiple scatter plot fixes
#956
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
eb7723c

scatter: make sure that restyle('mode', '') remove unwanted lines


etpinard Sep 20, 2016
fd656dd

scatter: make sure that restyle('mode', '') remove unwanted pt & text


etpinard Sep 20, 2016
f8ac787

drawing: fixup in translatePoint


etpinard Sep 20, 2016
ce762e8

scatter: call translatePoint on the merged selection


etpinard Sep 20, 2016
10ffd1e

test: add cases for restyle( 'mode', '*')


etpinard Sep 20, 2016
d810765

test: add cases for point translation on range relayout


etpinard Sep 20, 2016

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


4 changes: 2 additions & 2 deletions
src/components/drawing/index.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,8 +53,8 @@ drawing.translatePoint = function(d, sel, xa, ya) {

 if(isNumeric(x) && isNumeric(y)) {
 // for multiline text this works better
 if(this.nodeName === 'text') {
 sel.node().attr('x', x).attr('y', y);
 if(sel.node().nodeName === 'text') {
 sel.attr('x', x).attr('y', y);
 } else {
 sel.attr('transform', 'translate(' + x + ',' + y + ')');
 }
Expand Down

216 changes: 118 additions & 98 deletions
src/traces/scatter/plot.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,7 +33,7 @@ module.exports = function plot(gd, plotinfo, cdscatter, transitionOpts, makeOnCo

 selection = scatterlayer.selectAll('g.trace');

 join = selection.data(cdscatter, function(d) {return d[0].trace.uid;});
 join = selection.data(cdscatter, function(d) {return d[0].trace.uid;});

 // Append new traces:
 join.enter().append('g')
Expand DownExpand Up@@ -197,11 +197,19 @@ function plotOne(gd, idx, plotinfo, cdscatter, cdscatterAll, element, transition
 // revpath is fullpath reversed, for fill-to-next
 revpath = '',
 // functions for converting a point array to a path
 pathfn, revpathbase, revpathfn;
 pathfn, revpathbase, revpathfn,
 // variables used before and after the data join
 pt0, lastSegment, pt1, thisPolygons;

 // initialize line join data / method
 var segments = [],
 lineSegments = [],
 makeUpdate = Lib.noop;

 ownFillEl3 = trace._ownFill;

 if(subTypes.hasLines(trace) || trace.fill !== 'none') {

 if(tonext) {
 // This tells .style which trace to use for fill information:
 tonext.datum(cdscatter);
Expand DownExpand Up@@ -237,7 +245,7 @@ function plotOne(gd, idx, plotinfo, cdscatter, cdscatterAll, element, transition
 return revpathbase(pts.reverse());
 };

var segments = linePoints(cdscatter, {
 segments = linePoints(cdscatter, {
 xaxis: xa,
 yaxis: ya,
 connectGaps: trace.connectgaps,
Expand All@@ -250,24 +258,22 @@ function plotOne(gd, idx, plotinfo, cdscatter, cdscatterAll, element, transition
 // polygons for hover on fill
 // TODO: can we skip this if hoveron!=fills? That would mean we
 // need to redraw when you change hoveron...
var thisPolygons = trace._polygons = new Array(segments.length);
 thisPolygons = trace._polygons = new Array(segments.length);
 for(i = 0; i < segments.length; i++) {
 trace._polygons[i] = polygonTester(segments[i]);
 }

 var pt0, lastSegment, pt1;

 if(segments.length) {
 pt0 = segments[0][0];
 lastSegment = segments[segments.length - 1];
 pt1 = lastSegment[lastSegment.length - 1];
 }

var lineSegments = segments.filter(function(s) {
 lineSegments = segments.filter(function(s) {
 return s.length > 1;
 });

var makeUpdate = function(isEnter) {
 makeUpdate = function(isEnter) {
 return function(pts) {
 thispath = pathfn(pts);
 thisrevpath = revpathfn(pts);
Expand DownExpand Up@@ -303,66 +309,66 @@ function plotOne(gd, idx, plotinfo, cdscatter, cdscatterAll, element, transition
 }
 };
 };
 }

var lineJoin = tr.selectAll('.js-line').data(lineSegments);
 var lineJoin = tr.selectAll('.js-line').data(lineSegments);

transition(lineJoin.exit())
.style('opacity', 0)
.remove();
 transition(lineJoin.exit())
 .style('opacity', 0)
 .remove();

lineJoin.each(makeUpdate(false));
 lineJoin.each(makeUpdate(false));

lineJoin.enter().append('path')
.classed('js-line', true)
.style('vector-effect', 'non-scaling-stroke')
.call(Drawing.lineGroupStyle)
.each(makeUpdate(true));
 lineJoin.enter().append('path')
 .classed('js-line', true)
 .style('vector-effect', 'non-scaling-stroke')
 .call(Drawing.lineGroupStyle)
 .each(makeUpdate(true));

 if(segments.length) {
 if(ownFillEl3) {
 if(pt0 && pt1) {
 if(ownFillDir) {
 if(ownFillDir === 'y') {
 pt0[1] = pt1[1] = ya.c2p(0, true);
 }
 else if(ownFillDir === 'x') {
 pt0[0] = pt1[0] = xa.c2p(0, true);
 }

 // fill to zero: full trace path, plus extension of
 // the endpoints to the appropriate axis
 // For the sake of animations, wrap the points around so that
 // the points on the axes are the first two points. Otherwise
 // animations get a little crazy if the number of points changes.
 transition(ownFillEl3).attr('d', 'M' + pt1 + 'L' + pt0 + 'L' + fullpath.substr(1));
 } else {
 // fill to self: just join the path to itself
 transition(ownFillEl3).attr('d', fullpath + 'Z');
 if(segments.length) {
 if(ownFillEl3) {
 if(pt0 && pt1) {
 if(ownFillDir) {
 if(ownFillDir === 'y') {
 pt0[1] = pt1[1] = ya.c2p(0, true);
 }
 else if(ownFillDir === 'x') {
 pt0[0] = pt1[0] = xa.c2p(0, true);
 }

 // fill to zero: full trace path, plus extension of
 // the endpoints to the appropriate axis
 // For the sake of animations, wrap the points around so that
 // the points on the axes are the first two points. Otherwise
 // animations get a little crazy if the number of points changes.
 transition(ownFillEl3).attr('d', 'M' + pt1 + 'L' + pt0 + 'L' + fullpath.substr(1));
 } else {
 // fill to self: just join the path to itself
 transition(ownFillEl3).attr('d', fullpath + 'Z');
 }
 }
 else if(trace.fill.substr(0, 6) === 'tonext' && fullpath && prevRevpath) {
 // fill to next: full trace path, plus the previous path reversed
 if(trace.fill === 'tonext') {
 // tonext: for use by concentric shapes, like manually constructed
 // contours, we just add the two paths closed on themselves.
 // This makes strange results if one path is *not* entirely
 // inside the other, but then that is a strange usage.
 transition(tonext).attr('d', fullpath + 'Z' + prevRevpath + 'Z');
 }
 else {
 // tonextx/y: for now just connect endpoints with lines. This is
 // the correct behavior if the endpoints are at the same value of
 // y/x, but if they *aren't*, we should ideally do more complicated
 // things depending on whether the new endpoint projects onto the
 // existing curve or off the end of it
 transition(tonext).attr('d', fullpath + 'L' + prevRevpath.substr(1) + 'Z');
 }
 trace._polygons = trace._polygons.concat(prevPolygons);
 }
 else if(trace.fill.substr(0, 6) === 'tonext' && fullpath && prevRevpath) {
 // fill to next: full trace path, plus the previous path reversed
 if(trace.fill === 'tonext') {
 // tonext: for use by concentric shapes, like manually constructed
 // contours, we just add the two paths closed on themselves.
 // This makes strange results if one path is *not* entirely
 // inside the other, but then that is a strange usage.
 transition(tonext).attr('d', fullpath + 'Z' + prevRevpath + 'Z');
 }
 else {
 // tonextx/y: for now just connect endpoints with lines. This is
 // the correct behavior if the endpoints are at the same value of
 // y/x, but if they *aren't*, we should ideally do more complicated
 // things depending on whether the new endpoint projects onto the
 // existing curve or off the end of it
 transition(tonext).attr('d', fullpath + 'L' + prevRevpath.substr(1) + 'Z');
 }
 trace._prevRevpath = revpath;
 trace._prevPolygons = thisPolygons;
 trace._polygons = trace._polygons.concat(prevPolygons);
 }
 trace._prevRevpath = revpath;
 trace._prevPolygons = thisPolygons;
 }


Expand All@@ -381,64 +387,78 @@ function plotOne(gd, idx, plotinfo, cdscatter, cdscatterAll, element, transition
 }
 }

 function hideFilter() {
 return false;
 }

 function makePoints(d) {
 var join, selection;

 var trace = d[0].trace,
 s = d3.select(this),
 showMarkers = subTypes.hasMarkers(trace),
 showText = subTypes.hasText(trace);

 if((!showMarkers && !showText) || trace.visible !== true) s.remove();
 else {
 if(showMarkers) {
 selection = s.selectAll('path.point');
 var keyFunc = getKeyFunc(trace),
 markerFilter = hideFilter,
 textFilter = hideFilter;

 join = selection
 .data(trace.marker.maxdisplayed ? visFilter : Lib.identity, getKeyFunc(trace));
 if(showMarkers) {
 markerFilter = trace.marker.maxdisplayed ? visFilter : Lib.identity;
 }

 var enter = join.enter().append('path')
 .classed('point', true);
 if(showText) {
 textFilter = trace.marker.maxdisplayed ? visFilter : Lib.identity;
 }

 enter.call(Drawing.pointStyle, trace)
 .call(Drawing.translatePoints, xa, ya, trace);
 // marker points

 if(hasTransition) {
 enter.style('opacity', 0).transition()
 .style('opacity', 1);
 }
 selection = s.selectAll('path.point');

 join.each(function(d) {
 var sel = transition(d3.select(this));
 Drawing.translatePoint(d, sel, xa, ya);
 Drawing.singlePointStyle(d, sel, trace);
 });
 join = selection.data(markerFilter, keyFunc);

 if(hasTransition) {
 join.exit().transition()
 .style('opacity', 0)
 .remove();
 } else {
 join.exit().remove();
 }
 }
 if(showText) {
 selection = s.selectAll('g');
 var enter = join.enter().append('path')
 .classed('point', true);

 join = selection
 .data(trace.marker.maxdisplayed ? visFilter : Lib.identity);
enter.call(Drawing.pointStyle, trace)
.call(Drawing.translatePoints, xa, ya, trace);

 // each text needs to go in its own 'g' in case
 // it gets converted to mathjax
 join.enter().append('g')
 .append('text')
 .call(Drawing.translatePoints, xa, ya);
 if(hasTransition) {
 enter.style('opacity', 0).transition()
 .style('opacity', 1);
 }

 selection
 .call(Drawing.translatePoints, xa, ya);
 join.each(function(d) {
 var sel = transition(d3.select(this));
 Drawing.translatePoint(d, sel, xa, ya);
 Drawing.singlePointStyle(d, sel, trace);
 });

 join.exit().remove();
 }
 if(hasTransition) {
 join.exit().transition()
 .style('opacity', 0)
 .remove();
 } else {
 join.exit().remove();
 }

 // text points

 selection = s.selectAll('g');

 join = selection.data(textFilter, keyFunc);

 // each text needs to go in its own 'g' in case
 // it gets converted to mathjax
 join.enter().append('g')
 .append('text');

 join.each(function(d) {
 var sel = d3.select(this).select('text');
 Drawing.translatePoint(d, sel, xa, ya);
@rreusserrreusserSep 21, 2016

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

A small thing but should or could we enable transitions here? I can imagine it being a matter of just following the fancy d3 transitions-work-like-everything-else pattern that the points follow. I left this out previously (though it had other update problems.)
@etpinardetpinardSep 21, 2016

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

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

That will be for a future minor version bump (ref #933 (comment))
 });

 join.exit().remove();
 }

 // NB: selectAll is evaluated on instantiation:
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Multiple scatter plot fixes#956

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

etpinard
merged 6 commits into

from

Sep 21, 2016
 Merged


Multiple scatter plot fixes
#956
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
eb7723c

scatter: make sure that restyle('mode', '') remove unwanted lines


etpinard Sep 20, 2016
fd656dd

scatter: make sure that restyle('mode', '') remove unwanted pt & text


etpinard Sep 20, 2016
f8ac787

drawing: fixup in translatePoint


etpinard Sep 20, 2016
ce762e8

scatter: call translatePoint on the merged selection


etpinard Sep 20, 2016
10ffd1e

test: add cases for restyle( 'mode', '*')


etpinard Sep 20, 2016
d810765

test: add cases for point translation on range relayout


etpinard Sep 20, 2016

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


4 changes: 2 additions & 2 deletions
src/components/drawing/index.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,8 +53,8 @@ drawing.translatePoint = function(d, sel, xa, ya) {

 if(isNumeric(x) && isNumeric(y)) {
 // for multiline text this works better
 if(this.nodeName === 'text') {
 sel.node().attr('x', x).attr('y', y);
 if(sel.node().nodeName === 'text') {
 sel.attr('x', x).attr('y', y);
 } else {
 sel.attr('transform', 'translate(' + x + ',' + y + ')');
 }
Expand Down

216 changes: 118 additions & 98 deletions
src/traces/scatter/plot.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,7 +33,7 @@ module.exports = function plot(gd, plotinfo, cdscatter, transitionOpts, makeOnCo

 selection = scatterlayer.selectAll('g.trace');

 join = selection.data(cdscatter, function(d) {return d[0].trace.uid;});
 join = selection.data(cdscatter, function(d) {return d[0].trace.uid;});

 // Append new traces:
 join.enter().append('g')
Expand DownExpand Up@@ -197,11 +197,19 @@ function plotOne(gd, idx, plotinfo, cdscatter, cdscatterAll, element, transition
 // revpath is fullpath reversed, for fill-to-next
 revpath = '',
 // functions for converting a point array to a path
 pathfn, revpathbase, revpathfn;
 pathfn, revpathbase, revpathfn,
 // variables used before and after the data join
 pt0, lastSegment, pt1, thisPolygons;

 // initialize line join data / method
 var segments = [],
 lineSegments = [],
 makeUpdate = Lib.noop;

 ownFillEl3 = trace._ownFill;

 if(subTypes.hasLines(trace) || trace.fill !== 'none') {

 if(tonext) {
 // This tells .style which trace to use for fill information:
 tonext.datum(cdscatter);
Expand DownExpand Up@@ -237,7 +245,7 @@ function plotOne(gd, idx, plotinfo, cdscatter, cdscatterAll, element, transition
 return revpathbase(pts.reverse());
 };

var segments = linePoints(cdscatter, {
 segments = linePoints(cdscatter, {
 xaxis: xa,
 yaxis: ya,
 connectGaps: trace.connectgaps,
Expand All@@ -250,24 +258,22 @@ function plotOne(gd, idx, plotinfo, cdscatter, cdscatterAll, element, transition
 // polygons for hover on fill
 // TODO: can we skip this if hoveron!=fills? That would mean we
 // need to redraw when you change hoveron...
var thisPolygons = trace._polygons = new Array(segments.length);
 thisPolygons = trace._polygons = new Array(segments.length);
 for(i = 0; i < segments.length; i++) {
 trace._polygons[i] = polygonTester(segments[i]);
 }

 var pt0, lastSegment, pt1;

 if(segments.length) {
 pt0 = segments[0][0];
 lastSegment = segments[segments.length - 1];
 pt1 = lastSegment[lastSegment.length - 1];
 }

var lineSegments = segments.filter(function(s) {
 lineSegments = segments.filter(function(s) {
 return s.length > 1;
 });

var makeUpdate = function(isEnter) {
 makeUpdate = function(isEnter) {
 return function(pts) {
 thispath = pathfn(pts);
 thisrevpath = revpathfn(pts);
Expand DownExpand Up@@ -303,66 +309,66 @@ function plotOne(gd, idx, plotinfo, cdscatter, cdscatterAll, element, transition
 }
 };
 };
 }

var lineJoin = tr.selectAll('.js-line').data(lineSegments);
 var lineJoin = tr.selectAll('.js-line').data(lineSegments);

transition(lineJoin.exit())
.style('opacity', 0)
.remove();
 transition(lineJoin.exit())
 .style('opacity', 0)
 .remove();

lineJoin.each(makeUpdate(false));
 lineJoin.each(makeUpdate(false));

lineJoin.enter().append('path')
.classed('js-line', true)
.style('vector-effect', 'non-scaling-stroke')
.call(Drawing.lineGroupStyle)
.each(makeUpdate(true));
 lineJoin.enter().append('path')
 .classed('js-line', true)
 .style('vector-effect', 'non-scaling-stroke')
 .call(Drawing.lineGroupStyle)
 .each(makeUpdate(true));

 if(segments.length) {
 if(ownFillEl3) {
 if(pt0 && pt1) {
 if(ownFillDir) {
 if(ownFillDir === 'y') {
 pt0[1] = pt1[1] = ya.c2p(0, true);
 }
 else if(ownFillDir === 'x') {
 pt0[0] = pt1[0] = xa.c2p(0, true);
 }

 // fill to zero: full trace path, plus extension of
 // the endpoints to the appropriate axis
 // For the sake of animations, wrap the points around so that
 // the points on the axes are the first two points. Otherwise
 // animations get a little crazy if the number of points changes.
 transition(ownFillEl3).attr('d', 'M' + pt1 + 'L' + pt0 + 'L' + fullpath.substr(1));
 } else {
 // fill to self: just join the path to itself
 transition(ownFillEl3).attr('d', fullpath + 'Z');
 if(segments.length) {
 if(ownFillEl3) {
 if(pt0 && pt1) {
 if(ownFillDir) {
 if(ownFillDir === 'y') {
 pt0[1] = pt1[1] = ya.c2p(0, true);
 }
 else if(ownFillDir === 'x') {
 pt0[0] = pt1[0] = xa.c2p(0, true);
 }

 // fill to zero: full trace path, plus extension of
 // the endpoints to the appropriate axis
 // For the sake of animations, wrap the points around so that
 // the points on the axes are the first two points. Otherwise
 // animations get a little crazy if the number of points changes.
 transition(ownFillEl3).attr('d', 'M' + pt1 + 'L' + pt0 + 'L' + fullpath.substr(1));
 } else {
 // fill to self: just join the path to itself
 transition(ownFillEl3).attr('d', fullpath + 'Z');
 }
 }
 else if(trace.fill.substr(0, 6) === 'tonext' && fullpath && prevRevpath) {
 // fill to next: full trace path, plus the previous path reversed
 if(trace.fill === 'tonext') {
 // tonext: for use by concentric shapes, like manually constructed
 // contours, we just add the two paths closed on themselves.
 // This makes strange results if one path is *not* entirely
 // inside the other, but then that is a strange usage.
 transition(tonext).attr('d', fullpath + 'Z' + prevRevpath + 'Z');
 }
 else {
 // tonextx/y: for now just connect endpoints with lines. This is
 // the correct behavior if the endpoints are at the same value of
 // y/x, but if they *aren't*, we should ideally do more complicated
 // things depending on whether the new endpoint projects onto the
 // existing curve or off the end of it
 transition(tonext).attr('d', fullpath + 'L' + prevRevpath.substr(1) + 'Z');
 }
 trace._polygons = trace._polygons.concat(prevPolygons);
 }
 else if(trace.fill.substr(0, 6) === 'tonext' && fullpath && prevRevpath) {
 // fill to next: full trace path, plus the previous path reversed
 if(trace.fill === 'tonext') {
 // tonext: for use by concentric shapes, like manually constructed
 // contours, we just add the two paths closed on themselves.
 // This makes strange results if one path is *not* entirely
 // inside the other, but then that is a strange usage.
 transition(tonext).attr('d', fullpath + 'Z' + prevRevpath + 'Z');
 }
 else {
 // tonextx/y: for now just connect endpoints with lines. This is
 // the correct behavior if the endpoints are at the same value of
 // y/x, but if they *aren't*, we should ideally do more complicated
 // things depending on whether the new endpoint projects onto the
 // existing curve or off the end of it
 transition(tonext).attr('d', fullpath + 'L' + prevRevpath.substr(1) + 'Z');
 }
 trace._prevRevpath = revpath;
 trace._prevPolygons = thisPolygons;
 trace._polygons = trace._polygons.concat(prevPolygons);
 }
 trace._prevRevpath = revpath;
 trace._prevPolygons = thisPolygons;
 }


Expand All@@ -381,64 +387,78 @@ function plotOne(gd, idx, plotinfo, cdscatter, cdscatterAll, element, transition
 }
 }

 function hideFilter() {
 return false;
 }

 function makePoints(d) {
 var join, selection;

 var trace = d[0].trace,
 s = d3.select(this),
 showMarkers = subTypes.hasMarkers(trace),
 showText = subTypes.hasText(trace);

 if((!showMarkers && !showText) || trace.visible !== true) s.remove();
 else {
 if(showMarkers) {
 selection = s.selectAll('path.point');
 var keyFunc = getKeyFunc(trace),
 markerFilter = hideFilter,
 textFilter = hideFilter;

 join = selection
 .data(trace.marker.maxdisplayed ? visFilter : Lib.identity, getKeyFunc(trace));
 if(showMarkers) {
 markerFilter = trace.marker.maxdisplayed ? visFilter : Lib.identity;
 }

 var enter = join.enter().append('path')
 .classed('point', true);
 if(showText) {
 textFilter = trace.marker.maxdisplayed ? visFilter : Lib.identity;
 }

 enter.call(Drawing.pointStyle, trace)
 .call(Drawing.translatePoints, xa, ya, trace);
 // marker points

 if(hasTransition) {
 enter.style('opacity', 0).transition()
 .style('opacity', 1);
 }
 selection = s.selectAll('path.point');

 join.each(function(d) {
 var sel = transition(d3.select(this));
 Drawing.translatePoint(d, sel, xa, ya);
 Drawing.singlePointStyle(d, sel, trace);
 });
 join = selection.data(markerFilter, keyFunc);

 if(hasTransition) {
 join.exit().transition()
 .style('opacity', 0)
 .remove();
 } else {
 join.exit().remove();
 }
 }
 if(showText) {
 selection = s.selectAll('g');
 var enter = join.enter().append('path')
 .classed('point', true);

 join = selection
 .data(trace.marker.maxdisplayed ? visFilter : Lib.identity);
enter.call(Drawing.pointStyle, trace)
.call(Drawing.translatePoints, xa, ya, trace);

 // each text needs to go in its own 'g' in case
 // it gets converted to mathjax
 join.enter().append('g')
 .append('text')
 .call(Drawing.translatePoints, xa, ya);
 if(hasTransition) {
 enter.style('opacity', 0).transition()
 .style('opacity', 1);
 }

 selection
 .call(Drawing.translatePoints, xa, ya);
 join.each(function(d) {
 var sel = transition(d3.select(this));
 Drawing.translatePoint(d, sel, xa, ya);
 Drawing.singlePointStyle(d, sel, trace);
 });

 join.exit().remove();
 }
 if(hasTransition) {
 join.exit().transition()
 .style('opacity', 0)
 .remove();
 } else {
 join.exit().remove();
 }

 // text points

 selection = s.selectAll('g');

 join = selection.data(textFilter, keyFunc);

 // each text needs to go in its own 'g' in case
 // it gets converted to mathjax
 join.enter().append('g')
 .append('text');

 join.each(function(d) {
 var sel = d3.select(this).select('text');
 Drawing.translatePoint(d, sel, xa, ya);
@rreusserrreusserSep 21, 2016

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

A small thing but should or could we enable transitions here? I can imagine it being a matter of just following the fancy d3 transitions-work-like-everything-else pattern that the points follow. I left this out previously (though it had other update problems.)
@etpinardetpinardSep 21, 2016

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

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

That will be for a future minor version bump (ref #933 (comment))
 });

 join.exit().remove();
 }

 // NB: selectAll is evaluated on instantiation:
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Multiple scatter plot fixes#956

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

etpinard
merged 6 commits into

from

Sep 21, 2016
 Merged


Multiple scatter plot fixes
#956
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
eb7723c

scatter: make sure that restyle('mode', '') remove unwanted lines


etpinard Sep 20, 2016
fd656dd

scatter: make sure that restyle('mode', '') remove unwanted pt & text


etpinard Sep 20, 2016
f8ac787

drawing: fixup in translatePoint


etpinard Sep 20, 2016
ce762e8

scatter: call translatePoint on the merged selection


etpinard Sep 20, 2016
10ffd1e

test: add cases for restyle( 'mode', '*')


etpinard Sep 20, 2016
d810765

test: add cases for point translation on range relayout


etpinard Sep 20, 2016

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


4 changes: 2 additions & 2 deletions
src/components/drawing/index.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,8 +53,8 @@ drawing.translatePoint = function(d, sel, xa, ya) {

 if(isNumeric(x) && isNumeric(y)) {
 // for multiline text this works better
 if(this.nodeName === 'text') {
 sel.node().attr('x', x).attr('y', y);
 if(sel.node().nodeName === 'text') {
 sel.attr('x', x).attr('y', y);
 } else {
 sel.attr('transform', 'translate(' + x + ',' + y + ')');
 }
Expand Down

216 changes: 118 additions & 98 deletions
src/traces/scatter/plot.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,7 +33,7 @@ module.exports = function plot(gd, plotinfo, cdscatter, transitionOpts, makeOnCo

 selection = scatterlayer.selectAll('g.trace');

 join = selection.data(cdscatter, function(d) {return d[0].trace.uid;});
 join = selection.data(cdscatter, function(d) {return d[0].trace.uid;});

 // Append new traces:
 join.enter().append('g')
Expand DownExpand Up@@ -197,11 +197,19 @@ function plotOne(gd, idx, plotinfo, cdscatter, cdscatterAll, element, transition
 // revpath is fullpath reversed, for fill-to-next
 revpath = '',
 // functions for converting a point array to a path
 pathfn, revpathbase, revpathfn;
 pathfn, revpathbase, revpathfn,
 // variables used before and after the data join
 pt0, lastSegment, pt1, thisPolygons;

 // initialize line join data / method
 var segments = [],
 lineSegments = [],
 makeUpdate = Lib.noop;

 ownFillEl3 = trace._ownFill;

 if(subTypes.hasLines(trace) || trace.fill !== 'none') {

 if(tonext) {
 // This tells .style which trace to use for fill information:
 tonext.datum(cdscatter);
Expand DownExpand Up@@ -237,7 +245,7 @@ function plotOne(gd, idx, plotinfo, cdscatter, cdscatterAll, element, transition
 return revpathbase(pts.reverse());
 };

var segments = linePoints(cdscatter, {
 segments = linePoints(cdscatter, {
 xaxis: xa,
 yaxis: ya,
 connectGaps: trace.connectgaps,
Expand All@@ -250,24 +258,22 @@ function plotOne(gd, idx, plotinfo, cdscatter, cdscatterAll, element, transition
 // polygons for hover on fill
 // TODO: can we skip this if hoveron!=fills? That would mean we
 // need to redraw when you change hoveron...
var thisPolygons = trace._polygons = new Array(segments.length);
 thisPolygons = trace._polygons = new Array(segments.length);
 for(i = 0; i < segments.length; i++) {
 trace._polygons[i] = polygonTester(segments[i]);
 }

 var pt0, lastSegment, pt1;

 if(segments.length) {
 pt0 = segments[0][0];
 lastSegment = segments[segments.length - 1];
 pt1 = lastSegment[lastSegment.length - 1];
 }

var lineSegments = segments.filter(function(s) {
 lineSegments = segments.filter(function(s) {
 return s.length > 1;
 });

var makeUpdate = function(isEnter) {
 makeUpdate = function(isEnter) {
 return function(pts) {
 thispath = pathfn(pts);
 thisrevpath = revpathfn(pts);
Expand DownExpand Up@@ -303,66 +309,66 @@ function plotOne(gd, idx, plotinfo, cdscatter, cdscatterAll, element, transition
 }
 };
 };
 }

var lineJoin = tr.selectAll('.js-line').data(lineSegments);
 var lineJoin = tr.selectAll('.js-line').data(lineSegments);

transition(lineJoin.exit())
.style('opacity', 0)
.remove();
 transition(lineJoin.exit())
 .style('opacity', 0)
 .remove();

lineJoin.each(makeUpdate(false));
 lineJoin.each(makeUpdate(false));

lineJoin.enter().append('path')
.classed('js-line', true)
.style('vector-effect', 'non-scaling-stroke')
.call(Drawing.lineGroupStyle)
.each(makeUpdate(true));
 lineJoin.enter().append('path')
 .classed('js-line', true)
 .style('vector-effect', 'non-scaling-stroke')
 .call(Drawing.lineGroupStyle)
 .each(makeUpdate(true));

 if(segments.length) {
 if(ownFillEl3) {
 if(pt0 && pt1) {
 if(ownFillDir) {
 if(ownFillDir === 'y') {
 pt0[1] = pt1[1] = ya.c2p(0, true);
 }
 else if(ownFillDir === 'x') {
 pt0[0] = pt1[0] = xa.c2p(0, true);
 }

 // fill to zero: full trace path, plus extension of
 // the endpoints to the appropriate axis
 // For the sake of animations, wrap the points around so that
 // the points on the axes are the first two points. Otherwise
 // animations get a little crazy if the number of points changes.
 transition(ownFillEl3).attr('d', 'M' + pt1 + 'L' + pt0 + 'L' + fullpath.substr(1));
 } else {
 // fill to self: just join the path to itself
 transition(ownFillEl3).attr('d', fullpath + 'Z');
 if(segments.length) {
 if(ownFillEl3) {
 if(pt0 && pt1) {
 if(ownFillDir) {
 if(ownFillDir === 'y') {
 pt0[1] = pt1[1] = ya.c2p(0, true);
 }
 else if(ownFillDir === 'x') {
 pt0[0] = pt1[0] = xa.c2p(0, true);
 }

 // fill to zero: full trace path, plus extension of
 // the endpoints to the appropriate axis
 // For the sake of animations, wrap the points around so that
 // the points on the axes are the first two points. Otherwise
 // animations get a little crazy if the number of points changes.
 transition(ownFillEl3).attr('d', 'M' + pt1 + 'L' + pt0 + 'L' + fullpath.substr(1));
 } else {
 // fill to self: just join the path to itself
 transition(ownFillEl3).attr('d', fullpath + 'Z');
 }
 }
 else if(trace.fill.substr(0, 6) === 'tonext' && fullpath && prevRevpath) {
 // fill to next: full trace path, plus the previous path reversed
 if(trace.fill === 'tonext') {
 // tonext: for use by concentric shapes, like manually constructed
 // contours, we just add the two paths closed on themselves.
 // This makes strange results if one path is *not* entirely
 // inside the other, but then that is a strange usage.
 transition(tonext).attr('d', fullpath + 'Z' + prevRevpath + 'Z');
 }
 else {
 // tonextx/y: for now just connect endpoints with lines. This is
 // the correct behavior if the endpoints are at the same value of
 // y/x, but if they *aren't*, we should ideally do more complicated
 // things depending on whether the new endpoint projects onto the
 // existing curve or off the end of it
 transition(tonext).attr('d', fullpath + 'L' + prevRevpath.substr(1) + 'Z');
 }
 trace._polygons = trace._polygons.concat(prevPolygons);
 }
 else if(trace.fill.substr(0, 6) === 'tonext' && fullpath && prevRevpath) {
 // fill to next: full trace path, plus the previous path reversed
 if(trace.fill === 'tonext') {
 // tonext: for use by concentric shapes, like manually constructed
 // contours, we just add the two paths closed on themselves.
 // This makes strange results if one path is *not* entirely
 // inside the other, but then that is a strange usage.
 transition(tonext).attr('d', fullpath + 'Z' + prevRevpath + 'Z');
 }
 else {
 // tonextx/y: for now just connect endpoints with lines. This is
 // the correct behavior if the endpoints are at the same value of
 // y/x, but if they *aren't*, we should ideally do more complicated
 // things depending on whether the new endpoint projects onto the
 // existing curve or off the end of it
 transition(tonext).attr('d', fullpath + 'L' + prevRevpath.substr(1) + 'Z');
 }
 trace._prevRevpath = revpath;
 trace._prevPolygons = thisPolygons;
 trace._polygons = trace._polygons.concat(prevPolygons);
 }
 trace._prevRevpath = revpath;
 trace._prevPolygons = thisPolygons;
 }


Expand All@@ -381,64 +387,78 @@ function plotOne(gd, idx, plotinfo, cdscatter, cdscatterAll, element, transition
 }
 }

 function hideFilter() {
 return false;
 }

 function makePoints(d) {
 var join, selection;

 var trace = d[0].trace,
 s = d3.select(this),
 showMarkers = subTypes.hasMarkers(trace),
 showText = subTypes.hasText(trace);

 if((!showMarkers && !showText) || trace.visible !== true) s.remove();
 else {
 if(showMarkers) {
 selection = s.selectAll('path.point');
 var keyFunc = getKeyFunc(trace),
 markerFilter = hideFilter,
 textFilter = hideFilter;

 join = selection
 .data(trace.marker.maxdisplayed ? visFilter : Lib.identity, getKeyFunc(trace));
 if(showMarkers) {
 markerFilter = trace.marker.maxdisplayed ? visFilter : Lib.identity;
 }

 var enter = join.enter().append('path')
 .classed('point', true);
 if(showText) {
 textFilter = trace.marker.maxdisplayed ? visFilter : Lib.identity;
 }

 enter.call(Drawing.pointStyle, trace)
 .call(Drawing.translatePoints, xa, ya, trace);
 // marker points

 if(hasTransition) {
 enter.style('opacity', 0).transition()
 .style('opacity', 1);
 }
 selection = s.selectAll('path.point');

 join.each(function(d) {
 var sel = transition(d3.select(this));
 Drawing.translatePoint(d, sel, xa, ya);
 Drawing.singlePointStyle(d, sel, trace);
 });
 join = selection.data(markerFilter, keyFunc);

 if(hasTransition) {
 join.exit().transition()
 .style('opacity', 0)
 .remove();
 } else {
 join.exit().remove();
 }
 }
 if(showText) {
 selection = s.selectAll('g');
 var enter = join.enter().append('path')
 .classed('point', true);

 join = selection
 .data(trace.marker.maxdisplayed ? visFilter : Lib.identity);
enter.call(Drawing.pointStyle, trace)
.call(Drawing.translatePoints, xa, ya, trace);

 // each text needs to go in its own 'g' in case
 // it gets converted to mathjax
 join.enter().append('g')
 .append('text')
 .call(Drawing.translatePoints, xa, ya);
 if(hasTransition) {
 enter.style('opacity', 0).transition()
 .style('opacity', 1);
 }

 selection
 .call(Drawing.translatePoints, xa, ya);
 join.each(function(d) {
 var sel = transition(d3.select(this));
 Drawing.translatePoint(d, sel, xa, ya);
 Drawing.singlePointStyle(d, sel, trace);
 });

 join.exit().remove();
 }
 if(hasTransition) {
 join.exit().transition()
 .style('opacity', 0)
 .remove();
 } else {
 join.exit().remove();
 }

 // text points

 selection = s.selectAll('g');

 join = selection.data(textFilter, keyFunc);

 // each text needs to go in its own 'g' in case
 // it gets converted to mathjax
 join.enter().append('g')
 .append('text');

 join.each(function(d) {
 var sel = d3.select(this).select('text');
 Drawing.translatePoint(d, sel, xa, ya);
@rreusserrreusserSep 21, 2016

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

A small thing but should or could we enable transitions here? I can imagine it being a matter of just following the fancy d3 transitions-work-like-everything-else pattern that the points follow. I left this out previously (though it had other update problems.)
@etpinardetpinardSep 21, 2016

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

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

That will be for a future minor version bump (ref #933 (comment))
 });

 join.exit().remove();
 }

 // NB: selectAll is evaluated on instantiation:
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Multiple scatter plot fixes#956

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

etpinard
merged 6 commits into

from

Sep 21, 2016
 Merged


Multiple scatter plot fixes
#956
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
eb7723c

scatter: make sure that restyle('mode', '') remove unwanted lines


etpinard Sep 20, 2016
fd656dd

scatter: make sure that restyle('mode', '') remove unwanted pt & text


etpinard Sep 20, 2016
f8ac787

drawing: fixup in translatePoint


etpinard Sep 20, 2016
ce762e8

scatter: call translatePoint on the merged selection


etpinard Sep 20, 2016
10ffd1e

test: add cases for restyle( 'mode', '*')


etpinard Sep 20, 2016
d810765

test: add cases for point translation on range relayout


etpinard Sep 20, 2016

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


4 changes: 2 additions & 2 deletions
src/components/drawing/index.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,8 +53,8 @@ drawing.translatePoint = function(d, sel, xa, ya) {

 if(isNumeric(x) && isNumeric(y)) {
 // for multiline text this works better
 if(this.nodeName === 'text') {
 sel.node().attr('x', x).attr('y', y);
 if(sel.node().nodeName === 'text') {
 sel.attr('x', x).attr('y', y);
 } else {
 sel.attr('transform', 'translate(' + x + ',' + y + ')');
 }
Expand Down

216 changes: 118 additions & 98 deletions
src/traces/scatter/plot.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,7 +33,7 @@ module.exports = function plot(gd, plotinfo, cdscatter, transitionOpts, makeOnCo

 selection = scatterlayer.selectAll('g.trace');

 join = selection.data(cdscatter, function(d) {return d[0].trace.uid;});
 join = selection.data(cdscatter, function(d) {return d[0].trace.uid;});

 // Append new traces:
 join.enter().append('g')
Expand DownExpand Up@@ -197,11 +197,19 @@ function plotOne(gd, idx, plotinfo, cdscatter, cdscatterAll, element, transition
 // revpath is fullpath reversed, for fill-to-next
 revpath = '',
 // functions for converting a point array to a path
 pathfn, revpathbase, revpathfn;
 pathfn, revpathbase, revpathfn,
 // variables used before and after the data join
 pt0, lastSegment, pt1, thisPolygons;

 // initialize line join data / method
 var segments = [],
 lineSegments = [],
 makeUpdate = Lib.noop;

 ownFillEl3 = trace._ownFill;

 if(subTypes.hasLines(trace) || trace.fill !== 'none') {

 if(tonext) {
 // This tells .style which trace to use for fill information:
 tonext.datum(cdscatter);
Expand DownExpand Up@@ -237,7 +245,7 @@ function plotOne(gd, idx, plotinfo, cdscatter, cdscatterAll, element, transition
 return revpathbase(pts.reverse());
 };

var segments = linePoints(cdscatter, {
 segments = linePoints(cdscatter, {
 xaxis: xa,
 yaxis: ya,
 connectGaps: trace.connectgaps,
Expand All@@ -250,24 +258,22 @@ function plotOne(gd, idx, plotinfo, cdscatter, cdscatterAll, element, transition
 // polygons for hover on fill
 // TODO: can we skip this if hoveron!=fills? That would mean we
 // need to redraw when you change hoveron...
var thisPolygons = trace._polygons = new Array(segments.length);
 thisPolygons = trace._polygons = new Array(segments.length);
 for(i = 0; i < segments.length; i++) {
 trace._polygons[i] = polygonTester(segments[i]);
 }

 var pt0, lastSegment, pt1;

 if(segments.length) {
 pt0 = segments[0][0];
 lastSegment = segments[segments.length - 1];
 pt1 = lastSegment[lastSegment.length - 1];
 }

var lineSegments = segments.filter(function(s) {
 lineSegments = segments.filter(function(s) {
 return s.length > 1;
 });

var makeUpdate = function(isEnter) {
 makeUpdate = function(isEnter) {
 return function(pts) {
 thispath = pathfn(pts);
 thisrevpath = revpathfn(pts);
Expand DownExpand Up@@ -303,66 +309,66 @@ function plotOne(gd, idx, plotinfo, cdscatter, cdscatterAll, element, transition
 }
 };
 };
 }

var lineJoin = tr.selectAll('.js-line').data(lineSegments);
 var lineJoin = tr.selectAll('.js-line').data(lineSegments);

transition(lineJoin.exit())
.style('opacity', 0)
.remove();
 transition(lineJoin.exit())
 .style('opacity', 0)
 .remove();

lineJoin.each(makeUpdate(false));
 lineJoin.each(makeUpdate(false));

lineJoin.enter().append('path')
.classed('js-line', true)
.style('vector-effect', 'non-scaling-stroke')
.call(Drawing.lineGroupStyle)
.each(makeUpdate(true));
 lineJoin.enter().append('path')
 .classed('js-line', true)
 .style('vector-effect', 'non-scaling-stroke')
 .call(Drawing.lineGroupStyle)
 .each(makeUpdate(true));

 if(segments.length) {
 if(ownFillEl3) {
 if(pt0 && pt1) {
 if(ownFillDir) {
 if(ownFillDir === 'y') {
 pt0[1] = pt1[1] = ya.c2p(0, true);
 }
 else if(ownFillDir === 'x') {
 pt0[0] = pt1[0] = xa.c2p(0, true);
 }

 // fill to zero: full trace path, plus extension of
 // the endpoints to the appropriate axis
 // For the sake of animations, wrap the points around so that
 // the points on the axes are the first two points. Otherwise
 // animations get a little crazy if the number of points changes.
 transition(ownFillEl3).attr('d', 'M' + pt1 + 'L' + pt0 + 'L' + fullpath.substr(1));
 } else {
 // fill to self: just join the path to itself
 transition(ownFillEl3).attr('d', fullpath + 'Z');
 if(segments.length) {
 if(ownFillEl3) {
 if(pt0 && pt1) {
 if(ownFillDir) {
 if(ownFillDir === 'y') {
 pt0[1] = pt1[1] = ya.c2p(0, true);
 }
 else if(ownFillDir === 'x') {
 pt0[0] = pt1[0] = xa.c2p(0, true);
 }

 // fill to zero: full trace path, plus extension of
 // the endpoints to the appropriate axis
 // For the sake of animations, wrap the points around so that
 // the points on the axes are the first two points. Otherwise
 // animations get a little crazy if the number of points changes.
 transition(ownFillEl3).attr('d', 'M' + pt1 + 'L' + pt0 + 'L' + fullpath.substr(1));
 } else {
 // fill to self: just join the path to itself
 transition(ownFillEl3).attr('d', fullpath + 'Z');
 }
 }
 else if(trace.fill.substr(0, 6) === 'tonext' && fullpath && prevRevpath) {
 // fill to next: full trace path, plus the previous path reversed
 if(trace.fill === 'tonext') {
 // tonext: for use by concentric shapes, like manually constructed
 // contours, we just add the two paths closed on themselves.
 // This makes strange results if one path is *not* entirely
 // inside the other, but then that is a strange usage.
 transition(tonext).attr('d', fullpath + 'Z' + prevRevpath + 'Z');
 }
 else {
 // tonextx/y: for now just connect endpoints with lines. This is
 // the correct behavior if the endpoints are at the same value of
 // y/x, but if they *aren't*, we should ideally do more complicated
 // things depending on whether the new endpoint projects onto the
 // existing curve or off the end of it
 transition(tonext).attr('d', fullpath + 'L' + prevRevpath.substr(1) + 'Z');
 }
 trace._polygons = trace._polygons.concat(prevPolygons);
 }
 else if(trace.fill.substr(0, 6) === 'tonext' && fullpath && prevRevpath) {
 // fill to next: full trace path, plus the previous path reversed
 if(trace.fill === 'tonext') {
 // tonext: for use by concentric shapes, like manually constructed
 // contours, we just add the two paths closed on themselves.
 // This makes strange results if one path is *not* entirely
 // inside the other, but then that is a strange usage.
 transition(tonext).attr('d', fullpath + 'Z' + prevRevpath + 'Z');
 }
 else {
 // tonextx/y: for now just connect endpoints with lines. This is
 // the correct behavior if the endpoints are at the same value of
 // y/x, but if they *aren't*, we should ideally do more complicated
 // things depending on whether the new endpoint projects onto the
 // existing curve or off the end of it
 transition(tonext).attr('d', fullpath + 'L' + prevRevpath.substr(1) + 'Z');
 }
 trace._prevRevpath = revpath;
 trace._prevPolygons = thisPolygons;
 trace._polygons = trace._polygons.concat(prevPolygons);
 }
 trace._prevRevpath = revpath;
 trace._prevPolygons = thisPolygons;
 }


Expand All@@ -381,64 +387,78 @@ function plotOne(gd, idx, plotinfo, cdscatter, cdscatterAll, element, transition
 }
 }

 function hideFilter() {
 return false;
 }

 function makePoints(d) {
 var join, selection;

 var trace = d[0].trace,
 s = d3.select(this),
 showMarkers = subTypes.hasMarkers(trace),
 showText = subTypes.hasText(trace);

 if((!showMarkers && !showText) || trace.visible !== true) s.remove();
 else {
 if(showMarkers) {
 selection = s.selectAll('path.point');
 var keyFunc = getKeyFunc(trace),
 markerFilter = hideFilter,
 textFilter = hideFilter;

 join = selection
 .data(trace.marker.maxdisplayed ? visFilter : Lib.identity, getKeyFunc(trace));
 if(showMarkers) {
 markerFilter = trace.marker.maxdisplayed ? visFilter : Lib.identity;
 }

 var enter = join.enter().append('path')
 .classed('point', true);
 if(showText) {
 textFilter = trace.marker.maxdisplayed ? visFilter : Lib.identity;
 }

 enter.call(Drawing.pointStyle, trace)
 .call(Drawing.translatePoints, xa, ya, trace);
 // marker points

 if(hasTransition) {
 enter.style('opacity', 0).transition()
 .style('opacity', 1);
 }
 selection = s.selectAll('path.point');

 join.each(function(d) {
 var sel = transition(d3.select(this));
 Drawing.translatePoint(d, sel, xa, ya);
 Drawing.singlePointStyle(d, sel, trace);
 });
 join = selection.data(markerFilter, keyFunc);

 if(hasTransition) {
 join.exit().transition()
 .style('opacity', 0)
 .remove();
 } else {
 join.exit().remove();
 }
 }
 if(showText) {
 selection = s.selectAll('g');
 var enter = join.enter().append('path')
 .classed('point', true);

 join = selection
 .data(trace.marker.maxdisplayed ? visFilter : Lib.identity);
enter.call(Drawing.pointStyle, trace)
.call(Drawing.translatePoints, xa, ya, trace);

 // each text needs to go in its own 'g' in case
 // it gets converted to mathjax
 join.enter().append('g')
 .append('text')
 .call(Drawing.translatePoints, xa, ya);
 if(hasTransition) {
 enter.style('opacity', 0).transition()
 .style('opacity', 1);
 }

 selection
 .call(Drawing.translatePoints, xa, ya);
 join.each(function(d) {
 var sel = transition(d3.select(this));
 Drawing.translatePoint(d, sel, xa, ya);
 Drawing.singlePointStyle(d, sel, trace);
 });

 join.exit().remove();
 }
 if(hasTransition) {
 join.exit().transition()
 .style('opacity', 0)
 .remove();
 } else {
 join.exit().remove();
 }

 // text points

 selection = s.selectAll('g');

 join = selection.data(textFilter, keyFunc);

 // each text needs to go in its own 'g' in case
 // it gets converted to mathjax
 join.enter().append('g')
 .append('text');

 join.each(function(d) {
 var sel = d3.select(this).select('text');
 Drawing.translatePoint(d, sel, xa, ya);
@rreusserrreusserSep 21, 2016

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

A small thing but should or could we enable transitions here? I can imagine it being a matter of just following the fancy d3 transitions-work-like-everything-else pattern that the points follow. I left this out previously (though it had other update problems.)
@etpinardetpinardSep 21, 2016

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

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

That will be for a future minor version bump (ref #933 (comment))
 });

 join.exit().remove();
 }

 // NB: selectAll is evaluated on instantiation:
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Multiple scatter plot fixes#956

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

etpinard
merged 6 commits into

from

Sep 21, 2016
 Merged


Multiple scatter plot fixes
#956
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
eb7723c

scatter: make sure that restyle('mode', '') remove unwanted lines


etpinard Sep 20, 2016
fd656dd

scatter: make sure that restyle('mode', '') remove unwanted pt & text


etpinard Sep 20, 2016
f8ac787

drawing: fixup in translatePoint


etpinard Sep 20, 2016
ce762e8

scatter: call translatePoint on the merged selection


etpinard Sep 20, 2016
10ffd1e

test: add cases for restyle( 'mode', '*')


etpinard Sep 20, 2016
d810765

test: add cases for point translation on range relayout


etpinard Sep 20, 2016

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


4 changes: 2 additions & 2 deletions
src/components/drawing/index.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,8 +53,8 @@ drawing.translatePoint = function(d, sel, xa, ya) {

 if(isNumeric(x) && isNumeric(y)) {
 // for multiline text this works better
 if(this.nodeName === 'text') {
 sel.node().attr('x', x).attr('y', y);
 if(sel.node().nodeName === 'text') {
 sel.attr('x', x).attr('y', y);
 } else {
 sel.attr('transform', 'translate(' + x + ',' + y + ')');
 }
Expand Down

216 changes: 118 additions & 98 deletions
src/traces/scatter/plot.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,7 +33,7 @@ module.exports = function plot(gd, plotinfo, cdscatter, transitionOpts, makeOnCo

 selection = scatterlayer.selectAll('g.trace');

 join = selection.data(cdscatter, function(d) {return d[0].trace.uid;});
 join = selection.data(cdscatter, function(d) {return d[0].trace.uid;});

 // Append new traces:
 join.enter().append('g')
Expand DownExpand Up@@ -197,11 +197,19 @@ function plotOne(gd, idx, plotinfo, cdscatter, cdscatterAll, element, transition
 // revpath is fullpath reversed, for fill-to-next
 revpath = '',
 // functions for converting a point array to a path
 pathfn, revpathbase, revpathfn;
 pathfn, revpathbase, revpathfn,
 // variables used before and after the data join
 pt0, lastSegment, pt1, thisPolygons;

 // initialize line join data / method
 var segments = [],
 lineSegments = [],
 makeUpdate = Lib.noop;

 ownFillEl3 = trace._ownFill;

 if(subTypes.hasLines(trace) || trace.fill !== 'none') {

 if(tonext) {
 // This tells .style which trace to use for fill information:
 tonext.datum(cdscatter);
Expand DownExpand Up@@ -237,7 +245,7 @@ function plotOne(gd, idx, plotinfo, cdscatter, cdscatterAll, element, transition
 return revpathbase(pts.reverse());
 };

var segments = linePoints(cdscatter, {
 segments = linePoints(cdscatter, {
 xaxis: xa,
 yaxis: ya,
 connectGaps: trace.connectgaps,
Expand All@@ -250,24 +258,22 @@ function plotOne(gd, idx, plotinfo, cdscatter, cdscatterAll, element, transition
 // polygons for hover on fill
 // TODO: can we skip this if hoveron!=fills? That would mean we
 // need to redraw when you change hoveron...
var thisPolygons = trace._polygons = new Array(segments.length);
 thisPolygons = trace._polygons = new Array(segments.length);
 for(i = 0; i < segments.length; i++) {
 trace._polygons[i] = polygonTester(segments[i]);
 }

 var pt0, lastSegment, pt1;

 if(segments.length) {
 pt0 = segments[0][0];
 lastSegment = segments[segments.length - 1];
 pt1 = lastSegment[lastSegment.length - 1];
 }

var lineSegments = segments.filter(function(s) {
 lineSegments = segments.filter(function(s) {
 return s.length > 1;
 });

var makeUpdate = function(isEnter) {
 makeUpdate = function(isEnter) {
 return function(pts) {
 thispath = pathfn(pts);
 thisrevpath = revpathfn(pts);
Expand DownExpand Up@@ -303,66 +309,66 @@ function plotOne(gd, idx, plotinfo, cdscatter, cdscatterAll, element, transition
 }
 };
 };
 }

var lineJoin = tr.selectAll('.js-line').data(lineSegments);
 var lineJoin = tr.selectAll('.js-line').data(lineSegments);

transition(lineJoin.exit())
.style('opacity', 0)
.remove();
 transition(lineJoin.exit())
 .style('opacity', 0)
 .remove();

lineJoin.each(makeUpdate(false));
 lineJoin.each(makeUpdate(false));

lineJoin.enter().append('path')
.classed('js-line', true)
.style('vector-effect', 'non-scaling-stroke')
.call(Drawing.lineGroupStyle)
.each(makeUpdate(true));
 lineJoin.enter().append('path')
 .classed('js-line', true)
 .style('vector-effect', 'non-scaling-stroke')
 .call(Drawing.lineGroupStyle)
 .each(makeUpdate(true));

 if(segments.length) {
 if(ownFillEl3) {
 if(pt0 && pt1) {
 if(ownFillDir) {
 if(ownFillDir === 'y') {
 pt0[1] = pt1[1] = ya.c2p(0, true);
 }
 else if(ownFillDir === 'x') {
 pt0[0] = pt1[0] = xa.c2p(0, true);
 }

 // fill to zero: full trace path, plus extension of
 // the endpoints to the appropriate axis
 // For the sake of animations, wrap the points around so that
 // the points on the axes are the first two points. Otherwise
 // animations get a little crazy if the number of points changes.
 transition(ownFillEl3).attr('d', 'M' + pt1 + 'L' + pt0 + 'L' + fullpath.substr(1));
 } else {
 // fill to self: just join the path to itself
 transition(ownFillEl3).attr('d', fullpath + 'Z');
 if(segments.length) {
 if(ownFillEl3) {
 if(pt0 && pt1) {
 if(ownFillDir) {
 if(ownFillDir === 'y') {
 pt0[1] = pt1[1] = ya.c2p(0, true);
 }
 else if(ownFillDir === 'x') {
 pt0[0] = pt1[0] = xa.c2p(0, true);
 }

 // fill to zero: full trace path, plus extension of
 // the endpoints to the appropriate axis
 // For the sake of animations, wrap the points around so that
 // the points on the axes are the first two points. Otherwise
 // animations get a little crazy if the number of points changes.
 transition(ownFillEl3).attr('d', 'M' + pt1 + 'L' + pt0 + 'L' + fullpath.substr(1));
 } else {
 // fill to self: just join the path to itself
 transition(ownFillEl3).attr('d', fullpath + 'Z');
 }
 }
 else if(trace.fill.substr(0, 6) === 'tonext' && fullpath && prevRevpath) {
 // fill to next: full trace path, plus the previous path reversed
 if(trace.fill === 'tonext') {
 // tonext: for use by concentric shapes, like manually constructed
 // contours, we just add the two paths closed on themselves.
 // This makes strange results if one path is *not* entirely
 // inside the other, but then that is a strange usage.
 transition(tonext).attr('d', fullpath + 'Z' + prevRevpath + 'Z');
 }
 else {
 // tonextx/y: for now just connect endpoints with lines. This is
 // the correct behavior if the endpoints are at the same value of
 // y/x, but if they *aren't*, we should ideally do more complicated
 // things depending on whether the new endpoint projects onto the
 // existing curve or off the end of it
 transition(tonext).attr('d', fullpath + 'L' + prevRevpath.substr(1) + 'Z');
 }
 trace._polygons = trace._polygons.concat(prevPolygons);
 }
 else if(trace.fill.substr(0, 6) === 'tonext' && fullpath && prevRevpath) {
 // fill to next: full trace path, plus the previous path reversed
 if(trace.fill === 'tonext') {
 // tonext: for use by concentric shapes, like manually constructed
 // contours, we just add the two paths closed on themselves.
 // This makes strange results if one path is *not* entirely
 // inside the other, but then that is a strange usage.
 transition(tonext).attr('d', fullpath + 'Z' + prevRevpath + 'Z');
 }
 else {
 // tonextx/y: for now just connect endpoints with lines. This is
 // the correct behavior if the endpoints are at the same value of
 // y/x, but if they *aren't*, we should ideally do more complicated
 // things depending on whether the new endpoint projects onto the
 // existing curve or off the end of it
 transition(tonext).attr('d', fullpath + 'L' + prevRevpath.substr(1) + 'Z');
 }
 trace._prevRevpath = revpath;
 trace._prevPolygons = thisPolygons;
 trace._polygons = trace._polygons.concat(prevPolygons);
 }
 trace._prevRevpath = revpath;
 trace._prevPolygons = thisPolygons;
 }


Expand All@@ -381,64 +387,78 @@ function plotOne(gd, idx, plotinfo, cdscatter, cdscatterAll, element, transition
 }
 }

 function hideFilter() {
 return false;
 }

 function makePoints(d) {
 var join, selection;

 var trace = d[0].trace,
 s = d3.select(this),
 showMarkers = subTypes.hasMarkers(trace),
 showText = subTypes.hasText(trace);

 if((!showMarkers && !showText) || trace.visible !== true) s.remove();
 else {
 if(showMarkers) {
 selection = s.selectAll('path.point');
 var keyFunc = getKeyFunc(trace),
 markerFilter = hideFilter,
 textFilter = hideFilter;

 join = selection
 .data(trace.marker.maxdisplayed ? visFilter : Lib.identity, getKeyFunc(trace));
 if(showMarkers) {
 markerFilter = trace.marker.maxdisplayed ? visFilter : Lib.identity;
 }

 var enter = join.enter().append('path')
 .classed('point', true);
 if(showText) {
 textFilter = trace.marker.maxdisplayed ? visFilter : Lib.identity;
 }

 enter.call(Drawing.pointStyle, trace)
 .call(Drawing.translatePoints, xa, ya, trace);
 // marker points

 if(hasTransition) {
 enter.style('opacity', 0).transition()
 .style('opacity', 1);
 }
 selection = s.selectAll('path.point');

 join.each(function(d) {
 var sel = transition(d3.select(this));
 Drawing.translatePoint(d, sel, xa, ya);
 Drawing.singlePointStyle(d, sel, trace);
 });
 join = selection.data(markerFilter, keyFunc);

 if(hasTransition) {
 join.exit().transition()
 .style('opacity', 0)
 .remove();
 } else {
 join.exit().remove();
 }
 }
 if(showText) {
 selection = s.selectAll('g');
 var enter = join.enter().append('path')
 .classed('point', true);

 join = selection
 .data(trace.marker.maxdisplayed ? visFilter : Lib.identity);
enter.call(Drawing.pointStyle, trace)
.call(Drawing.translatePoints, xa, ya, trace);

 // each text needs to go in its own 'g' in case
 // it gets converted to mathjax
 join.enter().append('g')
 .append('text')
 .call(Drawing.translatePoints, xa, ya);
 if(hasTransition) {
 enter.style('opacity', 0).transition()
 .style('opacity', 1);
 }

 selection
 .call(Drawing.translatePoints, xa, ya);
 join.each(function(d) {
 var sel = transition(d3.select(this));
 Drawing.translatePoint(d, sel, xa, ya);
 Drawing.singlePointStyle(d, sel, trace);
 });

 join.exit().remove();
 }
 if(hasTransition) {
 join.exit().transition()
 .style('opacity', 0)
 .remove();
 } else {
 join.exit().remove();
 }

 // text points

 selection = s.selectAll('g');

 join = selection.data(textFilter, keyFunc);

 // each text needs to go in its own 'g' in case
 // it gets converted to mathjax
 join.enter().append('g')
 .append('text');

 join.each(function(d) {
 var sel = d3.select(this).select('text');
 Drawing.translatePoint(d, sel, xa, ya);
@rreusserrreusserSep 21, 2016

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

A small thing but should or could we enable transitions here? I can imagine it being a matter of just following the fancy d3 transitions-work-like-everything-else pattern that the points follow. I left this out previously (though it had other update problems.)
@etpinardetpinardSep 21, 2016

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

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

That will be for a future minor version bump (ref #933 (comment))
 });

 join.exit().remove();
 }

 // NB: selectAll is evaluated on instantiation:
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Multiple scatter plot fixes#956

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

etpinard
merged 6 commits into

from

Sep 21, 2016
 Merged


Multiple scatter plot fixes
#956
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
eb7723c

scatter: make sure that restyle('mode', '') remove unwanted lines


etpinard Sep 20, 2016
fd656dd

scatter: make sure that restyle('mode', '') remove unwanted pt & text


etpinard Sep 20, 2016
f8ac787

drawing: fixup in translatePoint


etpinard Sep 20, 2016
ce762e8

scatter: call translatePoint on the merged selection


etpinard Sep 20, 2016
10ffd1e

test: add cases for restyle( 'mode', '*')


etpinard Sep 20, 2016
d810765

test: add cases for point translation on range relayout


etpinard Sep 20, 2016

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


4 changes: 2 additions & 2 deletions
src/components/drawing/index.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,8 +53,8 @@ drawing.translatePoint = function(d, sel, xa, ya) {

 if(isNumeric(x) && isNumeric(y)) {
 // for multiline text this works better
 if(this.nodeName === 'text') {
 sel.node().attr('x', x).attr('y', y);
 if(sel.node().nodeName === 'text') {
 sel.attr('x', x).attr('y', y);
 } else {
 sel.attr('transform', 'translate(' + x + ',' + y + ')');
 }
Expand Down

216 changes: 118 additions & 98 deletions
src/traces/scatter/plot.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,7 +33,7 @@ module.exports = function plot(gd, plotinfo, cdscatter, transitionOpts, makeOnCo

 selection = scatterlayer.selectAll('g.trace');

 join = selection.data(cdscatter, function(d) {return d[0].trace.uid;});
 join = selection.data(cdscatter, function(d) {return d[0].trace.uid;});

 // Append new traces:
 join.enter().append('g')
Expand DownExpand Up@@ -197,11 +197,19 @@ function plotOne(gd, idx, plotinfo, cdscatter, cdscatterAll, element, transition
 // revpath is fullpath reversed, for fill-to-next
 revpath = '',
 // functions for converting a point array to a path
 pathfn, revpathbase, revpathfn;
 pathfn, revpathbase, revpathfn,
 // variables used before and after the data join
 pt0, lastSegment, pt1, thisPolygons;

 // initialize line join data / method
 var segments = [],
 lineSegments = [],
 makeUpdate = Lib.noop;

 ownFillEl3 = trace._ownFill;

 if(subTypes.hasLines(trace) || trace.fill !== 'none') {

 if(tonext) {
 // This tells .style which trace to use for fill information:
 tonext.datum(cdscatter);
Expand DownExpand Up@@ -237,7 +245,7 @@ function plotOne(gd, idx, plotinfo, cdscatter, cdscatterAll, element, transition
 return revpathbase(pts.reverse());
 };

var segments = linePoints(cdscatter, {
 segments = linePoints(cdscatter, {
 xaxis: xa,
 yaxis: ya,
 connectGaps: trace.connectgaps,
Expand All@@ -250,24 +258,22 @@ function plotOne(gd, idx, plotinfo, cdscatter, cdscatterAll, element, transition
 // polygons for hover on fill
 // TODO: can we skip this if hoveron!=fills? That would mean we
 // need to redraw when you change hoveron...
var thisPolygons = trace._polygons = new Array(segments.length);
 thisPolygons = trace._polygons = new Array(segments.length);
 for(i = 0; i < segments.length; i++) {
 trace._polygons[i] = polygonTester(segments[i]);
 }

 var pt0, lastSegment, pt1;

 if(segments.length) {
 pt0 = segments[0][0];
 lastSegment = segments[segments.length - 1];
 pt1 = lastSegment[lastSegment.length - 1];
 }

var lineSegments = segments.filter(function(s) {
 lineSegments = segments.filter(function(s) {
 return s.length > 1;
 });

var makeUpdate = function(isEnter) {
 makeUpdate = function(isEnter) {
 return function(pts) {
 thispath = pathfn(pts);
 thisrevpath = revpathfn(pts);
Expand DownExpand Up@@ -303,66 +309,66 @@ function plotOne(gd, idx, plotinfo, cdscatter, cdscatterAll, element, transition
 }
 };
 };
 }

var lineJoin = tr.selectAll('.js-line').data(lineSegments);
 var lineJoin = tr.selectAll('.js-line').data(lineSegments);

transition(lineJoin.exit())
.style('opacity', 0)
.remove();
 transition(lineJoin.exit())
 .style('opacity', 0)
 .remove();

lineJoin.each(makeUpdate(false));
 lineJoin.each(makeUpdate(false));

lineJoin.enter().append('path')
.classed('js-line', true)
.style('vector-effect', 'non-scaling-stroke')
.call(Drawing.lineGroupStyle)
.each(makeUpdate(true));
 lineJoin.enter().append('path')
 .classed('js-line', true)
 .style('vector-effect', 'non-scaling-stroke')
 .call(Drawing.lineGroupStyle)
 .each(makeUpdate(true));

 if(segments.length) {
 if(ownFillEl3) {
 if(pt0 && pt1) {
 if(ownFillDir) {
 if(ownFillDir === 'y') {
 pt0[1] = pt1[1] = ya.c2p(0, true);
 }
 else if(ownFillDir === 'x') {
 pt0[0] = pt1[0] = xa.c2p(0, true);
 }

 // fill to zero: full trace path, plus extension of
 // the endpoints to the appropriate axis
 // For the sake of animations, wrap the points around so that
 // the points on the axes are the first two points. Otherwise
 // animations get a little crazy if the number of points changes.
 transition(ownFillEl3).attr('d', 'M' + pt1 + 'L' + pt0 + 'L' + fullpath.substr(1));
 } else {
 // fill to self: just join the path to itself
 transition(ownFillEl3).attr('d', fullpath + 'Z');
 if(segments.length) {
 if(ownFillEl3) {
 if(pt0 && pt1) {
 if(ownFillDir) {
 if(ownFillDir === 'y') {
 pt0[1] = pt1[1] = ya.c2p(0, true);
 }
 else if(ownFillDir === 'x') {
 pt0[0] = pt1[0] = xa.c2p(0, true);
 }

 // fill to zero: full trace path, plus extension of
 // the endpoints to the appropriate axis
 // For the sake of animations, wrap the points around so that
 // the points on the axes are the first two points. Otherwise
 // animations get a little crazy if the number of points changes.
 transition(ownFillEl3).attr('d', 'M' + pt1 + 'L' + pt0 + 'L' + fullpath.substr(1));
 } else {
 // fill to self: just join the path to itself
 transition(ownFillEl3).attr('d', fullpath + 'Z');
 }
 }
 else if(trace.fill.substr(0, 6) === 'tonext' && fullpath && prevRevpath) {
 // fill to next: full trace path, plus the previous path reversed
 if(trace.fill === 'tonext') {
 // tonext: for use by concentric shapes, like manually constructed
 // contours, we just add the two paths closed on themselves.
 // This makes strange results if one path is *not* entirely
 // inside the other, but then that is a strange usage.
 transition(tonext).attr('d', fullpath + 'Z' + prevRevpath + 'Z');
 }
 else {
 // tonextx/y: for now just connect endpoints with lines. This is
 // the correct behavior if the endpoints are at the same value of
 // y/x, but if they *aren't*, we should ideally do more complicated
 // things depending on whether the new endpoint projects onto the
 // existing curve or off the end of it
 transition(tonext).attr('d', fullpath + 'L' + prevRevpath.substr(1) + 'Z');
 }
 trace._polygons = trace._polygons.concat(prevPolygons);
 }
 else if(trace.fill.substr(0, 6) === 'tonext' && fullpath && prevRevpath) {
 // fill to next: full trace path, plus the previous path reversed
 if(trace.fill === 'tonext') {
 // tonext: for use by concentric shapes, like manually constructed
 // contours, we just add the two paths closed on themselves.
 // This makes strange results if one path is *not* entirely
 // inside the other, but then that is a strange usage.
 transition(tonext).attr('d', fullpath + 'Z' + prevRevpath + 'Z');
 }
 else {
 // tonextx/y: for now just connect endpoints with lines. This is
 // the correct behavior if the endpoints are at the same value of
 // y/x, but if they *aren't*, we should ideally do more complicated
 // things depending on whether the new endpoint projects onto the
 // existing curve or off the end of it
 transition(tonext).attr('d', fullpath + 'L' + prevRevpath.substr(1) + 'Z');
 }
 trace._prevRevpath = revpath;
 trace._prevPolygons = thisPolygons;
 trace._polygons = trace._polygons.concat(prevPolygons);
 }
 trace._prevRevpath = revpath;
 trace._prevPolygons = thisPolygons;
 }


Expand All@@ -381,64 +387,78 @@ function plotOne(gd, idx, plotinfo, cdscatter, cdscatterAll, element, transition
 }
 }

 function hideFilter() {
 return false;
 }

 function makePoints(d) {
 var join, selection;

 var trace = d[0].trace,
 s = d3.select(this),
 showMarkers = subTypes.hasMarkers(trace),
 showText = subTypes.hasText(trace);

 if((!showMarkers && !showText) || trace.visible !== true) s.remove();
 else {
 if(showMarkers) {
 selection = s.selectAll('path.point');
 var keyFunc = getKeyFunc(trace),
 markerFilter = hideFilter,
 textFilter = hideFilter;

 join = selection
 .data(trace.marker.maxdisplayed ? visFilter : Lib.identity, getKeyFunc(trace));
 if(showMarkers) {
 markerFilter = trace.marker.maxdisplayed ? visFilter : Lib.identity;
 }

 var enter = join.enter().append('path')
 .classed('point', true);
 if(showText) {
 textFilter = trace.marker.maxdisplayed ? visFilter : Lib.identity;
 }

 enter.call(Drawing.pointStyle, trace)
 .call(Drawing.translatePoints, xa, ya, trace);
 // marker points

 if(hasTransition) {
 enter.style('opacity', 0).transition()
 .style('opacity', 1);
 }
 selection = s.selectAll('path.point');

 join.each(function(d) {
 var sel = transition(d3.select(this));
 Drawing.translatePoint(d, sel, xa, ya);
 Drawing.singlePointStyle(d, sel, trace);
 });
 join = selection.data(markerFilter, keyFunc);

 if(hasTransition) {
 join.exit().transition()
 .style('opacity', 0)
 .remove();
 } else {
 join.exit().remove();
 }
 }
 if(showText) {
 selection = s.selectAll('g');
 var enter = join.enter().append('path')
 .classed('point', true);

 join = selection
 .data(trace.marker.maxdisplayed ? visFilter : Lib.identity);
enter.call(Drawing.pointStyle, trace)
.call(Drawing.translatePoints, xa, ya, trace);

 // each text needs to go in its own 'g' in case
 // it gets converted to mathjax
 join.enter().append('g')
 .append('text')
 .call(Drawing.translatePoints, xa, ya);
 if(hasTransition) {
 enter.style('opacity', 0).transition()
 .style('opacity', 1);
 }

 selection
 .call(Drawing.translatePoints, xa, ya);
 join.each(function(d) {
 var sel = transition(d3.select(this));
 Drawing.translatePoint(d, sel, xa, ya);
 Drawing.singlePointStyle(d, sel, trace);
 });

 join.exit().remove();
 }
 if(hasTransition) {
 join.exit().transition()
 .style('opacity', 0)
 .remove();
 } else {
 join.exit().remove();
 }

 // text points

 selection = s.selectAll('g');

 join = selection.data(textFilter, keyFunc);

 // each text needs to go in its own 'g' in case
 // it gets converted to mathjax
 join.enter().append('g')
 .append('text');

 join.each(function(d) {
 var sel = d3.select(this).select('text');
 Drawing.translatePoint(d, sel, xa, ya);
@rreusserrreusserSep 21, 2016

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

A small thing but should or could we enable transitions here? I can imagine it being a matter of just following the fancy d3 transitions-work-like-everything-else pattern that the points follow. I left this out previously (though it had other update problems.)
@etpinardetpinardSep 21, 2016

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

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

That will be for a future minor version bump (ref #933 (comment))
 });

 join.exit().remove();
 }

 // NB: selectAll is evaluated on instantiation:
Expand Down
Loading