Skip to content

Commit c91104f

Browse files
archmojarchmoj
authored
Merge pull request #4465 from plotly/symbol-numbers-gl2d
Fix symbol numbers in scattergl and splom traces
2 parents d11e92f + 6468acc commit c91104f

File tree

10 files changed

+139
-27
lines changed

10 files changed

+139
-27
lines changed

Diff for: ‎src/components/drawing/index.js

+22-11
Original file line numberDiff line numberDiff line change
@@ -217,21 +217,31 @@ drawing.symbolList = [];
217217

218218
Object.keys(SYMBOLDEFS).forEach(function(k) {
219219
var symDef = SYMBOLDEFS[k];
220-
drawing.symbolList = drawing.symbolList.concat(
221-
[symDef.n, k, symDef.n + 100, k + '-open']);
222-
drawing.symbolNames[symDef.n] = k;
223-
drawing.symbolFuncs[symDef.n] = symDef.f;
220+
var n = symDef.n;
221+
drawing.symbolList.push(
222+
n,
223+
k,
224+
n + 100,
225+
k + '-open'
226+
);
227+
drawing.symbolNames[n] = k;
228+
drawing.symbolFuncs[n] = symDef.f;
229+
224230
if(symDef.needLine) {
225-
drawing.symbolNeedLines[symDef.n] = true;
231+
drawing.symbolNeedLines[n] = true;
226232
}
227233
if(symDef.noDot) {
228-
drawing.symbolNoDot[symDef.n] = true;
234+
drawing.symbolNoDot[n] = true;
229235
} else {
230-
drawing.symbolList = drawing.symbolList.concat(
231-
[symDef.n + 200, k + '-dot', symDef.n + 300, k + '-open-dot']);
236+
drawing.symbolList.push(
237+
n + 200,
238+
k + '-dot',
239+
n + 300,
240+
k + '-open-dot'
241+
);
232242
}
233243
if(symDef.noFill) {
234-
drawing.symbolNoFill[symDef.n] = true;
244+
drawing.symbolNoFill[n] = true;
235245
}
236246
});
237247

@@ -253,8 +263,9 @@ drawing.symbolNumber = function(v) {
253263
v = drawing.symbolNames.indexOf(v);
254264
if(v >= 0) { v += vbase; }
255265
}
256-
if((v % 100 >= MAXSYMBOL) || v >= 400) { return 0; }
257-
return Math.floor(Math.max(v, 0));
266+
267+
return (v % 100 >= MAXSYMBOL || v >= 400) ?
268+
0 : Math.floor(Math.max(v, 0));
258269
};
259270

