From 7b3161e949bb32f91d5cebc9d52147198e360b6b Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期五, 06 六月 2025 09:03:25 +0800
Subject: [PATCH] 1.增加菜单项设置send able等信号，用于模拟测试；
---
SourceCode/Bond/Servo/CPageGraph2.cpp | 18 ++++++++++++++++++
SourceCode/Bond/Servo/resource.h | 0
SourceCode/Bond/Servo/CEquipment.cpp | 9 ++++-----
SourceCode/Bond/Servo/Servo.rc | 0
4 files changed, 22 insertions(+), 5 deletions(-)
diff --git a/SourceCode/Bond/Servo/CEquipment.cpp b/SourceCode/Bond/Servo/CEquipment.cpp
index ad72643..ff6f293 100644
--- a/SourceCode/Bond/Servo/CEquipment.cpp
+++ b/SourceCode/Bond/Servo/CEquipment.cpp
@@ -1148,15 +1148,14 @@
if (m_slot[i].isLock()) continue;
CGlass* pGlass = (CGlass*)m_slot[i].getContext();
if (pGlass == nullptr) continue;
- if(!m_bLinkSignal[i][SIGNAL_UPSTREAM_INLINE]
- || m_bLinkSignal[i][SIGNAL_UPSTREAM_TROUBLE]
- || !m_bLinkSignal[i][SIGNAL_INTERLOCK]
- || !m_bLinkSignal[i][SIGNAL_SEND_ABLE] ) continue;
+ if(!m_bLinkSignal[0][SIGNAL_UPSTREAM_INLINE]
+ || m_bLinkSignal[0][SIGNAL_UPSTREAM_TROUBLE]
+ || !m_bLinkSignal[0][SIGNAL_INTERLOCK]
+ || !m_bLinkSignal[0][SIGNAL_SEND_ABLE] ) continue;
MaterialsType glassType = pGlass->getType();
if (glassType == MaterialsType::G1 && putSlotType == MaterialsType::G2) continue;
if (glassType == MaterialsType::G2 && putSlotType == MaterialsType::G1) continue;
- if (!pGlass->isProcessed(m_nID, 0)) continue;
return &m_slot[i];
}
diff --git a/SourceCode/Bond/Servo/CPageGraph2.cpp b/SourceCode/Bond/Servo/CPageGraph2.cpp
index d2a356e..c929527 100644
--- a/SourceCode/Bond/Servo/CPageGraph2.cpp
+++ b/SourceCode/Bond/Servo/CPageGraph2.cpp
@@ -264,6 +264,24 @@
}
else if (nCmd == ID_EQSGRAPHITEM_TEST4) {
SERVO::CEquipment* pEquipment = (SERVO::CEquipment*)pItem->pData;
+ if (pEquipment != nullptr) {
+ pEquipment->setLinkSignal(0, SIGNAL_UPSTREAM_INLINE, TRUE);
+ pEquipment->setLinkSignal(0, SIGNAL_UPSTREAM_TROUBLE, FALSE);
+ pEquipment->setLinkSignal(0, SIGNAL_INTERLOCK, TRUE);
+ pEquipment->setLinkSignal(0, SIGNAL_SEND_ABLE, TRUE);
+ }
+ }
+ else if (nCmd == ID_EQSGRAPHITEM_TEST5) {
+ SERVO::CEquipment* pEquipment = (SERVO::CEquipment*)pItem->pData;
+ if (pEquipment != nullptr) {
+ pEquipment->setLinkSignal(0, SIGNAL_UPSTREAM_INLINE, TRUE);
+ pEquipment->setLinkSignal(0, SIGNAL_UPSTREAM_TROUBLE, TRUE);
+ pEquipment->setLinkSignal(0, SIGNAL_INTERLOCK, TRUE);
+ pEquipment->setLinkSignal(0, SIGNAL_SEND_ABLE, FALSE);
+ }
+ }
+ else if (nCmd == ID_EQSGRAPHITEM_TEST6) {
+ SERVO::CEquipment* pEquipment = (SERVO::CEquipment*)pItem->pData;
// 娴嬭瘯涓嬪彂Cim Message
diff --git a/SourceCode/Bond/Servo/Servo.rc b/SourceCode/Bond/Servo/Servo.rc
index a333b5f..2f13140 100644
--- a/SourceCode/Bond/Servo/Servo.rc
+++ b/SourceCode/Bond/Servo/Servo.rc
Binary files differ
diff --git a/SourceCode/Bond/Servo/resource.h b/SourceCode/Bond/Servo/resource.h
index 8e4c2de..8baf4d6 100644
--- a/SourceCode/Bond/Servo/resource.h
+++ b/SourceCode/Bond/Servo/resource.h
Binary files differ
--
Gitblit v1.9.3