From 6dc80508b1c0f431007f8a8c947c152ec00c3d15 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期一, 08 九月 2025 09:24:05 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang
---
SourceCode/Bond/Servo/ServoDlg.h | 67 ++++++++++++++++++---------------
1 files changed, 36 insertions(+), 31 deletions(-)
diff --git a/SourceCode/Bond/Servo/ServoDlg.h b/SourceCode/Bond/Servo/ServoDlg.h
index b3f4cca..b8f6748 100644
--- a/SourceCode/Bond/Servo/ServoDlg.h
+++ b/SourceCode/Bond/Servo/ServoDlg.h
@@ -3,17 +3,22 @@
//
#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"
-
-enum DeviceStatus {
- ONLINE, // 在线
- OFFLINE, // 离线
-};
// CServoDlg 对话框
class CServoDlg : public CDialogEx
@@ -29,20 +34,21 @@
private:
void InitRxWindows();
void Resize();
- void UpdateLogBtn();
- void UpdateAlarmBtn();
- void UpdateRobotPosition(float percentage);
- void RotateRobot(float angleInDegrees);
- void UpdateDeviceStatus(int id, DeviceStatus status);
-
+ void ShowChildPage(int index);
+ void UpdateLoginStatus();
+ CString& GetRuntimeFormatText(CString& strText, const char* pszSuffix);
private:
IObserver* m_pObserver;
- BOOL m_bShowLogWnd;
- BOOL m_bShowAlarmWnd;
- CLogDlg* m_pLogDlg;
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
@@ -53,19 +59,16 @@
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV 支持
-private:
- BOOL m_bIsRobotMoving;
-
// 实现
protected:
HICON m_hIcon;
- CServoGraph* m_pGraph;
COLORREF m_crBkgnd;
HBRUSH m_hbrBkgnd;
- CBlButton m_btnLog;
- CBlButton m_btnAlarm;
+ CTopToolbar* m_pTopToolbar;
CPanelMaster* m_pPanelMaster;
-
+ CPanelEquipment* m_pPanelEquipment;
+ CPanelAttributes* m_pPanelAttributes;
+ CMyStatusbar* m_pMyStatusbar;
// 生成的消息映射函数
virtual BOOL OnInitDialog();
@@ -78,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);
@@ -89,14 +90,18 @@
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 OnMenuHelpAbout();
afx_msg void OnTimer(UINT_PTR nIDEvent);
- afx_msg BOOL OnEraseBkgnd(CDC* pDC);
- afx_msg void OnBnClickedButtonAlarm();
- afx_msg void OnGraphItemClicked(NMHDR* pNMHDR, LRESULT* pResult);
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