From 2070871df480a664c9c4e38bc4e4e324682a64c6 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期四, 03 四月 2025 16:12:28 +0800
Subject: [PATCH] 1. 解决 WebView2 控制器创建失败时闪退的问题 2. 解决连接图销毁时保存设备图形数据闪退的问题
---
SourceCode/Bond/Servo/ServoDlg.h | 35 +++++++++++++++++++----------------
1 files changed, 19 insertions(+), 16 deletions(-)
diff --git a/SourceCode/Bond/Servo/ServoDlg.h b/SourceCode/Bond/Servo/ServoDlg.h
index b3f4cca..85d8e85 100644
--- a/SourceCode/Bond/Servo/ServoDlg.h
+++ b/SourceCode/Bond/Servo/ServoDlg.h
@@ -3,17 +3,16 @@
//
#pragma once
-#include "ServoGraph.h"
#include "BlButton.h"
#include "LogDlg.h"
+#include "AlarmDlg.h"
#include "TerminalDisplayDlg.h"
#include "CPanelMaster.h"
+#include "CPanelEquipment.h"
+#include "CPanelAttributes.h"
+#include "CPageGraph1.h"
+#include "CPageGraph2.h"
-
-enum DeviceStatus {
- ONLINE, // 在线
- OFFLINE, // 离线
-};
// CServoDlg 对话框
class CServoDlg : public CDialogEx
@@ -31,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:
@@ -41,7 +38,10 @@
BOOL m_bShowLogWnd;
BOOL m_bShowAlarmWnd;
CLogDlg* m_pLogDlg;
+ CAlarmDlg* m_pAlarmDlg;
CTerminalDisplayDlg* m_pTerminalDisplayDlg;
+ CPageGraph1* m_pPageGraph1;
+ CPageGraph2* m_pPageGraph2;
// 对话框数据
@@ -53,19 +53,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;
CPanelMaster* m_pPanelMaster;
-
+ CPanelEquipment* m_pPanelEquipment;
+ CPanelAttributes* m_pPanelAttributes;
// 生成的消息映射函数
virtual BOOL OnInitDialog();
@@ -82,6 +79,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);
@@ -91,12 +89,17 @@
afx_msg void OnUpdateMenuFileSecsTest(CCmdUI* pCmdUI);
afx_msg void OnMenuWndLog();
afx_msg void OnUpdateMenuWndLog(CCmdUI* pCmdUI);
+ afx_msg void OnMenuWndAlarm();
+ 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