From 829fe6c6bc33d53fda9c31fd45a37e1df87befff Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期五, 30 一月 2026 11:16:24 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang
---
SourceCode/Bond/BoounionPLC/Model.cpp | 16 ++++------------
1 files changed, 4 insertions(+), 12 deletions(-)
diff --git a/SourceCode/Bond/BoounionPLC/Model.cpp b/SourceCode/Bond/BoounionPLC/Model.cpp
index 59587a7..051b050 100644
--- a/SourceCode/Bond/BoounionPLC/Model.cpp
+++ b/SourceCode/Bond/BoounionPLC/Model.cpp
@@ -21,6 +21,7 @@
m_pObservableEmitter = nullptr;
m_pObservable = nullptr;
m_nTimerID = 0;
+ m_pActivePlc = nullptr;
}
@@ -337,7 +338,7 @@
pPLC->setWorkDir((LPTSTR)(LPCTSTR)strPlcDir);
PLCListener listener;
listener.onStateChanged = [&](void* pFrom, int state) -> void {
- LOGD("PLC状态改变，%d", state);
+ notifyPtr(RX_PLC_STATE_CHANGED, pFrom);
};
listener.onMonitorData = [&](void* pFrom, int id) -> void {
LOGD("PLConMonitorData，%d", id);
@@ -388,19 +389,10 @@
void CModel::setCurrentPlc(CPLC* pPlc)
{
- if (pPlc != nullptr) {
- m_strCurrPlc = pPlc->getName();
- } else {
- m_strCurrPlc = "";
- }
+ m_pActivePlc = pPlc;
}
CPLC* CModel::getCurrentPlc()
{
- auto item = m_mapPlc.find(m_strCurrPlc);
- if (item != m_mapPlc.end()) {
- return item->second;
- }
-
- return nullptr;
+ return m_pActivePlc;
}
\ No newline at end of file
--
Gitblit v1.9.3