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

* UIChart: Legend增加一种绘制直线的方法

Browse Source
This commit is contained in:
Sunny 2023-07-25 23:14:28 +08:00
parent 7082bfc013
commit 5f97773d58
2 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
SunnyUI/Charts/UIChart.cs
View File

@ -19,6 +19,7 @@
* 2020-06-06: V2.2.5 增加文件说明 * 2020-06-06: V2.2.5 增加文件说明
* 2020-09-10: V2.2.7 增加图表的边框线颜色设置 * 2020-09-10: V2.2.7 增加图表的边框线颜色设置
* 2023-05-14: V3.3.6 重构DrawString函数 * 2023-05-14: V3.3.6 重构DrawString函数
* 2023-07-25: V3.4.1 Legend增加一种绘制直线的方法
******************************************************************************/ ******************************************************************************/
using System; using System;
@ -331,7 +332,11 @@ namespace Sunny.UI
if (legend.Orient == UIOrient.Horizontal) if (legend.Orient == UIOrient.Horizontal)
{ {
g.FillRoundRectangle(color, (int)startLeft, (int)top + 1, 18, (int)oneHeight - 2, 5); if (legend.Style == UILegendStyle.Rectangle)
g.FillRoundRectangle(color, (int)startLeft, (int)top + 1, 18, (int)oneHeight - 2, 5);
if (legend.Style == UILegendStyle.Line)
g.DrawLine(color, startLeft, top + oneHeight / 2, startLeft + 18, top + oneHeight / 2);
g.DrawString(data, TempLegendFont, color, new Rectangle((int)startLeft + 18, (int)top, Width, Height), ContentAlignment.TopLeft); g.DrawString(data, TempLegendFont, color, new Rectangle((int)startLeft + 18, (int)top, Width, Height), ContentAlignment.TopLeft);
startLeft += 22; startLeft += 22;
startLeft += sf.Width; startLeft += sf.Width;
@ -339,7 +344,11 @@ namespace Sunny.UI
if (legend.Orient == UIOrient.Vertical) if (legend.Orient == UIOrient.Vertical)
{ {
g.FillRoundRectangle(color, (int)left, (int)startTop + 1, 18, (int)oneHeight - 2, 5); if (legend.Style == UILegendStyle.Rectangle)
g.FillRoundRectangle(color, (int)left, (int)startTop + 1, 18, (int)oneHeight - 2, 5);
if (legend.Style == UILegendStyle.Line)
g.DrawLine(color, left, startTop, left + 18, startTop + oneHeight / 2);
g.DrawString(data, TempLegendFont, color, new Rectangle((int)left + 18, (int)startTop, Width, Height), ContentAlignment.TopLeft); g.DrawString(data, TempLegendFont, color, new Rectangle((int)left + 18, (int)startTop, Width, Height), ContentAlignment.TopLeft);
startTop += oneHeight; startTop += oneHeight;
} }

8
SunnyUI/Charts/UIOption.cs
View File

@ -327,6 +327,8 @@ namespace Sunny.UI
public int DataCount => Data.Count; public int DataCount => Data.Count;
public UILegendStyle Style { get; set; } = UILegendStyle.Rectangle;
public void AddData(string data) public void AddData(string data)
{ {
Data.Add(data); Data.Add(data);
@ -350,6 +352,12 @@ namespace Sunny.UI
} }
} }
public enum UILegendStyle
{
Rectangle,
Line
}
public class UIChartGrid public class UIChartGrid
{ {
public int Left { get; set; } = 60; public int Left { get; set; } = 60;