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

优化PieChart支持设置ignoreValue不显示指定数据

Browse Source
This commit is contained in:
monitor1394
2020-05-30 10:27:54 +08:00
parent 0dd194a6cf
commit 51c973a7ea
6 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -80,6 +80,11 @@ namespace XCharts
serieData.labelObject.label.fontStyle = label.fontStyle;
}
public static bool CanShowLabel(Serie serie, SerieData serieData, SerieLabel label, int dimesion)
{
return serie.show && serieData.canShowLabel && !serie.IsIgnoreValue(serieData.GetData(dimesion));
}
public static string GetFormatterContent(Serie serie, SerieData serieData,
float dataValue, float dataTotal, SerieLabel serieLabel = null)
{

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

@@ -102,6 +102,7 @@ namespace XCharts
case SerieType.Ring:
for (int i = 0; i < serie.data.Count; i++)
{
if (serie.type == SerieType.Pie && serie.IsIgnoreValue(serie.data[i].GetData(1))) continue;
if (string.IsNullOrEmpty(serie.data[i].name))
serieNameList.Add(ChartCached.IntToStr(i));
else if (!serieNameList.Contains(serie.data[i].name))

6
Runtime/PieChart.cs
View File

@@ -201,7 +201,7 @@ namespace XCharts
foreach (var serieData in serie.data)
{
var serieLabel = SerieHelper.GetSerieLabel(serie, serieData);
if (serieLabel.show && serieData.canShowLabel)
if (SerieLabelHelper.CanShowLabel(serie, serieData, serieLabel, 1))
{
int colorIndex = m_LegendRealShowName.IndexOf(serieData.name);
Color color = m_ThemeInfo.GetColor(colorIndex);
@@ -221,7 +221,7 @@ namespace XCharts
foreach (var serieData in serie.data)
{
var serieLabel = SerieHelper.GetSerieLabel(serie, serieData);
if (serieLabel.show && serieData.canShowLabel)
if (SerieLabelHelper.CanShowLabel(serie, serieData, serieLabel, 1))
{
UpdateLabelPostion(serie, serieData);
DrawLabelBackground(vh, serie, serieData);
@@ -342,7 +342,7 @@ namespace XCharts
for (int n = 0; n < data.Count; n++)
{
var serieData = data[n];
if (!serieData.canShowLabel)
if (!serieData.canShowLabel || serie.IsIgnoreValue(serieData.GetData(1)))
{
serieData.SetLabelActive(false);
continue;