From 8322172ad4e6d5636b8c32b94d95f8abbce1ed54 Mon Sep 17 00:00:00 2001 From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com> Date: 星期五, 28 三月 2025 17:40:59 +0800 Subject: [PATCH] 1.修改CReadStep::onReadSignal信号为多类型,以便适应其它场景(如 Port type,mode)等使用。 --- SourceCode/Bond/BondEq/BondEqDlg.h | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/SourceCode/Bond/BondEq/BondEqDlg.h b/SourceCode/Bond/BondEq/BondEqDlg.h index bcb13fd..19f50e1 100644 --- a/SourceCode/Bond/BondEq/BondEqDlg.h +++ b/SourceCode/Bond/BondEq/BondEqDlg.h @@ -9,6 +9,8 @@ #include "CBaseView.h" #include "CRemoteEqView.h" #include "TopToolbar.h" +#include "CComponentPLCDlg.h" +#include "AlarmPopupDlg.h" // CBondEqDlg 对话框 @@ -22,9 +24,13 @@ void InitRxWindows(); void Resize(); void CloseView(CBaseView* pView); + void CloseView(CComponentDlg* pView); CHomeDialog* CreateHomeDlg(); CBaseView* CreateRemoteEqView(BEQ::IRemoteEquipment* pEquipment); + CComponentPLCDlg* CreateComponentPLCDlg(CComponent* pComponent); void UpdateLoginStatus(); + void AlarmOn(); + void AlarmOff(); private: COLORREF m_crBkgnd; @@ -35,7 +41,8 @@ CPanelProject* m_pPanelProject; CHomeDialog* m_pHomeDialog; CBaseView* m_pActiveView; - + CComponentDlg* m_pActiveComponentDlg; + CAlarmPopupDlg* m_pAlarmWnd; // 对话框数据 #ifdef AFX_DESIGN_TIME -- Gitblit v1.9.3