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

* UIDoughnutChart: 数据显示的小数位数重构调整至Option.DecimalPlaces

Browse Source 
* UIPieChart: 数据显示的小数位数重构调整至Option.DecimalPlaces
This commit is contained in:
Sunny 2022-07-29 11:15:59 +08:00
parent 55fe87d8f3
commit 2cc9ef5308
6 changed files with 38 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
SunnyUI/Charts/UIBarChart.cs
View File

@ -220,7 +220,7 @@ namespace Sunny.UI
foreach (var series in Option.Series) foreach (var series in Option.Series)
{ {
str += '\n'; str += '\n';
str += series.Name + " : " + series.Data[i].ToString(Option.ToolTip.ValueFormat); //str += series.Name + " : " + series.Data[i].ToString(Option.ToolTip.ValueFormat);
} }
Bars[0][i].Tips = str; Bars[0][i].Tips = str;
@ -527,23 +527,23 @@ namespace Sunny.UI
if (Option.ShowValue) if (Option.ShowValue)
{ {
string value = info.Value.ToString(Option.ToolTip.ValueFormat); //string value = info.Value.ToString(Option.ToolTip.ValueFormat);
SizeF sf = g.MeasureString(value, TempFont); //SizeF sf = g.MeasureString(value, TempFont);
if (info.Top) //if (info.Top)
{ //{
float top = info.Rect.Top - sf.Height; // float top = info.Rect.Top - sf.Height;
if (top > Option.Grid.Top) // if (top > Option.Grid.Top)
{ // {
g.DrawString(value, TempFont, info.Color, info.Rect.Center().X - sf.Width / 2, top); // g.DrawString(value, TempFont, info.Color, info.Rect.Center().X - sf.Width / 2, top);
} // }
} //}
else //else
{ //{
if (info.Rect.Bottom + sf.Height + Option.Grid.Bottom < Height) // if (info.Rect.Bottom + sf.Height + Option.Grid.Bottom < Height)
{ // {
g.DrawString(value, TempFont, info.Color, info.Rect.Center().X - sf.Width / 2, info.Rect.Bottom); // g.DrawString(value, TempFont, info.Color, info.Rect.Center().X - sf.Width / 2, info.Rect.Bottom);
} // }
} //}
} }
} }
} }

1
SunnyUI/Charts/UIBarChartOption.cs
View File

@ -125,7 +125,6 @@ namespace Sunny.UI
public UIBarToolTip() public UIBarToolTip()
{ {
Formatter = "{{b}} : {{c}}"; Formatter = "{{b}} : {{c}}";
ValueFormat = "F0";
} }
} }

3
SunnyUI/Charts/UIDoughnutChart.cs
View File

@ -18,6 +18,7 @@
* *
* 2020-06-06: V2.2.5 增加文件说明 * 2020-06-06: V2.2.5 增加文件说明
* 2021-07-22: V3.0.5 增加更新数据的方法 * 2021-07-22: V3.0.5 增加更新数据的方法
* 2022-07-29: V3.2.2 数据显示的小数位数重构调整至Option.DecimalPlaces
******************************************************************************/ ******************************************************************************/
using System; using System;
@ -134,7 +135,7 @@ namespace Sunny.UI
UITemplate template = new UITemplate(Option.ToolTip.Formatter); UITemplate template = new UITemplate(Option.ToolTip.Formatter);
template.Set("a", pie.Name); template.Set("a", pie.Name);
template.Set("b", pie.Data[i].Name); template.Set("b", pie.Data[i].Name);
template.Set("c", pie.Data[i].Value.ToString(Option.ToolTip.ValueFormat)); template.Set("c", pie.Data[i].Value.ToString("F" + Option.DecimalPlaces));
template.Set("d", percent.ToString("F2")); template.Set("d", percent.ToString("F2"));
text = template.Render(); text = template.Render();
} }

2
SunnyUI/Charts/UIOption.cs
View File

