Skip to content

Commit 679f657

Browse files
erossinierossini
authored
Merge pull request #26 from erossini/feature/add-zoom
Add borderWidth for all charts
2 parents 10b0c45 + ad97ad4 commit 679f657

File tree

7 files changed

+106
-18
lines changed

7 files changed

+106
-18
lines changed

‎CHANGELOG.md‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,22 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog). To
88
auto-changelog
99
```
1010

11+
#### [0.91](https://github.com/erossini/BlazorChartjs/compare/0.9...0.91)
12+
13+
> 2 November 2022
14+
15+
- Add settings for Animations and Title [`#25`](https://github.com/erossini/BlazorChartjs/pull/25)
16+
- cleanup [`#24`](https://github.com/erossini/BlazorChartjs/pull/24)
17+
18+
#### [0.9](https://github.com/erossini/BlazorChartjs/compare/0.8...0.9)
19+
20+
> 21 October 2022
21+
22+
- Add zoom - Clean the projects [`#23`](https://github.com/erossini/BlazorChartjs/pull/23)
23+
- Update CHANGELOG [`d6abab3`](https://github.com/erossini/BlazorChartjs/commit/d6abab38cc0052d6fef270d274ec8fcea2b6a6ab)
24+
- Delete logs [`982833a`](https://github.com/erossini/BlazorChartjs/commit/982833abad557f51d0296a3741b7aafa8bb21760)
25+
- Delete folder [`5616644`](https://github.com/erossini/BlazorChartjs/commit/5616644b7217d407bcd1b0d084a6c0e6905e3332)
26+
1127
#### 0.8
1228

1329
> 21 October 2022

‎src/Models/Doughnut/DoughnutDataset.cs‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,17 @@ public class DoughnutDataset : Dataset
1515
[JsonPropertyName("backgroundColor")]
1616
[JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
1717
public List<string> BackgroundColor { get; set; } = new List<string>();
18+
19+
/// <summary>
20+
/// Gets or sets the width of the border.
21+
/// </summary>
22+
/// <value>
23+
/// The width of the border.
24+
/// </value>
25+
[JsonPropertyName("borderWidth")]
26+
[JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
27+
public int? BorderWidth { get; set; }
28+
1829
/// <summary>
1930
/// Gets or sets the arc offset when hovered (in pixels)
2031
/// </summary>

‎src/Models/Line/LineDataset.cs‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ public class LineDataset : Dataset
1515
[JsonPropertyName("backgroundColor")]
1616
[JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
1717
public string BackgroundColor { get; set; }
18+
1819
/// <summary>
1920
/// Gets or sets the color of the border.
2021
/// </summary>
@@ -24,6 +25,17 @@ public class LineDataset : Dataset
2425
[JsonPropertyName("borderColor")]
2526
[JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
2627
public string BorderColor { get; set; }
28+
29+
/// <summary>
30+
/// Gets or sets the width of the border.
31+
/// </summary>
32+
/// <value>
33+
/// The width of the border.
34+
/// </value>
35+
[JsonPropertyName("borderWidth")]
36+
[JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
37+
public int? BorderWidth { get; set; }
38+
2739
/// <summary>
2840
/// Gets or sets a value indicating whether this <see cref="LineDataset"/> is fill.
2941
/// </summary>
@@ -33,6 +45,7 @@ public class LineDataset : Dataset
3345
[JsonPropertyName("fill")]
3446
[JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingDefault)]
3547
public bool Fill { get; set; } = false;
48+
3649
/// <summary>
3750
/// Gets or sets the color of the fill.
3851
/// </summary>
@@ -42,6 +55,7 @@ public class LineDataset : Dataset
4255
[JsonPropertyName("fillColor")]
4356
[JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingDefault)]
4457
public string FillColor { get; set; }
58+
4559
/// <summary>
4660
/// Gets or sets the color of the stroke.
4761
/// </summary>
@@ -51,6 +65,7 @@ public class LineDataset : Dataset
5165
[JsonPropertyName("strokeColor")]
5266
[JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingDefault)]
5367
public string StrokeColor { get; set; }
68+
5469
/// <summary>
5570
/// Gets or sets the tension.
5671
/// </summary>
@@ -61,4 +76,4 @@ public class LineDataset : Dataset
6176
[JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingDefault)]
6277
public decimal Tension { get; set; } = 0;
6378
}
64-
}
79+
}

‎src/Models/Pie/PieDataset.cs‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,16 @@ public class PieDataset : Dataset
1616
[JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
1717
public List<string> BackgroundColor { get; set; } = new List<string>();
1818

19+
/// <summary>
20+
/// Gets or sets the width of the border.
21+
/// </summary>
22+
/// <value>
23+
/// The width of the border.
24+
/// </value>
25+
[JsonPropertyName("borderWidth")]
26+
[JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
27+
public int? BorderWidth { get; set; }
28+
1929
/// <summary>
2030
/// Gets or sets the arc offset when hovered (in pixels)
2131
/// </summary>

‎src/Models/Polar/PolarDataset.cs‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,15 @@ public class PolarDataset : Dataset
1111
[JsonPropertyName("backgroundColor")]
1212
[JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
1313
public List<string> BackgroundColor { get; set; } = new List<string>();
14+
15+
/// <summary>
16+
/// Gets or sets the width of the border.
17+
/// </summary>
18+
/// <value>
19+
/// The width of the border.
20+
/// </value>
21+
[JsonPropertyName("borderWidth")]
22+
[JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
23+
public int? BorderWidth { get; set; }
1424
}
1525
}

‎src/Models/Radar/RadarDataset.cs‎

Lines changed: 25 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,6 @@
22
{
33
public class RadarDataset : Dataset
44
{
5-
/// <summary>
6-
/// Gets or sets a value indicating whether this <see cref="RadarDataset"/> is fill.
7-
/// </summary>
8-
/// <value>
9-
/// <c>true</c> if fill; otherwise, <c>false</c>.
10-
/// </value>
11-
[JsonPropertyName("fill")]
12-
[JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingDefault)]
13-
public bool Fill { get; set; }
145
/// <summary>
156
/// Gets or sets the color of the background.
167
/// </summary>
@@ -20,6 +11,7 @@ public class RadarDataset : Dataset
2011
[JsonPropertyName("backgroundColor")]
2112
[JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
2213
public string BackgroundColor { get; set; }
14+
2315
/// <summary>
2416
/// Gets or sets the color of the border.
2517
/// </summary>
@@ -29,6 +21,27 @@ public class RadarDataset : Dataset
2921
[JsonPropertyName("borderColor")]
3022
[JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
3123
public string BorderColor { get; set; }
24+
25+
/// <summary>
26+
/// Gets or sets the width of the border.
27+
/// </summary>
28+
/// <value>
29+
/// The width of the border.
30+
/// </value>
31+
[JsonPropertyName("borderWidth")]
32+
[JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
33+
public int? BorderWidth { get; set; }
34+
35+
/// <summary>
36+
/// Gets or sets a value indicating whether this <see cref="RadarDataset"/> is fill.
37+
/// </summary>
38+
/// <value>
39+
/// <c>true</c> if fill; otherwise, <c>false</c>.
40+
/// </value>
41+
[JsonPropertyName("fill")]
42+
[JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingDefault)]
43+
public bool Fill { get; set; }
44+
3245
/// <summary>
3346
/// Gets or sets the color of the point background.
3447
/// </summary>
@@ -38,6 +51,7 @@ public class RadarDataset : Dataset
3851
[JsonPropertyName("pointBackgroundColor")]
3952
[JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
4053
public string PointBackgroundColor { get; set; }
54+
4155
/// <summary>
4256
/// Gets or sets the color of the point border.
4357
/// </summary>
@@ -47,6 +61,7 @@ public class RadarDataset : Dataset
4761
[JsonPropertyName("pointBorderColor")]
4862
[JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
4963
public string PointBorderColor { get; set; }
64+
5065
/// <summary>
5166
/// Gets or sets the color of the point hover background.
5267
/// </summary>
@@ -56,6 +71,7 @@ public class RadarDataset : Dataset
5671
[JsonPropertyName("pointHoverBackgroundColor")]
5772
[JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
5873
public string PointHoverBackgroundColor { get; set; }
74+
5975
/// <summary>
6076
/// Gets or sets the color of the point hover border.
6177
/// </summary>

‎src/Models/Scatter/ScatterDataset.cs‎

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,14 @@ public class ScatterDataset : CustomDataset<ScatterXYValue>
2323
public string BorderColor { get; set; }
2424

2525
/// <summary>
26-
/// Gets or sets the point radius.
26+
/// Gets or sets the width of the border.
2727
/// </summary>
2828
/// <value>
29-
/// The point radius.
29+
/// The width of the border.
3030
/// </value>
31-
[JsonPropertyName("pointRadius")]
31+
[JsonPropertyName("borderWidth")]
3232
[JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
33-
public decimal? PointRadius { get; set; }
33+
public int? BorderWidth { get; set; }
3434

3535
/// <summary>
3636
/// Gets or sets the point hit radius.
@@ -42,6 +42,16 @@ public class ScatterDataset : CustomDataset<ScatterXYValue>
4242
[JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
4343
public decimal? PointHitRadius { get; set; }
4444

45+
/// <summary>
46+
/// Gets or sets the point radius.
47+
/// </summary>
48+
/// <value>
49+
/// The point radius.
50+
/// </value>
51+
[JsonPropertyName("pointRadius")]
52+
[JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
53+
public decimal? PointRadius { get; set; }
54+
4555
/// <summary>
4656
/// Gets or sets a value indicating whether show line.
4757
/// </summary>
@@ -68,18 +78,18 @@ public class ScatterDataset : CustomDataset<ScatterXYValue>
6878
/// <value>
6979
/// The y axis identifier.
7080
/// </value>
71-
[JsonPropertyName("yAxisID")]
81+
[JsonPropertyName("y2AxisID")]
7282
[JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
73-
public string? YAxisId { get; set; }
83+
public string? Y2AxisId { get; set; }
7484

7585
/// <summary>
7686
/// Gets or sets the y axis identifier.
7787
/// </summary>
7888
/// <value>
7989
/// The y axis identifier.
8090
/// </value>
81-
[JsonPropertyName("y2AxisID")]
91+
[JsonPropertyName("yAxisID")]
8292
[JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
83-
public string? Y2AxisId { get; set; }
93+
public string? YAxisId { get; set; }
8494
}
8595
}

0 commit comments

Comments
 (0)