Skip to content

Bar with non-numeric (x,y) items bug fix#1519

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 5 commits into from
Mar 30, 2017
Merged

Bar with non-numeric (x,y) items bug fix #1519

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b62529d
make toBeCloseToArray and toBeCloseToArray2D handle NaN properly
etpinard Mar 27, 2017
5279f99
set bar size in main serieslen loop
etpinard Mar 27, 2017
0144f06
fill in non-numeric bar items in calcdata
etpinard Mar 28, 2017
042cc82
rm bar (now useless) 'placeholder' logic
etpinard Mar 28, 2017
6f0a95d
add non-numeric 'x' items test for bar calc.js
etpinard Mar 28, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 3 additions & 17 deletions src/traces/bar/calc.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -49,18 +49,11 @@ module.exports = function calc(gd, trace) {

// create the "calculated data" to plot
var serieslen = Math.min(pos.length, size.length),
cd = [];
cd = new Array(serieslen);

// set position
// set position and size
for(i = 0; i < serieslen; i++) {

// add bars with non-numeric sizes to calcdata
// so that ensure that traces with gaps are
// plotted in the correct order

if(isNumeric(pos[i])) {
cd.push({p: pos[i]});
}
cd[i] = { p: pos[i], s: size[i] };
}

// set base
Expand All@@ -84,13 +77,6 @@ module.exports = function calc(gd, trace) {
}
}

// set size
for(i = 0; i < cd.length; i++) {
if(isNumeric(size[i])) {
cd[i].s = size[i];
}
}