@ -36,8 +36,6 @@ namespace Sunny.UI
public bool Visible { get; set; } public bool Visible { get; set; }
public string Formatter { get; set; } public string Formatter { get; set; }
public string ValueFormat { get; set; }
} }
public class UIScaleLine public class UIScaleLine

7
SunnyUI/Charts/UIPieChart.cs
View File

@ -18,6 +18,7 @@
* *
* 2020-06-06: V2.2.5 增加文件说明 * 2020-06-06: V2.2.5 增加文件说明
* 2021-07-22: V3.0.5 增加更新数据的方法 * 2021-07-22: V3.0.5 增加更新数据的方法
* 2022-07-29: V3.2.2 数据显示的小数位数重构调整至Option.DecimalPlaces
******************************************************************************/ ******************************************************************************/
using System; using System;
@ -136,13 +137,13 @@ namespace Sunny.UI
UITemplate template = new UITemplate(Option.ToolTip.Formatter); UITemplate template = new UITemplate(Option.ToolTip.Formatter);
template.Set("a", pie.Name); template.Set("a", pie.Name);
template.Set("b", pie.Data[i].Name); template.Set("b", pie.Data[i].Name);
template.Set("c", pie.Data[i].Value.ToString(Option.ToolTip.ValueFormat)); template.Set("c", pie.Data[i].Value.ToString("F" + Option.DecimalPlaces));
template.Set("d", percent.ToString("F2")); template.Set("d", percent.ToString("F2"));
text = template.Render(); text = template.Render();
} }
catch catch
{ {
text = pie.Data[i].Name + " : " + pie.Data[i].Value.ToString("F2") + "(" + percent.ToString("F2") + "%)"; text = pie.Data[i].Name + " : " + pie.Data[i].Value.ToString("F" + Option.DecimalPlaces) + "(" + percent.ToString("F2") + "%)";
if (pie.Name.IsValid()) text = pie.Name + '\n' + text; if (pie.Name.IsValid()) text = pie.Name + '\n' + text;
} }
} }
@ -191,7 +192,7 @@ namespace Sunny.UI
string name = Option.Legend != null ? Option.Legend.Data[azIndex] + " : " : ""; string name = Option.Legend != null ? Option.Legend.Data[azIndex] + " : " : "";
if (pie.Data[azIndex].Value > 0) if (pie.Data[azIndex].Value > 0)
{ {
string text = name + pie.Data[azIndex].Value.ToString("F0"); string text = name + pie.Data[azIndex].Value.ToString("F" + Option.DecimalPlaces);
SizeF sf = g.MeasureString(text, TempFont); SizeF sf = g.MeasureString(text, TempFont);
PointF pf; PointF pf;
int added = 9; int added = 9;

15
SunnyUI/Charts/UIPieChartOption.cs
View File

@ -64,6 +64,13 @@ namespace Sunny.UI
return null; return null;
} }
} }
private int decimalPlaces = 0;
public int DecimalPlaces
{
get => decimalPlaces;
set => decimalPlaces = Math.Max(0, value);
}
} }
public class UIDoughnutOption : UIOption, IDisposable public class UIDoughnutOption : UIOption, IDisposable
@ -105,6 +112,13 @@ namespace Sunny.UI
return null; return null;
} }
} }
private int decimalPlaces = 0;
public int DecimalPlaces
{
get => decimalPlaces;
set => decimalPlaces = Math.Max(0, value);
}
} }
public class UIPieToolTip : UIChartToolTip public class UIPieToolTip : UIChartToolTip
@ -112,7 +126,6 @@ namespace Sunny.UI
public UIPieToolTip() public UIPieToolTip()
{ {
Formatter = "{{a}}" + '\n' + "{{b}} : {{c}} ({{d}}%)"; Formatter = "{{a}}" + '\n' + "{{b}} : {{c}} ({{d}}%)";
ValueFormat = "F0";
Visible = true; Visible = true;
} }
} }