diff --git a/Bin/SunnyUI.dll b/Bin/SunnyUI.dll index 8ae43d02..f5a068f8 100644 Binary files a/Bin/SunnyUI.dll and b/Bin/SunnyUI.dll differ diff --git a/SunnyUI/Charts/UILineChart.cs b/SunnyUI/Charts/UILineChart.cs index 4473acb2..9e789446 100644 --- a/SunnyUI/Charts/UILineChart.cs +++ b/SunnyUI/Charts/UILineChart.cs @@ -180,9 +180,19 @@ namespace Sunny.UI { string label; if (Option.XAxisType == UIAxisType.DateTime) - label = new DateTimeInt64(XLabels[i]).ToString(XScale.Format); + { + if (Option.XAxis.AxisLabel.AutoFormat) + label = new DateTimeInt64(XLabels[i]).ToString(XScale.Format); + else + label = new DateTimeInt64(XLabels[i]).ToString(Option.XAxis.AxisLabel.DateTimeFormat); + } else - label = XLabels[i].ToString(XScale.Format); + { + if (Option.XAxis.AxisLabel.AutoFormat) + label = XLabels[i].ToString(XScale.Format); + else + label = new DateTimeInt64(XLabels[i]).ToString("F" + Option.XAxis.AxisLabel.DecimalCount); + } SizeF sf = g.MeasureString(label, SubFont); g.DrawString(label, SubFont, ChartStyle.ForeColor, x - sf.Width / 2.0f, DrawOrigin.Y + Option.XAxis.AxisTick.Length);