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 2021-07-22 11:07:20 +08:00
parent 2ef88246cd
commit e9946fd631
16 changed files with 45 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Bin/net40/SunnyUI.Demo.exe
View File

Binary file not shown.

BIN
Bin/net40/SunnyUI.dll
View File

Binary file not shown.

BIN
Bin/net45/SunnyUI.dll
View File

Binary file not shown.

BIN
Bin/net5.0-windows/SunnyUI.dll
View File

Binary file not shown.

BIN
Bin/net5.0-windows/ref/SunnyUI.dll
View File

Binary file not shown.

BIN
Bin/netcoreapp3.1/SunnyUI.dll
View File

Binary file not shown.

1
SunnyUI.Demo/Charts/FBarChart.Designer.cs generated
View File

@ -117,6 +117,7 @@ namespace Sunny.UI.Demo
this.BarChart.MinimumSize = new System.Drawing.Size(1, 1); this.BarChart.MinimumSize = new System.Drawing.Size(1, 1);
this.BarChart.Name = "BarChart"; this.BarChart.Name = "BarChart";
this.BarChart.Size = new System.Drawing.Size(670, 400); this.BarChart.Size = new System.Drawing.Size(670, 400);
this.BarChart.Style = Sunny.UI.UIStyle.Custom;
this.BarChart.TabIndex = 29; this.BarChart.TabIndex = 29;
this.BarChart.Text = "uiBarChart1"; this.BarChart.Text = "uiBarChart1";
// //

9
SunnyUI.Demo/Charts/FBarChart.cs
View File

