From 3628a707a38e1c590216c5983c9b97b9c742f86c Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期一, 24 三月 2025 09:01:42 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang
---
SourceCode/Bond/Servo/ServoDlg.h | 25 ++++++++++---------------
1 files changed, 10 insertions(+), 15 deletions(-)
diff --git a/SourceCode/Bond/Servo/ServoDlg.h b/SourceCode/Bond/Servo/ServoDlg.h
index 685acf1..85d8e85 100644
--- a/SourceCode/Bond/Servo/ServoDlg.h
+++ b/SourceCode/Bond/Servo/ServoDlg.h
@@ -3,7 +3,6 @@
//
#pragma once
-#include "ServoGraph.h"
#include "BlButton.h"
#include "LogDlg.h"
#include "AlarmDlg.h"
@@ -11,12 +10,9 @@
#include "CPanelMaster.h"
#include "CPanelEquipment.h"
#include "CPanelAttributes.h"
+#include "CPageGraph1.h"
+#include "CPageGraph2.h"
-
-enum DeviceStatus {
- ONLINE, // 在线
- OFFLINE, // 离线
-};
// CServoDlg 对话框
class CServoDlg : public CDialogEx
@@ -34,9 +30,7 @@
void Resize();
void UpdateLogBtn();
void UpdateAlarmBtn();
- void UpdateRobotPosition(float percentage);
- void RotateRobot(float angleInDegrees);
- void UpdateDeviceStatus(int id, DeviceStatus status);
+ void ShowChildPage(int index);
private:
@@ -46,6 +40,8 @@
CLogDlg* m_pLogDlg;
CAlarmDlg* m_pAlarmDlg;
CTerminalDisplayDlg* m_pTerminalDisplayDlg;
+ CPageGraph1* m_pPageGraph1;
+ CPageGraph2* m_pPageGraph2;
// 对话框数据
@@ -57,13 +53,9 @@
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;
@@ -101,10 +93,13 @@
afx_msg void OnUpdateMenuWndAlarm(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 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);
};
--
Gitblit v1.9.3