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

* UILineChart: 增加了坐标轴绘制时显示箭头，并在箭头处显示数量单位的功能

Browse Source
This commit is contained in:
Sunny 2023-07-14 14:02:41 +08:00
parent 7424ad768c
commit 8a2053ee7f
5 changed files with 94 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
SunnyUI/Charts/UIBarChart.cs
View File

@ -66,13 +66,17 @@ namespace Sunny.UI
/// </summary> /// </summary>
public override void Refresh() public override void Refresh()
{ {
base.Refresh(); if (Option != null) SetOption(Option);
if (Option != null)
{
SetOption(Option);
}
CalcData(); CalcData();
if (InvokeRequired)
{
Invoke(new Action(base.Refresh));
}
else
{
base.Refresh();
}
} }
/// <summary> /// <summary>

16
SunnyUI/Charts/UIDoughnutChart.cs
View File

@ -82,13 +82,17 @@ namespace Sunny.UI
public override void Refresh() public override void Refresh()
{ {
base.Refresh(); if (Option != null) SetOption(Option);
if (Option != null)
{
SetOption(Option);
}
CalcData(); CalcData();
if (InvokeRequired)
{
Invoke(new Action(base.Refresh));
}
else
{
base.Refresh();
}
} }
/// <summary> /// <summary>

65
SunnyUI/Charts/UILineChart.cs
View File

