From 009eda749899fc85d3a75ad2016371f27436bf36 Mon Sep 17 00:00:00 2001
From: LAPTOP-T815PCOQ\25526 <mr.liuyang@126.com>
Date: 星期四, 09 一月 2025 14:04:16 +0800
Subject: [PATCH] Merge branch 'liuyang' into chenluhua

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

diff --git a/SourceCode/Bond/Servo/ServoDlg.h b/SourceCode/Bond/Servo/ServoDlg.h
index 1353deb..df41e4a 100644
--- a/SourceCode/Bond/Servo/ServoDlg.h
+++ b/SourceCode/Bond/Servo/ServoDlg.h
@@ -4,6 +4,8 @@
 
 #pragma once
 #include "ServoGraph.h"
+#include "BlButton.h"
+#include "LogDlg.h"
 
 
 // CServoDlg 对话框
@@ -12,6 +14,12 @@
 // 构造
 public:
 	CServoDlg(CWnd* pParent = NULL);	// 标准构造函数
+
+
+private:
+	void Resize();
+	void UpdateLogBtn();
+
 
 // 对话框数据
 #ifdef AFX_DESIGN_TIME
@@ -22,12 +30,18 @@
 	virtual void DoDataExchange(CDataExchange* pDX);	// DDX/DDV 支持
 
 
+private:
+	BOOL m_bShowLogWnd;
+	CLogDlg* m_pLogDlg;
+
 // 实现
 protected:
 	HICON m_hIcon;
 	CServoGraph* m_pGraph;
 	COLORREF m_crBkgnd;
 	HBRUSH m_hbrBkgnd;
+	CBlButton m_btnLog;
+
 
 	// 生成的消息映射函数
 	virtual BOOL OnInitDialog();
@@ -40,4 +54,10 @@
 	afx_msg void OnBnClickedCancel();
 	afx_msg HBRUSH OnCtlColor(CDC* pDC, CWnd* pWnd, UINT nCtlColor);
 	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);
 };

--
Gitblit v1.9.3