From 8287e5b91dff39a8c88f37004040a25ac5f3f488 Mon Sep 17 00:00:00 2001
From: xcd <834800634@qq.com>
Date: 星期三, 30 九月 2020 15:12:18 +0800
Subject: [PATCH] 1. KeyIndicator显示字体加粗
---
src/Bro.M071.Process/UI/M071_MainForm.cs | 70 +++++++++++++++++++++++++++++------
1 files changed, 58 insertions(+), 12 deletions(-)
diff --git a/src/Bro.M071.Process/UI/M071_MainForm.cs b/src/Bro.M071.Process/UI/M071_MainForm.cs
index e875fd6..7035785 100644
--- a/src/Bro.M071.Process/UI/M071_MainForm.cs
+++ b/src/Bro.M071.Process/UI/M071_MainForm.cs
@@ -40,6 +40,10 @@
cvImage.SetScreenSize();
cvImage.OnElementChangedHandle -= CvImage_OnElementChangedHandle;
cvImage.OnElementChangedHandle += CvImage_OnElementChangedHandle;
+
+ timer1.Enabled = true;
+
+ btnReset.Text = $"澶嶄綅锛堥暱鎸墈Config.FullResetRequiredDuration}绉掑ぇ澶嶄綅锛�";
};
}
@@ -135,6 +139,27 @@
{
tscEditLocation.Visible = tsmiShowEditor.Checked;
tscEditLocation.BringToFront();
+ }
+
+ private void tsmiRefreshLabels_Click(object sender, EventArgs e)
+ {
+ cvImage.Elements.Clear();
+ lvMeasures.Items.Clear();
+
+ Config.MeasurementUnitCollection.ForEach(u =>
+ {
+ if (!u.IsEnabled)
+ return;
+
+ var ele = new KeyIndicator(u.Id, u.DisplayLocation);
+ cvImage.Elements.Add(ele);
+
+ ListViewItem item = new ListViewItem(u.GetDisplayText());
+ item.Tag = u.Id;
+ lvMeasures.Items.Add(item);
+ });
+
+ this.Invalidate();
}
#endregion
@@ -235,6 +260,23 @@
#region 鏍囩缁撴灉鏄剧ず
private async void Process_M071_OnElementUpdated(Common.Interface.IShapeElement obj)
{
+ //this.Invoke(new Action(() =>
+ //{
+ // if (obj is KeyIndicator keyIndicator)
+ // {
+ // var ele = cvImage.Elements.FirstOrDefault(u => u.ID == keyIndicator.ID);
+
+ // //(ele as KeyIndicator).Text = keyIndicator.Text;
+ // //(ele as KeyIndicator).ResultState = keyIndicator.ResultState;
+ // if (ele != null)
+ // {
+ // ele = keyIndicator;
+ // }
+
+ // this.Invalidate();
+ // }
+ //}));
+
if (obj is KeyIndicator keyIndicator)
{
this.Invoke(new Action(() =>
@@ -262,6 +304,10 @@
if (keyStr.Length == 1)
{
_barcode += keyStr.ToUpper();
+ }
+ else if (keyStr.Length == 2 && keyStr.StartsWith("D"))
+ {
+ _barcode += keyStr.Substring(1).ToUpper();
}
if (e.KeyValue == 13)
@@ -292,7 +338,7 @@
{
if (lblMachineState.IsHandleCreated)
{
- lblMachineState.BeginInvoke(new Action(() =>
+ lblMachineState.Invoke(new Action(() =>
{
switch (state)
{
@@ -303,7 +349,6 @@
btnStartMeasure.Text = "寮�濮嬫祴閲�";
btnStartMeasure.Enabled = false;
- btnStartMeasure.BackColor = Color.Red;
break;
case MachineState.Pause:
btnStartMeasure.BackColor = lblMachineState.BackColor = Color.Yellow;
@@ -312,25 +357,22 @@
btnStartMeasure.Text = "缁х画娴嬮噺";
btnStartMeasure.Enabled = true;
- btnStartMeasure.BackColor = Color.Lime;
break;
case MachineState.Ready:
btnStartMeasure.BackColor = lblMachineState.BackColor = Color.Lime;
- btnStartMeasure.ForeColor = lblMachineState.ForeColor = Color.White;
+ btnStartMeasure.ForeColor = lblMachineState.ForeColor = Color.Black;
lblMachineState.Text = "灏辩华";
-
+
btnStartMeasure.Text = "寮�濮嬫祴閲�";
btnStartMeasure.Enabled = true;
- btnStartMeasure.BackColor = Color.Lime;
break;
case MachineState.Running:
- btnStartMeasure.BackColor = lblMachineState.BackColor = Color.Lime;
+ btnStartMeasure.BackColor = lblMachineState.BackColor = Color.Transparent;
btnStartMeasure.ForeColor = lblMachineState.ForeColor = Color.DarkGreen;
lblMachineState.Text = "杩愯";
btnStartMeasure.Text = "鏆傚仠娴嬮噺";
btnStartMeasure.Enabled = true;
- btnStartMeasure.BackColor = Color.Lime;
break;
case MachineState.Unknown:
btnStartMeasure.BackColor = lblMachineState.BackColor = SystemColors.Control;
@@ -338,7 +380,6 @@
lblMachineState.Text = "鏈煡";
btnStartMeasure.Enabled = false;
- btnStartMeasure.BackColor = Color.Red;
break;
}
}));
@@ -424,11 +465,11 @@
}
else if (btnStartMeasure.Text == "缁х画娴嬮噺")
{
- Process_M071.SwitchJobStatus(new OperationConfigBase() { InputPara = new List<int>() { 0 } }, null, null);
+ Process_M071.SwitchJobStatus(new OperationConfigBase() { InputPara = new List<int>() { 10 } }, null, null);
}
else
{
- Process_M071.SwitchJobStatus(new OperationConfigBase() { InputPara = new List<int>() { 1 } }, null, null);
+ Process_M071.SwitchJobStatus(new OperationConfigBase() { InputPara = new List<int>() { 11 } }, null, null);
}
}
@@ -450,7 +491,7 @@
Process_M071.Reset(null, null, null);
}
- Process_M071.ResetTimer.Change(1000 * 5, -1);
+ Process_M071.ResetTimer.Change(1000 * Config.FullResetRequiredDuration, -1);
}
private void btnReset_MouseUp(object sender, MouseEventArgs e)
@@ -458,5 +499,10 @@
Process_M071.ResetTimer.Change(-1, -1);
}
#endregion
+
+ private void timer1_Tick(object sender, EventArgs e)
+ {
+ cvImage.Refresh();
+ }
}
}
--
Gitblit v1.8.0