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

增加PieChart通过ItemStyle设置边框的支持

Browse Source
This commit is contained in:
monitor1394
2020-04-08 09:02:46 +08:00
parent 26e67fb1a2
commit 3065b34ba6
8 changed files with 432 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Runtime/Helper/SerieHelper.cs
View File

@@ -142,7 +142,7 @@ namespace XCharts
if (style == null) return GetItemStyle(serie, serieData, false);
else return style;
}
else if (serieData.enableItemStyle) return serieData.itemStyle;
else if (serieData != null && serieData.enableItemStyle) return serieData.itemStyle;
else return serie.itemStyle;
}
@@ -226,18 +226,18 @@ namespace XCharts
return color;
}
public static float GetSymbolBorder(Serie serie, SerieData serieData, bool highlight)
public static float GetSymbolBorder(Serie serie, SerieData serieData, bool highlight, bool useLineWidth = true)
{
var itemStyle = GetItemStyle(serie, serieData, highlight);
if (itemStyle != null && itemStyle.borderWidth != 0) return itemStyle.borderWidth;
else if (serie.lineStyle.width != 0) return serie.lineStyle.width;
else return 1;
else if (serie.lineStyle.width != 0 && useLineWidth) return serie.lineStyle.width;
else return 0;
}
public static float[] GetSymbolCornerRadius(Serie serie, SerieData serieData, bool highlight)
{
var itemStyle = GetItemStyle(serie, serieData, highlight);
if(itemStyle != null) return itemStyle.cornerRadius;
if (itemStyle != null) return itemStyle.cornerRadius;
else return null;
}
}

1
Runtime/Helper/TooltipHelper.cs
View File

@@ -145,6 +145,7 @@ namespace XCharts
var serie = series.GetSerie(i);
if (!serie.show) continue;
var serieData = serie.GetSerieData(dataIndex, dataZoom);
if (serieData == null) continue;
var itemFormatter = GetItemFormatter(tooltip, serie, serieData);
var percent = serieData.GetData(1) / serie.yTotal * 100;
needCategory = needCategory || (serie.type == SerieType.Line || serie.type == SerieType.Bar);