Skip to content

Commit 53ea0ec

Browse files
etpinardetpinard
committed
Merge branch 'master' into typed-arrays-support
2 parents b95e462 + 315272b commit 53ea0ec

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+1428
-238
lines changed

‎src/lib/coerce.js

Lines changed: 55 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -260,19 +260,56 @@ exports.valObjectMeta = {
260260
'An {array} of plot information.'
261261
].join(' '),
262262
requiredOpts: ['items'],
263-
otherOpts: ['dflt', 'freeLength'],
263+
// set dimensions=2 for a 2D array
264+
// `items` may be a single object instead of an array, in which case
265+
// `freeLength` must be true.
266+
otherOpts: ['dflt', 'freeLength', 'dimensions'],
264267
coerceFunction: function(v, propOut, dflt, opts) {
268+
269+
// simplified coerce function just for array items
270+
function coercePart(v, opts, dflt) {
271+
var out;
272+
var propPart = {set: function(v) { out = v; }};
273+
274+
if(dflt === undefined) dflt = opts.dflt;
275+
276+
exports.valObjectMeta[opts.valType].coerceFunction(v, propPart, dflt, opts);
277+
278+
return out;
279+
}
280+
281+
var twoD = opts.dimensions === 2;
282+
265283
if(!Array.isArray(v)) {
266284
propOut.set(dflt);
267285
return;
268286
}
269287

270-
var items = opts.items,
271-
vOut = [];
288+
var items = opts.items;
289+
var vOut = [];
290+
var arrayItems = Array.isArray(items);
291+
var len = arrayItems ? items.length : v.length;
292+
293+
var i, j, len2, vNew;
294+
272295
dflt = Array.isArray(dflt) ? dflt : [];
273296

274-
for(var i = 0; i < items.length; i++) {
275-
exports.coerce(v, vOut, items, '[' + i + ']', dflt[i]);
297+
if(twoD) {
298+
for(i = 0; i < len; i++) {
299+
vOut[i] = [];
300+
var row = Array.isArray(v[i]) ? v[i] : [];
301+
len2 = arrayItems ? items[i].length : row.length;
302+
for(j = 0; j < len2; j++) {
303+
vNew = coercePart(row[j], arrayItems ? items[i][j] : items, (dflt[i] || [])[j]);
304+
if(vNew !== undefined) vOut[i][j] = vNew;
305+
}
306+
}
307+
}
308+
else {
309+
for(i = 0; i < len; i++) {
310+
vNew = coercePart(v[i], arrayItems ? items[i] : items, dflt[i]);
311+
if(vNew !== undefined) vOut[i] = vNew;
312+
}
276313
}
277314

278315
propOut.set(vOut);
@@ -281,15 +318,25 @@ exports.valObjectMeta = {
281318
if(!Array.isArray(v)) return false;
282319

283320
var items = opts.items;
321+
var arrayItems = Array.isArray(items);
322+
var twoD = opts.dimensions === 2;
284323

285324
// when free length is off, input and declared lengths must match
286325
if(!opts.freeLength && v.length !== items.length) return false;
287326

288327
// valid when all input items are valid
289328
for(var i = 0; i < v.length; i++) {
290-
var isItemValid = exports.validate(v[i], opts.items[i]);
291-
292-
if(!isItemValid) return false;
329+
if(twoD) {
330+
if(!Array.isArray(v[i]) || (!opts.freeLength && v[i].length !== items[i].length)) {
331+
return false;
332+
}
333+
for(var j = 0; j < v[i].length; j++) {
334+
if(!exports.validate(v[i][j], arrayItems ? items[i][j] : items)) {
335+
return false;
336+
}
337+
}
338+
}
339+
else if(!exports.validate(v[i], arrayItems ? items[i] : items)) return false;
293340
}
294341

295342
return true;

‎src/lib/regex.js

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,19 @@
88

99
'use strict';
1010

11-
// Simple helper functions
12-
// none of these need any external deps
13-
1411
/*
1512
* make a regex for matching counter ids/names ie xaxis, xaxis2, xaxis10...
16-
* eg: regexCounter('x')
17-
* tail is an optional piece after the id
18-
* eg regexCounter('scene', '.annotations') for scene2.annotations etc.
13+
*
14+
* @param {string} head: the head of the pattern, eg 'x' matches 'x', 'x2', 'x10' etc.
15+
* 'xy' is a special case for cartesian subplots: it matches 'x2y3' etc
16+
* @param {Optional(string)} tail: a fixed piece after the id
17+
* eg counterRegex('scene', '.annotations') for scene2.annotations etc.
18+
* @param {boolean} openEnded: if true, the string may continue past the match.
1919
*/
2020
exports.counter = function(head, tail, openEnded) {
21-
return new RegExp('^' + head + '([2-9]|[1-9][0-9]+)?' +
22-
(tail || '') + (openEnded ? '' : '$'));
21+
var fullTail = (tail || '') + (openEnded ? '' : '$');
22+
if(head === 'xy') {
23+
return new RegExp('^x([2-9]|[1-9][0-9]+)?y([2-9]|[1-9][0-9]+)?' + fullTail);
24+
}
25+
return new RegExp('^' + head + '([2-9]|[1-9][0-9]+)?' + fullTail);
2326
};

‎src/lib/stats.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ var isArrayOrTypedArray = require('./is_array').isArrayOrTypedArray;
2828
exports.aggNums = function(f, v, a, len) {
2929
var i,
3030
b;
31-
if(!len) len = a.length;
31+
if(!len || len > a.length) len = a.length;
3232
if(!isNumeric(v)) v = false;
3333
if(isArrayOrTypedArray(a[0])) {
3434
b = new Array(len);

‎src/plot_api/plot_schema.js

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -383,7 +383,8 @@ function recurseIntoValObject(valObject, parts, i) {
383383
}
384384

385385
// now recurse as far as we can. Occasionally we have an attribute
386-
// setting an internal part below what's
386+
// setting an internal part below what's in the schema; just return
387+
// the innermost schema item we find.
387388
for(; i < parts.length; i++) {
388389
var newValObject = valObject[parts[i]];
389390
if(Lib.isPlainObject(newValObject)) valObject = newValObject;
@@ -398,8 +399,23 @@ function recurseIntoValObject(valObject, parts, i) {
398399
else if(valObject.valType === 'info_array') {
399400
i++;
400401
var index = parts[i];
401-
if(!isIndex(index) || index >= valObject.items.length) return false;
402-
valObject = valObject.items[index];
402+
if(!isIndex(index)) return false;
403+
404+
var items = valObject.items;
405+
if(Array.isArray(items)) {
406+
if(index >= items.length) return false;
407+
if(valObject.dimensions === 2) {
408+
i++;
409+
if(parts.length === i) return valObject;
410+
var index2 = parts[i];
411+
if(!isIndex(index2)) return false;
412+
valObject = items[index][index2];
413+
}
414+
else valObject = items[index];
415+
}
416+
else {
417+
valObject = items;
418+
}
403419
}
404420
}
405421

‎src/plot_api/validate.js

Lines changed: 51 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -162,19 +162,65 @@ function crawl(objIn, objOut, schema, list, base, path) {
162162
var valIn = objIn[k],
163163
valOut = objOut[k];
164164

165-
var nestedSchema = getNestedSchema(schema, k),
166-
isInfoArray = (nestedSchema || {}).valType === 'info_array',
167-
isColorscale = (nestedSchema || {}).valType === 'colorscale';
165+
var nestedSchema = getNestedSchema(schema, k);
166+
var isInfoArray = (nestedSchema || {}).valType === 'info_array';
167+
var isColorscale = (nestedSchema || {}).valType === 'colorscale';
168+
var items = (nestedSchema || {}).items;
168169

169170
if(!isInSchema(schema, k)) {
170171
list.push(format('schema', base, p));
171172
}
172173
else if(isPlainObject(valIn) && isPlainObject(valOut)) {
173174
crawl(valIn, valOut, nestedSchema, list, base, p);
174175
}
176+
else if(isInfoArray && isArray(valIn)) {
177+
if(valIn.length > valOut.length) {
178+
list.push(format('unused', base, p.concat(valOut.length)));
179+
}
180+
var len = valOut.length;
181+
var arrayItems = Array.isArray(items);
182+
if(arrayItems) len = Math.min(len, items.length);
183+
var m, n, item, valInPart, valOutPart;
184+
if(nestedSchema.dimensions === 2) {
185+
for(n = 0; n < len; n++) {
186+
if(isArray(valIn[n])) {
187+
if(valIn[n].length > valOut[n].length) {
188+
list.push(format('unused', base, p.concat(n, valOut[n].length)));
189+
}
190+
var len2 = valOut[n].length;
191+
for(m = 0; m < (arrayItems ? Math.min(len2, items[n].length) : len2); m++) {
192+
item = arrayItems ? items[n][m] : items;
193+
valInPart = valIn[n][m];
194+
valOutPart = valOut[n][m];
195+
if(!Lib.validate(valInPart, item)) {
196+
list.push(format('value', base, p.concat(n, m), valInPart));
197+
}
198+
else if(valOutPart !== valInPart && valOutPart !== +valInPart) {
199+
list.push(format('dynamic', base, p.concat(n, m), valInPart, valOutPart));
200+
}
201+
}
202+
}
203+
else {
204+
list.push(format('array', base, p.concat(n), valIn[n]));
205+
}
206+
}
207+
}
208+
else {
209+
for(n = 0; n < len; n++) {
210+
item = arrayItems ? items[n] : items;
211+
valInPart = valIn[n];
212+
valOutPart = valOut[n];
213+
if(!Lib.validate(valInPart, item)) {
214+
list.push(format('value', base, p.concat(n), valInPart));
215+
}
216+
else if(valOutPart !== valInPart && valOutPart !== +valInPart) {
217+
list.push(format('dynamic', base, p.concat(n), valInPart, valOutPart));
218+
}
219+
}
220+
}
221+
}
175222
else if(nestedSchema.items && !isInfoArray && isArray(valIn)) {
176-
var items = nestedSchema.items,
177-
_nestedSchema = items[Object.keys(items)[0]],
223+
var _nestedSchema = items[Object.keys(items)[0]],
178224
indexList = [];
179225

180226
var j, _p;

‎src/plots/cartesian/axes.js

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -568,7 +568,7 @@ axes.autoBin = function(data, ax, nbins, is2d, calendar) {
568568
start: dataMin - 0.5,
569569
end: dataMax + 0.5,
570570
size: 1,
571-
_count: dataMax - dataMin + 1
571+
_dataSpan: dataMax - dataMin,
572572
};
573573
}
574574

@@ -648,7 +648,7 @@ axes.autoBin = function(data, ax, nbins, is2d, calendar) {
648648
start: ax.c2r(binStart, 0, calendar),
649649
end: ax.c2r(binEnd, 0, calendar),
650650
size: dummyAx.dtick,
651-
_count: bincount
651+
_dataSpan: dataMax - dataMin
652652
};
653653
};
654654

@@ -742,11 +742,8 @@ function autoShiftMonthBins(binStart, data, dtick, dataMin, calendar) {
742742
// Ticks and grids
743743
// ----------------------------------------------------
744744

745-
// calculate the ticks: text, values, positioning
746-
// if ticks are set to automatic, determine the right values (tick0,dtick)
747-
// in any case, set tickround to # of digits to round tick labels to,
748-
// or codes to this effect for log and date scales
749-
axes.calcTicks = function calcTicks(ax) {
745+
// ensure we have tick0, dtick, and tick rounding calculated
746+
axes.prepTicks = function(ax) {
750747
var rng = Lib.simpleMap(ax.range, ax.r2l);
751748

752749
// calculate max number of (auto) ticks to display based on plot size
@@ -787,6 +784,15 @@ axes.calcTicks = function calcTicks(ax) {
787784

788785
// now figure out rounding of tick values
789786
autoTickRound(ax);
787+
};
788+
789+
// calculate the ticks: text, values, positioning
790+
// if ticks are set to automatic, determine the right values (tick0,dtick)
791+
// in any case, set tickround to # of digits to round tick labels to,
792+
// or codes to this effect for log and date scales
793+
axes.calcTicks = function calcTicks(ax) {
794+
axes.prepTicks(ax);
795+
var rng = Lib.simpleMap(ax.range, ax.r2l);
790796

791797
// now that we've figured out the auto values for formatting
792798
// in case we're missing some ticktext, we can break out for array ticks

‎src/plots/cartesian/constants.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*/
88

99
'use strict';
10-
var counterRegex = require('../../lib').counterRegex;
10+
var counterRegex = require('../../lib/regex').counter;
1111

1212

1313
module.exports = {

‎src/plots/cartesian/layout_attributes.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -685,11 +685,11 @@ module.exports = {
685685
valType: 'info_array',
686686
role: 'info',
687687
items: [
688-
{valType: 'number', min: 0, max: 1, editType: 'calc'},
689-
{valType: 'number', min: 0, max: 1, editType: 'calc'}
688+
{valType: 'number', min: 0, max: 1, editType: 'plot'},
689+
{valType: 'number', min: 0, max: 1, editType: 'plot'}
690690
],
691691
dflt: [0, 1],
692-
editType: 'calc',
692+
editType: 'plot',
693693
description: [
694694
'Sets the domain of this axis (in plot fraction).'
695695
].join(' ')

‎src/plots/cartesian/layout_defaults.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,8 @@ module.exports = function supplyLayoutDefaults(layoutIn, layoutOut, fullData) {
161161
var positioningOptions = {
162162
letter: axLetter,
163163
counterAxes: counterAxes[axLetter],
164-
overlayableAxes: overlayableAxes
164+
overlayableAxes: overlayableAxes,
165+
grid: layoutOut.grid
165166
};
166167

167168
handlePositionDefaults(axLayoutIn, axLayoutOut, coerce, positioningOptions);

‎src/plots/cartesian/position_defaults.js

Lines changed: 27 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,26 +15,43 @@ var Lib = require('../../lib');
1515

1616

1717
module.exports = function handlePositionDefaults(containerIn, containerOut, coerce, options) {
18-
var counterAxes = options.counterAxes || [],
19-
overlayableAxes = options.overlayableAxes || [],
20-
letter = options.letter;
18+
var counterAxes = options.counterAxes || [];
19+
var overlayableAxes = options.overlayableAxes || [];
20+
var letter = options.letter;
21+
var grid = options.grid;
22+
23+
var dfltAnchor, dfltDomain, dfltSide, dfltPosition;
24+
25+
if(grid) {
26+
dfltDomain = grid._domains[letter][grid._axisMap[containerOut._id]];
27+
dfltAnchor = grid._anchors[containerOut._id];
28+
if(dfltDomain) {
29+
dfltSide = grid[letter + 'side'].split(' ')[0];
30+
dfltPosition = grid.domain[letter][dfltSide === 'right' || dfltSide === 'top' ? 1 : 0];
31+
}
32+
}
33+
34+
// Even if there's a grid, this axis may not be in it - fall back on non-grid defaults
35+
dfltDomain = dfltDomain || [0, 1];
36+
dfltAnchor = dfltAnchor || (isNumeric(containerIn.position) ? 'free' : (counterAxes[0] || 'free'));
37+
dfltSide = dfltSide || (letter === 'x' ? 'bottom' : 'left');
38+
dfltPosition = dfltPosition || 0;
2139

2240
var anchor = Lib.coerce(containerIn, containerOut, {
2341
anchor: {
2442
valType: 'enumerated',
2543
values: ['free'].concat(counterAxes),
26-
dflt: isNumeric(containerIn.position) ? 'free' :
27-
(counterAxes[0] || 'free')
44+
dflt: dfltAnchor
2845
}
2946
}, 'anchor');
3047

31-
if(anchor === 'free') coerce('position');
48+
if(anchor === 'free') coerce('position', dfltPosition);
3249

3350
Lib.coerce(containerIn, containerOut, {
3451
side: {
3552
valType: 'enumerated',
3653
values: letter === 'x' ? ['bottom', 'top'] : ['left', 'right'],
37-
dflt: letter === 'x' ? 'bottom' : 'left'
54+
dflt: dfltSide
3855
}
3956
}, 'side');
4057

@@ -54,9 +71,9 @@ module.exports = function handlePositionDefaults(containerIn, containerOut, coer
5471
// in ax.setscale()... but this means we still need (imperfect) logic
5572
// in the axes popover to hide domain for the overlaying axis.
5673
// perhaps I should make a private version _domain that all axes get???
57-
var domain = coerce('domain');
58-
if(domain[0] > domain[1] - 0.01) containerOut.domain = [0, 1];
59-
Lib.noneOrAll(containerIn.domain, containerOut.domain, [0, 1]);
74+
var domain = coerce('domain', dfltDomain);
75+
if(domain[0] > domain[1] - 0.01) containerOut.domain = dfltDomain;
76+
Lib.noneOrAll(containerIn.domain, containerOut.domain, dfltDomain);
6077
}
6178

6279
coerce('layer');

0 commit comments

Comments
 (0)