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

修复LineChart的label偏移显示异常的问题

Browse Source
This commit is contained in:
monitor1394
2020-03-13 08:37:11 +08:00
parent ec4fb87142
commit 9079bedd9d
3 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -1,6 +1,7 @@
# 更新日志
* (2020.03.13) 修复`LineChart`的`label`偏移显示异常的问题
* (2020.03.11) 发布`v1.3.0`版本
* (2020.03.11) 优化`LineChart`的`label`偏移显示
* (2020.03.11) 优化清空并重新添加数据后的自动刷新问题

5
Runtime/Internal/BaseChart.cs
View File

@@ -821,7 +821,10 @@ namespace XCharts
var labelHalfWid = serieData.GetLabelWidth() / 2;
var labelHalfHig = serieData.GetLabelHeight() / 2;
var serieLabel = serieData.GetSerieLabel(serie.label);
var centerPos = serieData.labelPosition + serieLabel.offset;
var invert = serie.type == SerieType.Line
&& SerieHelper.IsDownPoint(serie, serieData.index)
&& !serie.areaStyle.show;
var centerPos = serieData.labelPosition + serieLabel.offset * (invert ? -1 : 1);
var p1 = new Vector3(centerPos.x - labelHalfWid, centerPos.y + labelHalfHig);
var p2 = new Vector3(centerPos.x + labelHalfWid, centerPos.y + labelHalfHig);
var p3 = new Vector3(centerPos.x + labelHalfWid, centerPos.y - labelHalfHig);

5
Runtime/Internal/CoordinateChart.cs
View File

@@ -1447,6 +1447,7 @@ namespace XCharts
for (int j = 0; j < serie.data.Count; j++)
{
var serieData = serie.data[j];
serieData.index = j;
if ((serie.label.show || serieData.iconStyle.show))
{
@@ -1527,8 +1528,8 @@ namespace XCharts
content = serie.label.GetFormatterContent(serie.name, serieData.name, value, total);
}
serieData.SetLabelActive(value != 0 && serieData.labelPosition != Vector3.zero);
var down = serie.type == SerieType.Line && SerieHelper.IsDownPoint(serie, j);
serieData.SetLabelPosition(down ? -serie.label.offset : serie.label.offset);
var invert = serie.type == SerieType.Line && SerieHelper.IsDownPoint(serie, j) && !serie.areaStyle.show;
serieData.SetLabelPosition(invert ? -serie.label.offset : serie.label.offset);
if (serieData.SetLabelText(content)) RefreshChart();
}
else