From 02c39baf5375f1588e9c20dc06d89a0605077672 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期一, 10 二月 2025 10:41:44 +0800
Subject: [PATCH] Merge branch 'liuyang' into clh

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

diff --git a/SourceCode/Bond/Servo/ServoDlg.h b/SourceCode/Bond/Servo/ServoDlg.h
index 30bea0c..596cf77 100644
--- a/SourceCode/Bond/Servo/ServoDlg.h
+++ b/SourceCode/Bond/Servo/ServoDlg.h
@@ -5,6 +5,8 @@
 #pragma once
 #include "ServoGraph.h"
 #include "BlButton.h"
+#include "LogDlg.h"
+#include "TerminalDisplayDlg.h"
 
 
 // CServoDlg 对话框
@@ -15,9 +17,22 @@
 	CServoDlg(CWnd* pParent = NULL);	// 标准构造函数
 
 
+public:
+	void ShowTerminalText(const char* pszText, unsigned int duration = -1);
+
 private:
+	void InitRxWindows();
 	void Resize();
 	void UpdateLogBtn();
+	void UpdateRobotPosition(float percentage);
+	void RotateRobot(float angleInDegrees);
+
+
+private:
+	IObserver* m_pObserver;
+	BOOL m_bShowLogWnd;
+	CLogDlg* m_pLogDlg;
+	CTerminalDisplayDlg* m_pTerminalDisplayDlg;
 
 
 // 对话框数据
@@ -30,7 +45,9 @@
 
 
 private:
+	BOOL m_bIsRobotMoving;
 	BOOL m_bShowLogWnd;
+	CLogDlg* m_pLogDlg;
 
 // 实现
 protected:
@@ -54,4 +71,20 @@
 	afx_msg void OnDestroy();
 	afx_msg void OnBnClickedButtonLog();
 	afx_msg void OnSize(UINT nType, int cx, int cy);
+	afx_msg void OnClose();
+	afx_msg LRESULT OnLogDlgHide(WPARAM wParam, LPARAM lParam);
+	afx_msg void OnMoving(UINT fwSide, LPRECT pRect);
+	afx_msg void OnMove(int x, int y);
+	afx_msg void OnInitMenuPopup(CMenu* pPopupMenu, UINT nIndex, BOOL bSysMenu);
+	afx_msg void OnMenuFileSettings();
+	afx_msg void OnUpdateMenuFileSettings(CCmdUI* pCmdUI);
+	afx_msg void OnMenuFileSecsTest();
+	afx_msg void OnUpdateMenuFileSecsTest(CCmdUI* pCmdUI);
+	afx_msg void OnMenuWndLog();
+	afx_msg void OnUpdateMenuWndLog(CCmdUI* pCmdUI);
+	afx_msg void OnMenuFileExit();
+	afx_msg void OnUpdateMenuFileExit(CCmdUI* pCmdUI);
+	afx_msg void OnMenuHelpAbout();
+	afx_msg void OnTimer(UINT_PTR nIDEvent);
+	afx_msg BOOL OnEraseBkgnd(CDC* pDC);
 };

--
Gitblit v1.9.3