From e8a27bb203fe2aff70390a5eca002d7438da9b0f Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期三, 22 十月 2025 14:24:34 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang
---
SourceCode/Bond/Servo/CEquipmentPage2.cpp | 88 +++++++++++++++++++++++++++++++-------------
1 files changed, 62 insertions(+), 26 deletions(-)
diff --git a/SourceCode/Bond/Servo/CEquipmentPage2.cpp b/SourceCode/Bond/Servo/CEquipmentPage2.cpp
index 0a09494..aef0b77 100644
--- a/SourceCode/Bond/Servo/CEquipmentPage2.cpp
+++ b/SourceCode/Bond/Servo/CEquipmentPage2.cpp
@@ -34,6 +34,7 @@
ON_WM_SIZE()
ON_NOTIFY(LVN_ITEMCHANGED, IDC_LIST1, &CEquipmentPage2::OnLvnItemchangedList1)
ON_BN_CLICKED(IDC_BUTTON_REMOVE, &CEquipmentPage2::OnBnClickedButtonRemove)
+ ON_BN_CLICKED(IDC_BUTTON_PUT, &CEquipmentPage2::OnBnClickedButtonPut)
END_MESSAGE_MAP()
@@ -82,24 +83,7 @@
ASSERT(m_pEquipment);
- for (int i = 0; i < SLOT_MAX; i++) {
- SERVO::CSlot* pSlot = m_pEquipment->getSlot(i);
- if (pSlot != nullptr && pSlot->isEnable()) {
- int index = m_listCtrl.InsertItem(m_listCtrl.GetItemCount(), _T(""));
- m_listCtrl.SetItemData(index, (DWORD_PTR)pSlot);
- m_listCtrl.SetItemText(index, 1, std::to_string(pSlot->getNo()).c_str());
- m_listCtrl.SetItemText(index, 2, pSlot->getName().c_str());
-
- SERVO::CGlass* pGlass = (SERVO::CGlass*)pSlot->getContext();
- if (pGlass != nullptr) {
- m_listCtrl.SetItemText(index, 3, pGlass->getID().c_str());
- SERVO::CGlass* pBuddy = pGlass->getBuddy();
- if (pBuddy != nullptr) {
- m_listCtrl.SetItemText(index, 4, pBuddy->getID().c_str());
- }
- }
- }
- }
+ UpdateSlots();
return TRUE; // return TRUE unless you set the focus to a control
// 寮傚父: OCX 灞炴�ч〉搴旇繑鍥� FALSE
@@ -142,10 +126,17 @@
GetClientRect(&rcClient);
int x = 12;
+ int x1 = x;
int y2 = rcClient.bottom - 12;
pItem = GetDlgItem(IDC_BUTTON_REMOVE);
pItem->GetWindowRect(&rcItem);
pItem->MoveWindow(x, y2 - rcItem.Height(), rcItem.Width(), rcItem.Height());
+ x1 += rcItem.Width();
+ x1 += 12;
+
+ pItem = GetDlgItem(IDC_BUTTON_PUT);
+ pItem->GetWindowRect(&rcItem);
+ pItem->MoveWindow(x1, y2 - rcItem.Height(), rcItem.Width(), rcItem.Height());
y2 -= rcItem.Height();
y2 -= 8;
@@ -173,16 +164,61 @@
void CEquipmentPage2::OnBnClickedButtonRemove()
{
- /*
int index = GetSelectedItemIndex();
if (index >= 0) {
- SERVO::CGlass* pGlass = (SERVO::CGlass*)m_listCtrl.GetItemData(index);
- ASSERT(m_pEquipment);
- BOOL bRet = m_pEquipment->removeClass(pGlass);
- if (bRet) {
- pGlass->release();
- m_listCtrl.DeleteItem(index);
+ SERVO::CSlot* pSlot = (SERVO::CSlot*)m_listCtrl.GetItemData(index);
+ ASSERT(pSlot);
+ if (theApp.m_model.getMaster().moveGlassToBuf(m_pEquipment->getID(),
+ pSlot->getNo())) {
+ UpdateSlots();
+ AfxMessageBox("鐗╂枡宸插彇鍑哄埌Buffer涓紒");
}
}
- */
+}
+
+void CEquipmentPage2::OnBnClickedButtonPut()
+{
+ int index = GetSelectedItemIndex();
+ if (index >= 0) {
+ SERVO::CSlot* pSlot = (SERVO::CSlot*)m_listCtrl.GetItemData(index);
+ ASSERT(pSlot);
+ if (theApp.m_model.getMaster().moveGlassToSlot(m_pEquipment->getID(),
+ pSlot->getNo())) {
+ UpdateSlots();
+ AfxMessageBox("鐗╂枡宸叉斁鍏ユ寚瀹氫綅缃紒");
+ }
+ }
+}
+
+void CEquipmentPage2::UpdateSlots()
+{
+ m_listCtrl.DeleteAllItems();
+ for (int i = 0; i < SLOT_MAX; i++) {
+ SERVO::CSlot* pSlot = m_pEquipment->getSlot(i);
+ if (pSlot != nullptr && pSlot->isEnable()) {
+ int index = m_listCtrl.InsertItem(m_listCtrl.GetItemCount(), _T(""));
+ m_listCtrl.SetItemData(index, (DWORD_PTR)pSlot);
+ m_listCtrl.SetItemText(index, 1, std::to_string(pSlot->getNo()).c_str());
+ m_listCtrl.SetItemText(index, 2, pSlot->getName().c_str());
+
+ SERVO::CGlass* pGlass = (SERVO::CGlass*)pSlot->getContext();
+ if (pGlass != nullptr) {
+ CString strText;
+ if (pGlass->getType() == SERVO::MaterialsType::G1) {
+ strText.Format(_T("(G1)%s"), pGlass->getID().c_str());
+ }
+ else if (pGlass->getType() == SERVO::MaterialsType::G2) {
+ strText.Format(_T("(G2)%s"), pGlass->getID().c_str());
+ }
+ else {
+ strText.Format(_T("(%s"), pGlass->getID().c_str());
+ }
+ m_listCtrl.SetItemText(index, 3, strText);
+ SERVO::CGlass* pBuddy = pGlass->getBuddy();
+ if (pBuddy != nullptr) {
+ m_listCtrl.SetItemText(index, 4, pBuddy->getID().c_str());
+ }
+ }
+ }
+ }
}
--
Gitblit v1.9.3