From 4e5df2e71445ca3c0cc412e24510234e671b6072 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期四, 19 六月 2025 16:18:33 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang
---
SourceCode/Bond/Servo/CPagePortProperty.cpp | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/SourceCode/Bond/Servo/CPagePortProperty.cpp b/SourceCode/Bond/Servo/CPagePortProperty.cpp
index b163d01..92fc3a2 100644
--- a/SourceCode/Bond/Servo/CPagePortProperty.cpp
+++ b/SourceCode/Bond/Servo/CPagePortProperty.cpp
@@ -57,39 +57,39 @@
CComboBox* pComboBox;
std::string strTemp;
-
+ ((CButton*)GetDlgItem(IDC_CHECK_ENABLE))->SetCheck(m_pPort->isEnable() ? BST_CHECKED : BST_UNCHECKED);
pComboBox = (CComboBox*)GetDlgItem(IDC_COMBO_PORT_TYPE);
for (int i = 1; i <= 7; i++) {
- pComboBox->InsertString(i - 1, SERVO::CLoadPort::getPortTypeDescription(i, strTemp).c_str());
+ pComboBox->InsertString(i - 1, SERVO::CLoadPort::getPortTypeDescription((SERVO::PortType)i, strTemp).c_str());
}
- int portType = m_pPort->getPortType();
+ int portType = (int)m_pPort->getPortType();
if (1 <= portType && portType <= 7) {
pComboBox->SetCurSel(portType - 1);
}
pComboBox = (CComboBox*)GetDlgItem(IDC_COMBO_PORT_MODE);
for (int i = 0; i <= 5; i++) {
- pComboBox->InsertString(i - 1, SERVO::CLoadPort::getPortModeDescription(i, strTemp).c_str());
+ pComboBox->InsertString(i, SERVO::CLoadPort::getPortModeDescription((SERVO::PortMode)i, strTemp).c_str());
}
- int portMode = m_pPort->getPortMode();
+ int portMode = (int)m_pPort->getPortMode();
if (0 <= portMode && portMode <= 5) {
pComboBox->SetCurSel(portMode);
}
pComboBox = (CComboBox*)GetDlgItem(IDC_COMBO_PORT_CASSERT_TYPE);
for (int i = 1; i <= 3; i++) {
- pComboBox->InsertString(i - 1, SERVO::CLoadPort::getPortCassetteTypeDescription(i, strTemp).c_str());
+ pComboBox->InsertString(i - 1, SERVO::CLoadPort::getPortCassetteTypeDescription((SERVO::CassetteType)i, strTemp).c_str());
}
- int cessetteType = m_pPort->getCessetteType();
+ int cessetteType = (int)m_pPort->getCessetteType();
if (1 <= cessetteType && cessetteType <= 3) {
pComboBox->SetCurSel(cessetteType - 1);
}
pComboBox = (CComboBox*)GetDlgItem(IDC_COMBO_PORT_TRANSFER_MODE);
for (int i = 1; i <= 3; i++) {
- pComboBox->InsertString(i - 1, SERVO::CLoadPort::getPortTransferModeDescription(i, strTemp).c_str());
+ pComboBox->InsertString(i - 1, SERVO::CLoadPort::getPortTransferModeDescription((SERVO::TransferMode)i, strTemp).c_str());
}
- int transferMode = m_pPort->getTransferMode();
+ int transferMode = (int)m_pPort->getTransferMode();
if (1 <= transferMode && transferMode <= 3) {
pComboBox->SetCurSel(transferMode - 1);
}
--
Gitblit v1.9.3