From c6bfb4fc0801c4cb1f9dd2128df5f20d2e9cf27d Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期一, 13 一月 2025 11:33:36 +0800
Subject: [PATCH] 1.PLC名字显示，按钮边框等；
---
SourceCode/Bond/BoounionPLC/BoounionPLCDlg.cpp | 157 ++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 139 insertions(+), 18 deletions(-)
diff --git a/SourceCode/Bond/BoounionPLC/BoounionPLCDlg.cpp b/SourceCode/Bond/BoounionPLC/BoounionPLCDlg.cpp
index dbd2ea0..70c30d3 100644
--- a/SourceCode/Bond/BoounionPLC/BoounionPLCDlg.cpp
+++ b/SourceCode/Bond/BoounionPLC/BoounionPLCDlg.cpp
@@ -8,11 +8,22 @@
#include "afxdialogex.h"
#include "Common.h"
#include "PlcView.h"
+#include "Log.h"
+#include "InputDialog.h"
+#include "AxisManager.h"
+#include "IOManager.h"
+
+// 测试
+#include "AxisSettingsDlg.h"
+#include "IOMonitoringDlg.h"
+
#ifdef _DEBUG
#define new DEBUG_NEW
#endif
+
+#define LOG_WND_HEIGHT 258
// 用于应用程序“关于”菜单项的 CAboutDlg 对话框
@@ -60,6 +71,8 @@
m_crBkgnd = APP_MAIN_DLG_BACKGROUND;
m_hbrBkgnd = nullptr;
m_pActiveView = nullptr;
+ m_pPageLogcat = nullptr;
+ m_bShowLogWnd = TRUE;
}
void CBoounionPLCDlg::DoDataExchange(CDataExchange* pDX)
@@ -78,6 +91,8 @@
ON_UPDATE_COMMAND_UI(ID_MENU_FILE_EXIT, &CBoounionPLCDlg::OnUpdateMenuFileExit)
ON_COMMAND(ID_MENU_FILE_SETTINGS, &CBoounionPLCDlg::OnMenuFileSettings)
ON_UPDATE_COMMAND_UI(ID_MENU_FILE_SETTINGS, &CBoounionPLCDlg::OnUpdateMenuFileSettings)
+ ON_COMMAND(ID_MENU_WND_LOG, &CBoounionPLCDlg::OnMenuWndLog)
+ ON_UPDATE_COMMAND_UI(ID_MENU_WND_LOG, &CBoounionPLCDlg::OnUpdateMenuWndLog)
ON_COMMAND(ID_MENU_HELP_ABOUT, &CBoounionPLCDlg::OnMenuHelpAbout)
ON_WM_INITMENUPOPUP()
ON_MESSAGE(ID_MSG_TOOLBAR_BTN_CLICKED, &CBoounionPLCDlg::OnToolbarBtnClicked)
@@ -104,18 +119,43 @@
if (RX_CODE_SELECT_PLC == code) {
CPLC* pPlc;
if (pAny->getPtrValue("ptr", (void*&)pPlc)) {
- ASSERT(m_pMainContainer != nullptr);
- if (m_pActiveView == nullptr) {
- m_pActiveView = (CPlcView*)CreatePlcView(pPlc);
+ if (pPlc != nullptr) {
+ ASSERT(m_pMainContainer != nullptr);
+ if (m_pActiveView == nullptr) {
+ m_pActiveView = (CPlcView*)CreatePlcView(pPlc);
+ }
+ ASSERT(m_pActiveView);
+ if (m_pActiveView->GetContext() != (void*)pPlc) {
+ CString strTitle;
+ strTitle.Format(_T("%s[%s:%d]"), pPlc->getName().c_str(), pPlc->getIp().c_str(),
+ pPlc->getPort());
+ m_pActiveView->SetWindowText(strTitle);
+ m_pActiveView->SetContext(pPlc);
+ m_pActiveView->SendMessage(WM_NCPAINT, 0, 0);
+ }
+ } else {
+ CloseView(m_pActiveView);
}
- ASSERT(m_pActiveView);
- if (m_pActiveView->GetContext() != (void*)pPlc) {
- m_pActiveView->SetWindowText(pPlc->getName().c_str());
- m_pActiveView->SetContext(pPlc);
- }
+
+ theApp.m_model.setCurrentPlc(pPlc);
}
}
-
+ else if (code == RX_CODE_ALARM_ON) {
+ CPLC* pPlc;
+ if (pAny->getPtrValue("ptr", (void*&)pPlc) && pPlc == theApp.m_model.getCurrentPlc()) {
+ AlarmOn(pPlc);
+ CAlarmMonitor* pComponent = (CAlarmMonitor*)pPlc->getComponent(ALARM_MONITOR);
+ m_pTopToolbar->GetBtn(IDC_BUTTON_ALARM)->EnableWindow(pComponent->isAlarming());
+ }
+ }
+ else if (code == RX_CODE_ALARM_OFF) {
+ CPLC* pPlc;
+ if (pAny->getPtrValue("ptr", (void*&)pPlc) && pPlc == theApp.m_model.getCurrentPlc()) {
+ AlarmOff(pPlc);
+ CAlarmMonitor* pComponent = (CAlarmMonitor*)pPlc->getComponent(ALARM_MONITOR);
+ m_pTopToolbar->GetBtn(IDC_BUTTON_ALARM)->EnableWindow(pComponent->isAlarming());
+ }
+ }
pAny->release();
}, [&]() -> void {
// onComplete
@@ -163,6 +203,7 @@
// toolbar
m_pTopToolbar = new CTopToolbar();
m_pTopToolbar->Create(IDD_TOP_TOOLBAR, this);
+ m_pTopToolbar->GetBtn(IDC_BUTTON_ALARM)->EnableWindow(FALSE);
m_pTopToolbar->ShowWindow(SW_SHOW);
HMENU hMenu = m_pTopToolbar->GetOperatorMenu();
ASSERT(hMenu);
@@ -179,6 +220,13 @@
m_pMainContainer = new CMainContainer();
m_pMainContainer->Create(IDD_MAIN_CONTAINER, this);
m_pMainContainer->ShowWindow(SW_SHOW);
+
+
+ // 日志
+ m_pPageLogcat = new CPageLogcat();
+ m_pPageLogcat->Create(IDD_PAGE_LOGCAT, m_pMainContainer);
+ m_pPageLogcat->ShowWindow(SW_SHOW);
+ m_pMainContainer->SetBottomWnd(m_pPageLogcat, LOG_WND_HEIGHT);
// 菜单
@@ -331,6 +379,12 @@
m_pPagePlcList = nullptr;
}
+ if (m_pPageLogcat != nullptr) {
+ m_pPageLogcat->DestroyWindow();
+ delete m_pPageLogcat;
+ m_pPageLogcat = nullptr;
+ }
+
if (m_pMainContainer != nullptr) {
m_pMainContainer->DestroyWindow();
delete m_pMainContainer;
@@ -415,6 +469,29 @@
pCmdUI->Enable(TRUE);
}
+void CBoounionPLCDlg::OnMenuWndLog()
+{
+ m_bShowLogWnd = !m_bShowLogWnd;
+
+ if (m_bShowLogWnd) {
+ m_pPageLogcat->ShowWindow(SW_SHOW);
+ m_pPageLogcat->SetParent(m_pMainContainer);
+ m_pMainContainer->SetBottomWnd(m_pPageLogcat, LOG_WND_HEIGHT);
+ m_pMainContainer->Resize();
+ }
+ else {
+ m_pPageLogcat->ShowWindow(SW_HIDE);
+ m_pPageLogcat->SetParent(this);
+ m_pMainContainer->SetBottomWnd(nullptr, 0);
+ m_pMainContainer->Resize();
+ }
+}
+
+void CBoounionPLCDlg::OnUpdateMenuWndLog(CCmdUI* pCmdUI)
+{
+ pCmdUI->SetCheck(m_bShowLogWnd);
+}
+
void CBoounionPLCDlg::OnMenuHelpAbout()
{
CAboutDlg dlgAbout;
@@ -425,20 +502,42 @@
{
int id = (int)lParam;
if (id == IDC_BUTTON_ADD) {
- static int i = 0;
- char szName[256];
- sprintf_s(szName, 256, "PLC%d", ++i);
- theApp.m_model.addPlc(szName, "192.168.1.188", 1001);
+ CInputDialog inputDialog(_T("新建设备"), _T("请输入设备名称："));
+ if (inputDialog.DoModal() != IDOK) {
+ AfxMessageBox(_T("取消验证！"));
+ return 0;
+ }
+
+ CString strName;
+ strName = inputDialog.GetInputText();
+ if (!strName.IsEmpty()) {
+ theApp.m_model.addPlc((LPTSTR)(LPCTSTR)strName, "192.168.1.188", 1001);
+
+ // 新建轴文件
+ AxisManager axisManager;
+ axisManager.SaveAxis((LPTSTR)(LPCTSTR)strName);
+
+ // 新建IO文件
+ IOManager ioManager;
+ ioManager.SaveToFile((LPTSTR)(LPCTSTR)strName);
+ }
}
else if (id == IDC_BUTTON_DELETE) {
- static int i = 0;
- i += 1;
- char szName[256];
- sprintf_s(szName, 256, "PLC%d", i);
- theApp.m_model.removePlc(szName);
+ CPLC* pPlc = theApp.m_model.getCurrentPlc();
+ if (pPlc != nullptr) {
+ theApp.m_model.removePlc(pPlc->getName().c_str());
+ }
}
else if (id == IDC_BUTTON_SETTINGS) {
+ // 测试 IO模块
+ CPLC* pPLC = theApp.m_model.getCurrentPlc();
+ if (pPLC != nullptr) {
+ //CIOMonitoringDlg dlg;
+ //dlg.DoModal();
+ CAxisSettingsDlg dlg;
+ dlg.DoModal();
+ }
}
else if (id == IDC_BUTTON_OPERATOR) {
/*
@@ -554,3 +653,25 @@
m_pActiveView = nullptr;
m_pMainContainer->Resize();
}
+
+void CBoounionPLCDlg::AlarmOn(CPLC* pPlc)
+{
+ if (m_pAlarmWnd == nullptr) {
+ m_pAlarmWnd = new CAlarmPopupDlg();
+ m_pAlarmWnd->SetPLC(pPlc);
+ m_pAlarmWnd->Create(IDD_DIALOG_POPUP_ALARM, this);
+ m_pAlarmWnd->CenterWindow();
+ }
+ m_pAlarmWnd->AlarmOn();
+}
+
+void CBoounionPLCDlg::AlarmOff(CPLC* pPlc)
+{
+ if (m_pAlarmWnd == nullptr) {
+ m_pAlarmWnd = new CAlarmPopupDlg();
+ m_pAlarmWnd->SetPLC(pPlc);
+ m_pAlarmWnd->Create(IDD_DIALOG_POPUP_ALARM, this);
+ m_pAlarmWnd->CenterWindow();
+ }
+ m_pAlarmWnd->AlarmOff();
+}
--
Gitblit v1.9.3