From e8a27bb203fe2aff70390a5eca002d7438da9b0f Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期三, 22 十月 2025 14:24:34 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang
---
SourceCode/Bond/Servo/ServoDlg.h | 82 +++++++++++++++++++++++++++++-----------
1 files changed, 59 insertions(+), 23 deletions(-)
diff --git a/SourceCode/Bond/Servo/ServoDlg.h b/SourceCode/Bond/Servo/ServoDlg.h
index 3b1cd3b..bdc47a4 100644
--- a/SourceCode/Bond/Servo/ServoDlg.h
+++ b/SourceCode/Bond/Servo/ServoDlg.h
@@ -1,49 +1,76 @@
-
-// ServoDlg.h : 头文件
+锘�
+// ServoDlg.h : 澶存枃浠�
//
#pragma once
-#include "ServoGraph.h"
#include "BlButton.h"
-#include "LogDlg.h"
+#include "PageLog.h"
+#include "PageAlarm.h"
+#include "PageTransferLog.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"
+#include "CRobotTaskDlg.h"
+#include "CPageGlassList.h"
-// CServoDlg 对话框
+// CServoDlg 瀵硅瘽妗�
class CServoDlg : public CDialogEx
{
-// 构造
+// 鏋勯��
public:
- CServoDlg(CWnd* pParent = NULL); // 标准构造函数
+ 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);
+ void UpdateLoginStatus();
+ CString& GetRuntimeFormatText(CString& strText, const char* pszSuffix);
+private:
+ IObserver* m_pObserver;
+ CTerminalDisplayDlg* m_pTerminalDisplayDlg;
+ CRobotTaskDlg* m_pRobotTaskDlg;
+ CPageGraph1* m_pPageGraph1;
+ CPageGraph2* m_pPageGraph2;
+ CPageGlassList* m_pPageGlassList;
+ CPageRecipe* m_pPageRecipe;
+ CPageAlarm* m_pPageAlarm;
+ CPageLog* m_pPageLog;
+ CPageTransferLog* m_pPageTransferLog;
-// 对话框数据
+// 瀵硅瘽妗嗘暟鎹�
#ifdef AFX_DESIGN_TIME
enum { IDD = IDD_SERVO_DIALOG };
#endif
protected:
- virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV 支持
+ 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();
afx_msg void OnSysCommand(UINT nID, LPARAM lParam);
afx_msg void OnPaint();
@@ -54,10 +81,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 +90,20 @@
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 OnMenuProjectVarialbleList();
+ afx_msg void OnUpdateMenuProjectVarialbleList(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 OnMenuToolsClientList();
+ afx_msg void OnUpdateMenuToolsClientList(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);
+ LRESULT OnStatusbarBtnClicked(WPARAM wParam, LPARAM lParam);
};
--
Gitblit v1.9.3