Skip to content

Implement horizontal and vertical markers for arrow charts #5010

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 24, 2020
Merged

Implement horizontal and vertical markers for arrow charts #5010

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5857754
add horizontal and vertical arrow markers
archmoj Jul 22, 2020
8cd6767
revise arrow markers names and defs
archmoj Jul 22, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
76 changes: 76 additions & 0 deletions src/components/drawing/symbol_defs.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -482,5 +482,81 @@ module.exports = {
needLine: true,
noDot: true,
noFill: true
},
'arrow-up': {
n: 45,
f: function(r) {
var rx = d3.round(r, 2);
var ry = d3.round(r * 2, 2);
return 'M0,0L-' + rx + ',' + ry + 'H' + rx + 'Z';
},
noDot: true
},
'arrow-down': {
n: 46,
f: function(r) {
var rx = d3.round(r, 2);
var ry = d3.round(r * 2, 2);
return 'M0,0L-' + rx + ',-' + ry + 'H' + rx + 'Z';
},
noDot: true
},
'arrow-left': {
n: 47,
f: function(r) {
var rx = d3.round(r * 2, 2);
var ry = d3.round(r, 2);
return 'M0,0L' + rx + ',-' + ry + 'V' + ry + 'Z';
},
noDot: true
},
'arrow-right': {
n: 48,
f: function(r) {
var rx = d3.round(r * 2, 2);
var ry = d3.round(r, 2);
return 'M0,0L-' + rx + ',-' + ry + 'V' + ry + 'Z';
},
noDot: true
},
'arrow-bar-up': {
n: 49,
f: function(r) {
var rx = d3.round(r, 2);
var ry = d3.round(r * 2, 2);
return 'M-' + rx + ',0H' + rx + 'M0,0L-' + rx + ',' + ry + 'H' + rx + 'Z';
},
needLine: true,
noDot: true
},
'arrow-bar-down': {
n: 50,
f: function(r) {
var rx = d3.round(r, 2);
var ry = d3.round(r * 2, 2);
return 'M-' + rx + ',0H' + rx + 'M0,0L-' + rx + ',-' + ry + 'H' + rx + 'Z';
},
needLine: true,
noDot: true
},
'arrow-bar-left': {
n: 51,
f: function(r) {
var rx = d3.round(r * 2, 2);
var ry = d3.round(r, 2);
return 'M0,-' + ry + 'V' + ry + 'M0,0L' + rx + ',-' + ry + 'V' + ry + 'Z';
},
needLine: true,
noDot: true
},
'arrow-bar-right': {
n: 52,
f: function(r) {
var rx = d3.round(r * 2, 2);
var ry = d3.round(r, 2);
return 'M0,-' + ry + 'V' + ry + 'M0,0L-' + rx + ',-' + ry + 'V' + ry + 'Z';
},
needLine: true,
noDot: true
}
};
Binary file added test/image/baselines/arrow-markers.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
235 changes: 235 additions & 0 deletions test/image/mocks/arrow-markers.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,235 @@
{
"data": [
{
"type": "scatter",
"mode": "lines+markers",
"line": {
"width": 5,
"color": "black"
},
"marker": {
"line": {
"width": 5,
"color": "black"
},
"color": "yellow",
"size": [
40,
40,
40,
null,
40,
40,
40
],
"symbol": [
0,
"arrow-up",
"arrow-down",
null,
100,
145,
146
]
},
"x": [
0,
0,
0,
null,
1,
1,
1
],
"y": [
0,
1,
-1,
null,
0,
1,
-1
]
},
{
"type": "scatter",
"mode": "lines+markers",
"line": {
"width": 5,
"color": "black"
},
"marker": {
"line": {
"width": 5,
"color": "black"
},
"color": "yellow",
"size": [
40,
40,
40,
null,
40,
40,
40
],
"symbol": [
0,
"arrow-bar-up",
"arrow-bar-down",
null,
100,
149,
150
]
},
"x": [
0,
0,
0,
null,
1,
1,
1
],
"y": [
0,
1,
-1,
null,
0,
1,
-1
],
"xaxis": "x2",
"yaxis": "y2"
},
{
"type": "scatter",
"mode": "lines+markers",
"line": {
"width": 5,
"color": "black"
},
"marker": {
"line": {
"width": 5,
"color": "black"
},
"color": "yellow",
"size": [
40,
40,
40,
null,
40,
40,
40
],
"symbol": [
0,
"arrow-right",
"arrow-left",
null,
100,
148,
147
]
},
"y": [
0,
0,
0,
null,
1,
1,
1
],
"x": [
0,
1,
-1,
null,
0,
1,
-1
],
"xaxis": "x3",
"yaxis": "y3"
},
{
"type": "scatter",
"mode": "lines+markers",
"line": {
"width": 5,
"color": "black"
},
"marker": {
"line": {
"width": 5,
"color": "black"
},
"color": "yellow",
"size": [
40,
40,
40,
null,
40,
40,
40
],
"symbol": [
0,
"arrow-bar-right",
"arrow-bar-left",
null,
100,
152,
151
]
},
"y": [
0,
0,
0,
null,
1,
1,
1
],
"x": [
0,
1,
-1,
null,
0,
1,
-1
],
"xaxis": "x4",
"yaxis": "y4"
}
],
"layout": {
"title": {
"text": "<b>arrow</b> and <b>arrow-bar</b> markers"
},
"showlegend": false,
"width": 800,
"height": 800,
"margin": {
"t": 80,
"b": 40,
"l": 40,
"r": 40
},
"grid": {
"rows": 2,
"columns": 2,
"xgap": 0.1,
"ygap": 0.1,
"pattern": "independent"
}
}
}
2 changes: 2 additions & 0 deletions test/jasmine/tests/mock_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ var list = [
'animation_bar',
'annotations',
'annotations-autorange',
'arrow-markers',
'automargin-mirror-all',
'automargin-mirror-allticks',
'automargin-multiline-titles',
Expand Down Expand Up @@ -1081,6 +1082,7 @@ figs['animation'] = require('@mocks/animation');
figs['animation_bar'] = require('@mocks/animation_bar');
// figs['annotations'] = require('@mocks/annotations');
// figs['annotations-autorange'] = require('@mocks/annotations-autorange');
figs['arrow-markers'] = require('@mocks/arrow-markers');
figs['automargin-mirror-all'] = require('@mocks/automargin-mirror-all');
figs['automargin-mirror-allticks'] = require('@mocks/automargin-mirror-allticks');
figs['automargin-multiline-titles'] = require('@mocks/automargin-multiline-titles');
Expand Down