@ -47,6 +47,7 @@
* 2023-06-06: V3.3.7 修复X轴文字重叠问题 * 2023-06-06: V3.3.7 修复X轴文字重叠问题
* 2023-07-02: V3.3.9 增加PointFormat，鼠标选中值显示格式化事件 * 2023-07-02: V3.3.9 增加PointFormat，鼠标选中值显示格式化事件
* 2023-07-02: V3.3.9 增加了数据沿Y轴变化时鼠标移动到数据点时显示数据点标签 * 2023-07-02: V3.3.9 增加了数据沿Y轴变化时鼠标移动到数据点时显示数据点标签
* 2023-07-14: V3.4.0 增加了坐标轴绘制时显示箭头，并在箭头处显示数量单位的功能
******************************************************************************/ ******************************************************************************/
using System; using System;
@ -114,13 +115,17 @@ namespace Sunny.UI
public override void Refresh() public override void Refresh()
{ {
base.Refresh(); if (Option != null) SetOption(Option);
if (Option != null)
{
SetOption(Option);
}
CalcData(); CalcData();
if (InvokeRequired)
{
Invoke(new Action(base.Refresh));
}
else
{
base.Refresh();
}
} }
protected UIScale XScale; protected UIScale XScale;
@ -308,6 +313,48 @@ namespace Sunny.UI
if (XScale == null || YScale == null || Y2Scale == null) return; if (XScale == null || YScale == null || Y2Scale == null) return;
if (Option.XAxis.ShowArrow)
{
Point pt1 = new Point(Width - Option.Grid.Right + Option.XAxis.ShowArrowSize, Height - Option.Grid.Bottom);
g.DrawLine(ForeColor, Option.Grid.Left, Height - Option.Grid.Bottom, pt1.X, pt1.Y);
Point pt2 = new Point(pt1.X - 10, pt1.Y - 4);
Point pt3 = new Point(pt1.X - 10, pt1.Y + 4);
g.FillPolygon(ForeColor, new PointF[] { pt1, pt2, pt3 });
if (Option.XAxis.Unit.IsValid())
{
g.DrawString(Option.XAxis.Unit, TempFont, ForeColor, new Rectangle(pt1.X - 200, pt1.Y, 400, 400), ContentAlignment.TopCenter);
}
}
if (Option.YAxis.ShowArrow)
{
Point pt1 = new Point(Option.Grid.Left, Option.Grid.Top - Option.YAxis.ShowArrowSize);
g.DrawLine(ForeColor, pt1.X, pt1.Y, Option.Grid.Left, Height - Option.Grid.Bottom);
Point pt2 = new Point(pt1.X - 4, pt1.Y + 10);
Point pt3 = new Point(pt1.X + 4, pt1.Y + 10);
g.FillPolygon(ForeColor, new PointF[] { pt1, pt2, pt3 });
if (Option.YAxis.Unit.IsValid())
{
g.DrawString(Option.YAxis.Unit, TempFont, ForeColor, new Rectangle(pt1.X - 200, pt1.Y - 200, 200, 400), ContentAlignment.MiddleRight);
}
}
if (Option.HaveY2 && Option.Y2Axis.ShowArrow)
{
Point pt1 = new Point(Width - Option.Grid.Right, Option.Grid.Top - Option.Y2Axis.ShowArrowSize);
g.DrawLine(ForeColor, pt1.X, pt1.Y, Width - Option.Grid.Right, Height - Option.Grid.Bottom);
Point pt2 = new Point(pt1.X - 4, pt1.Y + 10);
Point pt3 = new Point(pt1.X + 4, pt1.Y + 10);
g.FillPolygon(ForeColor, new PointF[] { pt1, pt2, pt3 });
if (Option.Y2Axis.Unit.IsValid())
{
g.DrawString(Option.Y2Axis.Unit, TempFont, ForeColor, new Rectangle(pt1.X, pt1.Y - 200, 200, 400), ContentAlignment.MiddleLeft);
}
}
//X Tick //X Tick
{ {
double[] XLabels = Option.XAxis.HaveCustomLabels ? Option.XAxis.CustomLabels.LabelValues() : XScale.CalcLabels(); double[] XLabels = Option.XAxis.HaveCustomLabels ? Option.XAxis.CustomLabels.LabelValues() : XScale.CalcLabels();
@ -443,7 +490,11 @@ namespace Sunny.UI
Size sf = TextRenderer.MeasureText(label, TempFont); Size sf = TextRenderer.MeasureText(label, TempFont);
widthMax = Math.Max(widthMax, sf.Width); widthMax = Math.Max(widthMax, sf.Width);
g.DrawString(label, TempFont, ForeColor, new Rectangle(Width - Option.Grid.Right + Option.Y2Axis.AxisTick.Length, (int)y - Height, Width, Height * 2), ContentAlignment.MiddleLeft);
if (y.Equals(DrawOrigin.Y) && Option.XAxis.ShowArrow)
g.DrawString(label, TempFont, ForeColor, new Rectangle(Width - Option.Grid.Right + Option.Y2Axis.AxisTick.Length, (int)y - Height, Width, Height * 2), ContentAlignment.MiddleLeft, 0, -sf.Height / 2);
else
g.DrawString(label, TempFont, ForeColor, new Rectangle(Width - Option.Grid.Right + Option.Y2Axis.AxisTick.Length, (int)y - Height, Width, Height * 2), ContentAlignment.MiddleLeft);
} }
if (Option.Y2Axis.AxisTick.Show) if (Option.Y2Axis.AxisTick.Show)

6
SunnyUI/Charts/UIOption.cs
View File

@ -121,6 +121,12 @@ namespace Sunny.UI
SetMinValue(min); SetMinValue(min);
SetMaxValue(max); SetMaxValue(max);
} }
public bool ShowArrow { get; set; } = false;
public int ShowArrowSize { get; set; } = 30;
public string Unit { get; set; } = string.Empty;
} }
public class CustomLabels public class CustomLabels

16
SunnyUI/Charts/UIPieChart.cs
View File

@ -81,13 +81,17 @@ namespace Sunny.UI
public override void Refresh() public override void Refresh()
{ {
base.Refresh(); if (Option != null) SetOption(Option);
if (Option != null)
{
SetOption(Option);
}
CalcData(); CalcData();
if (InvokeRequired)
{
Invoke(new Action(base.Refresh));
}
else
{
base.Refresh();
}
} }
/// <summary> /// <summary>