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

修复Serie开启ignore时被忽略的数据还会参与计算的问题 (#161)

Browse Source
This commit is contained in:
monitor1394
2021-07-29 08:27:23 +08:00
parent 9699f6159b
commit 65c3659c19
5 changed files with 51 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Runtime/Component/Main/Serie.cs
View File

@@ -1245,7 +1245,7 @@ namespace XCharts
var max = double.MinValue;
foreach (var sdata in data)
{
if (sdata.show && sdata.data[1] > max)
if (sdata.show && !IsIgnoreValue(sdata.data[1]) && sdata.data[1] > max)
{
max = sdata.data[1];
}
@@ -1264,7 +1264,7 @@ namespace XCharts
var max = double.MinValue;
foreach (var sdata in data)
{
if (sdata.show && sdata.data[0] > max)
if (sdata.show && !IsIgnoreValue(sdata.data[0]) && sdata.data[0] > max)
{
max = sdata.data[0];
}
@@ -1283,7 +1283,7 @@ namespace XCharts
var min = double.MaxValue;
foreach (var sdata in data)
{
if (sdata.show && sdata.data[1] < min)
if (sdata.show && !IsIgnoreValue(sdata.data[1]) && sdata.data[1] < min)
{
min = sdata.data[1];
}
@@ -1302,7 +1302,7 @@ namespace XCharts
var min = double.MaxValue;
foreach (var sdata in data)
{
if (sdata.show && sdata.data[0] < min)
if (sdata.show && !IsIgnoreValue(sdata.data[0]) && sdata.data[0] < min)
{
min = sdata.data[0];
}
@@ -1321,9 +1321,8 @@ namespace XCharts
double total = 0;
foreach (var sdata in data)
{
if (sdata.show)
if (sdata.show && !IsIgnoreValue(sdata.data[1]))
total += sdata.GetCurrData(1, animation.GetUpdateAnimationDuration());
//total += sdata.GetData(1);
}
return total;
}
@@ -1339,7 +1338,7 @@ namespace XCharts
double total = 0;
foreach (var sdata in data)
{
if (sdata.show)
if (sdata.show && !IsIgnoreValue(sdata.data[1]))
total += sdata.data[0];
}
return total;