From 829fe6c6bc33d53fda9c31fd45a37e1df87befff Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期五, 30 一月 2026 11:16:24 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang

---
 SourceCode/Bond/Servo/CPanelMaster.h |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/SourceCode/Bond/Servo/CPanelMaster.h b/SourceCode/Bond/Servo/CPanelMaster.h
index 50f44e3..481683a 100644
--- a/SourceCode/Bond/Servo/CPanelMaster.h
+++ b/SourceCode/Bond/Servo/CPanelMaster.h
@@ -12,8 +12,13 @@
 	CPanelMaster(CWnd* pParent = nullptr);   // 鏍囧噯鏋勯�犲嚱鏁�
 	virtual ~CPanelMaster();
 	int getPanelWidth();
+	void setPanelWidth(int width);
 	void loadEquipmentList();
 	void loadSteps(SERVO::CEquipment* pEquipment, HTREEITEM hItemEq);
+	SERVO::CEquipment* GetActiveEquipment();
+
+private:
+	int GetTreeItemLevel(HTREEITEM hItem);
 
 
 private:
@@ -39,4 +44,5 @@
 	afx_msg void OnSize(UINT nType, int cx, int cy);
 	afx_msg void OnVLineMoveX(NMHDR* nmhdr, LRESULT* result);
 	afx_msg void OnTimer(UINT_PTR nIDEvent);
+	afx_msg void OnTvnSelchangedTree1(NMHDR* pNMHDR, LRESULT* pResult);
 };

--
Gitblit v1.9.3