From 0d10528b430721512e0e93e0d455fcec44207ec9 Mon Sep 17 00:00:00 2001
From: xcd <834800634@qq.com>
Date: 星期二, 14 七月 2020 18:27:10 +0800
Subject: [PATCH] 1. 板卡驱动实现运动暂停/继续功能，板卡动作衔接实现暂停/继续 2. 修复部分调试bug 3. 安全光幕/安全门功能调整
---
src/Bro.UI.Config/MenuForms/FrmOperation.cs | 30 +++++++++++++++++++++---------
1 files changed, 21 insertions(+), 9 deletions(-)
diff --git a/src/Bro.UI.Config/MenuForms/FrmOperation.cs b/src/Bro.UI.Config/MenuForms/FrmOperation.cs
index 025c4fb..455f1aa 100644
--- a/src/Bro.UI.Config/MenuForms/FrmOperation.cs
+++ b/src/Bro.UI.Config/MenuForms/FrmOperation.cs
@@ -28,16 +28,21 @@
LoadProcessCode();
LoadProductionCode();
- Task.Run(() =>
- {
- Thread.Sleep(1000);
+ //Task.Run(() =>
+ //{
+ // Thread.Sleep(1000);
- if ((!plProcess.Visible) && (!plProduct.Visible) && _isFirstLoad)
- {
- LoadProcess();
- _isFirstLoad = false;
- }
- });
+ // if ((!plProcess.Visible) && (!plProduct.Visible) && _isFirstLoad)
+ // {
+ // LoadProcess();
+ // _isFirstLoad = false;
+ // }
+ //});
+ //if ((!plProcess.Visible) && (!plProduct.Visible) && _isFirstLoad)
+ //{
+ // LoadProcess();
+ // _isFirstLoad = false;
+ //}
}
#region Load Codes
@@ -128,6 +133,12 @@
private void FrmOperation_Load(object sender, System.EventArgs e)
{
+ //if ((!plProcess.Visible) && (!plProduct.Visible) && _isFirstLoad)
+ //{
+ // LoadProcess();
+ // _isFirstLoad = false;
+ //}
+
btnStart.Enabled = true;
}
@@ -194,6 +205,7 @@
}
//Process.OnProcessStateChanged += Process_OnProcessStateChanged;
+ Process.OnLog -= Process_OnLog;
Process.OnLog += Process_OnLog;
_currentProcssCode = _processCode;
--
Gitblit v1.8.0