From f0928d2abc4f3b5875d27b1beeb393cf5edf8c4a Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期一, 24 三月 2025 15:30:38 +0800
Subject: [PATCH] 1.Master数据的缓存，主动关闭程序，或程序闪退，可重启还原。
---
SourceCode/Bond/Servo/CLoadPort.cpp | 54 +++++++++++++++++-------------------------------------
1 files changed, 17 insertions(+), 37 deletions(-)
diff --git a/SourceCode/Bond/Servo/CLoadPort.cpp b/SourceCode/Bond/Servo/CLoadPort.cpp
index 5b54636..b881e5a 100644
--- a/SourceCode/Bond/Servo/CLoadPort.cpp
+++ b/SourceCode/Bond/Servo/CLoadPort.cpp
@@ -52,58 +52,38 @@
void CLoadPort::getAttributeVector(CAttributeVector& attrubutes)
{
__super::getAttributeVector(attrubutes);
-
- for (auto item : m_inputPins) {
- attrubutes.addAttribute(new CAttribute(item->getName().c_str(),
- std::to_string((int)item->getType()).c_str(), ""));
- }
-
- for (auto item : m_outputPins) {
- attrubutes.addAttribute(new CAttribute(item->getName().c_str(),
- std::to_string((int)item->getType()).c_str(), ""));
- }
-
- for (auto item : m_panelList) {
- attrubutes.addAttribute(new CAttribute("Panel",
- item->getID().c_str(), ""));
- }
}
- void CLoadPort::outputPanel()
+ int CLoadPort::recvIntent(CPin* pPin, CIntent* pIntent)
{
- CPin* pOutPin = getPin("Out");
+ return __super::recvIntent(pPin, pIntent);
+ }
-
+ int CLoadPort::outputGlass(int port)
+ {
// 如果列表中没有Panel,模拟生成10张
- if (m_panelList.empty()) {
+ if (m_glassList.empty()) {
static int ii = 0;
char szBuffer[64];
LOGI("<CLoadPort>模拟生成10张PANEL");
for (int i = 0; i < 10; i++) {
sprintf_s(szBuffer, "P20250320A1A%d", ++ii);
- CPanel* pPanel = new CPanel();
- pPanel->setID(szBuffer);
- addPanelToList(pPanel);
+ CGlass* pGlass = new CGlass();
+ pGlass->setID(szBuffer);
+ addGlassToList(pGlass);
}
}
+ return __super::outputGlass(port);
+ }
- // 模拟取出第一张Panel,传送到下一环节
- Lock();
- CPanel* pContext = m_panelList.front();
- pContext->addRef();
-
- CIntent intent(FLOW_MOVE_MATERIAL, "", pContext);
- int nRet = pOutPin->sendIntent(&intent);
- if (nRet == FLOW_REJECT) {
- AfxMessageBox("对方拒绝接受");
- }
- else if (nRet == FLOW_ACCEPT) {
- m_panelList.pop_front();
- pContext->release(); // 添加到列队时addRef, 取出时release
+ BOOL CLoadPort::glassWillArrive(CGlass* pGlass)
+ {
+ BOOL bRet = __super::glassWillArrive(pGlass);
+ if (!bRet) {
+ return FALSE;
}
- pContext->release();
- Unlock();
+ return (m_glassList.size() < 8);
}
}
--
Gitblit v1.9.3