From 6dc80508b1c0f431007f8a8c947c152ec00c3d15 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期一, 08 九月 2025 09:24:05 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang
---
SourceCode/Bond/Servo/CPagePortProperty.cpp | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/SourceCode/Bond/Servo/CPagePortProperty.cpp b/SourceCode/Bond/Servo/CPagePortProperty.cpp
index 380e35d..0c241c9 100644
--- a/SourceCode/Bond/Servo/CPagePortProperty.cpp
+++ b/SourceCode/Bond/Servo/CPagePortProperty.cpp
@@ -139,12 +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);
m_pPort->eablePort(bCheck, [&](int code) -> int {
Sleep(100);
CString strMsg;
@@ -184,6 +187,7 @@
msgDlg.DoModal();
g_nMsgDlgShow = 1;
+#endif
}
void CPagePortProperty::OnCbnSelchangeComboPortType()
@@ -280,12 +284,17 @@
void CPagePortProperty::OnCbnSelchangeComboPortCassertType()
{
+ // 鐢卞師鏉ョ殑鏇存柊鍒癊FEM, 淇敼涓轰繚瀛樺埌鏈湴ini鏂囦欢
+ ASSERT(m_pPort != nullptr);
+ int index = ((CComboBox*)GetDlgItem(IDC_COMBO_PORT_CASSERT_TYPE))->GetCurSel();
+ theApp.m_model.setPortCassetteType(m_pPort->getIndex(), SERVO::CassetteType(index + 1));
+
+
g_nMsgDlgShow = 0;
CMsgDlg msgDlg("璇风瓑寰�", "姝ｅ湪鎿嶄綔锛岃绛夊緟...");
msgDlg.SetData((DWORD_PTR)this);
ASSERT(m_pPort != nullptr);
- int index = ((CComboBox*)GetDlgItem(IDC_COMBO_PORT_CASSERT_TYPE))->GetCurSel();
m_pPort->setCassetteType(SERVO::CassetteType(index + 1), [&](int code) -> int {
Sleep(100);
CString strMsg;
@@ -425,9 +434,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