@ -1,4 +1,5 @@
using System; using System;
using System.Drawing;
namespace Sunny.UI.Demo namespace Sunny.UI.Demo
{ {
@ -62,9 +63,13 @@ namespace Sunny.UI.Demo
option.XAxis.Name = "日期"; option.XAxis.Name = "日期";
option.YAxis.Name = "数值"; option.YAxis.Name = "数值";
option.YAxis.AxisLabel.DecimalCount = 1;
option.YAxis.AxisLabel.AutoFormat = false;
//option.YAxisScaleLines.Add(new UIScaleLine() { Color = Color.Red, Name = "上限", Value = 12 }); option.YAxisScaleLines.Add(new UIScaleLine() { Color = Color.Red, Name = "上限", Value = 12 });
//option.YAxisScaleLines.Add(new UIScaleLine() { Color = Color.Gold, Name = "下限", Value = -20 }); option.YAxisScaleLines.Add(new UIScaleLine() { Color = Color.Gold, Name = "下限", Value = -20 });
option.ToolTip.AxisPointer.Type = UIAxisPointerType.Shadow;
BarChart.SetOption(option); BarChart.SetOption(option);

2
SunnyUI.Demo/FColorful.Designer.cs → SunnyUI.Demo/Forms/FColorful.Designer.cs generated
View File

@ -266,7 +266,7 @@ namespace Sunny.UI.Demo
// //
this.AllowShowTitle = true; this.AllowShowTitle = true;
this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 21F); this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 21F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
this.ClientSize = new System.Drawing.Size(776, 543); this.ClientSize = new System.Drawing.Size(776, 543);
this.Controls.Add(this.uiLabel2); this.Controls.Add(this.uiLabel2);
this.Controls.Add(this.uiPanel11); this.Controls.Add(this.uiPanel11);

0
SunnyUI.Demo/FColorful.cs → SunnyUI.Demo/Forms/FColorful.cs
View File

0
SunnyUI.Demo/FColorful.resx → SunnyUI.Demo/Forms/FColorful.resx
View File

6
SunnyUI.Demo/SunnyUI.Demo.csproj
View File

@ -335,10 +335,10 @@
</Compile> </Compile>
<Compile Include="Program.cs" /> <Compile Include="Program.cs" />
<Compile Include="Properties\AssemblyInfo.cs" /> <Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="FColorful.cs"> <Compile Include="Forms\FColorful.cs">
<SubType>Form</SubType> <SubType>Form</SubType>
</Compile> </Compile>
<Compile Include="FColorful.Designer.cs"> <Compile Include="Forms\FColorful.Designer.cs">
<DependentUpon>FColorful.cs</DependentUpon> <DependentUpon>FColorful.cs</DependentUpon>
</Compile> </Compile>
<EmbeddedResource Include="Charts\FBarChartEx.resx"> <EmbeddedResource Include="Charts\FBarChartEx.resx">
@ -489,7 +489,7 @@
<DependentUpon>Resources.resx</DependentUpon> <DependentUpon>Resources.resx</DependentUpon>
<DesignTime>True</DesignTime> <DesignTime>True</DesignTime>
</Compile> </Compile>
<EmbeddedResource Include="FColorful.resx"> <EmbeddedResource Include="Forms\FColorful.resx">
<DependentUpon>FColorful.cs</DependentUpon> <DependentUpon>FColorful.cs</DependentUpon>
</EmbeddedResource> </EmbeddedResource>
<None Include="..\.editorconfig"> <None Include="..\.editorconfig">

27
SunnyUI/Charts/UIBarChart.cs
View File

@ -445,10 +445,10 @@ namespace Sunny.UI
protected virtual void DrawAxis(Graphics g) protected virtual void DrawAxis(Graphics g)
{ {
if (YAxisStart >= 0) g.DrawLine(ChartStyle.ForeColor, DrawOrigin, new Point(DrawOrigin.X + DrawSize.Width, DrawOrigin.Y)); if (YAxisStart >= 0) g.DrawLine(ForeColor, DrawOrigin, new Point(DrawOrigin.X + DrawSize.Width, DrawOrigin.Y));
if (YAxisEnd <= 0) g.DrawLine(ChartStyle.ForeColor, new Point(DrawOrigin.X, Option.Grid.Top), new Point(DrawOrigin.X + DrawSize.Width, Option.Grid.Top)); if (YAxisEnd <= 0) g.DrawLine(ForeColor, new Point(DrawOrigin.X, Option.Grid.Top), new Point(DrawOrigin.X + DrawSize.Width, Option.Grid.Top));
g.DrawLine(ChartStyle.ForeColor, DrawOrigin, new Point(DrawOrigin.X, DrawOrigin.Y - DrawSize.Height)); g.DrawLine(ForeColor, DrawOrigin, new Point(DrawOrigin.X, DrawOrigin.Y - DrawSize.Height));
if (Option.XAxis.AxisTick.Show) if (Option.XAxis.AxisTick.Show)
{ {
@ -459,7 +459,7 @@ namespace Sunny.UI
start = DrawOrigin.X + DrawBarWidth / 2.0f; start = DrawOrigin.X + DrawBarWidth / 2.0f;
for (int i = 0; i < Option.XAxis.Data.Count; i++) for (int i = 0; i < Option.XAxis.Data.Count; i++)
{ {
g.DrawLine(ChartStyle.ForeColor, start, DrawOrigin.Y, start, DrawOrigin.Y + Option.XAxis.AxisTick.Length); g.DrawLine(ForeColor, start, DrawOrigin.Y, start, DrawOrigin.Y + Option.XAxis.AxisTick.Length);
start += DrawBarWidth; start += DrawBarWidth;
} }
} }
@ -480,7 +480,7 @@ namespace Sunny.UI
start = DrawOrigin.X; start = DrawOrigin.X;
for (int i = 0; i <= Option.XAxis.Data.Count; i++) for (int i = 0; i <= Option.XAxis.Data.Count; i++)
{ {
g.DrawLine(ChartStyle.ForeColor, start, DrawOrigin.Y, start, DrawOrigin.Y + Option.XAxis.AxisTick.Length); g.DrawLine(ForeColor, start, DrawOrigin.Y, start, DrawOrigin.Y + Option.XAxis.AxisTick.Length);
start += DrawBarWidth; start += DrawBarWidth;
} }
} }
@ -493,12 +493,12 @@ namespace Sunny.UI
foreach (var data in Option.XAxis.Data) foreach (var data in Option.XAxis.Data)
{ {
SizeF sf = g.MeasureString(data, SubFont); SizeF sf = g.MeasureString(data, SubFont);
g.DrawString(data, SubFont, ChartStyle.ForeColor, start - sf.Width / 2.0f, DrawOrigin.Y + Option.XAxis.AxisTick.Length); g.DrawString(data, SubFont, ForeColor, start - sf.Width / 2.0f, DrawOrigin.Y + Option.XAxis.AxisTick.Length);
start += DrawBarWidth; start += DrawBarWidth;
} }
SizeF sfname = g.MeasureString(Option.XAxis.Name, SubFont); SizeF sfname = g.MeasureString(Option.XAxis.Name, SubFont);
g.DrawString(Option.XAxis.Name, SubFont, ChartStyle.ForeColor, DrawOrigin.X + (DrawSize.Width - sfname.Width) / 2.0f, DrawOrigin.Y + Option.XAxis.AxisTick.Length + sfname.Height); g.DrawString(Option.XAxis.Name, SubFont, ForeColor, DrawOrigin.X + (DrawSize.Width - sfname.Width) / 2.0f, DrawOrigin.Y + Option.XAxis.AxisTick.Length + sfname.Height);
} }
if (Option.YAxis.AxisTick.Show) if (Option.YAxis.AxisTick.Show)
@ -507,11 +507,11 @@ namespace Sunny.UI
float DrawBarHeight = DrawSize.Height * 1.0f / (YAxisEnd - YAxisStart); float DrawBarHeight = DrawSize.Height * 1.0f / (YAxisEnd - YAxisStart);
for (int i = YAxisStart; i <= YAxisEnd; i++) for (int i = YAxisStart; i <= YAxisEnd; i++)
{ {
g.DrawLine(ChartStyle.ForeColor, DrawOrigin.X, start, DrawOrigin.X - Option.YAxis.AxisTick.Length, start); g.DrawLine(ForeColor, DrawOrigin.X, start, DrawOrigin.X - Option.YAxis.AxisTick.Length, start);
if (i != 0) if (i != 0)
{ {
using (Pen pn = new Pen(ChartStyle.ForeColor)) using (Pen pn = new Pen(ForeColor))
{ {
pn.DashStyle = DashStyle.Dash; pn.DashStyle = DashStyle.Dash;
pn.DashPattern = new float[] { 3, 3 }; pn.DashPattern = new float[] { 3, 3 };
@ -520,12 +520,12 @@ namespace Sunny.UI
} }
else else
{ {
g.DrawLine(ChartStyle.ForeColor, DrawOrigin.X, start, Width - Option.Grid.Right, start); g.DrawLine(ForeColor, DrawOrigin.X, start, Width - Option.Grid.Right, start);
float lineStart = DrawOrigin.X; float lineStart = DrawOrigin.X;
for (int j = 0; j <= Option.XAxis.Data.Count; j++) for (int j = 0; j <= Option.XAxis.Data.Count; j++)
{ {
g.DrawLine(ChartStyle.ForeColor, lineStart, start, lineStart, start + Option.XAxis.AxisTick.Length); g.DrawLine(ForeColor, lineStart, start, lineStart, start + Option.XAxis.AxisTick.Length);
lineStart += DrawBarWidth; lineStart += DrawBarWidth;
} }
} }
@ -549,14 +549,14 @@ namespace Sunny.UI
string label = Option.YAxis.AxisLabel.GetLabel(i * YAxisInterval, idx); string label = Option.YAxis.AxisLabel.GetLabel(i * YAxisInterval, idx);
SizeF sf = g.MeasureString(label, SubFont); SizeF sf = g.MeasureString(label, SubFont);
wmax = Math.Max(wmax, sf.Width); wmax = Math.Max(wmax, sf.Width);
g.DrawString(label, SubFont, ChartStyle.ForeColor, DrawOrigin.X - Option.YAxis.AxisTick.Length - sf.Width, start - sf.Height / 2.0f); g.DrawString(label, SubFont, ForeColor, DrawOrigin.X - Option.YAxis.AxisTick.Length - sf.Width, start - sf.Height / 2.0f);
start -= DrawBarHeight; start -= DrawBarHeight;
} }
SizeF sfname = g.MeasureString(Option.YAxis.Name, SubFont); SizeF sfname = g.MeasureString(Option.YAxis.Name, SubFont);
int x = (int)(DrawOrigin.X - Option.YAxis.AxisTick.Length - wmax - sfname.Height); int x = (int)(DrawOrigin.X - Option.YAxis.AxisTick.Length - wmax - sfname.Height);
int y = (int)(Option.Grid.Top + (DrawSize.Height - sfname.Width) / 2); int y = (int)(Option.Grid.Top + (DrawSize.Height - sfname.Width) / 2);
g.DrawString(Option.YAxis.Name, SubFont, ChartStyle.ForeColor, new Point(x, y), g.DrawString(Option.YAxis.Name, SubFont, ForeColor, new Point(x, y),
new StringFormat() { Alignment = StringAlignment.Center }, 270); new StringFormat() { Alignment = StringAlignment.Center }, 270);
} }
} }
@ -569,6 +569,7 @@ namespace Sunny.UI
double ymax = YAxisEnd * YAxisInterval; double ymax = YAxisEnd * YAxisInterval;
float pos = (float)((line.Value - ymin) * (Height - Option.Grid.Top - Option.Grid.Bottom) / (ymax - ymin)); float pos = (float)((line.Value - ymin) * (Height - Option.Grid.Top - Option.Grid.Bottom) / (ymax - ymin));
pos = (Height - Option.Grid.Bottom - pos); pos = (Height - Option.Grid.Bottom - pos);
if (pos <= Option.Grid.Top || pos >= Height - Option.Grid.Bottom) continue;
using (Pen pn = new Pen(line.Color, line.Size)) using (Pen pn = new Pen(line.Color, line.Size))
{ {
g.DrawLine(pn, DrawOrigin.X, pos, Width - Option.Grid.Right, pos); g.DrawLine(pn, DrawOrigin.X, pos, Width - Option.Grid.Right, pos);

24
SunnyUI/Charts/UILineChart.cs
View File

@ -197,11 +197,11 @@ namespace Sunny.UI
private void DrawAxis(Graphics g) private void DrawAxis(Graphics g)
{ {
g.DrawRectangle(ChartStyle.ForeColor, Option.Grid.Left, Option.Grid.Top, DrawSize.Width, DrawSize.Height); g.DrawRectangle(ForeColor, Option.Grid.Left, Option.Grid.Top, DrawSize.Width, DrawSize.Height);
float zeroPos = YScale.CalcYPixel(0, DrawOrigin.Y, DrawSize.Height); float zeroPos = YScale.CalcYPixel(0, DrawOrigin.Y, DrawSize.Height);
if (zeroPos > Option.Grid.Top && zeroPos < Height - Option.Grid.Bottom) if (zeroPos > Option.Grid.Top && zeroPos < Height - Option.Grid.Bottom)
{ {
g.DrawLine(ChartStyle.ForeColor, DrawOrigin.X, zeroPos, DrawOrigin.X + DrawSize.Width, zeroPos); g.DrawLine(ForeColor, DrawOrigin.X, zeroPos, DrawOrigin.X + DrawSize.Width, zeroPos);
} }
if (XScale == null || YScale == null) return; if (XScale == null || YScale == null) return;
@ -234,13 +234,13 @@ namespace Sunny.UI
} }
SizeF sf = g.MeasureString(label, SubFont); SizeF sf = g.MeasureString(label, SubFont);
g.DrawString(label, SubFont, ChartStyle.ForeColor, x - sf.Width / 2.0f, DrawOrigin.Y + Option.XAxis.AxisTick.Length); g.DrawString(label, SubFont, ForeColor, x - sf.Width / 2.0f, DrawOrigin.Y + Option.XAxis.AxisTick.Length);
} }
if (x.Equals(DrawOrigin.X)) continue; if (x.Equals(DrawOrigin.X)) continue;
if (x.Equals(DrawOrigin.X + DrawSize.Width)) continue; if (x.Equals(DrawOrigin.X + DrawSize.Width)) continue;
using (Pen pn = new Pen(ChartStyle.ForeColor)) using (Pen pn = new Pen(ForeColor))
{ {
pn.DashStyle = DashStyle.Dash; pn.DashStyle = DashStyle.Dash;
pn.DashPattern = new float[] { 3, 3 }; pn.DashPattern = new float[] { 3, 3 };
@ -249,7 +249,7 @@ namespace Sunny.UI
} }
SizeF sfName = g.MeasureString(Option.XAxis.Name, SubFont); SizeF sfName = g.MeasureString(Option.XAxis.Name, SubFont);
g.DrawString(Option.XAxis.Name, SubFont, ChartStyle.ForeColor, g.DrawString(Option.XAxis.Name, SubFont, ForeColor,
DrawOrigin.X + (DrawSize.Width - sfName.Width) / 2.0f, DrawOrigin.X + (DrawSize.Width - sfName.Width) / 2.0f,
DrawOrigin.Y + Option.XAxis.AxisTick.Length + sfName.Height); DrawOrigin.Y + Option.XAxis.AxisTick.Length + sfName.Height);
} }
@ -269,13 +269,13 @@ namespace Sunny.UI
string label = YLabels[i].ToString(YScale.Format); string label = YLabels[i].ToString(YScale.Format);
SizeF sf = g.MeasureString(label, SubFont); SizeF sf = g.MeasureString(label, SubFont);
widthMax = Math.Max(widthMax, sf.Width); widthMax = Math.Max(widthMax, sf.Width);
g.DrawString(label, SubFont, ChartStyle.ForeColor, DrawOrigin.X - Option.YAxis.AxisTick.Length - sf.Width, y - sf.Height / 2.0f); g.DrawString(label, SubFont, ForeColor, DrawOrigin.X - Option.YAxis.AxisTick.Length - sf.Width, y - sf.Height / 2.0f);
} }
if (y.Equals(DrawOrigin.Y)) continue; if (y.Equals(DrawOrigin.Y)) continue;
if (y.Equals(DrawOrigin.X - DrawSize.Height)) continue; if (y.Equals(DrawOrigin.X - DrawSize.Height)) continue;
using (Pen pn = new Pen(ChartStyle.ForeColor)) using (Pen pn = new Pen(ForeColor))
{ {
pn.DashStyle = DashStyle.Dash; pn.DashStyle = DashStyle.Dash;
pn.DashPattern = new float[] { 3, 3 }; pn.DashPattern = new float[] { 3, 3 };
@ -286,7 +286,7 @@ namespace Sunny.UI
SizeF sfName = g.MeasureString(Option.YAxis.Name, SubFont); SizeF sfName = g.MeasureString(Option.YAxis.Name, SubFont);
float xx = DrawOrigin.X - Option.YAxis.AxisTick.Length - widthMax - sfName.Height / 2.0f; float xx = DrawOrigin.X - Option.YAxis.AxisTick.Length - widthMax - sfName.Height / 2.0f;
float yy = Option.Grid.Top + DrawSize.Height / 2.0f; float yy = Option.Grid.Top + DrawSize.Height / 2.0f;
g.DrawStringRotateAtCenter(Option.YAxis.Name, SubFont, ChartStyle.ForeColor, new PointF(xx, yy), 270); g.DrawStringRotateAtCenter(Option.YAxis.Name, SubFont, ForeColor, new PointF(xx, yy), 270);
} }
} }
@ -322,17 +322,17 @@ namespace Sunny.UI
using (Graphics graphics = bmp.Graphics()) using (Graphics graphics = bmp.Graphics())
{ {
graphics.FillRectangle(ChartStyle.BackColor, 0, 0, Width, Height); graphics.FillRectangle(FillColor, 0, 0, Width, Height);
} }
using (Graphics graphics = bmpGreater.Graphics()) using (Graphics graphics = bmpGreater.Graphics())
{ {
graphics.FillRectangle(ChartStyle.BackColor, 0, 0, Width, Height); graphics.FillRectangle(FillColor, 0, 0, Width, Height);
} }
using (Graphics graphics = bmpLess.Graphics()) using (Graphics graphics = bmpLess.Graphics())
{ {
graphics.FillRectangle(ChartStyle.BackColor, 0, 0, Width, Height); graphics.FillRectangle(FillColor, 0, 0, Width, Height);
} }
int idx = 0; int idx = 0;
@ -430,7 +430,7 @@ namespace Sunny.UI
if (series.Symbol != UILinePointSymbol.None) if (series.Symbol != UILinePointSymbol.None)
{ {
using (Brush br = new SolidBrush(ChartStyle.BackColor)) using (Brush br = new SolidBrush(FillColor))
using (Pen pn = new Pen(color, series.SymbolLineWidth)) using (Pen pn = new Pen(color, series.SymbolLineWidth))
{ {
foreach (var p in series.Points) foreach (var p in series.Points)

5
SunnyUI/Controls/UINavMenu.cs
View File

@ -874,6 +874,11 @@ namespace Sunny.UI
return node; return node;
} }
public TreeNode CreateNode(int symbol, int symbolSize, UIPage page)
{
return CreateNode(new NavMenuItem(page), symbol, symbolSize);
}
public TreeNode CreateNode(string text, int symbol, int symbolSize, int pageIndex) public TreeNode CreateNode(string text, int symbol, int symbolSize, int pageIndex)
{ {
return CreateNode(new NavMenuItem(text, pageIndex), symbol, symbolSize); return CreateNode(new NavMenuItem(text, pageIndex), symbol, symbolSize);

2
SunnyUI/Controls/UINavMenuHelper.cs
View File

@ -392,6 +392,8 @@ namespace Sunny.UI
Text = page.Text; Text = page.Text;
PageIndex = page.PageIndex; PageIndex = page.PageIndex;
PageGuid = page.PageGuid; PageGuid = page.PageGuid;
Symbol = page.Symbol;
SymbolSize = page.SymbolSize;
AlwaysOpen = page.AlwaysOpen; AlwaysOpen = page.AlwaysOpen;
} }