From eafdcc5ad6a55d3dfdec6c4787c3f3a9f32efc7f Mon Sep 17 00:00:00 2001
From: xcd <834800634@qq.com>
Date: 星期二, 29 九月 2020 13:27:50 +0800
Subject: [PATCH] 1. M071B机台配置 2. GTS板卡添加回原点捕获模式和输入信号模式 3. CameraBase使用Dictionary类型做图片缓存 4. M071流程显式Copy，原来是为了避免内存泄漏，但目前来看不是这方面原因 5. Gocator驱动添加GoDataSet之类KObject资源显式回收，怀疑其中也有非托管对象资源，测试确实起到内存回收作用
---
src/Bro.M071.Process/UI/M071_ShortcutFrm.cs | 50 ++++++++++++++++++++++++++++++++++++--------------
1 files changed, 36 insertions(+), 14 deletions(-)
diff --git a/src/Bro.M071.Process/UI/M071_ShortcutFrm.cs b/src/Bro.M071.Process/UI/M071_ShortcutFrm.cs
index 01c11b7..34c3426 100644
--- a/src/Bro.M071.Process/UI/M071_ShortcutFrm.cs
+++ b/src/Bro.M071.Process/UI/M071_ShortcutFrm.cs
@@ -53,20 +53,42 @@
{
base.OnProcessUpdated();
- Task.Run(() =>
+ //Task.Run(() =>
+ //{
+ // if (loadHandle.Wait(1000))
+ // {
+ // this.Invoke(new Action(() =>
+ // {
+ // chkBlockBeep.Checked = Config.IsBeepBlocked;
+ // chkBlockSafetyBeam.Checked = Config.IsSafetyBeamBlocked;
+ // chkBlockSaftyDoor.Checked = Config.IsSafetyDoorBlocked;
+ // chkManualInputForbidden.Checked = Config.IsBarcodeManualInputBlocked;
+ // chkEnableMESUpload.Checked = Config.IsEnableMESUpload;
+ // }));
+ // }
+ //});
+ this.Invoke(new Action(() =>
{
- if (loadHandle.Wait(1000))
- {
- this.Invoke(new Action(() =>
- {
- chkBlockBeep.Checked = Config.IsBeepBlocked;
- chkBlockSafetyBeam.Checked = Config.IsSafetyBeamBlocked;
- chkBlockSaftyDoor.Checked = Config.IsSafetyDoorBlocked;
- chkManualInputForbidden.Checked = Config.IsBarcodeManulInputBlocked;
- chkEnableMESUpload.Checked = Config.IsEnableMESUpload;
- }));
- }
- });
+ chkBlockBeep.Checked = Config.IsBeepBlocked;
+ chkBlockSafetyBeam.Checked = Config.IsSafetyBeamBlocked;
+ chkBlockSaftyDoor.Checked = Config.IsSafetyDoorBlocked;
+ chkManualInputForbidden.Checked = Config.IsBarcodeManualInputBlocked;
+ chkEnableMESUpload.Checked = Config.IsEnableMESUpload;
+ }));
+
+ Config.PropertyChanged -= Config_PropertyChanged;
+ Config.PropertyChanged += Config_PropertyChanged;
+ }
+
+ private async void Config_PropertyChanged(object sender, PropertyChangedEventArgs e)
+ {
+ chkBlockBeep.Checked = Config.IsBeepBlocked;
+ chkBlockSafetyBeam.Checked = Config.IsSafetyBeamBlocked;
+ chkBlockSaftyDoor.Checked = Config.IsSafetyDoorBlocked;
+ chkManualInputForbidden.Checked = Config.IsBarcodeManualInputBlocked;
+ chkEnableMESUpload.Checked = Config.IsEnableMESUpload;
+
+ await Task.Delay(100);
}
private void chkBlockSaftyDoor_CheckedChanged(object sender, EventArgs e)
@@ -86,7 +108,7 @@
private void chkManualInputForbidden_CheckedChanged(object sender, EventArgs e)
{
- Config.IsBarcodeManulInputBlocked = chkManualInputForbidden.Checked;
+ Config.IsBarcodeManualInputBlocked = chkManualInputForbidden.Checked;
}
bool isLightOn = false;
--
Gitblit v1.8.0