foldcc/XCharts
1
0
Fork 0
mirror of https://github.com/XCharts-Team/XCharts.git synced 2026-05-27 11:40:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

修复Gauge的AxisLabel文字颜色无法修改的问题

Browse Source
This commit is contained in:
monitor1394
2021-04-22 07:29:08 +08:00
parent 6220b6af6f
commit 7c762b4455
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Assets/XCharts/Runtime/Internal/DrawSerieGauge.cs
View File

@@ -125,16 +125,17 @@ namespace XCharts
for (int i = 0; i < chart.series.Count; i++) for (int i = 0; i < chart.series.Count; i++)
{ {
var serie = chart.series.list[i]; var serie = chart.series.list[i];
if (serie.type != SerieType.Gauge) continue;
var serieLabel = serie.gaugeAxis.axisLabel; var serieLabel = serie.gaugeAxis.axisLabel;
var count = serie.splitNumber > 36 ? 36 : (serie.splitNumber + 1); var count = serie.splitNumber > 36 ? 36 : (serie.splitNumber + 1);
var startAngle = serie.startAngle; var startAngle = serie.startAngle;
var textColor = serieLabel.textStyle.GetColor(chart.theme.gauge.textColor);
serie.gaugeAxis.ClearLabelObject(); serie.gaugeAxis.ClearLabelObject();
SerieHelper.UpdateCenter(serie, chart.chartPosition, chart.chartWidth, chart.chartHeight); SerieHelper.UpdateCenter(serie, chart.chartPosition, chart.chartWidth, chart.chartHeight);
for (int j = 0; j < count; j++) for (int j = 0; j < count; j++)
{ {
var textName = ChartCached.GetSerieLabelName(s_SerieLabelObjectName, i, j); var textName = ChartCached.GetSerieLabelName(s_SerieLabelObjectName, i, j);
var color = Color.grey; var labelObj = SerieLabelPool.Get(textName, labelObject.transform, serieLabel, textColor, 100, 100, chart.theme);
var labelObj = SerieLabelPool.Get(textName, labelObject.transform, serieLabel, color, 100, 100, chart.theme);
var iconImage = labelObj.transform.Find("Icon").GetComponent<Image>(); var iconImage = labelObj.transform.Find("Icon").GetComponent<Image>();
var isAutoSize = serieLabel.backgroundWidth == 0 || serieLabel.backgroundHeight == 0; var isAutoSize = serieLabel.backgroundWidth == 0 || serieLabel.backgroundHeight == 0;
var item = new ChartLabel(); var item = new ChartLabel();
@@ -181,9 +182,10 @@ namespace XCharts
var value = serie.min + j * diffValue; var value = serie.min + j * diffValue;
var pos = ChartHelper.GetPosition(serie.runtimeCenterPos, angle, radius); var pos = ChartHelper.GetPosition(serie.runtimeCenterPos, angle, radius);
var text = customLabelText != null && j < customLabelText.Count ? customLabelText[j] : var text = customLabelText != null && j < customLabelText.Count ? customLabelText[j] :
SerieLabelHelper.GetFormatterContent(serie, serieData, value, totalValue, serie.gaugeAxis.axisLabel); SerieLabelHelper.GetFormatterContent(serie, serieData, value, totalValue,
serie.gaugeAxis.axisLabel, Color.clear);
serie.gaugeAxis.SetLabelObjectText(j, text); serie.gaugeAxis.SetLabelObjectText(j, text);
serie.gaugeAxis.SetLabelObjectPosition(j, pos); serie.gaugeAxis.SetLabelObjectPosition(j, pos + serie.gaugeAxis.axisLabel.offset);
} }
} }