From bef00f18e16c86c3f9aee769808187664751eeb3 Mon Sep 17 00:00:00 2001 From: monitor1394 Date: Wed, 8 Apr 2020 12:59:35 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BB=AA=E8=A1=A8=E7=9B=98?= =?UTF-8?q?=E7=BB=98=E5=88=B6=E5=BC=82=E5=B8=B8=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/XCharts/Runtime/GaugeChart.cs | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/Assets/XCharts/Runtime/GaugeChart.cs b/Assets/XCharts/Runtime/GaugeChart.cs index eb22fa2a..beed6897 100644 --- a/Assets/XCharts/Runtime/GaugeChart.cs +++ b/Assets/XCharts/Runtime/GaugeChart.cs @@ -135,7 +135,6 @@ namespace XCharts private void DrawGauge(VertexHelper vh, Serie serie) { - serie.UpdateCenter(chartWidth, chartHeight); var destAngle = GetCurrAngle(serie, true); serie.animation.InitProgress(0, serie.startAngle, destAngle); @@ -167,20 +166,14 @@ namespace XCharts var color = serie.gaugeAxis.GetAxisLineColor(m_ThemeInfo, serie.index); var backgroundColor = serie.gaugeAxis.GetAxisLineBackgroundColor(m_ThemeInfo, serie.index); var outsideRadius = serie.runtimeInsideRadius + serie.gaugeAxis.axisLine.width; + var borderWidth = serie.itemStyle.borderWidth; + var borderColor = serie.itemStyle.borderColor; ChartDrawer.DrawDoughnut(vh, serie.runtimeCenterPos, serie.runtimeInsideRadius, outsideRadius, - backgroundColor, m_ThemeInfo.backgroundColor, m_Settings.cicleSmoothness, serie.startAngle, serie.endAngle); - if (serie.roundCap) - { - DrawRoundCap(vh, serie, serie.startAngle, backgroundColor, true); - DrawRoundCap(vh, serie, serie.endAngle, backgroundColor); - } + backgroundColor, backgroundColor, Color.clear, serie.startAngle, serie.endAngle, 0, Color.clear, + 0, m_Settings.cicleSmoothness, serie.roundCap); ChartDrawer.DrawDoughnut(vh, serie.runtimeCenterPos, serie.runtimeInsideRadius, outsideRadius, - color, m_ThemeInfo.backgroundColor, m_Settings.cicleSmoothness, serie.startAngle, currAngle); - if (serie.roundCap && currAngle != serie.startAngle) - { - DrawRoundCap(vh, serie, currAngle, color); - DrawRoundCap(vh, serie, serie.startAngle, color, true); - } + color, color, Color.clear, serie.startAngle, currAngle, 0, Color.clear, + 0, m_Settings.cicleSmoothness, serie.roundCap); } private void DrawStageColor(VertexHelper vh, Serie serie) @@ -198,7 +191,8 @@ namespace XCharts tempEndAngle = serie.startAngle + totalAngle * stageColor.percent; serie.gaugeAxis.runtimeStageAngle.Add(tempEndAngle); ChartDrawer.DrawDoughnut(vh, serie.runtimeCenterPos, serie.runtimeInsideRadius, outsideRadius, - stageColor.color, m_ThemeInfo.backgroundColor, m_Settings.cicleSmoothness, tempStartAngle, tempEndAngle); + stageColor.color, stageColor.color, Color.clear, tempStartAngle, tempEndAngle, 0, Color.clear, + 0, m_Settings.cicleSmoothness); tempStartAngle = tempEndAngle; } }