From 253693b8e42a751030051d3d619201dc6f5b12db Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期五, 16 五月 2025 11:14:11 +0800
Subject: [PATCH] 1.CGlassPool实现； 2.CGlass翻译逻辑优化； 3.在Glass列表页，Glass项的显示，增加显示贴合的Glass的id
---
SourceCode/Bond/Servo/CEquipment.cpp | 61 +++++++++++++++++++++++++++++-
1 files changed, 59 insertions(+), 2 deletions(-)
diff --git a/SourceCode/Bond/Servo/CEquipment.cpp b/SourceCode/Bond/Servo/CEquipment.cpp
index cea483e..f7e2424 100644
--- a/SourceCode/Bond/Servo/CEquipment.cpp
+++ b/SourceCode/Bond/Servo/CEquipment.cpp
@@ -3,6 +3,8 @@
#include "ToolUnits.h"
#include <regex>
#include "CArm.h"
+#include "CGlassPool.h"
+#include "Servo.h"
#define CHECK_READ_STEP_SIGNAL(addr, data, size) { \
@@ -311,13 +313,28 @@
Unlock();
}
else {
- Lock();
+ // addGlassToList前不需要上锁，因其内部有锁
int count;
ar >> count;
for (int i = 0; i < count; i++) {
- CGlass* pGlass = new CGlass();
+ CGlass* pGlass = theApp.m_model.m_glassPool.allocaGlass();
pGlass->serialize(ar);
addGlassToList(pGlass);
+ }
+
+ // 梳理各玻璃之间的绑定关系
+ Lock();
+ std::list<CGlass*> list = m_glassList;
+ for (auto item : list) {
+ std::string& strBuddyId = item->getBuddyId();
+ if (!strBuddyId.empty()) {
+ for (auto item2 : m_glassList) {
+ if (strBuddyId.compare(item2->getID()) == 0) {
+ item->setBuddy(item2);
+ TRACE("绑定关系: %s <- %s\n", item->getID().c_str(), item2->getID().c_str());
+ }
+ }
+ }
}
Unlock();
}
@@ -786,6 +803,21 @@
}
}
+ CGlass* CEquipment::getGlassFromList(const char* pszId)
+ {
+ CGlass* pGlass = nullptr;
+ Lock();
+ for (auto item : m_glassList) {
+ if (item->getID().compare(pszId) == 0) {
+ pGlass = item;
+ break;
+ }
+ }
+ Unlock();
+
+ return pGlass;
+ }
+
BOOL CEquipment::removeClass(CGlass* pGlass)
{
Lock();
@@ -853,6 +885,19 @@
return -3;
}
+ // 如果此玻璃已经贴合，贴合的玻璃也要从列表中移除
+ CGlass* pBuddy = pContext->getBuddy();
+ if (pBuddy != nullptr) {
+ for (auto iter = m_glassList.begin(); iter != m_glassList.end(); iter++) {
+ if ((*iter)->getID().compare(pBuddy->getID()) == 0) {
+ (*iter)->release();
+ m_glassList.erase(iter);
+ break;
+ }
+ }
+ }
+
+
((CArm*)m_pArm)->tempStore(pContext);
pContext->release();
Unlock();
@@ -884,6 +929,18 @@
pGlass->release(); // tempFetchOut需要调用一次release
Unlock();
+
+ // 如果此玻璃已经贴合，贴合的玻璃也要从加入到列表中
+ CGlass* pBuddy = pGlass->getBuddy();
+ if (pBuddy != nullptr) {
+ Lock();
+ pBuddy->addPath(m_nID);
+ pBuddy->addRef(); // 加入list,addRef
+ m_glassList.push_back(pBuddy);
+ Unlock();
+ }
+
+
if (m_listener.onDataChanged != nullptr) {
m_listener.onDataChanged(this, 0);
}
--
Gitblit v1.9.3