Skip to content

Commit 8cd6767

Browse files
archmojarchmoj
committed
revise arrow markers names and defs
1 parent 5857754 commit 8cd6767

File tree

3 files changed

+99
-23
lines changed

3 files changed

+99
-23
lines changed

‎src/components/drawing/symbol_defs.js

Lines changed: 24 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -489,62 +489,74 @@ module.exports = {
489489
var rx = d3.round(r, 2);
490490
var ry = d3.round(r * 2, 2);
491491
return 'M0,0L-' + rx + ',' + ry + 'H' + rx + 'Z';
492-
}
492+
},
493+
noDot: true
493494
},
494495
'arrow-down': {
495496
n: 46,
496497
f: function(r) {
497498
var rx = d3.round(r, 2);
498499
var ry = d3.round(r * 2, 2);
499500
return 'M0,0L-' + rx + ',-' + ry + 'H' + rx + 'Z';
500-
}
501+
},
502+
noDot: true
501503
},
502504
'arrow-left': {
503505
n: 47,
504506
f: function(r) {
505507
var rx = d3.round(r * 2, 2);
506508
var ry = d3.round(r, 2);
507509
return 'M0,0L' + rx + ',-' + ry + 'V' + ry + 'Z';
508-
}
510+
},
511+
noDot: true
509512
},
510513
'arrow-right': {
511514
n: 48,
512515
f: function(r) {
513516
var rx = d3.round(r * 2, 2);
514517
var ry = d3.round(r, 2);
515518
return 'M0,0L-' + rx + ',-' + ry + 'V' + ry + 'Z';
516-
}
519+
},
520+
noDot: true
517521
},
518-
'arrow-to-bar-up': {
522+
'arrow-bar-up': {
519523
n: 49,
520524
f: function(r) {
521525
var rx = d3.round(r, 2);
522526
var ry = d3.round(r * 2, 2);
523527
return 'M-' + rx + ',0H' + rx + 'M0,0L-' + rx + ',' + ry + 'H' + rx + 'Z';
524-
}
528+
},
529+
needLine: true,
530+
noDot: true
525531
},
526-
'arrow-to-bar-down': {
532+
'arrow-bar-down': {
527533
n: 50,
528534
f: function(r) {
529535
var rx = d3.round(r, 2);
530536
var ry = d3.round(r * 2, 2);
531537
return 'M-' + rx + ',0H' + rx + 'M0,0L-' + rx + ',-' + ry + 'H' + rx + 'Z';
532-
}
538+
},
539+
needLine: true,
540+
noDot: true
533541
},
534-
'arrow-to-bar-left': {
542+
'arrow-bar-left': {
535543
n: 51,
536544
f: function(r) {
537545
var rx = d3.round(r * 2, 2);
538546
var ry = d3.round(r, 2);
539547
return 'M0,-' + ry + 'V' + ry + 'M0,0L' + rx + ',-' + ry + 'V' + ry + 'Z';
540-
}
548+
},
549+
needLine: true,
550+
noDot: true
541551
},
542-
'arrow-to-bar-right': {
552+
'arrow-bar-right': {
543553
n: 52,
544554
f: function(r) {
545555
var rx = d3.round(r * 2, 2);
546556
var ry = d3.round(r, 2);
547557
return 'M0,-' + ry + 'V' + ry + 'M0,0L-' + rx + ',-' + ry + 'V' + ry + 'Z';
548-
}
558+
},
559+
needLine: true,
560+
noDot: true
549561
}
550562
};

‎test/image/baselines/arrow-markers.png

7.64 KB
Loading

‎test/image/mocks/arrow-markers.json

Lines changed: 75 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,22 +14,38 @@
1414
},
1515
"color": "yellow",
1616
"size": [
17+
40,
18+
40,
19+
40,
20+
null,
1721
40,
1822
40,
1923
40
2024
],
2125
"symbol": [
2226
0,
2327
"arrow-up",
24-
"arrow-down"
28+
"arrow-down",
29+
null,
30+
100,
31+
145,
32+
146
2533
]
2634
},
2735
"x": [
2836
0,
2937
0,
30-
0
38+
0,
39+
null,
40+
1,
41+
1,
42+
1
3143
],
3244
"y": [
45+
0,
46+
1,
47+
-1,
48+
null,
3349
0,
3450
1,
3551
-1
@@ -49,22 +65,38 @@
4965
},
5066
"color": "yellow",
5167
"size": [
68+
40,
69+
40,
70+
40,
71+
null,
5272
40,
5373
40,
5474
40
5575
],
5676
"symbol": [
5777
0,
58-
"arrow-to-bar-up",
59-
"arrow-to-bar-down"
78+
"arrow-bar-up",
79+
"arrow-bar-down",
80+
null,
81+
100,
82+
149,
83+
150
6084
]
6185
},
6286
"x": [
6387
0,
6488
0,
65-
0
89+
0,
90+
null,
91+
1,
92+
1,
93+
1
6694
],
6795
"y": [
96+
0,
97+
1,
98+
-1,
99+
null,
68100
0,
69101
1,
70102
-1
@@ -86,22 +118,38 @@
86118
},
87119
"color": "yellow",
88120
"size": [
121+
40,
122+
40,
123+
40,
124+
null,
89125
40,
90126
40,
91127
40
92128
],
93129
"symbol": [
94130
0,
95131
"arrow-right",
96-
"arrow-left"
132+
"arrow-left",
133+
null,
134+
100,
135+
148,
136+
147
97137
]
98138
},
99139
"y": [
100140
0,
101141
0,
102-
0
142+
0,
143+
null,
144+
1,
145+
1,
146+
1
103147
],
104148
"x": [
149+
0,
150+
1,
151+
-1,
152+
null,
105153
0,
106154
1,
107155
-1
@@ -123,22 +171,38 @@
123171
},
124172
"color": "yellow",
125173
"size": [
174+
40,
175+
40,
176+
40,
177+
null,
126178
40,
127179
40,
128180
40
129181
],
130182
"symbol": [
131183
0,
132-
"arrow-to-bar-right",
133-
"arrow-to-bar-left"
184+
"arrow-bar-right",
185+
"arrow-bar-left",
186+
null,
187+
100,
188+
152,
189+
151
134190
]
135191
},
136192
"y": [
137193
0,
138194
0,
139-
0
195+
0,
196+
null,
197+
1,
198+
1,
199+
1
140200
],
141201
"x": [
202+
0,
203+
1,
204+
-1,
205+
null,
142206
0,
143207
1,
144208
-1
@@ -149,7 +213,7 @@
149213
],
150214
"layout": {
151215
"title": {
152-
"text": "<b>arrow</b> and <b>arrow-to-bar</b> markers"
216+
"text": "<b>arrow</b> and <b>arrow-bar</b> markers"
153217
},
154218
"showlegend": false,
155219
"width": 800,

0 commit comments

Comments
 (0)