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/CPanelMaster.cpp | 35 ++++++++++++++++++++++++++++++++---
1 files changed, 32 insertions(+), 3 deletions(-)
diff --git a/SourceCode/Bond/Servo/CPanelMaster.cpp b/SourceCode/Bond/Servo/CPanelMaster.cpp
index a4233f6..82c5361 100644
--- a/SourceCode/Bond/Servo/CPanelMaster.cpp
+++ b/SourceCode/Bond/Servo/CPanelMaster.cpp
@@ -108,13 +108,17 @@
if (GetDlgItem(IDC_LINE1) == nullptr) return;
CWnd* pItem;
- CRect rcClient;
+ CRect rcClient, rcItem;
GetClientRect(&rcClient);
pItem = GetDlgItem(IDC_LINE1);
pItem->MoveWindow(rcClient.right - 3, 0, 3, rcClient.Height());
- m_treeCtrl.MoveWindow(5, 5, rcClient.Width() - 13, rcClient.Height() - 10);
+ pItem = GetDlgItem(IDC_LABEL_LOADING);
+ pItem->GetWindowRect(&rcItem);
+ pItem->MoveWindow(12, (rcClient.Height() - rcItem.Height()) / 2, rcClient.Width() - 24, rcItem.Height());
+
+ m_treeCtrl.MoveWindow(5, 5, rcClient.Width() - 8, rcClient.Height() - 10);
}
@@ -143,6 +147,8 @@
{
if (1 == nIDEvent) {
KillTimer(1);
+ GetDlgItem(IDC_LABEL_LOADING)->ShowWindow(SW_HIDE);
+ m_treeCtrl.ShowWindow(SW_SHOW);
loadEquipmentList();
}
@@ -180,7 +186,11 @@
LPNMTREEVIEW pNMTreeView = reinterpret_cast<LPNMTREEVIEW>(pNMHDR);
HTREEITEM hItem = pNMTreeView->itemNew.hItem;
int nLevel = GetTreeItemLevel(hItem);
- if (nLevel == 3) {
+ if (nLevel == 2) {
+ SERVO::CEquipment* pEquipment = (SERVO::CEquipment*)m_treeCtrl.GetItemData(hItem);
+ theApp.m_model.notifyPtr(RX_CODE_SELECT_EQUIPMENT, pEquipment);
+ }
+ else if (nLevel == 3) {
SERVO::CStep* pStep = (SERVO::CStep*)m_treeCtrl.GetItemData(hItem);
theApp.m_model.notifyPtr(RX_CODE_SELECT_STEP, pStep);
}
@@ -201,3 +211,22 @@
return nLevel;
}
+
+SERVO::CEquipment* CPanelMaster::GetActiveEquipment()
+{
+ HTREEITEM hItem = m_treeCtrl.GetSelectedItem();
+ if (hItem == nullptr) return nullptr;
+
+ int nLevel = GetTreeItemLevel(hItem);
+ if (nLevel == 2) {
+ return (SERVO::CEquipment*)m_treeCtrl.GetItemData(hItem);
+ }
+ else if (nLevel == 3) {
+ SERVO::CStep* pStep = (SERVO::CStep*)m_treeCtrl.GetItemData(hItem);
+ if (pStep != nullptr) {
+ return pStep->getEquipment();
+ }
+ }
+
+ return nullptr;
+}
--
Gitblit v1.9.3