From f6a5e27c91e635ad59d2fd45a52d56c085c7d066 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期二, 26 八月 2025 12:37:22 +0800
Subject: [PATCH] 1.顶部工具条增加按钮"批运行"，用于ControlJob模式调度的运行； 2.CMaster增加startBatch，启动批运动模式； 3.CMaster在兼容原单片Glass调试的情况下，增加startBatch调度，开始实现调度功能。
---
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