From 5bf1b91009a182188d6d2245aa71653801eea60b Mon Sep 17 00:00:00 2001
From: wells <123>
Date: 星期日, 12 七月 2020 18:09:54 +0800
Subject: [PATCH] debug
---
src/Bro.M071.Process/UI/M071_MainForm.cs | 190 ++++++++++++++++++++++++++++-------------------
1 files changed, 113 insertions(+), 77 deletions(-)
diff --git a/src/Bro.M071.Process/UI/M071_MainForm.cs b/src/Bro.M071.Process/UI/M071_MainForm.cs
index 17b79c9..e875fd6 100644
--- a/src/Bro.M071.Process/UI/M071_MainForm.cs
+++ b/src/Bro.M071.Process/UI/M071_MainForm.cs
@@ -53,38 +53,44 @@
if (string.IsNullOrWhiteSpace(Config.BackgroundImagePath))
return;
- this.Invoke(new Action(() =>
+ try
{
- try
- {
- Bitmap image = (Bitmap)Image.FromFile(Config.BackgroundImagePath);
- cvImage.LoadImage(image);
- cvImage.SetScreenSize();
- }
- catch (Exception ex)
- {
- LogAsync(new LogMsg(DateTime.Now, "杞藉叆鑳屾櫙鍥惧紓甯�", ex.Message));
- return;
- }
+ this.Invoke(new Action(() =>
+ {
+ try
+ {
+ Bitmap image = (Bitmap)Image.FromFile(Config.BackgroundImagePath);
+ cvImage.LoadImage(image);
+ cvImage.SetScreenSize();
+ }
+ catch (Exception ex)
+ {
+ LogAsync(new LogMsg(DateTime.Now, "杞藉叆鑳屾櫙鍥惧紓甯�", ex.Message));
+ return;
+ }
- cvImage.Elements.Clear();
- lvMeasures.Items.Clear();
+ cvImage.Elements.Clear();
+ lvMeasures.Items.Clear();
- txtBarcode.Enabled = !Config.IsBarcodeManualInputBlocked;
+ txtBarcode.Enabled = !Config.IsBarcodeManualInputBlocked;
- Config.MeasurementUnitCollection.ForEach(u =>
- {
- if (!u.IsEnabled)
- return;
+ Config.MeasurementUnitCollection.ForEach(u =>
+ {
+ if (!u.IsEnabled)
+ return;
- var ele = new KeyIndicator(u.Id, u.DisplayLocation);
- cvImage.Elements.Add(ele);
+ 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);
- });
- }));
+ ListViewItem item = new ListViewItem(u.GetDisplayText());
+ item.Tag = u.Id;
+ lvMeasures.Items.Add(item);
+ });
+ }));
+ }
+ catch (Exception ex)
+ {
+ }
Process_M071.OnClearBarcode -= M071_MainForm_OnClearBarcode;
Process_M071.OnClearBarcode += M071_MainForm_OnClearBarcode;
@@ -104,6 +110,9 @@
Config.PropertyChanged -= Config_PropertyChanged;
Config.PropertyChanged += Config_PropertyChanged;
+
+ Process_M071.OnElementUpdated -= Process_M071_OnElementUpdated;
+ Process_M071.OnElementUpdated += Process_M071_OnElementUpdated;
}
private void Config_PropertyChanged(object sender, PropertyChangedEventArgs e)
@@ -223,6 +232,26 @@
}
#endregion
+ #region 鏍囩缁撴灉鏄剧ず
+ private async void Process_M071_OnElementUpdated(Common.Interface.IShapeElement obj)
+ {
+ if (obj is KeyIndicator keyIndicator)
+ {
+ this.Invoke(new Action(() =>
+ {
+ var ele = cvImage.Elements.FirstOrDefault(u => u.ID == keyIndicator.ID);
+
+ (ele as KeyIndicator).Text = keyIndicator.Text;
+ (ele as KeyIndicator).ResultState = keyIndicator.ResultState;
+
+ this.Invalidate();
+ }));
+ }
+
+ await Task.Delay(100);
+ }
+ #endregion
+
#region 涓婃柟鐘舵�佸尯
#region 鏉＄爜
@@ -261,46 +290,59 @@
#region 鏈哄彴鐘舵��
private async void M071_MainForm_MachineStateChanged(MachineState state)
{
- lblMachineState.BeginInvoke(new Action(() =>
+ if (lblMachineState.IsHandleCreated)
{
- switch (state)
+ lblMachineState.BeginInvoke(new Action(() =>
{
- case MachineState.Alarm:
- btnStartMeasure.BackColor = lblMachineState.BackColor = Color.Red;
- btnStartMeasure.ForeColor = lblMachineState.ForeColor = Color.White;
- lblMachineState.Text = "璀︽姤";
+ switch (state)
+ {
+ case MachineState.Alarm:
+ btnStartMeasure.BackColor = lblMachineState.BackColor = Color.Red;
+ btnStartMeasure.ForeColor = lblMachineState.ForeColor = Color.White;
+ lblMachineState.Text = "璀︽姤";
- btnStartMeasure.Enabled = false;
- break;
- case MachineState.Pause:
- btnStartMeasure.BackColor = lblMachineState.BackColor = Color.Yellow;
- btnStartMeasure.ForeColor = lblMachineState.ForeColor = Color.Black;
- lblMachineState.Text = "鏆傚仠";
+ btnStartMeasure.Text = "寮�濮嬫祴閲�";
+ btnStartMeasure.Enabled = false;
+ btnStartMeasure.BackColor = Color.Red;
+ break;
+ case MachineState.Pause:
+ btnStartMeasure.BackColor = lblMachineState.BackColor = Color.Yellow;
+ btnStartMeasure.ForeColor = lblMachineState.ForeColor = Color.Black;
+ lblMachineState.Text = "鏆傚仠";
- //btnStartMeasure.Text = "鏆傚仠娴嬮噺";
- btnStartMeasure.Enabled = true;
- break;
- case MachineState.Ready:
- btnStartMeasure.BackColor = lblMachineState.BackColor = Color.Lime;
- btnStartMeasure.ForeColor = lblMachineState.ForeColor = Color.White;
- lblMachineState.Text = "灏辩华";
+ 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;
+ lblMachineState.Text = "灏辩华";
+
+ btnStartMeasure.Text = "寮�濮嬫祴閲�";
+ btnStartMeasure.Enabled = true;
+ btnStartMeasure.BackColor = Color.Lime;
+ break;
+ case MachineState.Running:
+ btnStartMeasure.BackColor = lblMachineState.BackColor = Color.Lime;
+ btnStartMeasure.ForeColor = lblMachineState.ForeColor = Color.DarkGreen;
+ lblMachineState.Text = "杩愯";
- btnStartMeasure.Enabled = true;
- break;
- case MachineState.Running:
- btnStartMeasure.BackColor = lblMachineState.BackColor = Color.Lime;
- 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;
+ btnStartMeasure.ForeColor = lblMachineState.ForeColor = SystemColors.ControlText;
+ lblMachineState.Text = "鏈煡";
- btnStartMeasure.Enabled = true;
- break;
- case MachineState.Unknown:
- btnStartMeasure.BackColor = lblMachineState.BackColor = SystemColors.Control;
- btnStartMeasure.ForeColor = lblMachineState.ForeColor = SystemColors.ControlText;
- lblMachineState.Text = "鏈煡";
- break;
- }
- }));
+ btnStartMeasure.Enabled = false;
+ btnStartMeasure.BackColor = Color.Red;
+ break;
+ }
+ }));
+ }
await Task.Delay(100);
}
@@ -333,7 +375,7 @@
lblProductionState.Text = "NG";
}
- btnStartMeasure.Text = "寮�濮嬫祴閲�";
+ //btnStartMeasure.Text = "寮�濮嬫祴閲�";
}));
await Task.Delay(100);
}
@@ -347,6 +389,15 @@
lblProductionState.Text = "娴嬭瘯涓�";
lblCT.Text = "";
+
+ cvImage.Elements.ToList().ForEach(e =>
+ {
+ if (e is KeyIndicator indicator)
+ {
+ indicator.Text = "";
+ indicator.ResultState = null;
+ }
+ });
}));
await Task.Delay(100);
}
@@ -356,9 +407,6 @@
private async void btnStartMeasure_Click(object sender, EventArgs e)
{
- btnStartMeasure.Enabled = false;
- bool isBreak = false;
-
if (btnStartMeasure.Text == "寮�濮嬫祴閲�")
{
await Task.Run(() =>
@@ -369,31 +417,19 @@
}
catch (Exception ex)
{
- isBreak = true;
-
LogAsync(DateTime.Now, "娴佺▼寮傚父", ex.Message);
Process_M071.ExceptionRaisedInMonitor(ex);
-
- btnStartMeasure.Text = "寮�濮嬫祴閲�";
-
}
});
-
- if (!isBreak)
- btnStartMeasure.Text = "鏆傚仠娴嬮噺";
}
else if (btnStartMeasure.Text == "缁х画娴嬮噺")
{
Process_M071.SwitchJobStatus(new OperationConfigBase() { InputPara = new List<int>() { 0 } }, null, null);
- btnStartMeasure.Text = "鏆傚仠娴嬮噺";
}
else
{
Process_M071.SwitchJobStatus(new OperationConfigBase() { InputPara = new List<int>() { 1 } }, null, null);
- btnStartMeasure.Text = "缁х画娴嬮噺";
}
-
- btnStartMeasure.Enabled = true;
}
#region 澶嶄綅鎿嶄綔
@@ -414,7 +450,7 @@
Process_M071.Reset(null, null, null);
}
- Process_M071.ResetTimer.Change(-1, 1000 * 5);
+ Process_M071.ResetTimer.Change(1000 * 5, -1);
}
private void btnReset_MouseUp(object sender, MouseEventArgs e)
--
Gitblit v1.8.0