From 8ffc831c6bf37a73961e22efc145be4e8c8f1241 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期四, 19 六月 2025 10:05:07 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang
---
SourceCode/Bond/Servo/CGlass.cpp | 44 +++++++++++++++++++-------------------------
1 files changed, 19 insertions(+), 25 deletions(-)
diff --git a/SourceCode/Bond/Servo/CGlass.cpp b/SourceCode/Bond/Servo/CGlass.cpp
index 029f39f..dc47c5e 100644
--- a/SourceCode/Bond/Servo/CGlass.cpp
+++ b/SourceCode/Bond/Servo/CGlass.cpp
@@ -66,29 +66,16 @@
return m_strID;
}
- CPath* CGlass::getPathWithSiteID(unsigned int nSiteId)
- {
- CPath* pPath = m_pPath;
- while (pPath != nullptr) {
- if (nSiteId == pPath->getSiteID()) {
- return pPath;
- }
- pPath = pPath->getNext();
- }
-
- return nullptr;
- }
-
CPath* CGlass::getPath()
{
return m_pPath;
}
- CPath* CGlass::getPathWithSiteId(unsigned int nSiteId)
+ CPath* CGlass::getPathWithEq(unsigned int nEqId, unsigned int nUnit)
{
CPath* pTemp = m_pPath;
while (pTemp != nullptr) {
- if (pTemp->getSiteID() == nSiteId) {
+ if (pTemp->getEqID() == nEqId && pTemp->getUnit() == nUnit) {
return pTemp;
}
@@ -98,9 +85,9 @@
return nullptr;
}
- void CGlass::addPath(unsigned int nSiteId)
+ void CGlass::addPath(unsigned int nEqId, unsigned int nUnit)
{
- CPath* pPath = new CPath(nSiteId);
+ CPath* pPath = new CPath(nEqId, nUnit);
if (m_pPath == nullptr) {
m_pPath = pPath;
}
@@ -148,7 +135,7 @@
m_jobDataB.unserialize(temp, JOBDATAB_SIZE);
ar.Read(temp, JOBDATAS_SIZE);
m_jobDataS.unserialize(temp, JOBDATAS_SIZE);
- ar >> ullPath; // 这是m_pBuddy, 用不上
+ ar >> ullPath; m_pBuddy = (CGlass*)ullPath;
ReadString(ar, m_strBuddyId);
Unlock();
}
@@ -179,9 +166,16 @@
if (m_pBuddy != nullptr) return FALSE;
if (pGlass->getType() == this->getType()) return FALSE;
m_pBuddy = pGlass;
- if (m_type == MaterialsType::G1) {
- m_pBuddy->addRef();
- }
+ m_pBuddy->addRef();
+ m_strBuddyId = m_pBuddy->getID();
+
+ return TRUE;
+ }
+
+ BOOL CGlass::forceSetBuddy(CGlass* pGlass)
+ {
+ m_pBuddy = pGlass;
+ m_pBuddy->addRef();
m_strBuddyId = m_pBuddy->getID();
return TRUE;
@@ -197,17 +191,17 @@
return m_strBuddyId;
}
- void CGlass::processEnd(unsigned int nSiteId)
+ void CGlass::processEnd(unsigned int nEqId, unsigned int nUnit)
{
- CPath* pPath = getPathWithSiteID(nSiteId);
+ CPath* pPath = getPathWithEq(nEqId, nUnit);
if (pPath != nullptr) {
pPath->processEnd();
}
}
- BOOL CGlass::isProcessed(unsigned int nSiteId)
+ BOOL CGlass::isProcessed(unsigned int nEqId, unsigned int nUnit)
{
- CPath* pPath = getPathWithSiteID(nSiteId);
+ CPath* pPath = getPathWithEq(nEqId, nUnit);
if (pPath == nullptr) return FALSE;
return pPath->isProcessEnd();
--
Gitblit v1.9.3