260271
function makePointPath(symbolNumber, r) {

Diff for: ‎src/traces/scattergl/convert.js

+13-9
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ var formatColor = require('../../lib/gl_format_color').formatColor;
2121
var subTypes = require('../scatter/subtypes');
2222
var makeBubbleSizeFn = require('../scatter/make_bubble_size_func');
2323

24+
var helpers = require('./helpers');
2425
var constants = require('./constants');
2526
var DESELECTDIM = require('../../constants/interactions').DESELECTDIM;
2627

@@ -59,7 +60,7 @@ function convertStyle(gd, trace) {
5960
opts.markerSel = convertMarkerSelection(trace, trace.selected);
6061
opts.markerUnsel = convertMarkerSelection(trace, trace.unselected);
6162

62-
if(!trace.unselected && Array.isArray(trace.marker.opacity)) {
63+
if(!trace.unselected && Lib.isArrayOrTypedArray(trace.marker.opacity)) {
6364
var mo = trace.marker.opacity;
6465
opts.markerUnsel.opacity = new Array(mo.length);
6566
for(i = 0; i < mo.length; i++) {
@@ -187,15 +188,18 @@ function convertTextStyle(gd, trace) {
187188
optsOut.color = tfc;
188189
}
189190

190-
if(Array.isArray(tfs) || Array.isArray(tff)) {
191+
if(Lib.isArrayOrTypedArray(tfs) || Array.isArray(tff)) {
191192
// if any textfont param is array - make render a batch
192193
optsOut.font = new Array(count);
193194
for(i = 0; i < count; i++) {
194195
var fonti = optsOut.font[i] = {};
195196

196-
fonti.size = Array.isArray(tfs) ?
197-
(isNumeric(tfs[i]) ? tfs[i] : 0) :
198-
tfs;
197+
fonti.size = (
198+
Lib.isTypedArray(tfs) ? tfs[i] :
199+
Array.isArray(tfs) ? (
200+
isNumeric(tfs[i]) ? tfs[i] : 0
201+
) : tfs
202+
);
199203

200204
fonti.family = Array.isArray(tff) ? tff[i] : tff;
201205
}
@@ -214,15 +218,15 @@ function convertMarkerStyle(trace) {
214218
var optsOut = {};
215219
var i;
216220

217-
var multiSymbol = Array.isArray(optsIn.symbol);
221+
var multiSymbol = Lib.isArrayOrTypedArray(optsIn.symbol);
218222
var multiColor = Lib.isArrayOrTypedArray(optsIn.color);
219223
var multiLineColor = Lib.isArrayOrTypedArray(optsIn.line.color);
220224
var multiOpacity = Lib.isArrayOrTypedArray(optsIn.opacity);
221225
var multiSize = Lib.isArrayOrTypedArray(optsIn.size);
222226
var multiLineWidth = Lib.isArrayOrTypedArray(optsIn.line.width);
223227

224228
var isOpen;
225-
if(!multiSymbol) isOpen = constants.OPEN_RE.test(optsIn.symbol);
229+
if(!multiSymbol) isOpen = helpers.isOpenSymbol(optsIn.symbol);
226230

227231
// prepare colors
228232
if(multiSymbol || multiColor || multiLineColor || multiOpacity) {
@@ -253,7 +257,7 @@ function convertMarkerStyle(trace) {
253257
for(i = 0; i < count; i++) {
254258
if(multiSymbol) {
255259
var symbol = optsIn.symbol[i];
256-
isOpen = constants.OPEN_RE.test(symbol);
260+
isOpen = helpers.isOpenSymbol(symbol);
257261
}
258262
if(isOpen) {
259263
borderColors[i] = colors[i].slice();
@@ -398,7 +402,7 @@ function getSymbolSdf(symbol) {
398402
var symbolNoDot = !!Drawing.symbolNoDot[symbolNumber % 100];
399403
var symbolNoFill = !!Drawing.symbolNoFill[symbolNumber % 100];
400404

401-
var isDot = constants.DOT_RE.test(symbol);
405+
var isDot = helpers.isDotSymbol(symbol);
402406

403407
// get symbol sdf from cache or generate it
404408
if(SYMBOL_SDF[symbol]) return SYMBOL_SDF[symbol];

Diff for: ‎src/traces/scattergl/defaults.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
var Lib = require('../../lib');
1212
var Registry = require('../../registry');
1313

14+
var helpers = require('./helpers');
1415
var attributes = require('./attributes');
1516
var constants = require('../scatter/constants');
1617
var subTypes = require('../scatter/subtypes');
@@ -25,7 +26,7 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout
2526
return Lib.coerce(traceIn, traceOut, attributes, attr, dflt);
2627
}
2728

28-
var isOpen = traceIn.marker ? /-open/.test(traceIn.marker.symbol) : false;
29+
var isOpen = traceIn.marker ? helpers.isOpenSymbol(traceIn.marker.symbol) : false;
2930
var isBubble = subTypes.isBubble(traceIn);
3031

3132
var len = handleXYDefaults(traceIn, traceOut, layout, coerce);

Diff for: ‎src/traces/scattergl/helpers.js

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
/**
2+
* Copyright 2012-2020, Plotly, Inc.
3+
* All rights reserved.
4+
*
5+
* This source code is licensed under the MIT license found in the
6+
* LICENSE file in the root directory of this source tree.
7+
*/
8+
9+
'use strict';
10+
11+
var constants = require('./constants');
12+
13+
exports.isOpenSymbol = function(symbol) {
14+
return (typeof symbol === 'string') ?
15+
constants.OPEN_RE.test(symbol) :
16+
symbol % 200 > 100;
17+
};
18+
19+
exports.isDotSymbol = function(symbol) {
20+
return (typeof symbol === 'string') ?
21+
constants.DOT_RE.test(symbol) :
22+
symbol > 200;
23+
};

Diff for: ‎src/traces/scattergl/hover.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ function calcHover(pointData, x, y, trace) {
109109

110110
var font = trace.textfont;
111111
if(font) {
112-
di.ts = Array.isArray(font.size) ? font.size[id] : font.size;
112+
di.ts = Lib.isArrayOrTypedArray(font.size) ? font.size[id] : font.size;
113113
di.tc = Array.isArray(font.color) ? font.color[id] : font.color;
114114
di.tf = Array.isArray(font.family) ? font.family[id] : font.family;
115115
}
@@ -118,7 +118,7 @@ function calcHover(pointData, x, y, trace) {
118118
if(marker) {
119119
di.ms = Lib.isArrayOrTypedArray(marker.size) ? marker.size[id] : marker.size;
120120
di.mo = Lib.isArrayOrTypedArray(marker.opacity) ? marker.opacity[id] : marker.opacity;
121-
di.mx = Array.isArray(marker.symbol) ? marker.symbol[id] : marker.symbol;
121+
di.mx = Lib.isArrayOrTypedArray(marker.symbol) ? marker.symbol[id] : marker.symbol;
122122
di.mc = Lib.isArrayOrTypedArray(marker.color) ? marker.color[id] : marker.color;
123123
}
124124

@@ -143,10 +143,10 @@ function calcHover(pointData, x, y, trace) {
143143
if(hoverlabel) {
144144
di.hbg = Array.isArray(hoverlabel.bgcolor) ? hoverlabel.bgcolor[id] : hoverlabel.bgcolor;
145145
di.hbc = Array.isArray(hoverlabel.bordercolor) ? hoverlabel.bordercolor[id] : hoverlabel.bordercolor;
146-
di.hts = Array.isArray(hoverlabel.font.size) ? hoverlabel.font.size[id] : hoverlabel.font.size;
146+
di.hts = Lib.isArrayOrTypedArray(hoverlabel.font.size) ? hoverlabel.font.size[id] : hoverlabel.font.size;
147147
di.htc = Array.isArray(hoverlabel.font.color) ? hoverlabel.font.color[id] : hoverlabel.font.color;
148148
di.htf = Array.isArray(hoverlabel.font.family) ? hoverlabel.font.family[id] : hoverlabel.font.family;
149-
di.hnl = Array.isArray(hoverlabel.namelength) ? hoverlabel.namelength[id] : hoverlabel.namelength;
149+
di.hnl = Lib.isArrayOrTypedArray(hoverlabel.namelength) ? hoverlabel.namelength[id] : hoverlabel.namelength;
150150
}
151151
var hoverinfo = trace.hoverinfo;
152152
if(hoverinfo) {

Diff for: ‎src/traces/splom/defaults.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ var attributes = require('./attributes');
1515
var subTypes = require('../scatter/subtypes');
1616
var handleMarkerDefaults = require('../scatter/marker_defaults');
1717
var mergeLength = require('../parcoords/merge_length');
18-
var OPEN_RE = /-open/;
18+
var isOpenSymbol = require('../scattergl/helpers').isOpenSymbol;
1919

2020
module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout) {
2121
function coerce(attr, dflt) {
@@ -44,7 +44,7 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout
4444

4545
handleMarkerDefaults(traceIn, traceOut, defaultColor, layout, coerce);
4646

47-
var isOpen = OPEN_RE.test(traceOut.marker.symbol);
47+
var isOpen = isOpenSymbol(traceOut.marker.symbol);
4848
var isBubble = subTypes.isBubble(traceOut);
4949
coerce('marker.line.width', isOpen || isBubble ? 1 : 0);
5050

Diff for: ‎test/image/baselines/gl2d_symbol_numbers.png

14.8 KB
Loading

Diff for: ‎test/image/baselines/splom_symbol_numbers.png

23.3 KB
Loading

Diff for: ‎test/image/mocks/gl2d_symbol_numbers.json

+32
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
{
2+
"data": [
3+
{
4+
"y": [
5+
0,
6+
0,
7+
0
8+
],
9+
"type": "scattergl",
10+
"marker": {
11+
"size": 24,
12+
"symbol": "diamond-open-dot"
13+
}
14+
},
15+
{
16+
"y": [
17+
1,
18+
1,
19+
1
20+
],
21+
"type": "scattergl",
22+
"marker": {
23+
"size": 24,
24+
"symbol": 302
25+
}
26+
}
27+
],
28+
"layout": {
29+
"width": 600,
30+
"height": 400
31+
}
32+
}

Diff for: ‎test/image/mocks/splom_symbol_numbers.json

+41
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
{
2+
"data": [
3+
{
4+
"type": "splom",
5+
"marker": {
6+
"size": [
7+
12,
8+
16,
9+
24,
10+
32
11+
],
12+
"symbol": [
13+
1,
14+
102,
15+
203,
16+
304
17+
]
18+
},
19+
"dimensions": [
20+
{
21+
"values": [
22+
0,
23+
1,
24+
2,
25+
3
26+
],
27+
"label": "A"
28+
},
29+
{
30+
"values": [
31+
0,
32+
2,
33+
5,
34+
6
35+
],
36+
"label": "B"
37+
}
38+
]
39+
}
40+
]
41+
}

0 commit comments

Comments
 (0)