Skip to content

Commit 81f6098

Browse files
committed
Marker labels added for some presets.
1 parent c3556c7 commit 81f6098

File tree

3 files changed

+21
-10
lines changed

3 files changed

+21
-10
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
- Axis line, labels, ticks, interlacing and guide can be switched on/off
88
via channel config parameters.
99
- Padding defaults changed.
10+
- Marker labels added for some presets.
1011

1112
### Fixed
1213

src/apps/weblib/js-api/presets.js

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ export default class Presets {
2929
x: "x",
3030
y: ["y", "splittedBy"],
3131
color: "splittedBy",
32+
label: "y"
3233
},
3334
split: true,
3435
},
@@ -37,6 +38,7 @@ export default class Presets {
3738
x: "x",
3839
y: ["y", "stackedBy"],
3940
color: "stackedBy",
41+
label: "y"
4042
},
4143
align: "stretch",
4244
},
@@ -95,6 +97,7 @@ export default class Presets {
9597
x: ["x", "splittedBy"],
9698
y: "y",
9799
color: "splittedBy",
100+
label: "x"
98101
},
99102
split: true,
100103
},
@@ -103,13 +106,15 @@ export default class Presets {
103106
x: ["x", "stackedBy"],
104107
y: "y",
105108
color: "stackedBy",
109+
label: "x"
106110
},
107111
align: "stretch",
108112
},
109113
lollipop: {
110114
channels: {
111115
x: "x",
112116
y: "y",
117+
label: "y"
113118
},
114119
geometry: "circle",
115120
},
@@ -127,6 +132,7 @@ export default class Presets {
127132
y: "y",
128133
color: "color",
129134
size: "size",
135+
label: "dividedBy",
130136
noop: "dividedBy",
131137
},
132138
geometry: "circle",
@@ -230,6 +236,7 @@ export default class Presets {
230236
channels: {
231237
x: "angle",
232238
y: "radius",
239+
label: "radius"
233240
},
234241
coordSystem: "polar",
235242
},
@@ -246,13 +253,15 @@ export default class Presets {
246253
x: ["angle", "by"],
247254
y: "radius",
248255
color: "by",
256+
label: "radius"
249257
},
250258
coordSystem: "polar",
251259
},
252260
radialBar: {
253261
channels: {
254262
x: "angle",
255263
y: { set: "radius", range: { min: "-50%" } },
264+
label: "angle"
256265
},
257266
coordSystem: "polar",
258267
},
@@ -261,6 +270,7 @@ export default class Presets {
261270
x: ["angle", "stackedBy"],
262271
y: { set: "radius", range: { min: "-50%" } },
263272
color: "stackedBy",
273+
label: "angle"
264274
},
265275
coordSystem: "polar",
266276
},

test/integration/test_cases/test_cases.json

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2008,12 +2008,12 @@
20082008
},
20092009
"web_content/preset/05_C_R_splitted_column": {
20102010
"refs": [
2011-
"676eb66"
2011+
"9bc0fae"
20122012
]
20132013
},
20142014
"web_content/preset/06_C_R_percentage_column": {
20152015
"refs": [
2016-
"86f5e13"
2016+
"85f70d0"
20172017
]
20182018
},
20192019
"web_content/preset/08_C_R_waterfall": {
@@ -2048,17 +2048,17 @@
20482048
},
20492049
"web_content/preset/16_C_R_splitted_bar": {
20502050
"refs": [
2051-
"ac05d1a"
2051+
"9db19f9"
20522052
]
20532053
},
20542054
"web_content/preset/17_C_R_percentage_bar": {
20552055
"refs": [
2056-
"876eb14"
2056+
"9517e64"
20572057
]
20582058
},
20592059
"web_content/preset/20_C_C_lollipop_chart": {
20602060
"refs": [
2061-
"e2a2997"
2061+
"b3bd2a1"
20622062
]
20632063
},
20642064
"web_content/preset/22_C_C_scatter": {
@@ -2068,7 +2068,7 @@
20682068
},
20692069
"web_content/preset/24_C_C_bubbleplot": {
20702070
"refs": [
2071-
"42469e9"
2071+
"266c15c"
20722072
]
20732073
},
20742074
"web_content/preset/27_C_A_area_negative": {
@@ -2128,7 +2128,7 @@
21282128
},
21292129
"web_content/preset/42_P_R_polar_column": {
21302130
"refs": [
2131-
"849af8c"
2131+
"13680f9"
21322132
]
21332133
},
21342134
"web_content/preset/42a_P_R_polar_stacked_column": {
@@ -2138,17 +2138,17 @@
21382138
},
21392139
"web_content/preset/44_P_R_variable_radius_pie_chart": {
21402140
"refs": [
2141-
"316e65d"
2141+
"0103c33"
21422142
]
21432143
},
21442144
"web_content/preset/49_P_R_radial_bar": {
21452145
"refs": [
2146-
"fbeac71"
2146+
"5d9a445"
21472147
]
21482148
},
21492149
"web_content/preset/50_P_R_radial_stacked_bar": {
21502150
"refs": [
2151-
"1caf9f3"
2151+
"48985b9"
21522152
]
21532153
},
21542154
"web_content/preset/51_P_R_donut": {

0 commit comments

Comments
 (0)