From 82114df5ce7233a3fd22c44f0c72a083feab539c Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期二, 05 八月 2025 15:59:25 +0800
Subject: [PATCH] 1. SGMeasurement的PLC监听超时设置5秒 2. SGMeasurement的PLC监听类添加注释
---
SourceCode/Bond/Servo/CPagePortProperty.cpp | 12 +++++-------
1 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/SourceCode/Bond/Servo/CPagePortProperty.cpp b/SourceCode/Bond/Servo/CPagePortProperty.cpp
index f61f01a..eadf60f 100644
--- a/SourceCode/Bond/Servo/CPagePortProperty.cpp
+++ b/SourceCode/Bond/Servo/CPagePortProperty.cpp
@@ -139,14 +139,15 @@
BOOL bCheck = ((CButton*)GetDlgItem(IDC_CHECK_ENABLE))->GetCheck() == BST_CHECKED;
EnableCtrls(bCheck);
+#ifdef _LOCAL
+ ASSERT(m_pPort != nullptr);
+ theApp.m_model.setPortEnable(m_pPort->getIndex(), bCheck);
+#else
// enable port
g_nMsgDlgShow = 0;
CMsgDlg msgDlg("璇风瓑寰�", "姝ｅ湪鎿嶄綔锛岃绛夊緟...");
- ASSERT(m_pPort != nullptr);
- theApp.m_model.setPortEnable(m_pPort->getIndex(), bCheck);
- /*
m_pPort->eablePort(bCheck, [&](int code) -> int {
Sleep(100);
CString strMsg;
@@ -186,7 +187,7 @@
msgDlg.DoModal();
g_nMsgDlgShow = 1;
- */
+#endif
}
void CPagePortProperty::OnCbnSelchangeComboPortType()
@@ -436,9 +437,6 @@
void CPagePortProperty::EnableCtrls(BOOL bEnable)
{
GetDlgItem(IDC_COMBO_PORT_TYPE)->EnableWindow(bEnable);
- GetDlgItem(IDC_COMBO_PORT_MODE)->EnableWindow(bEnable);
GetDlgItem(IDC_COMBO_PORT_CASSERT_TYPE)->EnableWindow(bEnable);
- GetDlgItem(IDC_COMBO_PORT_TRANSFER_MODE)->EnableWindow(bEnable);
- GetDlgItem(IDC_CHECK_AUTO_CHANGE)->EnableWindow(bEnable);
}
--
Gitblit v1.9.3