From 2af991c1c72211b3b6b7fda703846bc017bc1908 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期一, 10 三月 2025 11:25:33 +0800
Subject: [PATCH] 1.修复上一次合并代码遗留问题；
---
SourceCode/Bond/Servo/ServoDlg.h | 28 +++++++++++++++++++++++++++-
1 files changed, 27 insertions(+), 1 deletions(-)
diff --git a/SourceCode/Bond/Servo/ServoDlg.h b/SourceCode/Bond/Servo/ServoDlg.h
index 2681c75..39ae6d7 100644
--- a/SourceCode/Bond/Servo/ServoDlg.h
+++ b/SourceCode/Bond/Servo/ServoDlg.h
@@ -6,8 +6,17 @@
#include "ServoGraph.h"
#include "BlButton.h"
#include "LogDlg.h"
+#include "AlarmDlg.h"
#include "TerminalDisplayDlg.h"
+#include "CPanelMaster.h"
+#include "CPanelEquipment.h"
+#include "CPanelAttributes.h"
+
+enum DeviceStatus {
+ ONLINE, // 在线
+ OFFLINE, // 离线
+};
// CServoDlg 对话框
class CServoDlg : public CDialogEx
@@ -24,12 +33,18 @@
void InitRxWindows();
void Resize();
void UpdateLogBtn();
+ void UpdateAlarmBtn();
+ void UpdateRobotPosition(float percentage);
+ void RotateRobot(float angleInDegrees);
+ void UpdateDeviceStatus(int id, DeviceStatus status);
private:
IObserver* m_pObserver;
BOOL m_bShowLogWnd;
+ BOOL m_bShowAlarmWnd;
CLogDlg* m_pLogDlg;
+ CAlarmDlg* m_pAlarmDlg;
CTerminalDisplayDlg* m_pTerminalDisplayDlg;
@@ -42,6 +57,9 @@
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV 支持
+private:
+ BOOL m_bIsRobotMoving;
+
// 实现
protected:
HICON m_hIcon;
@@ -49,7 +67,10 @@
COLORREF m_crBkgnd;
HBRUSH m_hbrBkgnd;
CBlButton m_btnLog;
-
+ CBlButton m_btnAlarm;
+ CPanelMaster* m_pPanelMaster;
+ CPanelEquipment* m_pPanelEquipment;
+ CPanelAttributes* m_pPanelAttributes;
// 生成的消息映射函数
virtual BOOL OnInitDialog();
@@ -66,6 +87,7 @@
afx_msg void OnSize(UINT nType, int cx, int cy);
afx_msg void OnClose();
afx_msg LRESULT OnLogDlgHide(WPARAM wParam, LPARAM lParam);
+ afx_msg LRESULT OnAlarmDlgHide(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);
@@ -79,4 +101,8 @@
afx_msg void OnUpdateMenuFileExit(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);
};
--
Gitblit v1.9.3