From eff39fab10e5285f0d1196037f3a237a676346d2 Mon Sep 17 00:00:00 2001
From: xcd <834800634@qq.com>
Date: 星期四, 09 七月 2020 10:17:26 +0800
Subject: [PATCH] IImageSet添加图片信息序列化输出 操作配置添加输出信息序列化输出 添加激光扫描参数模型 修改CollectionHImage方法，输出IImageSet
---
src/Bro.UI.Config/MainFrm.cs | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/src/Bro.UI.Config/MainFrm.cs b/src/Bro.UI.Config/MainFrm.cs
index e7940f5..39c483d 100644
--- a/src/Bro.UI.Config/MainFrm.cs
+++ b/src/Bro.UI.Config/MainFrm.cs
@@ -90,7 +90,9 @@
private void RegisterEvent(MenuFrmBase dockFrm)
{
dockFrm.OnUploadProcess = DockFrm_OnUploadProcess;
- dockFrm.OnLogMsgOutput = DockFrm_OnLogMsgOutput;
+
+ dockFrm.OnLogMsgOutput -= DockFrm_OnLogMsgOutput;
+ dockFrm.OnLogMsgOutput += DockFrm_OnLogMsgOutput;
//if (dockFrm is FrmDevices)
//{
@@ -167,9 +169,14 @@
});
}
- private void Process_OnAlarmUpdate(string alarmMsg)
+ private async void Process_OnAlarmUpdate(string alarmMsg)
{
- tsslWarning.Text = alarmMsg;
+ this.BeginInvoke(new Action(() =>
+ {
+ tsslWarning.Text = alarmMsg;
+ }));
+
+ await Task.Delay(100);
}
private ToolStripMenuItem GetMatchNode(ToolStripItemCollection items, string parentMenuCode)
@@ -310,7 +317,7 @@
private void OnLoginOK(bool isLogin)
{
- IsLogin = true;
+ IsLogin = isLogin;
}
#endregion
--
Gitblit v1.8.0