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

增加LineChart的普通折线图可通过设置ingore参数过滤数据的支持

Browse Source
This commit is contained in:
monitor1394
2020-03-10 09:15:55 +08:00
parent 705652d50c
commit c783896e0e
1 changed files with 31 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
Runtime/Internal/CoordinateChart.cs
View File

@@ -1441,33 +1441,41 @@ namespace XCharts
for (int j = 0; j < serie.data.Count; j++) for (int j = 0; j < serie.data.Count; j++)
{ {
var serieData = serie.data[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 pos = serie.dataPoints[j];
var value = serieData.data[1]; var isIngore = ChartHelper.IsIngore(pos);
switch (serie.type) if (isIngore)
{ {
case SerieType.Line: serieData.SetLabelActive(false);
break; }
case SerieType.Bar: else
var bottomPos = lastStackSerie == null ? zeroPos : lastStackSerie.dataPoints[j]; {
switch (serie.label.position) var value = serieData.data[1];
{ switch (serie.type)
case SerieLabel.Position.Center: {
case SerieType.Line:
pos = isYAxis ? new Vector3(bottomPos.x + (pos.x - bottomPos.x) / 2, pos.y) : break;
new Vector3(pos.x, bottomPos.y + (pos.y - bottomPos.y) / 2); case SerieType.Bar:
break; var bottomPos = lastStackSerie == null ? zeroPos : lastStackSerie.dataPoints[j];
case SerieLabel.Position.Bottom: switch (serie.label.position)
pos = isYAxis ? new Vector3(bottomPos.x, pos.y) : new Vector3(pos.x, bottomPos.y); {
break; case SerieLabel.Position.Center:
}
break; 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 else
{ {