zhaoyushun1999/SunnyUI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* UILineChart: 修复双Y轴时，数据为空，刷新出错的问题

Browse Source
This commit is contained in:
Sunny 2022-08-02 12:21:54 +08:00
parent 8211491bb9
commit 35c1714ac2
1 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
SunnyUI/Charts/UILineChartOption.cs
View File

@ -181,7 +181,7 @@ namespace Sunny.UI
{ {
get get
{ {
if (AllDataCount() == 0) return false; //if (AllDataCount() == 0) return false;
foreach (var series in Series.Values) foreach (var series in Series.Values)
{ {
if (series.IsY2) return true; if (series.IsY2) return true;
@ -235,26 +235,34 @@ namespace Sunny.UI
} }
else else
{ {
min = double.MaxValue; if (AllDataCount() == 0)
max = double.MinValue;
foreach (var series in Series.Values)
{ {
if (!series.IsY2) continue; min = 0;
if (series.DataCount > 0) max = 1;
}
else
{
min = double.MaxValue;
max = double.MinValue;
foreach (var series in Series.Values)
{ {
if (series.ContainsNan) if (!series.IsY2) continue;
if (series.DataCount > 0)
{ {
foreach (var d in series.YData) if (series.ContainsNan)
{ {
if (d.IsNan() || d.IsInfinity()) continue; foreach (var d in series.YData)
min = Math.Min(min, d); {
max = Math.Max(max, d); if (d.IsNan() || d.IsInfinity()) continue;
min = Math.Min(min, d);
max = Math.Max(max, d);
}
}
else
{
min = Math.Min(min, series.YData.Min());
max = Math.Max(max, series.YData.Max());
} }
}
else
{
min = Math.Min(min, series.YData.Min());
max = Math.Max(max, series.YData.Max());
} }
} }
} }