foldcc/XCharts
1
0
Fork 0
mirror of https://github.com/XCharts-Team/XCharts.git synced 2026-05-30 05:08:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

增加RingChart环形渐变支持#75

Browse Source
This commit is contained in:
monitor1394
2020-07-23 12:52:06 +08:00
parent 58ab97c2a0
commit 74b3cf7159
3 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG-EN.md
View File

@@ -1,6 +1,7 @@
# 更新日志 # 更新日志
* (2020.07.23) Added `RingChart` ring gradient support#75
* (2020.07.21) Added `formatter` of `AxisLabel` and `SerieLabel` to configure numeric formatting separately. * (2020.07.21) Added `formatter` of `AxisLabel` and `SerieLabel` to configure numeric formatting separately.
* (2020.07.17) Added animation completion callback interface for `SerieAnimation`. * (2020.07.17) Added animation completion callback interface for `SerieAnimation`.
* (2020.07.17) Optimize `Chart` under `ScrollView` without affecting the scrolling and dragging of `ScrollView`. * (2020.07.17) Optimize `Chart` under `ScrollView` without affecting the scrolling and dragging of `ScrollView`.

1
CHANGELOG.md
View File

@@ -1,6 +1,7 @@
# 更新日志 # 更新日志
* (2020.07.23) 增加`RingChart`环形渐变支持#75
* (2020.07.21) 增加`AxisLabel`和`SerieLabel`的`formatter`可单独配置数值格式化#68 * (2020.07.21) 增加`AxisLabel`和`SerieLabel`的`formatter`可单独配置数值格式化#68
* (2020.07.17) 增加`SerieAnimation`动画完成回调接口 * (2020.07.17) 增加`SerieAnimation`动画完成回调接口
* (2020.07.17) 优化`Chart`放在`ScrollView`下时不影响`ScrollView`的滚动和拖动 * (2020.07.17) 优化`Chart`放在`ScrollView`下时不影响`ScrollView`的滚动和拖动

15
Runtime/Internal/Utility/ChartDrawer.cs
View File

@@ -1160,7 +1160,7 @@ namespace XCharts
roundCenter = p + roundAngleRadius * ChartHelper.GetDire(realToOutAngle); roundCenter = p + roundAngleRadius * ChartHelper.GetDire(realToOutAngle);
sectorStartDegree = clockwise ? roundTotalDegree : roundTotalDegree + 180; sectorStartDegree = clockwise ? roundTotalDegree : roundTotalDegree + 180;
sectorToDegree = clockwise ? roundTotalDegree + 180 : roundTotalDegree + 360; sectorToDegree = clockwise ? roundTotalDegree + 180 : roundTotalDegree + 360;
DrawSector(vh, roundCenter, roundRadius, color, sectorStartDegree, sectorToDegree, smoothness / 2); DrawSector(vh, roundCenter, roundRadius, toColor, sectorStartDegree, sectorToDegree, smoothness / 2);
if (needBorder) if (needBorder)
{ {
DrawDoughnut(vh, roundCenter, roundRadius, roundRadius + borderWidth, borderColor, Color.clear, DrawDoughnut(vh, roundCenter, roundRadius, roundRadius + borderWidth, borderColor, Color.clear,
@@ -1169,7 +1169,8 @@ namespace XCharts
e1 = ChartHelper.GetPos(p, insideRadius, realToOutAngle); e1 = ChartHelper.GetPos(p, insideRadius, realToOutAngle);
e2 = ChartHelper.GetPos(p, outsideRadius, realToOutAngle); e2 = ChartHelper.GetPos(p, outsideRadius, realToOutAngle);
} }
float segmentAngle = (realToInAngle - realStartInAngle) / segments; var segmentAngle = (realToInAngle - realStartInAngle) / segments;
var isGradient = !ChartHelper.IsValueEqualsColor(color, toColor);
for (int i = 0; i <= segments; i++) for (int i = 0; i <= segments; i++)
{ {
float currAngle = realStartInAngle + i * segmentAngle; float currAngle = realStartInAngle + i * segmentAngle;
@@ -1178,7 +1179,15 @@ namespace XCharts
p4 = new Vector3(p.x + insideRadius * Mathf.Sin(currAngle), p4 = new Vector3(p.x + insideRadius * Mathf.Sin(currAngle),
p.y + insideRadius * Mathf.Cos(currAngle)); p.y + insideRadius * Mathf.Cos(currAngle));
if (!ChartHelper.IsClearColor(emptyColor)) DrawTriangle(vh, p, p1, p4, emptyColor); if (!ChartHelper.IsClearColor(emptyColor)) DrawTriangle(vh, p, p1, p4, emptyColor);
DrawPolygon(vh, p2, p3, p4, p1, color, toColor); if (isGradient)
{
var tcolor = Color.Lerp(color, toColor, i * 1.0f / segments);
DrawPolygon(vh, p2, p3, p4, p1, tcolor, tcolor);
}
else
{
DrawPolygon(vh, p2, p3, p4, p1, color, color);
}
p1 = p4; p1 = p4;
p2 = p3; p2 = p3;
} }