From 592c0397bd5bc333b37b0b762b1bfeedae11f770 Mon Sep 17 00:00:00 2001
From: LAPTOP-T815PCOQ\25526 <mr.liuyang@126.com>
Date: 星期四, 09 一月 2025 19:30:16 +0800
Subject: [PATCH] 1. 添加删除目录的辅助函数 2.添加PLC列表管理 3.进一步完善输出PLC功能
---
SourceCode/Bond/BoounionPLC/BoounionPLCDlg.cpp | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/SourceCode/Bond/BoounionPLC/BoounionPLCDlg.cpp b/SourceCode/Bond/BoounionPLC/BoounionPLCDlg.cpp
index d8fc12f..1c72de5 100644
--- a/SourceCode/Bond/BoounionPLC/BoounionPLCDlg.cpp
+++ b/SourceCode/Bond/BoounionPLC/BoounionPLCDlg.cpp
@@ -123,6 +123,8 @@
m_pActiveView->SetContext(pPlc);
m_pActiveView->SendMessage(WM_NCPAINT, 0, 0);
}
+
+ theApp.m_model.setCurrentPlc(pPlc);
}
}
else if (code == RX_CODE_ALARM_ON) {
@@ -358,6 +360,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;
@@ -447,14 +455,12 @@
m_bShowLogWnd = !m_bShowLogWnd;
if (m_bShowLogWnd) {
- LOGD("显示日志窗口");
m_pPageLogcat->ShowWindow(SW_SHOW);
m_pPageLogcat->SetParent(m_pMainContainer);
m_pMainContainer->SetBottomWnd(m_pPageLogcat, LOG_WND_HEIGHT);
m_pMainContainer->Resize();
}
else {
- LOGD("隐藏日志窗口");
m_pPageLogcat->ShowWindow(SW_HIDE);
m_pPageLogcat->SetParent(this);
m_pMainContainer->SetBottomWnd(nullptr, 0);
@@ -483,11 +489,10 @@
theApp.m_model.addPlc(szName, "192.168.1.188", 1001);
}
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) {
--
Gitblit v1.9.3