From c31db72ac3c2c3a29a9bbf7ac1b153f236d971fb Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期二, 21 十月 2025 18:22:10 +0800
Subject: [PATCH] 1.优化；
---
SourceCode/Bond/Servo/CPanelMaster.cpp | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 58 insertions(+), 2 deletions(-)
diff --git a/SourceCode/Bond/Servo/CPanelMaster.cpp b/SourceCode/Bond/Servo/CPanelMaster.cpp
index 7991ae7..82c5361 100644
--- a/SourceCode/Bond/Servo/CPanelMaster.cpp
+++ b/SourceCode/Bond/Servo/CPanelMaster.cpp
@@ -38,6 +38,7 @@
ON_WM_SIZE()
ON_NOTIFY(BYVERTICALLINE_MOVEX, IDC_LINE1, &CPanelMaster::OnVLineMoveX)
ON_WM_TIMER()
+ ON_NOTIFY(TVN_SELCHANGED, IDC_TREE1, &CPanelMaster::OnTvnSelchangedTree1)
END_MESSAGE_MAP()
@@ -107,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);
}
@@ -142,6 +147,8 @@
{
if (1 == nIDEvent) {
KillTimer(1);
+ GetDlgItem(IDC_LABEL_LOADING)->ShowWindow(SW_HIDE);
+ m_treeCtrl.ShowWindow(SW_SHOW);
loadEquipmentList();
}
@@ -174,3 +181,52 @@
}
}
+void CPanelMaster::OnTvnSelchangedTree1(NMHDR* pNMHDR, LRESULT* pResult)
+{
+ LPNMTREEVIEW pNMTreeView = reinterpret_cast<LPNMTREEVIEW>(pNMHDR);
+ HTREEITEM hItem = pNMTreeView->itemNew.hItem;
+ int nLevel = GetTreeItemLevel(hItem);
+ 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);
+ }
+
+
+
+ *pResult = 0;
+}
+
+int CPanelMaster::GetTreeItemLevel(HTREEITEM hItem)
+{
+ int nLevel = 0;
+ HTREEITEM hTemp = hItem;
+ while (hTemp != nullptr) {
+ hTemp = m_treeCtrl.GetParentItem(hTemp);
+ nLevel++;
+ }
+
+ 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