diff --git a/.gitignore b/.gitignore
index 33ed5dc3..1a8c86ab 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@
/HZH_Controls/HZH_Controls/*.nupkg
/HZH_Controls/Help
/HZH_Controls/HZH_Controls.sln.GhostDoc.xml
+/HZH_Controls/.vs/HZH_Controls/v16
diff --git a/HZH_Controls/HZH_Controls/Controls/Text/UCNumTextBox.cs b/HZH_Controls/HZH_Controls/Controls/Text/UCNumTextBox.cs
index da84df08..366bb5e7 100644
--- a/HZH_Controls/HZH_Controls/Controls/Text/UCNumTextBox.cs
+++ b/HZH_Controls/HZH_Controls/Controls/Text/UCNumTextBox.cs
@@ -141,17 +141,34 @@ public decimal Num
get { return txtNum.Text.ToDecimal(); }
set { txtNum.Text = value.ToString(); }
}
- ///
- /// 获取或设置控件显示的文字的字体。
- ///
- /// The font.
- ///
- ///
- ///
- ///
- ///
- ///
- [Description("字体"), Category("自定义")]
+
+ private decimal increment = 1;
+ ///
+ /// increment number
+ ///
+ [Description("单次点击的加减值 默认1")]
+ public decimal Increment
+ {
+ get
+ {
+ return increment;
+ }
+ set
+ {
+ increment = value;
+ }
+ }
+ ///
+ /// 获取或设置控件显示的文字的字体。
+ ///
+ /// The font.
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ [Description("字体"), Category("自定义")]
public new Font Font
{
get
@@ -286,7 +303,7 @@ private void btnAdd_MouseDown(object sender, MouseEventArgs e)
AddClick(this, e);
}
decimal dec = this.txtNum.Text.ToDecimal();
- dec++;
+ dec+= increment;
txtNum.Text = dec.ToString();
}
@@ -303,7 +320,7 @@ private void btnMinus_MouseDown(object sender, MouseEventArgs e)
MinusClick(this, e);
}
decimal dec = this.txtNum.Text.ToDecimal();
- dec--;
+ dec-= increment;
txtNum.Text = dec.ToString();
}
diff --git a/HZH_Controls/HZH_Controls/Controls/Wave/UCWaveChart.cs b/HZH_Controls/HZH_Controls/Controls/Wave/UCWaveChart.cs
index f69a3e80..3400b61b 100644
--- a/HZH_Controls/HZH_Controls/Controls/Wave/UCWaveChart.cs
+++ b/HZH_Controls/HZH_Controls/Controls/Wave/UCWaveChart.cs
@@ -24,374 +24,387 @@
namespace HZH_Controls.Controls
{
- ///
- /// Class UCWaveChart.
- /// Implements the
- ///
- ///
- public class UCWaveChart : UCControlBase
- {
- ///
- /// The m wave actual width
- ///
- private int m_waveActualWidth = 50;
-
- ///
- /// The m wave width
- ///
- private int m_waveWidth = 50;
-
- ///
- /// Gets or sets the width of the wave.
- ///
- /// The width of the wave.
- [Description("波形宽度"), Category("自定义")]
- public int WaveWidth
- {
- get { return m_waveWidth; }
- set
- {
- if (value <= 0)
- return;
- m_waveWidth = value;
- ResetWaveCount();
- Refresh();
- }
- }
-
- ///
- /// The m sleep time
- ///
- private int m_sleepTime = 1000;
- ///
- /// 波运行速度（运行时间间隔，毫秒）
- ///
- /// The sleep time.
- [Description("运行速度（运行时间间隔，毫秒）"), Category("自定义")]
- public int SleepTime
- {
- get { return m_sleepTime; }
- set
- {
- if (value <= 0)
- return;
- m_sleepTime = value;
- if (timer != null)
- {
- timer.Enabled = false;
- timer.Interval = value;
- timer.Enabled = true;
- }
- }
- }
-
- ///
- /// The m line tension
- ///
- private float m_lineTension = 0.5f;
- ///
- /// 线弯曲程度
- ///
- /// The line tension.
- [Description("线弯曲程度(0-1）"), Category("自定义")]
- public float LineTension
- {
- get { return m_lineTension; }
- set
- {
- if (!(value >= 0 && value <= 1))
- {
- return;
- }
- m_lineTension = value;
- Refresh();
- }
- }
-
- ///
- /// The m line color
- ///
- private Color m_lineColor = Color.FromArgb(150, 255, 77, 59);
-
- ///
- /// Gets or sets the color of the line.
- ///
- /// The color of the line.
- [Description("曲线颜色"), Category("自定义")]
- public Color LineColor
- {
- get { return m_lineColor; }
- set
- {
- m_lineColor = value;
- Refresh();
-
- }
- }
-
- ///
- /// The m grid line color
- ///
- private Color m_gridLineColor = Color.FromArgb(50, 255, 77, 59);
-
- ///
- /// Gets or sets the color of the grid line.
- ///
- /// The color of the grid line.
- [Description("网格线颜色"), Category("自定义")]
- public Color GridLineColor
- {
- get { return m_gridLineColor; }
- set
- {
- m_gridLineColor = value;
- Refresh();
- }
- }
-
- ///
- /// The m grid line text color
- ///
- private Color m_gridLineTextColor = Color.FromArgb(150, 255, 77, 59);
-
- ///
- /// Gets or sets the color of the grid line text.
- ///
- /// The color of the grid line text.
- [Description("网格文本颜色"), Category("自定义")]
- public Color GridLineTextColor
- {
- get { return m_gridLineTextColor; }
- set
- {
- m_gridLineTextColor = value;
- Refresh();
- }
- }
-
- ///
- /// 获取或设置控件显示的文字的字体。
- ///
- /// The font.
- ///
- ///
- ///
- ///
- ///
- ///
- public override Font Font
- {
- get
- {
- return base.Font;
- }
- set
- {
- base.Font = value;
- }
- }
- ///
- /// 数据源，用以缓存所有需要显示的数据
- ///
- List> m_dataSource = new List>();
- ///
- /// 当前需要显示的数据
- ///
- List> m_currentSource = new List>();
- ///
- /// The timer
- ///
- Timer timer = new Timer();
- ///
- /// 画图区域
- ///
- Rectangle m_drawRect;
-
- ///
- /// The m wave count
- ///
- int m_waveCount = 0;
- ///
- /// Initializes a new instance of the class.
- ///
- public UCWaveChart()
- {
- this.SetStyle(ControlStyles.AllPaintingInWmPaint, true);
- this.SetStyle(ControlStyles.DoubleBuffer, true);
- this.SetStyle(ControlStyles.ResizeRedraw, true);
- this.SetStyle(ControlStyles.Selectable, true);
- this.SetStyle(ControlStyles.SupportsTransparentBackColor, true);
- this.SetStyle(ControlStyles.UserPaint, true);
-
- this.SizeChanged += UCWaveWithSource_SizeChanged;
- this.IsShowRect = true;
- this.RectColor = Color.FromArgb(232, 232, 232);
- this.FillColor = Color.FromArgb(50, 255, 77, 59);
- this.RectWidth = 1;
- this.ConerRadius = 10;
- this.IsRadius = true;
- this.Size = new Size(300, 200);
-
- timer.Interval = m_sleepTime;
- timer.Tick += timer_Tick;
- this.VisibleChanged += UCWave_VisibleChanged;
- }
-
-
- ///
- /// 添加需要显示的数据
- ///
- /// 名称
- /// 值
- public void AddSource(string key, double value)
- {
- m_dataSource.Add(new KeyValuePair(key, value));
- }
-
- ///
- /// Handles the VisibleChanged event of the UCWave control.
- ///
- /// The source of the event.
- /// The instance containing the event data.
- void UCWave_VisibleChanged(object sender, EventArgs e)
- {
- if (!DesignMode)
- {
- timer.Enabled = this.Visible;
- }
- }
-
- ///
- /// Handles the Tick event of the timer control.
- ///
- /// The source of the event.
- /// The instance containing the event data.
- void timer_Tick(object sender, EventArgs e)
- {
- m_currentSource = GetCurrentList();
- m_dataSource.RemoveAt(0);
- this.Refresh();
- }
- ///
- /// Handles the SizeChanged event of the UCWaveWithSource control.
- ///
- /// The source of the event.
- /// The instance containing the event data.
- void UCWaveWithSource_SizeChanged(object sender, EventArgs e)
- {
- m_drawRect = new Rectangle(60, 20, this.Width - 80, this.Height - 60);
- ResetWaveCount();
- }
-
- ///
- /// 引发 事件。
- ///
- /// 包含事件数据的 。
- protected override void OnPaint(PaintEventArgs e)
- {
- base.OnPaint(e);
- var g = e.Graphics;
- g.SetGDIHigh();
-
- int intLineSplit = m_drawRect.Height / 4;
- for (int i = 0; i <= 4; i++)
- {
- var pen = new Pen(new SolidBrush(m_gridLineColor), 1);
- // pen.DashStyle = System.Drawing.Drawing2D.DashStyle.Dot;
- g.DrawLine(pen, m_drawRect.Left, m_drawRect.Bottom - 1 - i * intLineSplit, m_drawRect.Right, m_drawRect.Bottom - 1 - i * intLineSplit);
- }
-
- if (m_currentSource == null || m_currentSource.Count <= 0)
- {
- for (int i = 0; i <= 4; i++)
- {
- string strText = (100 / 4 * i).ToString();
- System.Drawing.SizeF _numSize = g.MeasureString(strText, this.Font);
- g.DrawString(strText, Font, new SolidBrush(m_gridLineTextColor), m_drawRect.Left - _numSize.Width - 1, m_drawRect.Bottom - 1 - i * intLineSplit - (_numSize.Height / 2));
- }
- return;
- }
- List lst1 = new List();
- double dblValue = m_currentSource.Max(p => p.Value);
- int intValue = (int)dblValue;
- int intDivisor = ("1".PadRight(intValue.ToString().Length - 1, '0')).ToInt();
- if (intDivisor < 100)
- intDivisor = 100;
- int intTop = intValue;
- if (intValue % intDivisor != 0)
- {
- intTop = (intValue / intDivisor + 1) * intDivisor;
- }
- if (intTop == 0)
- intTop = 100;
-
- for (int i = 0; i <= 4; i++)
- {
- string strText = (intTop / 4 * i).ToString();
- System.Drawing.SizeF _numSize = g.MeasureString(strText, this.Font);
- g.DrawString(strText, Font, new SolidBrush(m_gridLineTextColor), m_drawRect.Left - _numSize.Width - 1, m_drawRect.Bottom - 1 - i * intLineSplit - (_numSize.Height / 2));
- }
-
- int intEndX = 0;
- int intEndY = 0;
- for (int i = 0; i < m_currentSource.Count; i++)
- {
- intEndX = i * m_waveActualWidth + m_drawRect.X;
- intEndY = m_drawRect.Bottom - 1 - (int)(m_currentSource[i].Value / intTop * m_drawRect.Height);
- lst1.Add(new Point(intEndX, intEndY));
- if (!string.IsNullOrEmpty(m_currentSource[i].Key))
- {
- System.Drawing.SizeF _numSize = g.MeasureString(m_currentSource[i].Key, this.Font);
- int txtX = intEndX - (int)(_numSize.Width / 2) + 1;
- g.DrawString(m_currentSource[i].Key, Font, new SolidBrush(m_gridLineTextColor), new PointF(txtX, m_drawRect.Bottom + 5));
- }
- }
-
- int intFirstY = m_drawRect.Bottom - 1 - (int)(m_currentSource[0].Value / intTop * m_drawRect.Height);
-
-
- GraphicsPath path1 = new GraphicsPath();
- path1.AddCurve(lst1.ToArray(), m_lineTension);
- g.DrawPath(new Pen(new SolidBrush(m_lineColor), 1), path1);
-
- }
- ///
- /// 得到当前需要画图的数据
- ///
- /// List<KeyValuePair<System.String, System.Double>>.
- private List> GetCurrentList()
- {
- if (m_dataSource.Count < m_waveCount)
- {
- int intCount = m_waveCount - m_dataSource.Count;
- for (int i = 0; i < intCount; i++)
- {
- m_dataSource.Add(new KeyValuePair("", 0));
- }
- }
-
- var lst = m_dataSource.GetRange(0, m_waveCount);
- if (lst.Count == 1)
- lst.Insert(0, new KeyValuePair("", 0));
- return lst;
- }
-
- ///
- /// 计算需要显示的个数
- ///
- private void ResetWaveCount()
- {
- m_waveCount = m_drawRect.Width / m_waveWidth;
- m_waveActualWidth = m_waveWidth + (m_drawRect.Width % m_waveWidth) / m_waveCount;
- m_waveCount++;
- if (m_dataSource.Count < m_waveCount)
- {
- int intCount = m_waveCount - m_dataSource.Count;
- for (int i = 0; i < intCount; i++)
- {
- m_dataSource.Insert(0, new KeyValuePair("", 0));
- }
- }
- }
- }
+ ///
+ /// Class UCWaveChart.
+ /// Implements the
+ ///
+ ///
+ public class UCWaveChart : UCControlBase
+ {
+ ///
+ /// The m wave actual width
+ ///
+ private int m_waveActualWidth = 50;
+
+ ///
+ /// The m wave width
+ ///
+ private int m_waveWidth = 50;
+
+ ///
+ /// Gets or sets the width of the wave.
+ ///
+ /// The width of the wave.
+ [Description("波形宽度"), Category("自定义")]
+ public int WaveWidth
+ {
+ get { return m_waveWidth; }
+ set
+ {
+ if (value <= 0)
+ return;
+ m_waveWidth = value;
+ ResetWaveCount();
+ Refresh();
+ }
+ }
+
+ ///
+ /// The m sleep time
+ ///
+ private int m_sleepTime = 1000;
+ ///
+ /// 波运行速度（运行时间间隔，毫秒）
+ ///
+ /// The sleep time.
+ [Description("运行速度（运行时间间隔，毫秒）"), Category("自定义")]
+ public int SleepTime
+ {
+ get { return m_sleepTime; }
+ set
+ {
+ if (value <= 0)
+ return;
+ m_sleepTime = value;
+ if (timer != null)
+ {
+ timer.Enabled = false;
+ timer.Interval = value;
+ timer.Enabled = true;
+ }
+ }
+ }
+
+ ///
+ /// The m line tension
+ ///
+ private float m_lineTension = 0.5f;
+ ///
+ /// 线弯曲程度
+ ///
+ /// The line tension.
+ [Description("线弯曲程度(0-1）"), Category("自定义")]
+ public float LineTension
+ {
+ get { return m_lineTension; }
+ set
+ {
+ if (!(value >= 0 && value <= 1))
+ {
+ return;
+ }
+ m_lineTension = value;
+ Refresh();
+ }
+ }
+
+ ///
+ /// The m line color
+ ///
+ private Color m_lineColor = Color.FromArgb(150, 255, 77, 59);
+
+ ///
+ /// Gets or sets the color of the line.
+ ///
+ /// The color of the line.
+ [Description("曲线颜色"), Category("自定义")]
+ public Color LineColor
+ {
+ get { return m_lineColor; }
+ set
+ {
+ m_lineColor = value;
+ Refresh();
+
+ }
+ }
+
+ ///
+ /// The m grid line color
+ ///
+ private Color m_gridLineColor = Color.FromArgb(50, 255, 77, 59);
+
+ ///
+ /// Gets or sets the color of the grid line.
+ ///
+ /// The color of the grid line.
+ [Description("网格线颜色"), Category("自定义")]
+ public Color GridLineColor
+ {
+ get { return m_gridLineColor; }
+ set
+ {
+ m_gridLineColor = value;
+ Refresh();
+ }
+ }
+
+ ///
+ /// The m grid line text color
+ ///
+ private Color m_gridLineTextColor = Color.FromArgb(150, 255, 77, 59);
+
+ ///
+ /// Gets or sets the color of the grid line text.
+ ///
+ /// The color of the grid line text.
+ [Description("网格文本颜色"), Category("自定义")]
+ public Color GridLineTextColor
+ {
+ get { return m_gridLineTextColor; }
+ set
+ {
+ m_gridLineTextColor = value;
+ Refresh();
+ }
+ }
+
+ private int minY = 10;
+ [Description("默认Y轴初始值"), Category("自定义")]
+ public int MinY
+ {
+ get { return minY; }
+ set
+ {
+ minY = value;
+ Refresh();
+
+ }
+ }
+
+ ///
+ /// 获取或设置控件显示的文字的字体。
+ ///
+ /// The font.
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ public override Font Font
+ {
+ get
+ {
+ return base.Font;
+ }
+ set
+ {
+ base.Font = value;
+ }
+ }
+ ///
+ /// 数据源，用以缓存所有需要显示的数据
+ ///
+ List> m_dataSource = new List>();
+ ///
+ /// 当前需要显示的数据
+ ///
+ List> m_currentSource = new List>();
+ ///
+ /// The timer
+ ///
+ Timer timer = new Timer();
+ ///
+ /// 画图区域
+ ///
+ Rectangle m_drawRect;
+
+ ///
+ /// The m wave count
+ ///
+ int m_waveCount = 0;
+ ///
+ /// Initializes a new instance of the class.
+ ///
+ public UCWaveChart()
+ {
+ this.SetStyle(ControlStyles.AllPaintingInWmPaint, true);
+ this.SetStyle(ControlStyles.DoubleBuffer, true);
+ this.SetStyle(ControlStyles.ResizeRedraw, true);
+ this.SetStyle(ControlStyles.Selectable, true);
+ this.SetStyle(ControlStyles.SupportsTransparentBackColor, true);
+ this.SetStyle(ControlStyles.UserPaint, true);
+
+ this.SizeChanged += UCWaveWithSource_SizeChanged;
+ this.IsShowRect = true;
+ this.RectColor = Color.FromArgb(232, 232, 232);
+ this.FillColor = Color.FromArgb(50, 255, 77, 59);
+ this.RectWidth = 1;
+ this.ConerRadius = 10;
+ this.IsRadius = true;
+ this.Size = new Size(300, 200);
+
+ timer.Interval = m_sleepTime;
+ timer.Tick += timer_Tick;
+ this.VisibleChanged += UCWave_VisibleChanged;
+ }
+
+
+ ///
+ /// 添加需要显示的数据
+ ///
+ /// 名称
+ /// 值
+ public void AddSource(string key, double value)
+ {
+ m_dataSource.Add(new KeyValuePair(key, value));
+ }
+
+ ///
+ /// Handles the VisibleChanged event of the UCWave control.
+ ///
+ /// The source of the event.
+ /// The instance containing the event data.
+ void UCWave_VisibleChanged(object sender, EventArgs e)
+ {
+ if (!DesignMode)
+ {
+ timer.Enabled = this.Visible;
+ }
+ }
+
+ ///
+ /// Handles the Tick event of the timer control.
+ ///
+ /// The source of the event.
+ /// The instance containing the event data.
+ void timer_Tick(object sender, EventArgs e)
+ {
+ m_currentSource = GetCurrentList();
+ m_dataSource.RemoveAt(0);
+ this.Refresh();
+ }
+ ///
+ /// Handles the SizeChanged event of the UCWaveWithSource control.
+ ///
+ /// The source of the event.
+ /// The instance containing the event data.
+ void UCWaveWithSource_SizeChanged(object sender, EventArgs e)
+ {
+ m_drawRect = new Rectangle(60, 20, this.Width - 80, this.Height - 60);
+ ResetWaveCount();
+ }
+
+ ///
+ /// 引发 事件。
+ ///
+ /// 包含事件数据的 。
+ protected override void OnPaint(PaintEventArgs e)
+ {
+ base.OnPaint(e);
+ var g = e.Graphics;
+ g.SetGDIHigh();
+
+ int intLineSplit = m_drawRect.Height / 4;
+ for (int i = 0; i <= 4; i++)
+ {
+ var pen = new Pen(new SolidBrush(m_gridLineColor), 1);
+ // pen.DashStyle = System.Drawing.Drawing2D.DashStyle.Dot;
+ g.DrawLine(pen, m_drawRect.Left, m_drawRect.Bottom - 1 - i * intLineSplit, m_drawRect.Right, m_drawRect.Bottom - 1 - i * intLineSplit);
+ }
+
+ if (m_currentSource == null || m_currentSource.Count <= 0)
+ {
+ for (int i = 0; i <= 4; i++)
+ {
+ string strText = (100 / 4 * i).ToString();
+ System.Drawing.SizeF _numSize = g.MeasureString(strText, this.Font);
+ g.DrawString(strText, Font, new SolidBrush(m_gridLineTextColor), m_drawRect.Left - _numSize.Width - 1, m_drawRect.Bottom - 1 - i * intLineSplit - (_numSize.Height / 2));
+ }
+ return;
+ }
+ List lst1 = new List();
+ double dblValue = m_currentSource.Max(p => p.Value);
+ int intValue = (int)dblValue;
+ int intDivisor = ("1".PadRight(intValue.ToString().Length - 1, '0')).ToInt();
+ if (intDivisor < minY)
+ intDivisor = minY;
+ int intTop = intValue;
+ if (intValue % intDivisor != 0)
+ {
+ intTop = (intValue / intDivisor + 1) * intDivisor;
+ }
+ if (intTop == 0)
+ intTop = minY;
+
+ for (int i = 0; i <= 4; i++)
+ {
+ string strText = (intTop / 4 * i).ToString();
+ System.Drawing.SizeF _numSize = g.MeasureString(strText, this.Font);
+ g.DrawString(strText, Font, new SolidBrush(m_gridLineTextColor), m_drawRect.Left - _numSize.Width - 1, m_drawRect.Bottom - 1 - i * intLineSplit - (_numSize.Height / 2));
+ }
+
+ int intEndX = 0;
+ int intEndY = 0;
+ for (int i = 0; i < m_currentSource.Count; i++)
+ {
+ intEndX = i * m_waveActualWidth + m_drawRect.X;
+ intEndY = m_drawRect.Bottom - 1 - (int)(m_currentSource[i].Value / intTop * m_drawRect.Height);
+ lst1.Add(new Point(intEndX, intEndY));
+ if (!string.IsNullOrEmpty(m_currentSource[i].Key))
+ {
+ System.Drawing.SizeF _numSize = g.MeasureString(m_currentSource[i].Key, this.Font);
+ int txtX = intEndX - (int)(_numSize.Width / 2) + 1;
+ g.DrawString(m_currentSource[i].Key, Font, new SolidBrush(m_gridLineTextColor), new PointF(txtX, m_drawRect.Bottom + 5));
+ }
+ }
+
+ int intFirstY = m_drawRect.Bottom - 1 - (int)(m_currentSource[0].Value / intTop * m_drawRect.Height);
+
+
+ GraphicsPath path1 = new GraphicsPath();
+ path1.AddCurve(lst1.ToArray(), m_lineTension);
+ g.DrawPath(new Pen(new SolidBrush(m_lineColor), 1), path1);
+
+ }
+ ///
+ /// 得到当前需要画图的数据
+ ///
+ /// List<KeyValuePair<System.String, System.Double>>.
+ private List> GetCurrentList()
+ {
+ if (m_dataSource.Count < m_waveCount)
+ {
+ int intCount = m_waveCount - m_dataSource.Count;
+ for (int i = 0; i < intCount; i++)
+ {
+ m_dataSource.Add(new KeyValuePair("", 0));
+ }
+ }
+
+ var lst = m_dataSource.GetRange(0, m_waveCount);
+ if (lst.Count == 1)
+ lst.Insert(0, new KeyValuePair("", 0));
+ return lst;
+ }
+
+ ///
+ /// 计算需要显示的个数
+ ///
+ private void ResetWaveCount()
+ {
+ m_waveCount = m_drawRect.Width / m_waveWidth;
+ m_waveActualWidth = m_waveWidth + (m_drawRect.Width % m_waveWidth) / m_waveCount;
+ m_waveCount++;
+ if (m_dataSource.Count < m_waveCount)
+ {
+ int intCount = m_waveCount - m_dataSource.Count;
+ for (int i = 0; i < intCount; i++)
+ {
+ m_dataSource.Insert(0, new KeyValuePair("", 0));
+ }
+ }
+ }
+ }
}