diff --git a/Bin/net40/SunnyUI.Demo.exe b/Bin/net40/SunnyUI.Demo.exe index cad65cec..c0cac7b5 100644 Binary files a/Bin/net40/SunnyUI.Demo.exe and b/Bin/net40/SunnyUI.Demo.exe differ diff --git a/Bin/net40/SunnyUI.dll b/Bin/net40/SunnyUI.dll index 9af15ae1..3b6c4525 100644 Binary files a/Bin/net40/SunnyUI.dll and b/Bin/net40/SunnyUI.dll differ diff --git a/Bin/net45/SunnyUI.dll b/Bin/net45/SunnyUI.dll index 255c9e5d..7aeb6cab 100644 Binary files a/Bin/net45/SunnyUI.dll and b/Bin/net45/SunnyUI.dll differ diff --git a/Bin/net5.0-windows/SunnyUI.dll b/Bin/net5.0-windows/SunnyUI.dll index f3442d8b..f1b7b3a5 100644 Binary files a/Bin/net5.0-windows/SunnyUI.dll and b/Bin/net5.0-windows/SunnyUI.dll differ diff --git a/Bin/netcoreapp3.1/SunnyUI.dll b/Bin/netcoreapp3.1/SunnyUI.dll index db95874c..d9218997 100644 Binary files a/Bin/netcoreapp3.1/SunnyUI.dll and b/Bin/netcoreapp3.1/SunnyUI.dll differ diff --git a/SunnyUI.Demo/Charts/FBarChart.cs b/SunnyUI.Demo/Charts/FBarChart.cs index 0d6a6745..8fea469a 100644 --- a/SunnyUI.Demo/Charts/FBarChart.cs +++ b/SunnyUI.Demo/Charts/FBarChart.cs @@ -26,26 +26,26 @@ namespace Sunny.UI.Demo var series = new UIBarSeries(); series.Name = "Bar1"; - series.AddData(-1); - series.AddData(-1); - series.AddData(-1); - series.AddData(-1); - series.AddData(-1); - series.AddData(1); - series.AddData(1); - series.AddData(1); + series.AddData(-1.1); + series.AddData(-1.1); + series.AddData(-1.1); + series.AddData(-1.1); + series.AddData(-1.1); + series.AddData(-1.1); + series.AddData(-1.1); + series.AddData(-1.1); option.Series.Add(series); series = new UIBarSeries(); series.Name = "Bar2"; - series.AddData(1.1); - series.AddData(1.1); - series.AddData(1.1); - series.AddData(1.1); - series.AddData(1.1); - series.AddData(1.1); - series.AddData(1.1); - series.AddData(1.1); + series.AddData(-1.1); + series.AddData(-1.1); + series.AddData(-1.1); + series.AddData(-1.1); + series.AddData(-1.1); + series.AddData(-1.1); + series.AddData(-1.1); + series.AddData(-1.1); option.Series.Add(series); option.XAxis.Data.Add("D1"); diff --git a/SunnyUI/Charts/UIBarChart.cs b/SunnyUI/Charts/UIBarChart.cs index b865beb7..0c3fe1b6 100644 --- a/SunnyUI/Charts/UIBarChart.cs +++ b/SunnyUI/Charts/UIBarChart.cs @@ -139,16 +139,24 @@ namespace Sunny.UI if (!Option.YAxis.MaxAuto) max = Option.YAxis.Max; if (!Option.YAxis.MinAuto) min = Option.YAxis.Min; - if ((max - min).IsZero() && min.IsZero()) + if ((max - min).IsZero()) { - max = 100; - min = 0; + if (min.IsZero()) + { + max = 100; + min = 0; + } + else if (max > 0) + { + max = max * 2; + min = 0; + } + else + { + max = 0; + min = min * 2; + } } - //else - //{ - // if (max > 0) min = 0; - // else max = 0; - //} CalcDegreeScale(min, max, Option.YAxis.SplitNumber, out int start, out int end, out double interval, out int decimalCount); diff --git a/SunnyUI/Charts/UIBarChartEx.cs b/SunnyUI/Charts/UIBarChartEx.cs index 81d25f1b..faa33798 100644 --- a/SunnyUI/Charts/UIBarChartEx.cs +++ b/SunnyUI/Charts/UIBarChartEx.cs @@ -67,15 +67,23 @@ namespace Sunny.UI if (!Option.YAxis.MaxAuto) max = Option.YAxis.Max; if (!Option.YAxis.MinAuto) min = Option.YAxis.Min; - if ((max - min).IsZero() && min.IsZero()) + if ((max - min).IsZero()) { - max = 100; - min = 0; - } - else - { - if (max > 0) min = 0; - else max = 0; + if (min.IsZero()) + { + max = 100; + min = 0; + } + else if (max > 0) + { + max = max * 2; + min = 0; + } + else + { + max = 0; + min = min * 2; + } } CalcDegreeScale(min, max, Option.YAxis.SplitNumber,