From c783896e0e8026717cdc536a7404b24ab5474a5c Mon Sep 17 00:00:00 2001 From: monitor1394 Date: Tue, 10 Mar 2020 09:15:55 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0`LineChart`=E7=9A=84=E6=99=AE?= =?UTF-8?q?=E9=80=9A=E6=8A=98=E7=BA=BF=E5=9B=BE=E5=8F=AF=E9=80=9A=E8=BF=87?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE`ingore`=E5=8F=82=E6=95=B0=E8=BF=87=E6=BB=A4?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=9A=84=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Runtime/Internal/CoordinateChart.cs | 54 +++++++++++++++++------------ 1 file changed, 31 insertions(+), 23 deletions(-) diff --git a/Runtime/Internal/CoordinateChart.cs b/Runtime/Internal/CoordinateChart.cs index f2579b1c..4f04b782 100644 --- a/Runtime/Internal/CoordinateChart.cs +++ b/Runtime/Internal/CoordinateChart.cs @@ -1441,33 +1441,41 @@ namespace XCharts for (int j = 0; j < serie.data.Count; j++) { var serieData = serie.data[j]; - var isIngore = ChartHelper.IsIngore(serie.dataPoints[j]); - if ((serie.label.show || serieData.iconStyle.show) && !isIngore) + + if ((serie.label.show || serieData.iconStyle.show)) { var pos = serie.dataPoints[j]; - var value = serieData.data[1]; - switch (serie.type) + var isIngore = ChartHelper.IsIngore(pos); + if (isIngore) { - case SerieType.Line: - break; - case SerieType.Bar: - var bottomPos = lastStackSerie == null ? zeroPos : lastStackSerie.dataPoints[j]; - switch (serie.label.position) - { - case SerieLabel.Position.Center: - - pos = isYAxis ? new Vector3(bottomPos.x + (pos.x - bottomPos.x) / 2, pos.y) : - new Vector3(pos.x, bottomPos.y + (pos.y - bottomPos.y) / 2); - break; - case SerieLabel.Position.Bottom: - pos = isYAxis ? new Vector3(bottomPos.x, pos.y) : new Vector3(pos.x, bottomPos.y); - break; - } - break; + serieData.SetLabelActive(false); + } + else + { + var value = serieData.data[1]; + switch (serie.type) + { + case SerieType.Line: + break; + case SerieType.Bar: + var bottomPos = lastStackSerie == null ? zeroPos : lastStackSerie.dataPoints[j]; + switch (serie.label.position) + { + case SerieLabel.Position.Center: + + pos = isYAxis ? new Vector3(bottomPos.x + (pos.x - bottomPos.x) / 2, pos.y) : + new Vector3(pos.x, bottomPos.y + (pos.y - bottomPos.y) / 2); + break; + case SerieLabel.Position.Bottom: + pos = isYAxis ? new Vector3(bottomPos.x, pos.y) : new Vector3(pos.x, bottomPos.y); + break; + } + break; + } + m_RefreshLabel = true; + serieData.labelPosition = pos; + if (serie.label.show) DrawLabelBackground(vh, serie, serieData); } - m_RefreshLabel = true; - serieData.labelPosition = pos; - if (serie.label.show) DrawLabelBackground(vh, serie, serieData); } else {