Skip to content

Commit 6c07e2e

Browse files
committed
use BADNUM instead of false to denote bad calcdata items
- unfinished business from b5cd573
1 parent 30eb865 commit 6c07e2e

File tree

2 files changed

+10
-8
lines changed

2 files changed

+10
-8
lines changed

src/traces/scatter/calc.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
var isNumeric = require('fast-isnumeric');
1313

1414
var Axes = require('../../plots/cartesian/axes');
15+
var BADNUM = require('../../constants/numerical').BADNUM;
1516

1617
var subTypes = require('./subtypes');
1718
var calcColorscale = require('./colorscale_calc');
@@ -114,7 +115,7 @@ module.exports = function calc(gd, trace) {
114115
var cd = new Array(serieslen);
115116
for(i = 0; i < serieslen; i++) {
116117
cd[i] = (isNumeric(x[i]) && isNumeric(y[i])) ?
117-
{x: x[i], y: y[i]} : {x: false, y: false};
118+
{x: x[i], y: y[i]} : {x: BADNUM, y: BADNUM};
118119

119120
if(trace.ids) {
120121
cd[i].id = String(trace.ids[i]);

test/jasmine/tests/calcdata_test.js

+8-7
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
var Plotly = require('@lib/index');
22

3+
var BADNUM = require('@src/constants/numerical').BADNUM;
34
var createGraphDiv = require('../assets/create_graph_div');
45
var destroyGraphDiv = require('../assets/destroy_graph_div');
56

@@ -18,15 +19,15 @@ describe('calculated data and points', function() {
1819
it('should exclude null and undefined points when false', function() {
1920
Plotly.plot(gd, [{ x: [1, 2, 3, undefined, 5], y: [1, null, 3, 4, 5]}], {});
2021

21-
expect(gd.calcdata[0][1]).toEqual(jasmine.objectContaining({ x: false, y: false}));
22-
expect(gd.calcdata[0][3]).toEqual(jasmine.objectContaining({ x: false, y: false}));
22+
expect(gd.calcdata[0][1]).toEqual(jasmine.objectContaining({ x: BADNUM, y: BADNUM}));
23+
expect(gd.calcdata[0][3]).toEqual(jasmine.objectContaining({ x: BADNUM, y: BADNUM}));
2324
});
2425

2526
it('should exclude null and undefined points as categories when false', function() {
2627
Plotly.plot(gd, [{ x: [1, 2, 3, undefined, 5], y: [1, null, 3, 4, 5] }], { xaxis: { type: 'category' }});
2728

28-
expect(gd.calcdata[0][1]).toEqual(jasmine.objectContaining({ x: false, y: false}));
29-
expect(gd.calcdata[0][3]).toEqual(jasmine.objectContaining({ x: false, y: false}));
29+
expect(gd.calcdata[0][1]).toEqual(jasmine.objectContaining({ x: BADNUM, y: BADNUM}));
30+
expect(gd.calcdata[0][3]).toEqual(jasmine.objectContaining({ x: BADNUM, y: BADNUM}));
3031
});
3132
});
3233

@@ -192,9 +193,9 @@ describe('calculated data and points', function() {
192193
}});
193194

194195
expect(gd.calcdata[0][0]).toEqual(jasmine.objectContaining({x: 4, y: 15}));
195-
expect(gd.calcdata[0][1]).toEqual(jasmine.objectContaining({ x: false, y: false}));
196+
expect(gd.calcdata[0][1]).toEqual(jasmine.objectContaining({ x: BADNUM, y: BADNUM}));
196197
expect(gd.calcdata[0][2]).toEqual(jasmine.objectContaining({x: 3, y: 12}));
197-
expect(gd.calcdata[0][3]).toEqual(jasmine.objectContaining({ x: false, y: false}));
198+
expect(gd.calcdata[0][3]).toEqual(jasmine.objectContaining({ x: BADNUM, y: BADNUM}));
198199
expect(gd.calcdata[0][4]).toEqual(jasmine.objectContaining({x: 2, y: 14}));
199200
});
200201

@@ -269,7 +270,7 @@ describe('calculated data and points', function() {
269270
}});
270271

271272
expect(gd.calcdata[0][0]).toEqual(jasmine.objectContaining({x: 6, y: 15}));
272-
expect(gd.calcdata[0][1]).toEqual(jasmine.objectContaining({x: false, y: false}));
273+
expect(gd.calcdata[0][1]).toEqual(jasmine.objectContaining({x: BADNUM, y: BADNUM}));
273274
expect(gd.calcdata[0][2]).toEqual(jasmine.objectContaining({x: 5, y: 12}));
274275
expect(gd.calcdata[0][3]).toEqual(jasmine.objectContaining({x: 0, y: 13}));
275276
expect(gd.calcdata[0][4]).toEqual(jasmine.objectContaining({x: 3, y: 14}));

0 commit comments

Comments
 (0)