// auto-z and autocolorscale if applicable
if(hasColorscale(trace, 'marker')) {
colorscaleCalc(trace, trace.marker.color, 'marker', 'c');
Expand Down
14 changes: 8 additions & 6 deletions src/traces/bar/set_positions.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@
'use strict';

var isNumeric = require('fast-isnumeric');
var BADNUM = require('../../constants/numerical').BADNUM;

var Registry = require('../../registry');
var Axes = require('../../plots/cartesian/axes');
Expand DownExpand Up@@ -37,8 +38,7 @@ module.exports = function setPositions(gd, plotinfo) {
fullTrace.visible === true &&
Registry.traceIs(fullTrace, 'bar') &&
fullTrace.xaxis === xa._id &&
fullTrace.yaxis === ya._id &&
!calcTraces[i][0].placeholder
fullTrace.yaxis === ya._id
) {
if(fullTrace.orientation === 'h') {
calcTracesHorizontal.push(calcTraces[i]);
Expand DownExpand Up@@ -188,7 +188,7 @@ function setGroupPositionsInStackOrRelativeMode(gd, pa, sa, calcTraces) {
for(var j = 0; j < calcTrace.length; j++) {
var bar = calcTrace[j];

if(!isNumeric(bar.s)) continue;
if(bar.s === BADNUM) continue;

var isOutmostBar = ((bar.b + bar.s) === sieve.get(bar.p, bar.s));
if(isOutmostBar) bar._outmost = true;
Expand DownExpand Up@@ -395,6 +395,8 @@ function setBarCenter(gd, pa, sieve) {
calcBar[pLetter] = calcBar.p +
((poffsetIsArray) ? poffset[j] : poffset) +
((barwidthIsArray) ? barwidth[j] : barwidth) / 2;


}
}
}
Expand DownExpand Up@@ -502,7 +504,7 @@ function stackBars(gd, sa, sieve) {
for(j = 0; j < trace.length; j++) {
bar = trace[j];

if(!isNumeric(bar.s)) continue;
if(bar.s === BADNUM) continue;

// stack current bar and get previous sum
var barBase = sieve.put(bar.p, bar.b + bar.s),
Expand DownExpand Up@@ -533,7 +535,7 @@ function sieveBars(gd, sa, sieve) {
for(var j = 0; j < trace.length; j++) {
var bar = trace[j];

if(isNumeric(bar.s)) sieve.put(bar.p, bar.b + bar.s);
if(bar.s !== BADNUM) sieve.put(bar.p, bar.b + bar.s);
}
}
}
Expand DownExpand Up@@ -569,7 +571,7 @@ function normalizeBars(gd, sa, sieve) {
for(var j = 0; j < trace.length; j++) {
var bar = trace[j];

if(!isNumeric(bar.s)) continue;
if(bar.s === BADNUM) continue;

var scale = Math.abs(sTop / sieve.get(bar.p, bar.s));
bar.b *= scale;
Expand Down
3 changes: 2 additions & 1 deletion src/traces/bar/sieve.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@
module.exports = Sieve;

var Lib = require('../../lib');
var BADNUM = require('../../constants/numerical').BADNUM;

/**
* Helper class to sieve data from traces into bins
Expand All@@ -34,7 +35,7 @@ function Sieve(traces, separateNegativeValues, dontMergeOverlappingData) {
var trace = traces[i];
for(var j = 0; j < trace.length; j++) {
var bar = trace[j];
positions.push(bar.p);
if(bar.p !== BADNUM) positions.push(bar.p);
}
}
this.positions = positions;
Expand Down
5 changes: 4 additions & 1 deletion test/jasmine/assets/custom_matchers.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -143,7 +143,10 @@ function isClose(actual, expected, precision) {
return Math.abs(actual - expected) < precision;
}

return actual === expected;
return (
actual === expected ||
(isNaN(actual) && isNaN(expected))
);
}

function coercePosition(precision) {
Expand Down
52 changes: 34 additions & 18 deletions test/jasmine/tests/bar_test.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -283,6 +283,39 @@ describe('Bar.calc', function() {
var cd = gd.calcdata;
assertPointField(cd, 'b', [[0, 1, 2], [0, 1, 0], [0, 0]]);
});

it('should not exclude items with non-numeric x/y from calcdata', function() {
var gd = mockBarPlot([{
x: [5, NaN, 15, 20, null, 21],
y: [20, NaN, 23, 25, null, 26]
}]);

var cd = gd.calcdata;
assertPointField(cd, 'x', [[5, NaN, 15, 20, NaN, 21]]);
assertPointField(cd, 'y', [[20, NaN, 23, 25, NaN, 26]]);
});

it('should not exclude items with non-numeric y from calcdata (to plots gaps correctly)', function() {
var gd = mockBarPlot([{
x: ['a', 'b', 'c', 'd'],
y: [1, null, 'nonsense', 15]
}]);

var cd = gd.calcdata;
assertPointField(cd, 'x', [[0, 1, 2, 3]]);
assertPointField(cd, 'y', [[1, NaN, NaN, 15]]);
});

@alexcjohnsonalexcjohnsonMar 28, 2017

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

do we have a test with a bad x but good y for the same point?

@etpinardetpinardMar 28, 2017

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.

Good call. Added in 6f0a95d


it('should not exclude items with non-numeric x from calcdata (to plots gaps correctly)', function() {
var gd = mockBarPlot([{
x: [1, null, 'nonsense', 15],
y: [1, 2, 10, 30]
}]);

var cd = gd.calcdata;
assertPointField(cd, 'x', [[1, NaN, NaN, 15]]);
assertPointField(cd, 'y', [[1, 2, 10, 30]]);
});
});

describe('Bar.setPositions', function() {
Expand DownExpand Up@@ -681,23 +714,6 @@ describe('Bar.setPositions', function() {
expect(Axes.getAutoRange(ya)).toBeCloseToArray([-1.11, 1.11], undefined, '(ya.range)');
});

it('should skip placeholder trace in position computations', function() {
var gd = mockBarPlot([{
x: [1, 2, 3],
y: [2, 1, 2]
}, {
x: [null],
y: [null]
}]);

expect(gd.calcdata[0][0].t.barwidth).toEqual(0.8);

expect(gd.calcdata[1][0].x).toBe(false);
expect(gd.calcdata[1][0].y).toBe(false);
expect(gd.calcdata[1][0].placeholder).toBe(true);
expect(gd.calcdata[1][0].t.barwidth).toBeUndefined();
});

it('works with log axes (grouped bars)', function() {
var gd = mockBarPlot([
{y: [1, 10, 1e10, -1]},
Expand DownExpand Up@@ -1285,7 +1301,7 @@ function mockBarPlot(dataWithoutTraceType, layout) {

var gd = {
data: dataWithTraceType,
layout: layout,
layout: layout || {},
calcdata: []
};

Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
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;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Bar with non-numeric (x,y) items bug fix by etpinard · Pull Request #1519 · plotly/plotly.js · GitHub
Skip to content
Bar with non-numeric (x,y) items bug fix#1519

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 5 commits into

from

Mar 30, 2017
 Merged


Bar with non-numeric (x,y) items bug fix
#1519
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
b62529d

make toBeCloseToArray and toBeCloseToArray2D handle NaN properly


etpinard Mar 27, 2017
5279f99

set bar size in main serieslen loop


etpinard Mar 27, 2017
0144f06

fill in non-numeric bar items in calcdata


etpinard Mar 28, 2017
042cc82

rm bar (now useless) 'placeholder' logic


etpinard Mar 28, 2017
6f0a95d

add non-numeric 'x' items test for bar calc.js


etpinard Mar 28, 2017

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


20 changes: 3 additions & 17 deletions
src/traces/bar/calc.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,18 +49,11 @@ module.exports = function calc(gd, trace) {

 // create the "calculated data" to plot
 var serieslen = Math.min(pos.length, size.length),
 cd = [];
 cd = new Array(serieslen);

 // set position
 // set position and size
 for(i = 0; i < serieslen; i++) {

 // add bars with non-numeric sizes to calcdata
 // so that ensure that traces with gaps are
 // plotted in the correct order

 if(isNumeric(pos[i])) {
 cd.push({p: pos[i]});
 }
 cd[i] = { p: pos[i], s: size[i] };
 }

 // set base
Expand All@@ -84,13 +77,6 @@ module.exports = function calc(gd, trace) {
 }
 }

 // set size
 for(i = 0; i < cd.length; i++) {
 if(isNumeric(size[i])) {
 cd[i].s = size[i];
 }
 }

 // auto-z and autocolorscale if applicable
 if(hasColorscale(trace, 'marker')) {
 colorscaleCalc(trace, trace.marker.color, 'marker', 'c');
Expand Down

14 changes: 8 additions & 6 deletions
src/traces/bar/set_positions.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@
'use strict';

var isNumeric = require('fast-isnumeric');
var BADNUM = require('../../constants/numerical').BADNUM;

var Registry = require('../../registry');
var Axes = require('../../plots/cartesian/axes');
Expand DownExpand Up@@ -37,8 +38,7 @@ module.exports = function setPositions(gd, plotinfo) {
 fullTrace.visible === true &&
 Registry.traceIs(fullTrace, 'bar') &&
 fullTrace.xaxis === xa._id &&
 fullTrace.yaxis === ya._id &&
 !calcTraces[i][0].placeholder
 fullTrace.yaxis === ya._id
 ) {
 if(fullTrace.orientation === 'h') {
 calcTracesHorizontal.push(calcTraces[i]);
Expand DownExpand Up@@ -188,7 +188,7 @@ function setGroupPositionsInStackOrRelativeMode(gd, pa, sa, calcTraces) {
 for(var j = 0; j < calcTrace.length; j++) {
 var bar = calcTrace[j];

 if(!isNumeric(bar.s)) continue;
 if(bar.s === BADNUM) continue;

 var isOutmostBar = ((bar.b + bar.s) === sieve.get(bar.p, bar.s));
 if(isOutmostBar) bar._outmost = true;
Expand DownExpand Up@@ -395,6 +395,8 @@ function setBarCenter(gd, pa, sieve) {
 calcBar[pLetter] = calcBar.p +
 ((poffsetIsArray) ? poffset[j] : poffset) +
 ((barwidthIsArray) ? barwidth[j] : barwidth) / 2;


 }
 }
}
Expand DownExpand Up@@ -502,7 +504,7 @@ function stackBars(gd, sa, sieve) {
 for(j = 0; j < trace.length; j++) {
 bar = trace[j];

 if(!isNumeric(bar.s)) continue;
 if(bar.s === BADNUM) continue;

 // stack current bar and get previous sum
 var barBase = sieve.put(bar.p, bar.b + bar.s),
Expand DownExpand Up@@ -533,7 +535,7 @@ function sieveBars(gd, sa, sieve) {
 for(var j = 0; j < trace.length; j++) {
 var bar = trace[j];

 if(isNumeric(bar.s)) sieve.put(bar.p, bar.b + bar.s);
 if(bar.s !== BADNUM) sieve.put(bar.p, bar.b + bar.s);
 }
 }
}
Expand DownExpand Up@@ -569,7 +571,7 @@ function normalizeBars(gd, sa, sieve) {
 for(var j = 0; j < trace.length; j++) {
 var bar = trace[j];

 if(!isNumeric(bar.s)) continue;
 if(bar.s === BADNUM) continue;

 var scale = Math.abs(sTop / sieve.get(bar.p, bar.s));
 bar.b *= scale;
Expand Down

3 changes: 2 additions & 1 deletion
src/traces/bar/sieve.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@
module.exports = Sieve;

var Lib = require('../../lib');
var BADNUM = require('../../constants/numerical').BADNUM;

/**
 * Helper class to sieve data from traces into bins
Expand All@@ -34,7 +35,7 @@ function Sieve(traces, separateNegativeValues, dontMergeOverlappingData) {
 var trace = traces[i];
 for(var j = 0; j < trace.length; j++) {
 var bar = trace[j];
 positions.push(bar.p);
if(bar.p !== BADNUM) positions.push(bar.p);
 }
 }
 this.positions = positions;
Expand Down

5 changes: 4 additions & 1 deletion
test/jasmine/assets/custom_matchers.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -143,7 +143,10 @@ function isClose(actual, expected, precision) {
 return Math.abs(actual - expected) < precision;
 }

 return actual === expected;
 return (
 actual === expected ||
 (isNaN(actual) && isNaN(expected))
 );
}

function coercePosition(precision) {
Expand Down

52 changes: 34 additions & 18 deletions
test/jasmine/tests/bar_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -283,6 +283,39 @@ describe('Bar.calc', function() {
 var cd = gd.calcdata;
 assertPointField(cd, 'b', [[0, 1, 2], [0, 1, 0], [0, 0]]);
 });

 it('should not exclude items with non-numeric x/y from calcdata', function() {
 var gd = mockBarPlot([{
 x: [5, NaN, 15, 20, null, 21],
 y: [20, NaN, 23, 25, null, 26]
 }]);

 var cd = gd.calcdata;
 assertPointField(cd, 'x', [[5, NaN, 15, 20, NaN, 21]]);
 assertPointField(cd, 'y', [[20, NaN, 23, 25, NaN, 26]]);
 });

 it('should not exclude items with non-numeric y from calcdata (to plots gaps correctly)', function() {
 var gd = mockBarPlot([{
 x: ['a', 'b', 'c', 'd'],
 y: [1, null, 'nonsense', 15]
 }]);

 var cd = gd.calcdata;
 assertPointField(cd, 'x', [[0, 1, 2, 3]]);
 assertPointField(cd, 'y', [[1, NaN, NaN, 15]]);
 });
@alexcjohnsonalexcjohnsonMar 28, 2017

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

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

do we have a test with a bad x but good y for the same point?
@etpinardetpinardMar 28, 2017

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.

Good call. Added in 6f0a95d

 it('should not exclude items with non-numeric x from calcdata (to plots gaps correctly)', function() {
 var gd = mockBarPlot([{
 x: [1, null, 'nonsense', 15],
 y: [1, 2, 10, 30]
 }]);

 var cd = gd.calcdata;
 assertPointField(cd, 'x', [[1, NaN, NaN, 15]]);
 assertPointField(cd, 'y', [[1, 2, 10, 30]]);
 });
});

describe('Bar.setPositions', function() {
Expand DownExpand Up@@ -681,23 +714,6 @@ describe('Bar.setPositions', function() {
 expect(Axes.getAutoRange(ya)).toBeCloseToArray([-1.11, 1.11], undefined, '(ya.range)');
 });

 it('should skip placeholder trace in position computations', function() {
 var gd = mockBarPlot([{
 x: [1, 2, 3],
 y: [2, 1, 2]
 }, {
 x: [null],
 y: [null]
 }]);

 expect(gd.calcdata[0][0].t.barwidth).toEqual(0.8);

 expect(gd.calcdata[1][0].x).toBe(false);
 expect(gd.calcdata[1][0].y).toBe(false);
 expect(gd.calcdata[1][0].placeholder).toBe(true);
 expect(gd.calcdata[1][0].t.barwidth).toBeUndefined();
 });

 it('works with log axes (grouped bars)', function() {
 var gd = mockBarPlot([
 {y: [1, 10, 1e10, -1]},
Expand DownExpand Up@@ -1285,7 +1301,7 @@ function mockBarPlot(dataWithoutTraceType, layout) {

 var gd = {
 data: dataWithTraceType,
 layout: layout,
 layout: layout || {},
 calcdata: []
 };

Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Bar with non-numeric (x,y) items bug fix by etpinard · Pull Request #1519 · plotly/plotly.js · GitHub
Skip to content
Bar with non-numeric (x,y) items bug fix#1519

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 5 commits into

from

Mar 30, 2017
 Merged


Bar with non-numeric (x,y) items bug fix
#1519
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
b62529d

make toBeCloseToArray and toBeCloseToArray2D handle NaN properly


etpinard Mar 27, 2017
5279f99

set bar size in main serieslen loop


etpinard Mar 27, 2017
0144f06

fill in non-numeric bar items in calcdata


etpinard Mar 28, 2017
042cc82

rm bar (now useless) 'placeholder' logic


etpinard Mar 28, 2017
6f0a95d

add non-numeric 'x' items test for bar calc.js


etpinard Mar 28, 2017

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


20 changes: 3 additions & 17 deletions
src/traces/bar/calc.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,18 +49,11 @@ module.exports = function calc(gd, trace) {

 // create the "calculated data" to plot
 var serieslen = Math.min(pos.length, size.length),
 cd = [];
 cd = new Array(serieslen);

 // set position
 // set position and size
 for(i = 0; i < serieslen; i++) {

 // add bars with non-numeric sizes to calcdata
 // so that ensure that traces with gaps are
 // plotted in the correct order

 if(isNumeric(pos[i])) {
 cd.push({p: pos[i]});
 }
 cd[i] = { p: pos[i], s: size[i] };
 }

 // set base
Expand All@@ -84,13 +77,6 @@ module.exports = function calc(gd, trace) {
 }
 }

 // set size
 for(i = 0; i < cd.length; i++) {
 if(isNumeric(size[i])) {
 cd[i].s = size[i];
 }
 }

 // auto-z and autocolorscale if applicable
 if(hasColorscale(trace, 'marker')) {
 colorscaleCalc(trace, trace.marker.color, 'marker', 'c');
Expand Down

14 changes: 8 additions & 6 deletions
src/traces/bar/set_positions.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@
'use strict';

var isNumeric = require('fast-isnumeric');
var BADNUM = require('../../constants/numerical').BADNUM;

var Registry = require('../../registry');
var Axes = require('../../plots/cartesian/axes');
Expand DownExpand Up@@ -37,8 +38,7 @@ module.exports = function setPositions(gd, plotinfo) {
 fullTrace.visible === true &&
 Registry.traceIs(fullTrace, 'bar') &&
 fullTrace.xaxis === xa._id &&
 fullTrace.yaxis === ya._id &&
 !calcTraces[i][0].placeholder
 fullTrace.yaxis === ya._id
 ) {
 if(fullTrace.orientation === 'h') {
 calcTracesHorizontal.push(calcTraces[i]);
Expand DownExpand Up@@ -188,7 +188,7 @@ function setGroupPositionsInStackOrRelativeMode(gd, pa, sa, calcTraces) {
 for(var j = 0; j < calcTrace.length; j++) {
 var bar = calcTrace[j];

 if(!isNumeric(bar.s)) continue;
 if(bar.s === BADNUM) continue;

 var isOutmostBar = ((bar.b + bar.s) === sieve.get(bar.p, bar.s));
 if(isOutmostBar) bar._outmost = true;
Expand DownExpand Up@@ -395,6 +395,8 @@ function setBarCenter(gd, pa, sieve) {
 calcBar[pLetter] = calcBar.p +
 ((poffsetIsArray) ? poffset[j] : poffset) +
 ((barwidthIsArray) ? barwidth[j] : barwidth) / 2;


 }
 }
}
Expand DownExpand Up@@ -502,7 +504,7 @@ function stackBars(gd, sa, sieve) {
 for(j = 0; j < trace.length; j++) {
 bar = trace[j];

 if(!isNumeric(bar.s)) continue;
 if(bar.s === BADNUM) continue;

 // stack current bar and get previous sum
 var barBase = sieve.put(bar.p, bar.b + bar.s),
Expand DownExpand Up@@ -533,7 +535,7 @@ function sieveBars(gd, sa, sieve) {
 for(var j = 0; j < trace.length; j++) {
 var bar = trace[j];

 if(isNumeric(bar.s)) sieve.put(bar.p, bar.b + bar.s);
 if(bar.s !== BADNUM) sieve.put(bar.p, bar.b + bar.s);
 }
 }
}
Expand DownExpand Up@@ -569,7 +571,7 @@ function normalizeBars(gd, sa, sieve) {
 for(var j = 0; j < trace.length; j++) {
 var bar = trace[j];

 if(!isNumeric(bar.s)) continue;
 if(bar.s === BADNUM) continue;

 var scale = Math.abs(sTop / sieve.get(bar.p, bar.s));
 bar.b *= scale;
Expand Down

3 changes: 2 additions & 1 deletion
src/traces/bar/sieve.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@
module.exports = Sieve;

var Lib = require('../../lib');
var BADNUM = require('../../constants/numerical').BADNUM;

/**
 * Helper class to sieve data from traces into bins
Expand All@@ -34,7 +35,7 @@ function Sieve(traces, separateNegativeValues, dontMergeOverlappingData) {
 var trace = traces[i];
 for(var j = 0; j < trace.length; j++) {
 var bar = trace[j];
 positions.push(bar.p);
if(bar.p !== BADNUM) positions.push(bar.p);
 }
 }
 this.positions = positions;
Expand Down

5 changes: 4 additions & 1 deletion
test/jasmine/assets/custom_matchers.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -143,7 +143,10 @@ function isClose(actual, expected, precision) {
 return Math.abs(actual - expected) < precision;
 }

 return actual === expected;
 return (
 actual === expected ||
 (isNaN(actual) && isNaN(expected))
 );
}

function coercePosition(precision) {
Expand Down

52 changes: 34 additions & 18 deletions
test/jasmine/tests/bar_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -283,6 +283,39 @@ describe('Bar.calc', function() {
 var cd = gd.calcdata;
 assertPointField(cd, 'b', [[0, 1, 2], [0, 1, 0], [0, 0]]);
 });

 it('should not exclude items with non-numeric x/y from calcdata', function() {
 var gd = mockBarPlot([{
 x: [5, NaN, 15, 20, null, 21],
 y: [20, NaN, 23, 25, null, 26]
 }]);

 var cd = gd.calcdata;
 assertPointField(cd, 'x', [[5, NaN, 15, 20, NaN, 21]]);
 assertPointField(cd, 'y', [[20, NaN, 23, 25, NaN, 26]]);
 });

 it('should not exclude items with non-numeric y from calcdata (to plots gaps correctly)', function() {
 var gd = mockBarPlot([{
 x: ['a', 'b', 'c', 'd'],
 y: [1, null, 'nonsense', 15]
 }]);

 var cd = gd.calcdata;
 assertPointField(cd, 'x', [[0, 1, 2, 3]]);
 assertPointField(cd, 'y', [[1, NaN, NaN, 15]]);
 });
@alexcjohnsonalexcjohnsonMar 28, 2017

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

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

do we have a test with a bad x but good y for the same point?
@etpinardetpinardMar 28, 2017

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.

Good call. Added in 6f0a95d

 it('should not exclude items with non-numeric x from calcdata (to plots gaps correctly)', function() {
 var gd = mockBarPlot([{
 x: [1, null, 'nonsense', 15],
 y: [1, 2, 10, 30]
 }]);

 var cd = gd.calcdata;
 assertPointField(cd, 'x', [[1, NaN, NaN, 15]]);
 assertPointField(cd, 'y', [[1, 2, 10, 30]]);
 });
});

describe('Bar.setPositions', function() {
Expand DownExpand Up@@ -681,23 +714,6 @@ describe('Bar.setPositions', function() {
 expect(Axes.getAutoRange(ya)).toBeCloseToArray([-1.11, 1.11], undefined, '(ya.range)');
 });

 it('should skip placeholder trace in position computations', function() {
 var gd = mockBarPlot([{
 x: [1, 2, 3],
 y: [2, 1, 2]
 }, {
 x: [null],
 y: [null]
 }]);

 expect(gd.calcdata[0][0].t.barwidth).toEqual(0.8);

 expect(gd.calcdata[1][0].x).toBe(false);
 expect(gd.calcdata[1][0].y).toBe(false);
 expect(gd.calcdata[1][0].placeholder).toBe(true);
 expect(gd.calcdata[1][0].t.barwidth).toBeUndefined();
 });

 it('works with log axes (grouped bars)', function() {
 var gd = mockBarPlot([
 {y: [1, 10, 1e10, -1]},
Expand DownExpand Up@@ -1285,7 +1301,7 @@ function mockBarPlot(dataWithoutTraceType, layout) {

 var gd = {
 data: dataWithTraceType,
 layout: layout,
 layout: layout || {},
 calcdata: []
 };

Expand Down

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

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 5 commits into

from

Mar 30, 2017
 Merged


Bar with non-numeric (x,y) items bug fix
#1519
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
b62529d

make toBeCloseToArray and toBeCloseToArray2D handle NaN properly


etpinard Mar 27, 2017
5279f99

set bar size in main serieslen loop


etpinard Mar 27, 2017
0144f06

fill in non-numeric bar items in calcdata


etpinard Mar 28, 2017
042cc82

rm bar (now useless) 'placeholder' logic


etpinard Mar 28, 2017
6f0a95d

add non-numeric 'x' items test for bar calc.js


etpinard Mar 28, 2017

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


20 changes: 3 additions & 17 deletions
src/traces/bar/calc.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,18 +49,11 @@ module.exports = function calc(gd, trace) {

 // create the "calculated data" to plot
 var serieslen = Math.min(pos.length, size.length),
 cd = [];
 cd = new Array(serieslen);

 // set position
 // set position and size
 for(i = 0; i < serieslen; i++) {

 // add bars with non-numeric sizes to calcdata
 // so that ensure that traces with gaps are
 // plotted in the correct order

 if(isNumeric(pos[i])) {
 cd.push({p: pos[i]});
 }
 cd[i] = { p: pos[i], s: size[i] };
 }

 // set base
Expand All@@ -84,13 +77,6 @@ module.exports = function calc(gd, trace) {
 }
 }

 // set size
 for(i = 0; i < cd.length; i++) {
 if(isNumeric(size[i])) {
 cd[i].s = size[i];
 }
 }

 // auto-z and autocolorscale if applicable
 if(hasColorscale(trace, 'marker')) {
 colorscaleCalc(trace, trace.marker.color, 'marker', 'c');
Expand Down

14 changes: 8 additions & 6 deletions
src/traces/bar/set_positions.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@
'use strict';

var isNumeric = require('fast-isnumeric');
var BADNUM = require('../../constants/numerical').BADNUM;

var Registry = require('../../registry');
var Axes = require('../../plots/cartesian/axes');
Expand DownExpand Up@@ -37,8 +38,7 @@ module.exports = function setPositions(gd, plotinfo) {
 fullTrace.visible === true &&
 Registry.traceIs(fullTrace, 'bar') &&
 fullTrace.xaxis === xa._id &&
 fullTrace.yaxis === ya._id &&
 !calcTraces[i][0].placeholder
 fullTrace.yaxis === ya._id
 ) {
 if(fullTrace.orientation === 'h') {
 calcTracesHorizontal.push(calcTraces[i]);
Expand DownExpand Up@@ -188,7 +188,7 @@ function setGroupPositionsInStackOrRelativeMode(gd, pa, sa, calcTraces) {
 for(var j = 0; j < calcTrace.length; j++) {
 var bar = calcTrace[j];

 if(!isNumeric(bar.s)) continue;
 if(bar.s === BADNUM) continue;

 var isOutmostBar = ((bar.b + bar.s) === sieve.get(bar.p, bar.s));
 if(isOutmostBar) bar._outmost = true;
Expand DownExpand Up@@ -395,6 +395,8 @@ function setBarCenter(gd, pa, sieve) {
 calcBar[pLetter] = calcBar.p +
 ((poffsetIsArray) ? poffset[j] : poffset) +
 ((barwidthIsArray) ? barwidth[j] : barwidth) / 2;


 }
 }
}
Expand DownExpand Up@@ -502,7 +504,7 @@ function stackBars(gd, sa, sieve) {
 for(j = 0; j < trace.length; j++) {
 bar = trace[j];

 if(!isNumeric(bar.s)) continue;
 if(bar.s === BADNUM) continue;

 // stack current bar and get previous sum
 var barBase = sieve.put(bar.p, bar.b + bar.s),
Expand DownExpand Up@@ -533,7 +535,7 @@ function sieveBars(gd, sa, sieve) {
 for(var j = 0; j < trace.length; j++) {
 var bar = trace[j];

 if(isNumeric(bar.s)) sieve.put(bar.p, bar.b + bar.s);
 if(bar.s !== BADNUM) sieve.put(bar.p, bar.b + bar.s);
 }
 }
}
Expand DownExpand Up@@ -569,7 +571,7 @@ function normalizeBars(gd, sa, sieve) {
 for(var j = 0; j < trace.length; j++) {
 var bar = trace[j];

 if(!isNumeric(bar.s)) continue;
 if(bar.s === BADNUM) continue;

 var scale = Math.abs(sTop / sieve.get(bar.p, bar.s));
 bar.b *= scale;
Expand Down

3 changes: 2 additions & 1 deletion
src/traces/bar/sieve.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@
module.exports = Sieve;

var Lib = require('../../lib');
var BADNUM = require('../../constants/numerical').BADNUM;

/**
 * Helper class to sieve data from traces into bins
Expand All@@ -34,7 +35,7 @@ function Sieve(traces, separateNegativeValues, dontMergeOverlappingData) {
 var trace = traces[i];
 for(var j = 0; j < trace.length; j++) {
 var bar = trace[j];
 positions.push(bar.p);
if(bar.p !== BADNUM) positions.push(bar.p);
 }
 }
 this.positions = positions;
Expand Down

5 changes: 4 additions & 1 deletion
test/jasmine/assets/custom_matchers.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -143,7 +143,10 @@ function isClose(actual, expected, precision) {
 return Math.abs(actual - expected) < precision;
 }

 return actual === expected;
 return (
 actual === expected ||
 (isNaN(actual) && isNaN(expected))
 );
}

function coercePosition(precision) {
Expand Down

52 changes: 34 additions & 18 deletions
test/jasmine/tests/bar_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -283,6 +283,39 @@ describe('Bar.calc', function() {
 var cd = gd.calcdata;
 assertPointField(cd, 'b', [[0, 1, 2], [0, 1, 0], [0, 0]]);
 });

 it('should not exclude items with non-numeric x/y from calcdata', function() {
 var gd = mockBarPlot([{
 x: [5, NaN, 15, 20, null, 21],
 y: [20, NaN, 23, 25, null, 26]
 }]);

 var cd = gd.calcdata;
 assertPointField(cd, 'x', [[5, NaN, 15, 20, NaN, 21]]);
 assertPointField(cd, 'y', [[20, NaN, 23, 25, NaN, 26]]);
 });

 it('should not exclude items with non-numeric y from calcdata (to plots gaps correctly)', function() {
 var gd = mockBarPlot([{
 x: ['a', 'b', 'c', 'd'],
 y: [1, null, 'nonsense', 15]
 }]);

 var cd = gd.calcdata;
 assertPointField(cd, 'x', [[0, 1, 2, 3]]);
 assertPointField(cd, 'y', [[1, NaN, NaN, 15]]);
 });
@alexcjohnsonalexcjohnsonMar 28, 2017

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

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

do we have a test with a bad x but good y for the same point?
@etpinardetpinardMar 28, 2017

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.

Good call. Added in 6f0a95d

 it('should not exclude items with non-numeric x from calcdata (to plots gaps correctly)', function() {
 var gd = mockBarPlot([{
 x: [1, null, 'nonsense', 15],
 y: [1, 2, 10, 30]
 }]);

 var cd = gd.calcdata;
 assertPointField(cd, 'x', [[1, NaN, NaN, 15]]);
 assertPointField(cd, 'y', [[1, 2, 10, 30]]);
 });
});

describe('Bar.setPositions', function() {
Expand DownExpand Up@@ -681,23 +714,6 @@ describe('Bar.setPositions', function() {
 expect(Axes.getAutoRange(ya)).toBeCloseToArray([-1.11, 1.11], undefined, '(ya.range)');
 });

 it('should skip placeholder trace in position computations', function() {
 var gd = mockBarPlot([{
 x: [1, 2, 3],
 y: [2, 1, 2]
 }, {
 x: [null],
 y: [null]
 }]);

 expect(gd.calcdata[0][0].t.barwidth).toEqual(0.8);

 expect(gd.calcdata[1][0].x).toBe(false);
 expect(gd.calcdata[1][0].y).toBe(false);
 expect(gd.calcdata[1][0].placeholder).toBe(true);
 expect(gd.calcdata[1][0].t.barwidth).toBeUndefined();
 });

 it('works with log axes (grouped bars)', function() {
 var gd = mockBarPlot([
 {y: [1, 10, 1e10, -1]},
Expand DownExpand Up@@ -1285,7 +1301,7 @@ function mockBarPlot(dataWithoutTraceType, layout) {

 var gd = {
 data: dataWithTraceType,
 layout: layout,
 layout: layout || {},
 calcdata: []
 };

Expand Down

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

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 5 commits into

from

Mar 30, 2017
 Merged


Bar with non-numeric (x,y) items bug fix
#1519
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
b62529d

make toBeCloseToArray and toBeCloseToArray2D handle NaN properly


etpinard Mar 27, 2017
5279f99

set bar size in main serieslen loop


etpinard Mar 27, 2017
0144f06

fill in non-numeric bar items in calcdata


etpinard Mar 28, 2017
042cc82

rm bar (now useless) 'placeholder' logic


etpinard Mar 28, 2017
6f0a95d

add non-numeric 'x' items test for bar calc.js


etpinard Mar 28, 2017

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


20 changes: 3 additions & 17 deletions
src/traces/bar/calc.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,18 +49,11 @@ module.exports = function calc(gd, trace) {

 // create the "calculated data" to plot
 var serieslen = Math.min(pos.length, size.length),
 cd = [];
 cd = new Array(serieslen);

 // set position
 // set position and size
 for(i = 0; i < serieslen; i++) {

 // add bars with non-numeric sizes to calcdata
 // so that ensure that traces with gaps are
 // plotted in the correct order

 if(isNumeric(pos[i])) {
 cd.push({p: pos[i]});
 }
 cd[i] = { p: pos[i], s: size[i] };
 }

 // set base
Expand All@@ -84,13 +77,6 @@ module.exports = function calc(gd, trace) {
 }
 }

 // set size
 for(i = 0; i < cd.length; i++) {
 if(isNumeric(size[i])) {
 cd[i].s = size[i];
 }
 }

 // auto-z and autocolorscale if applicable
 if(hasColorscale(trace, 'marker')) {
 colorscaleCalc(trace, trace.marker.color, 'marker', 'c');
Expand Down

14 changes: 8 additions & 6 deletions
src/traces/bar/set_positions.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@
'use strict';

var isNumeric = require('fast-isnumeric');
var BADNUM = require('../../constants/numerical').BADNUM;

var Registry = require('../../registry');
var Axes = require('../../plots/cartesian/axes');
Expand DownExpand Up@@ -37,8 +38,7 @@ module.exports = function setPositions(gd, plotinfo) {
 fullTrace.visible === true &&
 Registry.traceIs(fullTrace, 'bar') &&
 fullTrace.xaxis === xa._id &&
 fullTrace.yaxis === ya._id &&
 !calcTraces[i][0].placeholder
 fullTrace.yaxis === ya._id
 ) {
 if(fullTrace.orientation === 'h') {
 calcTracesHorizontal.push(calcTraces[i]);
Expand DownExpand Up@@ -188,7 +188,7 @@ function setGroupPositionsInStackOrRelativeMode(gd, pa, sa, calcTraces) {
 for(var j = 0; j < calcTrace.length; j++) {
 var bar = calcTrace[j];

 if(!isNumeric(bar.s)) continue;
 if(bar.s === BADNUM) continue;

 var isOutmostBar = ((bar.b + bar.s) === sieve.get(bar.p, bar.s));
 if(isOutmostBar) bar._outmost = true;
Expand DownExpand Up@@ -395,6 +395,8 @@ function setBarCenter(gd, pa, sieve) {
 calcBar[pLetter] = calcBar.p +
 ((poffsetIsArray) ? poffset[j] : poffset) +
 ((barwidthIsArray) ? barwidth[j] : barwidth) / 2;


 }
 }
}
Expand DownExpand Up@@ -502,7 +504,7 @@ function stackBars(gd, sa, sieve) {
 for(j = 0; j < trace.length; j++) {
 bar = trace[j];

 if(!isNumeric(bar.s)) continue;
 if(bar.s === BADNUM) continue;

 // stack current bar and get previous sum
 var barBase = sieve.put(bar.p, bar.b + bar.s),
Expand DownExpand Up@@ -533,7 +535,7 @@ function sieveBars(gd, sa, sieve) {
 for(var j = 0; j < trace.length; j++) {
 var bar = trace[j];

 if(isNumeric(bar.s)) sieve.put(bar.p, bar.b + bar.s);
 if(bar.s !== BADNUM) sieve.put(bar.p, bar.b + bar.s);
 }
 }
}
Expand DownExpand Up@@ -569,7 +571,7 @@ function normalizeBars(gd, sa, sieve) {
 for(var j = 0; j < trace.length; j++) {
 var bar = trace[j];

 if(!isNumeric(bar.s)) continue;
 if(bar.s === BADNUM) continue;

 var scale = Math.abs(sTop / sieve.get(bar.p, bar.s));
 bar.b *= scale;
Expand Down

3 changes: 2 additions & 1 deletion
src/traces/bar/sieve.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@
module.exports = Sieve;

var Lib = require('../../lib');
var BADNUM = require('../../constants/numerical').BADNUM;

/**
 * Helper class to sieve data from traces into bins
Expand All@@ -34,7 +35,7 @@ function Sieve(traces, separateNegativeValues, dontMergeOverlappingData) {
 var trace = traces[i];
 for(var j = 0; j < trace.length; j++) {
 var bar = trace[j];
 positions.push(bar.p);
if(bar.p !== BADNUM) positions.push(bar.p);
 }
 }
 this.positions = positions;
Expand Down

5 changes: 4 additions & 1 deletion
test/jasmine/assets/custom_matchers.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -143,7 +143,10 @@ function isClose(actual, expected, precision) {
 return Math.abs(actual - expected) < precision;
 }

 return actual === expected;
 return (
 actual === expected ||
 (isNaN(actual) && isNaN(expected))
 );
}

function coercePosition(precision) {
Expand Down

52 changes: 34 additions & 18 deletions
test/jasmine/tests/bar_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -283,6 +283,39 @@ describe('Bar.calc', function() {
 var cd = gd.calcdata;
 assertPointField(cd, 'b', [[0, 1, 2], [0, 1, 0], [0, 0]]);
 });

 it('should not exclude items with non-numeric x/y from calcdata', function() {
 var gd = mockBarPlot([{
 x: [5, NaN, 15, 20, null, 21],
 y: [20, NaN, 23, 25, null, 26]
 }]);

 var cd = gd.calcdata;
 assertPointField(cd, 'x', [[5, NaN, 15, 20, NaN, 21]]);
 assertPointField(cd, 'y', [[20, NaN, 23, 25, NaN, 26]]);
 });

 it('should not exclude items with non-numeric y from calcdata (to plots gaps correctly)', function() {
 var gd = mockBarPlot([{
 x: ['a', 'b', 'c', 'd'],
 y: [1, null, 'nonsense', 15]
 }]);

 var cd = gd.calcdata;
 assertPointField(cd, 'x', [[0, 1, 2, 3]]);
 assertPointField(cd, 'y', [[1, NaN, NaN, 15]]);
 });
@alexcjohnsonalexcjohnsonMar 28, 2017

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

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

do we have a test with a bad x but good y for the same point?
@etpinardetpinardMar 28, 2017

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.

Good call. Added in 6f0a95d

 it('should not exclude items with non-numeric x from calcdata (to plots gaps correctly)', function() {
 var gd = mockBarPlot([{
 x: [1, null, 'nonsense', 15],
 y: [1, 2, 10, 30]
 }]);

 var cd = gd.calcdata;
 assertPointField(cd, 'x', [[1, NaN, NaN, 15]]);
 assertPointField(cd, 'y', [[1, 2, 10, 30]]);
 });
});

describe('Bar.setPositions', function() {
Expand DownExpand Up@@ -681,23 +714,6 @@ describe('Bar.setPositions', function() {
 expect(Axes.getAutoRange(ya)).toBeCloseToArray([-1.11, 1.11], undefined, '(ya.range)');
 });

 it('should skip placeholder trace in position computations', function() {
 var gd = mockBarPlot([{
 x: [1, 2, 3],
 y: [2, 1, 2]
 }, {
 x: [null],
 y: [null]
 }]);

 expect(gd.calcdata[0][0].t.barwidth).toEqual(0.8);

 expect(gd.calcdata[1][0].x).toBe(false);
 expect(gd.calcdata[1][0].y).toBe(false);
 expect(gd.calcdata[1][0].placeholder).toBe(true);
 expect(gd.calcdata[1][0].t.barwidth).toBeUndefined();
 });

 it('works with log axes (grouped bars)', function() {
 var gd = mockBarPlot([
 {y: [1, 10, 1e10, -1]},
Expand DownExpand Up@@ -1285,7 +1301,7 @@ function mockBarPlot(dataWithoutTraceType, layout) {

 var gd = {
 data: dataWithTraceType,
 layout: layout,
 layout: layout || {},
 calcdata: []
 };

Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Bar with non-numeric (x,y) items bug fix by etpinard · Pull Request #1519 · plotly/plotly.js · GitHub
Skip to content
Bar with non-numeric (x,y) items bug fix#1519

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 5 commits into

from

Mar 30, 2017
 Merged


Bar with non-numeric (x,y) items bug fix
#1519
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
b62529d

make toBeCloseToArray and toBeCloseToArray2D handle NaN properly


etpinard Mar 27, 2017
5279f99

set bar size in main serieslen loop


etpinard Mar 27, 2017
0144f06

fill in non-numeric bar items in calcdata


etpinard Mar 28, 2017
042cc82

rm bar (now useless) 'placeholder' logic


etpinard Mar 28, 2017
6f0a95d

add non-numeric 'x' items test for bar calc.js


etpinard Mar 28, 2017

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


20 changes: 3 additions & 17 deletions
src/traces/bar/calc.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,18 +49,11 @@ module.exports = function calc(gd, trace) {

 // create the "calculated data" to plot
 var serieslen = Math.min(pos.length, size.length),
 cd = [];
 cd = new Array(serieslen);

 // set position
 // set position and size
 for(i = 0; i < serieslen; i++) {

 // add bars with non-numeric sizes to calcdata
 // so that ensure that traces with gaps are
 // plotted in the correct order

 if(isNumeric(pos[i])) {
 cd.push({p: pos[i]});
 }
 cd[i] = { p: pos[i], s: size[i] };
 }

 // set base
Expand All@@ -84,13 +77,6 @@ module.exports = function calc(gd, trace) {
 }
 }

 // set size
 for(i = 0; i < cd.length; i++) {
 if(isNumeric(size[i])) {
 cd[i].s = size[i];
 }
 }

 // auto-z and autocolorscale if applicable
 if(hasColorscale(trace, 'marker')) {
 colorscaleCalc(trace, trace.marker.color, 'marker', 'c');
Expand Down

14 changes: 8 additions & 6 deletions
src/traces/bar/set_positions.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@
'use strict';

var isNumeric = require('fast-isnumeric');
var BADNUM = require('../../constants/numerical').BADNUM;

var Registry = require('../../registry');
var Axes = require('../../plots/cartesian/axes');
Expand DownExpand Up@@ -37,8 +38,7 @@ module.exports = function setPositions(gd, plotinfo) {
 fullTrace.visible === true &&
 Registry.traceIs(fullTrace, 'bar') &&
 fullTrace.xaxis === xa._id &&
 fullTrace.yaxis === ya._id &&
 !calcTraces[i][0].placeholder
 fullTrace.yaxis === ya._id
 ) {
 if(fullTrace.orientation === 'h') {
 calcTracesHorizontal.push(calcTraces[i]);
Expand DownExpand Up@@ -188,7 +188,7 @@ function setGroupPositionsInStackOrRelativeMode(gd, pa, sa, calcTraces) {
 for(var j = 0; j < calcTrace.length; j++) {
 var bar = calcTrace[j];

 if(!isNumeric(bar.s)) continue;
 if(bar.s === BADNUM) continue;

 var isOutmostBar = ((bar.b + bar.s) === sieve.get(bar.p, bar.s));
 if(isOutmostBar) bar._outmost = true;
Expand DownExpand Up@@ -395,6 +395,8 @@ function setBarCenter(gd, pa, sieve) {
 calcBar[pLetter] = calcBar.p +
 ((poffsetIsArray) ? poffset[j] : poffset) +
 ((barwidthIsArray) ? barwidth[j] : barwidth) / 2;


 }
 }
}
Expand DownExpand Up@@ -502,7 +504,7 @@ function stackBars(gd, sa, sieve) {
 for(j = 0; j < trace.length; j++) {
 bar = trace[j];

 if(!isNumeric(bar.s)) continue;
 if(bar.s === BADNUM) continue;

 // stack current bar and get previous sum
 var barBase = sieve.put(bar.p, bar.b + bar.s),
Expand DownExpand Up@@ -533,7 +535,7 @@ function sieveBars(gd, sa, sieve) {
 for(var j = 0; j < trace.length; j++) {
 var bar = trace[j];

 if(isNumeric(bar.s)) sieve.put(bar.p, bar.b + bar.s);
 if(bar.s !== BADNUM) sieve.put(bar.p, bar.b + bar.s);
 }
 }
}
Expand DownExpand Up@@ -569,7 +571,7 @@ function normalizeBars(gd, sa, sieve) {
 for(var j = 0; j < trace.length; j++) {
 var bar = trace[j];

 if(!isNumeric(bar.s)) continue;
 if(bar.s === BADNUM) continue;

 var scale = Math.abs(sTop / sieve.get(bar.p, bar.s));
 bar.b *= scale;
Expand Down

3 changes: 2 additions & 1 deletion
src/traces/bar/sieve.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@
module.exports = Sieve;

var Lib = require('../../lib');
var BADNUM = require('../../constants/numerical').BADNUM;

/**
 * Helper class to sieve data from traces into bins
Expand All@@ -34,7 +35,7 @@ function Sieve(traces, separateNegativeValues, dontMergeOverlappingData) {
 var trace = traces[i];
 for(var j = 0; j < trace.length; j++) {
 var bar = trace[j];
 positions.push(bar.p);
if(bar.p !== BADNUM) positions.push(bar.p);
 }
 }
 this.positions = positions;
Expand Down

5 changes: 4 additions & 1 deletion
test/jasmine/assets/custom_matchers.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -143,7 +143,10 @@ function isClose(actual, expected, precision) {
 return Math.abs(actual - expected) < precision;
 }

 return actual === expected;
 return (
 actual === expected ||
 (isNaN(actual) && isNaN(expected))
 );
}

function coercePosition(precision) {
Expand Down

52 changes: 34 additions & 18 deletions
test/jasmine/tests/bar_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -283,6 +283,39 @@ describe('Bar.calc', function() {
 var cd = gd.calcdata;
 assertPointField(cd, 'b', [[0, 1, 2], [0, 1, 0], [0, 0]]);
 });

 it('should not exclude items with non-numeric x/y from calcdata', function() {
 var gd = mockBarPlot([{
 x: [5, NaN, 15, 20, null, 21],
 y: [20, NaN, 23, 25, null, 26]
 }]);

 var cd = gd.calcdata;
 assertPointField(cd, 'x', [[5, NaN, 15, 20, NaN, 21]]);
 assertPointField(cd, 'y', [[20, NaN, 23, 25, NaN, 26]]);
 });

 it('should not exclude items with non-numeric y from calcdata (to plots gaps correctly)', function() {
 var gd = mockBarPlot([{
 x: ['a', 'b', 'c', 'd'],
 y: [1, null, 'nonsense', 15]
 }]);

 var cd = gd.calcdata;
 assertPointField(cd, 'x', [[0, 1, 2, 3]]);
 assertPointField(cd, 'y', [[1, NaN, NaN, 15]]);
 });
@alexcjohnsonalexcjohnsonMar 28, 2017

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

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

do we have a test with a bad x but good y for the same point?
@etpinardetpinardMar 28, 2017

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.

Good call. Added in 6f0a95d

 it('should not exclude items with non-numeric x from calcdata (to plots gaps correctly)', function() {
 var gd = mockBarPlot([{
 x: [1, null, 'nonsense', 15],
 y: [1, 2, 10, 30]
 }]);

 var cd = gd.calcdata;
 assertPointField(cd, 'x', [[1, NaN, NaN, 15]]);
 assertPointField(cd, 'y', [[1, 2, 10, 30]]);
 });
});

describe('Bar.setPositions', function() {
Expand DownExpand Up@@ -681,23 +714,6 @@ describe('Bar.setPositions', function() {
 expect(Axes.getAutoRange(ya)).toBeCloseToArray([-1.11, 1.11], undefined, '(ya.range)');
 });

 it('should skip placeholder trace in position computations', function() {
 var gd = mockBarPlot([{
 x: [1, 2, 3],
 y: [2, 1, 2]
 }, {
 x: [null],
 y: [null]
 }]);

 expect(gd.calcdata[0][0].t.barwidth).toEqual(0.8);

 expect(gd.calcdata[1][0].x).toBe(false);
 expect(gd.calcdata[1][0].y).toBe(false);
 expect(gd.calcdata[1][0].placeholder).toBe(true);
 expect(gd.calcdata[1][0].t.barwidth).toBeUndefined();
 });

 it('works with log axes (grouped bars)', function() {
 var gd = mockBarPlot([
 {y: [1, 10, 1e10, -1]},
Expand DownExpand Up@@ -1285,7 +1301,7 @@ function mockBarPlot(dataWithoutTraceType, layout) {

 var gd = {
 data: dataWithTraceType,
 layout: layout,
 layout: layout || {},
 calcdata: []
 };

Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Bar with non-numeric (x,y) items bug fix by etpinard · Pull Request #1519 · plotly/plotly.js · GitHub
Skip to content
Bar with non-numeric (x,y) items bug fix#1519

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 5 commits into

from

Mar 30, 2017
 Merged


Bar with non-numeric (x,y) items bug fix
#1519
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
b62529d

make toBeCloseToArray and toBeCloseToArray2D handle NaN properly


etpinard Mar 27, 2017
5279f99

set bar size in main serieslen loop


etpinard Mar 27, 2017
0144f06

fill in non-numeric bar items in calcdata


etpinard Mar 28, 2017
042cc82

rm bar (now useless) 'placeholder' logic


etpinard Mar 28, 2017
6f0a95d

add non-numeric 'x' items test for bar calc.js


etpinard Mar 28, 2017

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


20 changes: 3 additions & 17 deletions
src/traces/bar/calc.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,18 +49,11 @@ module.exports = function calc(gd, trace) {

 // create the "calculated data" to plot
 var serieslen = Math.min(pos.length, size.length),
 cd = [];
 cd = new Array(serieslen);

 // set position
 // set position and size
 for(i = 0; i < serieslen; i++) {

 // add bars with non-numeric sizes to calcdata
 // so that ensure that traces with gaps are
 // plotted in the correct order

 if(isNumeric(pos[i])) {
 cd.push({p: pos[i]});
 }
 cd[i] = { p: pos[i], s: size[i] };
 }

 // set base
Expand All@@ -84,13 +77,6 @@ module.exports = function calc(gd, trace) {
 }
 }

 // set size
 for(i = 0; i < cd.length; i++) {
 if(isNumeric(size[i])) {
 cd[i].s = size[i];
 }
 }

 // auto-z and autocolorscale if applicable
 if(hasColorscale(trace, 'marker')) {
 colorscaleCalc(trace, trace.marker.color, 'marker', 'c');
Expand Down

14 changes: 8 additions & 6 deletions
src/traces/bar/set_positions.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@
'use strict';

var isNumeric = require('fast-isnumeric');
var BADNUM = require('../../constants/numerical').BADNUM;

var Registry = require('../../registry');
var Axes = require('../../plots/cartesian/axes');
Expand DownExpand Up@@ -37,8 +38,7 @@ module.exports = function setPositions(gd, plotinfo) {
 fullTrace.visible === true &&
 Registry.traceIs(fullTrace, 'bar') &&
 fullTrace.xaxis === xa._id &&
 fullTrace.yaxis === ya._id &&
 !calcTraces[i][0].placeholder
 fullTrace.yaxis === ya._id
 ) {
 if(fullTrace.orientation === 'h') {
 calcTracesHorizontal.push(calcTraces[i]);
Expand DownExpand Up@@ -188,7 +188,7 @@ function setGroupPositionsInStackOrRelativeMode(gd, pa, sa, calcTraces) {
 for(var j = 0; j < calcTrace.length; j++) {
 var bar = calcTrace[j];

 if(!isNumeric(bar.s)) continue;
 if(bar.s === BADNUM) continue;

 var isOutmostBar = ((bar.b + bar.s) === sieve.get(bar.p, bar.s));
 if(isOutmostBar) bar._outmost = true;
Expand DownExpand Up@@ -395,6 +395,8 @@ function setBarCenter(gd, pa, sieve) {
 calcBar[pLetter] = calcBar.p +
 ((poffsetIsArray) ? poffset[j] : poffset) +
 ((barwidthIsArray) ? barwidth[j] : barwidth) / 2;


 }
 }
}
Expand DownExpand Up@@ -502,7 +504,7 @@ function stackBars(gd, sa, sieve) {
 for(j = 0; j < trace.length; j++) {
 bar = trace[j];

 if(!isNumeric(bar.s)) continue;
 if(bar.s === BADNUM) continue;

 // stack current bar and get previous sum
 var barBase = sieve.put(bar.p, bar.b + bar.s),
Expand DownExpand Up@@ -533,7 +535,7 @@ function sieveBars(gd, sa, sieve) {
 for(var j = 0; j < trace.length; j++) {
 var bar = trace[j];

 if(isNumeric(bar.s)) sieve.put(bar.p, bar.b + bar.s);
 if(bar.s !== BADNUM) sieve.put(bar.p, bar.b + bar.s);
 }
 }
}
Expand DownExpand Up@@ -569,7 +571,7 @@ function normalizeBars(gd, sa, sieve) {
 for(var j = 0; j < trace.length; j++) {
 var bar = trace[j];

 if(!isNumeric(bar.s)) continue;
 if(bar.s === BADNUM) continue;

 var scale = Math.abs(sTop / sieve.get(bar.p, bar.s));
 bar.b *= scale;
Expand Down

3 changes: 2 additions & 1 deletion
src/traces/bar/sieve.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@
module.exports = Sieve;

var Lib = require('../../lib');
var BADNUM = require('../../constants/numerical').BADNUM;

/**
 * Helper class to sieve data from traces into bins
Expand All@@ -34,7 +35,7 @@ function Sieve(traces, separateNegativeValues, dontMergeOverlappingData) {
 var trace = traces[i];
 for(var j = 0; j < trace.length; j++) {
 var bar = trace[j];
 positions.push(bar.p);
if(bar.p !== BADNUM) positions.push(bar.p);
 }
 }
 this.positions = positions;
Expand Down

5 changes: 4 additions & 1 deletion
test/jasmine/assets/custom_matchers.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -143,7 +143,10 @@ function isClose(actual, expected, precision) {
 return Math.abs(actual - expected) < precision;
 }

 return actual === expected;
 return (
 actual === expected ||
 (isNaN(actual) && isNaN(expected))
 );
}

function coercePosition(precision) {
Expand Down

52 changes: 34 additions & 18 deletions
test/jasmine/tests/bar_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -283,6 +283,39 @@ describe('Bar.calc', function() {
 var cd = gd.calcdata;
 assertPointField(cd, 'b', [[0, 1, 2], [0, 1, 0], [0, 0]]);
 });

 it('should not exclude items with non-numeric x/y from calcdata', function() {
 var gd = mockBarPlot([{
 x: [5, NaN, 15, 20, null, 21],
 y: [20, NaN, 23, 25, null, 26]
 }]);

 var cd = gd.calcdata;
 assertPointField(cd, 'x', [[5, NaN, 15, 20, NaN, 21]]);
 assertPointField(cd, 'y', [[20, NaN, 23, 25, NaN, 26]]);
 });

 it('should not exclude items with non-numeric y from calcdata (to plots gaps correctly)', function() {
 var gd = mockBarPlot([{
 x: ['a', 'b', 'c', 'd'],
 y: [1, null, 'nonsense', 15]
 }]);

 var cd = gd.calcdata;
 assertPointField(cd, 'x', [[0, 1, 2, 3]]);
 assertPointField(cd, 'y', [[1, NaN, NaN, 15]]);
 });
@alexcjohnsonalexcjohnsonMar 28, 2017

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

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

do we have a test with a bad x but good y for the same point?
@etpinardetpinardMar 28, 2017

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.

Good call. Added in 6f0a95d

 it('should not exclude items with non-numeric x from calcdata (to plots gaps correctly)', function() {
 var gd = mockBarPlot([{
 x: [1, null, 'nonsense', 15],
 y: [1, 2, 10, 30]
 }]);

 var cd = gd.calcdata;
 assertPointField(cd, 'x', [[1, NaN, NaN, 15]]);
 assertPointField(cd, 'y', [[1, 2, 10, 30]]);
 });
});

describe('Bar.setPositions', function() {
Expand DownExpand Up@@ -681,23 +714,6 @@ describe('Bar.setPositions', function() {
 expect(Axes.getAutoRange(ya)).toBeCloseToArray([-1.11, 1.11], undefined, '(ya.range)');
 });

 it('should skip placeholder trace in position computations', function() {
 var gd = mockBarPlot([{
 x: [1, 2, 3],
 y: [2, 1, 2]
 }, {
 x: [null],
 y: [null]
 }]);

 expect(gd.calcdata[0][0].t.barwidth).toEqual(0.8);

 expect(gd.calcdata[1][0].x).toBe(false);
 expect(gd.calcdata[1][0].y).toBe(false);
 expect(gd.calcdata[1][0].placeholder).toBe(true);
 expect(gd.calcdata[1][0].t.barwidth).toBeUndefined();
 });

 it('works with log axes (grouped bars)', function() {
 var gd = mockBarPlot([
 {y: [1, 10, 1e10, -1]},
Expand DownExpand Up@@ -1285,7 +1301,7 @@ function mockBarPlot(dataWithoutTraceType, layout) {

 var gd = {
 data: dataWithTraceType,
 layout: layout,
 layout: layout || {},
 calcdata: []
 };

Expand Down

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

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 5 commits into

from

Mar 30, 2017
 Merged


Bar with non-numeric (x,y) items bug fix
#1519
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
b62529d

make toBeCloseToArray and toBeCloseToArray2D handle NaN properly


etpinard Mar 27, 2017
5279f99

set bar size in main serieslen loop


etpinard Mar 27, 2017
0144f06

fill in non-numeric bar items in calcdata


etpinard Mar 28, 2017
042cc82

rm bar (now useless) 'placeholder' logic


etpinard Mar 28, 2017
6f0a95d

add non-numeric 'x' items test for bar calc.js


etpinard Mar 28, 2017

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


20 changes: 3 additions & 17 deletions
src/traces/bar/calc.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,18 +49,11 @@ module.exports = function calc(gd, trace) {

 // create the "calculated data" to plot
 var serieslen = Math.min(pos.length, size.length),
 cd = [];
 cd = new Array(serieslen);

 // set position
 // set position and size
 for(i = 0; i < serieslen; i++) {

 // add bars with non-numeric sizes to calcdata
 // so that ensure that traces with gaps are
 // plotted in the correct order

 if(isNumeric(pos[i])) {
 cd.push({p: pos[i]});
 }
 cd[i] = { p: pos[i], s: size[i] };
 }

 // set base
Expand All@@ -84,13 +77,6 @@ module.exports = function calc(gd, trace) {
 }
 }

 // set size
 for(i = 0; i < cd.length; i++) {
 if(isNumeric(size[i])) {
 cd[i].s = size[i];
 }
 }

 // auto-z and autocolorscale if applicable
 if(hasColorscale(trace, 'marker')) {
 colorscaleCalc(trace, trace.marker.color, 'marker', 'c');
Expand Down

14 changes: 8 additions & 6 deletions
src/traces/bar/set_positions.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@
'use strict';

var isNumeric = require('fast-isnumeric');
var BADNUM = require('../../constants/numerical').BADNUM;

var Registry = require('../../registry');
var Axes = require('../../plots/cartesian/axes');
Expand DownExpand Up@@ -37,8 +38,7 @@ module.exports = function setPositions(gd, plotinfo) {
 fullTrace.visible === true &&
 Registry.traceIs(fullTrace, 'bar') &&
 fullTrace.xaxis === xa._id &&
 fullTrace.yaxis === ya._id &&
 !calcTraces[i][0].placeholder
 fullTrace.yaxis === ya._id
 ) {
 if(fullTrace.orientation === 'h') {
 calcTracesHorizontal.push(calcTraces[i]);
Expand DownExpand Up@@ -188,7 +188,7 @@ function setGroupPositionsInStackOrRelativeMode(gd, pa, sa, calcTraces) {
 for(var j = 0; j < calcTrace.length; j++) {
 var bar = calcTrace[j];

 if(!isNumeric(bar.s)) continue;
 if(bar.s === BADNUM) continue;

 var isOutmostBar = ((bar.b + bar.s) === sieve.get(bar.p, bar.s));
 if(isOutmostBar) bar._outmost = true;
Expand DownExpand Up@@ -395,6 +395,8 @@ function setBarCenter(gd, pa, sieve) {
 calcBar[pLetter] = calcBar.p +
 ((poffsetIsArray) ? poffset[j] : poffset) +
 ((barwidthIsArray) ? barwidth[j] : barwidth) / 2;


 }
 }
}
Expand DownExpand Up@@ -502,7 +504,7 @@ function stackBars(gd, sa, sieve) {
 for(j = 0; j < trace.length; j++) {
 bar = trace[j];

 if(!isNumeric(bar.s)) continue;
 if(bar.s === BADNUM) continue;

 // stack current bar and get previous sum
 var barBase = sieve.put(bar.p, bar.b + bar.s),
Expand DownExpand Up@@ -533,7 +535,7 @@ function sieveBars(gd, sa, sieve) {
 for(var j = 0; j < trace.length; j++) {
 var bar = trace[j];

 if(isNumeric(bar.s)) sieve.put(bar.p, bar.b + bar.s);
 if(bar.s !== BADNUM) sieve.put(bar.p, bar.b + bar.s);
 }
 }
}
Expand DownExpand Up@@ -569,7 +571,7 @@ function normalizeBars(gd, sa, sieve) {
 for(var j = 0; j < trace.length; j++) {
 var bar = trace[j];

 if(!isNumeric(bar.s)) continue;
 if(bar.s === BADNUM) continue;

 var scale = Math.abs(sTop / sieve.get(bar.p, bar.s));
 bar.b *= scale;
Expand Down

3 changes: 2 additions & 1 deletion
src/traces/bar/sieve.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@
module.exports = Sieve;

var Lib = require('../../lib');
var BADNUM = require('../../constants/numerical').BADNUM;

/**
 * Helper class to sieve data from traces into bins
Expand All@@ -34,7 +35,7 @@ function Sieve(traces, separateNegativeValues, dontMergeOverlappingData) {
 var trace = traces[i];
 for(var j = 0; j < trace.length; j++) {
 var bar = trace[j];
 positions.push(bar.p);
if(bar.p !== BADNUM) positions.push(bar.p);
 }
 }
 this.positions = positions;
Expand Down

5 changes: 4 additions & 1 deletion
test/jasmine/assets/custom_matchers.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -143,7 +143,10 @@ function isClose(actual, expected, precision) {
 return Math.abs(actual - expected) < precision;
 }

 return actual === expected;
 return (
 actual === expected ||
 (isNaN(actual) && isNaN(expected))
 );
}

function coercePosition(precision) {
Expand Down

52 changes: 34 additions & 18 deletions
test/jasmine/tests/bar_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -283,6 +283,39 @@ describe('Bar.calc', function() {
 var cd = gd.calcdata;
 assertPointField(cd, 'b', [[0, 1, 2], [0, 1, 0], [0, 0]]);
 });

 it('should not exclude items with non-numeric x/y from calcdata', function() {
 var gd = mockBarPlot([{
 x: [5, NaN, 15, 20, null, 21],
 y: [20, NaN, 23, 25, null, 26]
 }]);

 var cd = gd.calcdata;
 assertPointField(cd, 'x', [[5, NaN, 15, 20, NaN, 21]]);
 assertPointField(cd, 'y', [[20, NaN, 23, 25, NaN, 26]]);
 });

 it('should not exclude items with non-numeric y from calcdata (to plots gaps correctly)', function() {
 var gd = mockBarPlot([{
 x: ['a', 'b', 'c', 'd'],
 y: [1, null, 'nonsense', 15]
 }]);

 var cd = gd.calcdata;
 assertPointField(cd, 'x', [[0, 1, 2, 3]]);
 assertPointField(cd, 'y', [[1, NaN, NaN, 15]]);
 });
@alexcjohnsonalexcjohnsonMar 28, 2017

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

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

do we have a test with a bad x but good y for the same point?
@etpinardetpinardMar 28, 2017

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.

Good call. Added in 6f0a95d

 it('should not exclude items with non-numeric x from calcdata (to plots gaps correctly)', function() {
 var gd = mockBarPlot([{
 x: [1, null, 'nonsense', 15],
 y: [1, 2, 10, 30]
 }]);

 var cd = gd.calcdata;
 assertPointField(cd, 'x', [[1, NaN, NaN, 15]]);
 assertPointField(cd, 'y', [[1, 2, 10, 30]]);
 });
});

describe('Bar.setPositions', function() {
Expand DownExpand Up@@ -681,23 +714,6 @@ describe('Bar.setPositions', function() {
 expect(Axes.getAutoRange(ya)).toBeCloseToArray([-1.11, 1.11], undefined, '(ya.range)');
 });

 it('should skip placeholder trace in position computations', function() {
 var gd = mockBarPlot([{
 x: [1, 2, 3],
 y: [2, 1, 2]
 }, {
 x: [null],
 y: [null]
 }]);

 expect(gd.calcdata[0][0].t.barwidth).toEqual(0.8);

 expect(gd.calcdata[1][0].x).toBe(false);
 expect(gd.calcdata[1][0].y).toBe(false);
 expect(gd.calcdata[1][0].placeholder).toBe(true);
 expect(gd.calcdata[1][0].t.barwidth).toBeUndefined();
 });

 it('works with log axes (grouped bars)', function() {
 var gd = mockBarPlot([
 {y: [1, 10, 1e10, -1]},
Expand DownExpand Up@@ -1285,7 +1301,7 @@ function mockBarPlot(dataWithoutTraceType, layout) {

 var gd = {
 data: dataWithTraceType,
 layout: layout,
 layout: layout || {},
 calcdata: []
 };

Expand Down