From e42e8364112e97d89eeaecd13f043dff42179949 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期二, 27 五月 2025 17:19:02 +0800
Subject: [PATCH] 1.enum修改为enum class, 理顺CLoadPort各成员变量在调度中的判定作用；

---
 SourceCode/Bond/Servo/ServoDlg.h |   53 +++++++++++++++++++++++++++++++++++++++--------------
 1 files changed, 39 insertions(+), 14 deletions(-)

diff --git a/SourceCode/Bond/Servo/ServoDlg.h b/SourceCode/Bond/Servo/ServoDlg.h
index 3b1cd3b..a281b1c 100644
--- a/SourceCode/Bond/Servo/ServoDlg.h
+++ b/SourceCode/Bond/Servo/ServoDlg.h
@@ -3,9 +3,18 @@
 //
 
 #pragma once
-#include "ServoGraph.h"
 #include "BlButton.h"
-#include "LogDlg.h"
+#include "PageLog.h"
+#include "PageAlarm.h"
+#include "PageRecipe.h"
+#include "TerminalDisplayDlg.h"
+#include "CPanelMaster.h"
+#include "CPanelEquipment.h"
+#include "CPanelAttributes.h"
+#include "CPageGraph1.h"
+#include "CPageGraph2.h"
+#include "TopToolbar.h"
+#include "CMyStatusbar.h"
 
 
 // CServoDlg 对话框
@@ -16,9 +25,23 @@
 	CServoDlg(CWnd* pParent = NULL);	// 标准构造函数
 
 
+public:
+	void ShowTerminalText(const char* pszText, unsigned int duration = -1);
+
 private:
+	void InitRxWindows();
 	void Resize();
-	void UpdateLogBtn();
+	void ShowChildPage(int index);
+	CString& GetRuntimeFormatText(CString& strText, const char* pszSuffix);
+
+private:
+	IObserver* m_pObserver;
+	CTerminalDisplayDlg* m_pTerminalDisplayDlg;
+	CPageGraph1* m_pPageGraph1;
+	CPageGraph2* m_pPageGraph2;
+	CPageRecipe* m_pPageRecipe;
+	CPageAlarm*	 m_pPageAlarm;
+	CPageLog*	 m_pPageLog;
 
 
 // 对话框数据
@@ -30,18 +53,16 @@
 	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;
-
+	CTopToolbar* m_pTopToolbar;
+	CPanelMaster* m_pPanelMaster;
+	CPanelEquipment* m_pPanelEquipment;
+	CPanelAttributes* m_pPanelAttributes;
+	CMyStatusbar* m_pMyStatusbar;
 
 	// 生成的消息映射函数
 	virtual BOOL OnInitDialog();
@@ -54,10 +75,8 @@
 	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);
 	afx_msg void OnInitMenuPopup(CMenu* pPopupMenu, UINT nIndex, BOOL bSysMenu);
@@ -65,9 +84,15 @@
 	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 OnMenuTestMessageSet();
+	afx_msg void OnUpdateMenuTestMessageSet(CCmdUI* pCmdUI);
+	afx_msg void OnMenuTestMessageClear();
+	afx_msg void OnUpdateMenuTestMessageClear(CCmdUI* pCmdUI);
 	afx_msg void OnMenuHelpAbout();
+	afx_msg void OnTimer(UINT_PTR nIDEvent);
+	afx_msg LRESULT OnPanelResize(WPARAM wParam, LPARAM lParam);
+	afx_msg void OnTabSelChanged(NMHDR* nmhdr, LRESULT* result);
+	LRESULT OnToolbarBtnClicked(WPARAM wParam, LPARAM lParam);
 };

--
Gitblit v1.9.3