Skip to content

Commit f021efa

Browse files
maantjemaantje
committed
Add better defaults, add more color, font options.
Fix line not using x values correctly. Reorder line point from y,x to x,y.
1 parent f6f2942 commit f021efa

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+781
-902
lines changed

‎README.md

+12-4
Original file line numberDiff line numberDiff line change
@@ -126,10 +126,18 @@ $chart = new Chart(
126126
lines: [
127127
new Line(
128128
points: [
129-
new Point(y: 0, x: 0),
130-
new Point(y: 4, x: 100),
131-
new Point(y: 12, x: 200),
132-
new Point(y: 8, x: 300),
129+
new Point(x: 0, y: 0),
130+
new Point(x: 100, y: 4),
131+
new Point(x: 200, y: 12),
132+
new Point(x: 300, y: 8),
133+
],
134+
),
135+
new Line(
136+
points: [
137+
[0, 0],
138+
[100, 4],
139+
[200, 12],
140+
[300, 8],
133141
],
134142
),
135143
],

‎examples/advanced-line-chart.php

+10-10
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020
new YAxis(
2121
name: 'celsius',
2222
title: 'Temperature',
23-
color: 'red',
2423
minValue: 30,
2524
maxValue: 50,
25+
color: 'red',
2626
annotations: [
2727
new YAxisLineAnnotation(
2828
y: 48,
@@ -65,7 +65,6 @@
6565
title: 'Elevation',
6666
minValue: 0,
6767
maxValue: 3000,
68-
labelMargin: 10,
6968
annotations: [
7069
new PointAnnotation(
7170
x: 1725331334 + 3600,
@@ -77,6 +76,7 @@
7776
label: 'Point annotation',
7877
),
7978
],
79+
labelMargin: 10,
8080
formatter: Formatter::template(':value m')
8181

8282
),
@@ -104,20 +104,20 @@
104104
lines: [
105105
new Line(
106106
[
107-
new Point(y: 37.3, x: 1725331334),
108-
new Point(y: 37.8, x: 1725331334 + 3600),
109-
new Point(y: 38, x: 1725331334 + 3600 + 3600),
110-
new Point(y: 42.2, x: 1725331334 + 3600 + 3600 + 3600),
107+
new Point(x: 1725331334, y: 37.3),
108+
new Point(x: 1725331334 + 3600, y: 37.8),
109+
new Point(x: 1725331334 + 3600 + 3600, y: 38),
110+
new Point(x: 1725331334 + 3600 + 3600 + 3600, y: 42.2),
111111
],
112112
yAxis: 'celsius',
113113
color: '#FF0000',
114114
),
115115
new Line(
116116
[
117-
new Point(y: 0, x: 1725331334),
118-
new Point(y: 900, x: 1725331334 + 3600),
119-
new Point(y: 1800, x: 1725331334 + 3600 + 3600),
120-
new Point(y: 2200, x: 1725331334 + 3600 + 3600 + 3600),
117+
new Point(x: 1725331334, y: 0),
118+
new Point(x: 1725331334 + 3600, y: 900),
119+
new Point(x: 1725331334 + 3600 + 3600, y: 1800),
120+
new Point(x: 1725331334 + 3600 + 3600 + 3600, y: 2200),
121121
],
122122
yAxis: 'elevation',
123123
),

‎examples/area-line-chart.php

+21-21
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@
1414

1515
new Line(
1616
points: [
17-
new Point(y: 20, x: 0),
18-
new Point(y: 35, x: 100),
19-
new Point(y: 50, x: 200),
20-
new Point(y: 30, x: 300),
21-
new Point(y: 50, x: 400),
22-
new Point(y: 45, x: 500),
23-
new Point(y: 30, x: 600),
17+
new Point(x: 0, y: 20),
18+
new Point(x: 100, y: 35),
19+
new Point(x: 200, y: 50),
20+
new Point(x: 300, y: 30),
21+
new Point(x: 400, y: 50),
22+
new Point(x: 500, y: 45),
23+
new Point(x: 600, y: 30),
2424
],
2525
color: 'rgb(75, 192, 192)',
2626
areaColor: 'rgba(75, 192, 192, 0.3)',
@@ -29,13 +29,13 @@
2929

3030
new Line(
3131
points: [
32-
new Point(y: 10, x: 0),
33-
new Point(y: 20, x: 100),
34-
new Point(y: 15, x: 200),
35-
new Point(y: 25, x: 300),
36-
new Point(y: 20, x: 400),
37-
new Point(y: 35, x: 500),
38-
new Point(y: 35, x: 600),
32+
new Point(x: 0, y: 10),
33+
new Point(x: 100, y: 20),
34+
new Point(x: 200, y: 15),
35+
new Point(x: 300, y: 25),
36+
new Point(x: 400, y: 20),
37+
new Point(x: 500, y: 35),
38+
new Point(x: 600, y: 35),
3939
],
4040
color: 'rgb(255, 99, 132)',
4141
areaColor: 'rgba(255, 99, 132, 0.3)',
@@ -44,13 +44,13 @@
4444

4545
new Line(
4646
points: [
47-
new Point(y: 10, x: 0),
48-
new Point(y: 40, x: 100),
49-
new Point(y: 20, x: 200),
50-
new Point(y: 50, x: 300),
51-
new Point(y: 30, x: 400),
52-
new Point(y: 60, x: 500),
53-
new Point(y: 40, x: 600),
47+
new Point(x: 0, y: 10),
48+
new Point(x: 100, y: 40),
49+
new Point(x: 200, y: 20),
50+
new Point(x: 300, y: 50),
51+
new Point(x: 400, y: 30),
52+
new Point(x: 500, y: 60),
53+
new Point(x: 600, y: 40),
5454
],
5555
color: 'rgb(54, 162, 235)',
5656
areaColor: 'rgba(54, 162, 235, 0.3)',

‎examples/curved-line-chart.php

+35-34
Original file line numberDiff line numberDiff line change
@@ -13,61 +13,62 @@
1313
lines: [
1414
new Line(
1515
points: [
16-
new Point(y: 0, x: 0),
17-
new Point(y: 20, x: 50),
18-
new Point(y: 5, x: 100),
19-
new Point(y: 25, x: 150),
20-
new Point(y: 10, x: 200),
21-
new Point(y: 30, x: 250),
22-
new Point(y: 15, x: 300),
23-
new Point(y: 25, x: 350),
24-
new Point(y: 35, x: 400),
16+
new Point(x: 0, y: 0),
17+
new Point(x: 50, y: 20),
18+
new Point(x: 100, y: 5),
19+
new Point(x: 150, y: 25),
20+
new Point(x: 200, y: 10),
21+
new Point(x: 250, y: 30),
22+
new Point(x: 300, y: 15),
23+
new Point(x: 350, y: 25),
24+
new Point(x: 400, y: 35),
2525
],
2626
color: 'red',
2727
curve: 8
2828
),
2929

3030
new Line(
3131
points: [
32-
new Point(y: 2, x: 0),
33-
new Point(y: 4, x: 50),
34-
new Point(y: 8, x: 100),
35-
new Point(y: 16, x: 150),
36-
new Point(y: 32, x: 200),
37-
new Point(y: 64, x: 300),
38-
new Point(y: 96, x: 350),
39-
new Point(y: 128, x: 400),
32+
new Point(x: 0, y: 2),
33+
new Point(x: 50, y: 4),
34+
new Point(x: 100, y: 8),
35+
new Point(x: 150, y: 16),
36+
new Point(x: 200, y: 32),
37+
new Point(x: 250, y: 32),
38+
new Point(x: 300, y: 64),
39+
new Point(x: 350, y: 96),
40+
new Point(x: 400, y: 128),
4041
],
4142
color: 'blue',
4243
curve: 6
4344
),
4445

4546
new Line(
4647
points: [
47-
new Point(y: 10, x: 0),
48-
new Point(y: 20, x: 50),
49-
new Point(y: 10, x: 100),
50-
new Point(y: 0, x: 150),
51-
new Point(y: 10, x: 200),
52-
new Point(y: 20, x: 250),
53-
new Point(y: 10, x: 300),
54-
new Point(y: 5, x: 350),
55-
new Point(y: 0, x: 400),
48+
new Point(x: 0, y: 10),
49+
new Point(x: 50, y: 20),
50+
new Point(x: 100, y: 10),
51+
new Point(x: 150, y: 0),
52+
new Point(x: 200, y: 10),
53+
new Point(x: 250, y: 20),
54+
new Point(x: 300, y: 10),
55+
new Point(x: 350, y: 5),
56+
new Point(x: 400, y: 0),
5657
],
5758
color: 'green',
5859
curve: 5
5960
),
6061

6162
new Line(
6263
points: [
63-
new Point(y: 5, x: 0),
64-
new Point(y: 15, x: 50),
65-
new Point(y: 30, x: 120),
66-
new Point(y: 10, x: 180),
67-
new Point(y: 40, x: 250),
68-
new Point(y: 20, x: 320),
69-
new Point(y: 35, x: 350),
70-
new Point(y: 50, x: 400),
64+
new Point(x: 0, y: 5),
65+
new Point(x: 50, y: 15),
66+
new Point(x: 150, y: 30),
67+
new Point(x: 200, y: 10),
68+
new Point(x: 250, y: 40),
69+
new Point(x: 300, y: 20),
70+
new Point(x: 350, y: 35),
71+
new Point(x: 400, y: 50),
7172
],
7273
color: 'purple',
7374
curve: 7

‎examples/line-chart.php

+9-9
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,18 @@
1313
lines: [
1414
new Line(
1515
points: [
16-
new Point(y: 0, x: 0),
17-
new Point(y: 4, x: 100),
18-
new Point(y: 12, x: 200),
19-
new Point(y: 8, x: 300),
20-
],
16+
[0, 0],
17+
[100, 4],
18+
[200, 12],
19+
[300, 8],
20+
]
2121
),
2222
new Line(
2323
points: [
24-
new Point(y: 4, x: 0),
25-
new Point(y: 12, x: 100),
26-
new Point(y: 24, x: 200),
27-
new Point(y: 7, x: 300),
24+
new Point(x: 0, y: 4, color: 'red', size: 5),
25+
new Point(x: 100, y: 12, color: 'red', size: 5),
26+
new Point(x: 200, y: 24, color: 'red', size: 5),
27+
new Point(x: 300, y: 7, color: 'red', size: 5),
2828
],
2929
color: 'blue'
3030
),

‎examples/mixed-chart.php

+8-8
Original file line numberDiff line numberDiff line change
@@ -54,18 +54,18 @@
5454
lines: [
5555
new Line(
5656
points: [
57-
new Point(y: 0, x: 0),
58-
new Point(y: 4000, x: 100),
59-
new Point(y: 12000, x: 200),
60-
new Point(y: 8000, x: 300),
57+
new Point(x: 0, y: 0),
58+
new Point(x: 100, y: 4000),
59+
new Point(x: 200, y: 12000),
60+
new Point(x: 300, y: 8000),
6161
],
6262
),
6363
new Line(
6464
points: [
65-
new Point(y: 0, x: 0),
66-
new Point(y: 12000, x: 100),
67-
new Point(y: 14000, x: 200),
68-
new Point(y: 7000, x: 300),
65+
new Point(x: 0, y: 0),
66+
new Point(x: 100, y: 12000),
67+
new Point(x: 200, y: 14000),
68+
new Point(x: 300, y: 7000),
6969
],
7070
color: 'blue'
7171
),

‎examples/output/advanced-bar-chart.svg

+9-9
Loading

0 commit comments

Comments
 (0)