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

优化PieChart文本堆叠和引线效果#85

Browse Source
This commit is contained in:
monitor1394
2020-08-11 08:47:20 +08:00
parent e1936fcffc
commit d0fafae3db
6 changed files with 48 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Runtime/Internal/BaseChart.cs
View File

@@ -744,7 +744,11 @@ namespace XCharts
&& serie.type == SerieType.Line
&& SerieHelper.IsDownPoint(serie, serieData.index)
&& !serie.areaStyle.show;
var centerPos = serieData.labelPosition + serieLabel.offset * (invert ? -1 : 1);
var centerPos = Vector3.zero;
if (serie.type == SerieType.Pie)
centerPos = SerieLabelHelper.GetRealLabelPosition(serieData, serieLabel);
else
centerPos = serieData.labelPosition + serieLabel.offset * (invert ? -1 : 1);
var labelHalfWid = serieData.labelObject.GetLabelWidth() / 2;
var labelHalfHig = serieData.GetLabelHeight() / 2;
var p1 = new Vector3(centerPos.x - labelHalfWid, centerPos.y + labelHalfHig);
@@ -767,6 +771,7 @@ namespace XCharts
ChartDrawer.DrawBorder(vh, centerPos, serieData.GetLabelWidth(), serieData.GetLabelHeight(),
serieLabel.borderWidth, serieLabel.borderColor, serieLabel.rotate);
}
ChartDrawer.DrawPolygon(vh, serieData.labelPosition, 0.3f, Color.red);
}
}
}

1
Runtime/Internal/Helper/SerieLabelHelper.cs
View File

@@ -258,7 +258,6 @@ namespace XCharts
break;
}
}
if (splitCount <= 0) return;
for (int n = 0; n < splitCount; n++)
{
var serieData = data[n];

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

@@ -49,6 +49,38 @@ namespace XCharts
vh.AddUIVertexQuad(vertex);
}
public static void DrawLine(VertexHelper vh, Vector3 start, Vector3 middle, Vector3 end, float size, Color32 color)
{
var dir1 = (middle - start).normalized;
var dir2 = (end - middle).normalized;
var dir1v = Vector3.Cross(dir1, Vector3.forward).normalized;
var dir2v = Vector3.Cross(dir2, Vector3.forward).normalized;
var dir3 = (dir1 + dir2).normalized;
var isDown = Vector3.Cross(dir1, dir2).z <= 0;
var angle = (180 - Vector3.Angle(dir1, dir2)) * Mathf.Deg2Rad / 2;
var diff = size / Mathf.Sin(angle);
var dirDp = Vector3.Cross(dir3, Vector3.forward).normalized;
var dnPos = middle + (isDown ? dirDp : -dirDp) * diff;
var upPos1 = middle + (isDown ? -dir1v : dir1v) * size;
var upPos2 = middle + (isDown ? -dir2v : dir2v) * size;
var startUp = start - dir1v * size;
var startDn = start + dir1v * size;
var endUp = end - dir2v * size;
var endDn = end + dir2v * size;
if (isDown)
{
DrawPolygon(vh, startDn, startUp, upPos1, dnPos, color);
DrawPolygon(vh, dnPos, upPos2, endUp, endDn, color);
DrawTriangle(vh, dnPos, upPos1, upPos2, color);
}
else
{
DrawPolygon(vh, startDn, startUp, dnPos, upPos1, color);
DrawPolygon(vh, upPos2, dnPos, endUp, endDn, color);
DrawTriangle(vh, dnPos, upPos1, upPos2, color);
}
}
public static void DrawDashLine(VertexHelper vh, Vector3 p1, Vector3 p2, float size, Color32 color,
float dashLen = 15f, float blankLen = 7f, List<Vector3> posList = null)
{