diff --git a/Runtime/Serie/Pie/PieHandler.cs b/Runtime/Serie/Pie/PieHandler.cs index 1b8322ae..96b8b017 100644 --- a/Runtime/Serie/Pie/PieHandler.cs +++ b/Runtime/Serie/Pie/PieHandler.cs @@ -516,6 +516,7 @@ namespace XCharts.Runtime break; } } + DrawLabelLineSymbol(vh, labelLine, pos1, pos5, color); } } diff --git a/Runtime/Serie/Ring/RingHandler.cs b/Runtime/Serie/Ring/RingHandler.cs index 8c7828ba..08fdcd29 100644 --- a/Runtime/Serie/Ring/RingHandler.cs +++ b/Runtime/Serie/Ring/RingHandler.cs @@ -407,22 +407,8 @@ namespace XCharts.Runtime UGL.DrawLine(vh, pos1, pos5, labelLine.lineWidth, color); break; } - if (labelLine.startSymbol != null && labelLine.startSymbol.show) - { - DrawSymbol(vh, labelLine.startSymbol, pos1, color); - } - if (labelLine.endSymbol != null && labelLine.endSymbol.show) - { - DrawSymbol(vh, labelLine.endSymbol, pos5, color); - } + DrawLabelLineSymbol(vh, labelLine, pos1, pos5, color); } } - - private void DrawSymbol(VertexHelper vh, SymbolStyle symbol, Vector3 pos, Color32 defaultColor) - { - var color = symbol.GetColor(defaultColor); - chart.DrawSymbol(vh, symbol.type, symbol.size, 1, pos, - color, color, ColorUtil.clearColor32, color, symbol.gap, null); - } } } \ No newline at end of file diff --git a/Runtime/Serie/SerieHandler.cs b/Runtime/Serie/SerieHandler.cs index 2d83c10d..401fbb43 100644 --- a/Runtime/Serie/SerieHandler.cs +++ b/Runtime/Serie/SerieHandler.cs @@ -593,5 +593,24 @@ namespace XCharts.Runtime paramList.Add(param); } + + public void DrawLabelLineSymbol(VertexHelper vh, LabelLine labelLine, Vector3 startPos, Vector3 endPos, Color32 defaultColor) + { + if (labelLine.startSymbol != null && labelLine.startSymbol.show) + { + DrawSymbol(vh, labelLine.startSymbol, startPos, defaultColor); + } + if (labelLine.endSymbol != null && labelLine.endSymbol.show) + { + DrawSymbol(vh, labelLine.endSymbol, endPos, defaultColor); + } + } + + private void DrawSymbol(VertexHelper vh, SymbolStyle symbol, Vector3 pos, Color32 defaultColor) + { + var color = symbol.GetColor(defaultColor); + chart.DrawSymbol(vh, symbol.type, symbol.size, 1, pos, + color, color, ColorUtil.clearColor32, color, symbol.gap, null); + } } } \ No newline at end of file