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/BoounionPLC/BoounionPLCDlg.h |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/SourceCode/Bond/BoounionPLC/BoounionPLCDlg.h b/SourceCode/Bond/BoounionPLC/BoounionPLCDlg.h
index 286767b..c94fd54 100644
--- a/SourceCode/Bond/BoounionPLC/BoounionPLCDlg.h
+++ b/SourceCode/Bond/BoounionPLC/BoounionPLCDlg.h
@@ -8,6 +8,7 @@
 #include "CMainContainer.h"
 #include "CBaseView.h"
 #include "AlarmPopupDlg.h"
+#include "CPageLogcat.h"
 
 
 // CBoounionPLCDlg 对话框
@@ -22,8 +23,8 @@
 	void Resize();
 	CBaseView* CreatePlcView(CPLC* pPlc);
 	void CloseView(CBaseView* pView);
-	void AlarmOn();
-	void AlarmOff();
+	void AlarmOn(CPLC* pPlc);
+	void AlarmOff(CPLC* pPlc);
 
 private:
 	COLORREF m_crBkgnd;
@@ -33,6 +34,7 @@
 	CPagePlcList* m_pPagePlcList;
 	CMainContainer* m_pMainContainer;
 	CBaseView* m_pActiveView;
+	CPageLogcat* m_pPageLogcat;
 	CAlarmPopupDlg* m_pAlarmWnd;
 
 
@@ -48,6 +50,7 @@
 // 实现
 protected:
 	HICON m_hIcon;
+	BOOL m_bShowLogWnd;
 
 	// 生成的消息映射函数
 	virtual BOOL OnInitDialog();
@@ -62,6 +65,8 @@
 	afx_msg void OnInitMenuPopup(CMenu* pPopupMenu, UINT nIndex, BOOL bSysMenu);
 	afx_msg void OnMenuFileSettings();
 	afx_msg void OnUpdateMenuFileSettings(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 OnMenuHelpAbout();

--
Gitblit v1.9.3