Skip to content

Commit bb9a46c

Browse files
etpinardetpinard
committed
AJ-proof gl2d marker symbols
1 parent 5b89cf2 commit bb9a46c

File tree

4 files changed

+54
-115
lines changed

4 files changed

+54
-115
lines changed

‎src/constants/gl2d_markers.js

Lines changed: 9 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -106,38 +106,28 @@ module.exports = {
106106
'diamond-tall-open': {
107107
unicode: '♢',
108108
},
109-
'diamond-wide': {
110-
unicode: '▰',
111-
},
112-
'diamond-wide-open': {
113-
unicode: '▱',
114-
},
115109
'bowtie': {
116110
unicode: '⧓',
117111
},
118112
'bowtie-open': {
119113
unicode: '⋈',
120-
bwFactor: 0.25
114+
bwFactor: 0.2
121115
},
122-
'circle-cross': {
116+
'circle-cross-open': {
123117
unicode: '⨁',
124-
bwFactor: 0.25
118+
bwFactor: 0.2
125119
},
126-
'circle-x': {
120+
'circle-x-open': {
127121
unicode: '⨂',
128-
bwFactor: 0.25
122+
bwFactor: 0.2
129123
},
130-
'square-cross': {
124+
'square-cross-open': {
131125
unicode: '⊞',
132-
bwFactor: 0.25
126+
bwFactor: 0.2
133127
},
134-
'square-x': {
128+
'square-x-open': {
135129
unicode: '⊠',
136-
bwFactor: 0.25
137-
},
138-
'diamond-cross': {
139-
unicode: '⟠',
140-
bwFactor: 0.25
130+
bwFactor: 0.2
141131
},
142132
'diamond-x': {
143133
unicode: '❖',
@@ -150,13 +140,6 @@ module.exports = {
150140
'cross-thin-open': {
151141
unicode: '+',
152142
},
153-
'x-thin': {
154-
unicode: '╳',
155-
noBorder: true
156-
},
157-
'x-thin-open': {
158-
unicode: '╳',
159-
},
160143
'asterisk': {
161144
unicode: '✳',
162145
noBorder: true
@@ -180,22 +163,6 @@ module.exports = {
180163
unicode: 'Y',
181164
noBorder: true
182165
},
183-
'y-left': {
184-
unicode: '≺',
185-
noBorder: true
186-
},
187-
'y-left-open': {
188-
unicode: '≺',
189-
noBorder: true
190-
},
191-
'y-right': {
192-
unicode: '≻',
193-
noBorder: true
194-
},
195-
'y-right-open': {
196-
unicode: '≻',
197-
noBorder: true
198-
},
199166
'line-ew': {
200167
unicode: '─',
201168
noBorder: true
@@ -211,21 +178,5 @@ module.exports = {
211178
'line-ns-open': {
212179
unicode: '│',
213180
noBorder: true
214-
},
215-
'line-ne': {
216-
unicode: '╱',
217-
noBorder: true
218-
},
219-
'line-ne-open': {
220-
unicode: '╱',
221-
noBorder: true
222-
},
223-
'line-nw': {
224-
unicode: '╲',
225-
noBorder: true
226-
},
227-
'line-nw-open': {
228-
unicode: '╲',
229-
noBorder: true
230181
}
231182
};

‎src/traces/scattergl/convert.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -514,11 +514,11 @@ proto.updateFancy = function(options) {
514514
if(isSymbolOpen(symbol)) {
515515
_colors = colors;
516516
_borderColors = colors;
517-
bwFactor = 0.25;
517+
bwFactor = symbolSpec.bwFactor || 0.25;
518518
} else if(symbolSpec.noBorder) {
519519
_colors = borderColors;
520520
_borderColors = borderColors;
521-
bwFactor = 0.25;
521+
bwFactor = symbolSpec.bwFactor || 0.25;
522522
} else {
523523
_colors = colors;
524524
_borderColors = borderColors;

‎test/image/baselines/gl2d_marker_symbols.png

-3.05 KB
Loading

‎test/image/mocks/gl2d_marker_symbols.json

Lines changed: 43 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -171,27 +171,27 @@
171171
1,
172172
1,
173173
20,
174-
20,
174+
1,
175175
1,
176176
20,
177-
20,
178-
20,
179-
20,
180-
20,
181-
20,
182-
20,
183-
20,
184-
20,
185-
20,
177+
1,
178+
1,
179+
1,
180+
1,
186181
1,
187182
20,
188183
20,
184+
1,
189185
20,
186+
1,
190187
20,
191188
20,
189+
1,
190+
1,
192191
20,
193192
20,
194-
20
193+
1,
194+
1
195195
],
196196
"line": {
197197
"color": "orange",
@@ -223,27 +223,27 @@
223223
"marker symbol: star-square<br>NOT AVAILABLE",
224224
"marker symbol: star-diamond<br>NOT AVAILABLE",
225225
"marker symbol: diamond-tall",
226-
"marker symbol: diamond-wide",
226+
"marker symbol: diamond-wide<br>NOT AVAILABLE",
227227
"marker symbol: hourglass<br>NOT AVAILABLE",
228228
"marker symbol: bowtie",
229-
"marker symbol: circle-cross",
230-
"marker symbol: circle-x",
231-
"marker symbol: square-cross",
232-
"marker symbol: square-x",
233-
"marker symbol: diamond-cross",
229+
"marker symbol: circle-cross<br>NOT AVAILABLE",
230+
"marker symbol: circle-x<br>NOT AVAILABLE",
231+
"marker symbol: square-cross<br>NOT AVAILABLE",
232+
"marker symbol: square-x<br>NOT AVAILABLE",
233+
"marker symbol: diamond-cross<br>NOT AVAILABLE",
234234
"marker symbol: diamond-x",
235235
"marker symbol: cross-thin",
236-
"marker symbol: x-thin",
236+
"marker symbol: x-thin<br>NOT AVAILABLE",
237237
"marker symbol: asterisk",
238238
"marker symbol: hash<br>NOT AVAILABLE",
239239
"marker symbol: y-up",
240240
"marker symbol: y-down",
241-
"marker symbol: y-left",
242-
"marker symbol: y-right",
241+
"marker symbol: y-left<br>NOT AVAILABLE",
242+
"marker symbol: y-right<br>NOT AVAILABLE",
243243
"marker symbol: line-ew",
244244
"marker symbol: line-ns",
245-
"marker symbol: line-ne",
246-
"marker symbol: line-nw"
245+
"marker symbol: line-ne<br>NOT AVAILABLE",
246+
"marker symbol: line-nw<br>NOT AVAILABLE"
247247
],
248248
"hoverinfo": "text"
249249
},
@@ -418,27 +418,27 @@
418418
1,
419419
1,
420420
20,
421-
20,
422-
1,
423-
20,
424-
1,
425-
1,
426-
1,
427-
1,
428421
1,
429422
1,
430423
20,
431424
20,
432425
20,
433-
1,
434426
20,
435427
20,
428+
1,
429+
1,
430+
20,
431+
1,
436432
20,
433+
1,
437434
20,
438435
20,
436+
1,
437+
1,
439438
20,
440439
20,
441-
20
440+
1,
441+
1
442442
],
443443
"line": {
444444
"color": "orange",
@@ -470,27 +470,27 @@
470470
"marker symbol: star-square-open<br>NOT AVAILABLE",
471471
"marker symbol: star-diamond-open<br>NOT AVAILABLE",
472472
"marker symbol: diamond-tall-open",
473-
"marker symbol: diamond-wide-open",
473+
"marker symbol: diamond-wide-open<br>NOT AVAILABLE",
474474
"marker symbol: hourglass-open<br>NOT AVAILABLE",
475475
"marker symbol: bowtie-open",
476-
"marker symbol: circle-cross-open<br>NOT AVAILABLE",
477-
"marker symbol: circle-x-open<br>NOT AVAILABLE",
478-
"marker symbol: square-cross-open<br>NOT AVAILABLE",
479-
"marker symbol: square-x-open<br>NOT AVAILABLE",
476+
"marker symbol: circle-cross-open",
477+
"marker symbol: circle-x-open",
478+
"marker symbol: square-cross-open",
479+
"marker symbol: square-x-open",
480480
"marker symbol: diamond-cross-open<br>NOT AVAILABLE",
481481
"marker symbol: diamond-x-open<br>NOT AVAILABLE",
482482
"marker symbol: cross-thin-open",
483-
"marker symbol: x-thin-open",
483+
"marker symbol: x-thin-open<br>NOT AVAILABLE",
484484
"marker symbol: asterisk-open",
485485
"marker symbol: hash-open<br>NOT AVAILABLE",
486486
"marker symbol: y-up-open",
487487
"marker symbol: y-down-open",
488-
"marker symbol: y-left-open",
489-
"marker symbol: y-right-open",
488+
"marker symbol: y-left-open<br>NOT AVAILABLE",
489+
"marker symbol: y-right-open<br>NOT AVAILABLE",
490490
"marker symbol: line-ew-open",
491491
"marker symbol: line-ns-open",
492-
"marker symbol: line-ne-open",
493-
"marker symbol: line-nw-open"
492+
"marker symbol: line-ne-open<br>NOT AVAILABLE",
493+
"marker symbol: line-nw-open<br>NOT AVAILABLE"
494494
],
495495
"hoverinfo": "text"
496496
},
@@ -1000,23 +1000,11 @@
10001000
"height": 500,
10011001
"xaxis": {
10021002
"showgrid": false,
1003-
"zeroline": false,
1004-
"type": "linear",
1005-
"range": [
1006-
-1.3389711064129668,
1007-
20.084566596194502
1008-
],
1009-
"autorange": true
1003+
"zeroline": false
10101004
},
10111005
"yaxis": {
10121006
"showgrid": false,
1013-
"zeroline": false,
1014-
"type": "linear",
1015-
"range": [
1016-
-0.6511627906976745,
1017-
8.651162790697674
1018-
],
1019-
"autorange": true
1007+
"zeroline": false
10201008
},
10211009
"showlegend": false,
10221010
"hovermode": "closest"

0 commit comments

Comments
 (0)