From 690bbf01bc579aff0ca31b2f326c7a6b5d83604d Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期四, 05 六月 2025 10:51:13 +0800
Subject: [PATCH] 1.Slot的部分数据不需要存储，否则影响代码修改Slot布局等信息； 2.Bonder Porcess完成后，合成两片一起搬送的逻辑问题；
---
SourceCode/Bond/Servo/CGlass.cpp | 118 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 115 insertions(+), 3 deletions(-)
diff --git a/SourceCode/Bond/Servo/CGlass.cpp b/SourceCode/Bond/Servo/CGlass.cpp
index a21bd7b..029f39f 100644
--- a/SourceCode/Bond/Servo/CGlass.cpp
+++ b/SourceCode/Bond/Servo/CGlass.cpp
@@ -6,9 +6,16 @@
CGlass::CGlass()
{
m_pPath = nullptr;
+ m_type = MaterialsType::G1;
+ m_pBuddy = nullptr;
}
CGlass::~CGlass()
+ {
+
+ }
+
+ void CGlass::reset()
{
CPath* pPath = m_pPath;
while (pPath != nullptr) {
@@ -17,6 +24,10 @@
pPath = pTemp;
}
m_pPath = nullptr;
+
+ if (m_pBuddy != nullptr) {
+ m_pBuddy->release();
+ }
}
std::string& CGlass::getClassName()
@@ -33,6 +44,16 @@
strText += "]";
return strText;
+ }
+
+ MaterialsType CGlass::getType()
+ {
+ return m_type;
+ }
+
+ void CGlass::setType(MaterialsType type)
+ {
+ m_type = type;
}
void CGlass::setID(const char* pszID)
@@ -63,6 +84,20 @@
return m_pPath;
}
+ CPath* CGlass::getPathWithSiteId(unsigned int nSiteId)
+ {
+ CPath* pTemp = m_pPath;
+ while (pTemp != nullptr) {
+ if (pTemp->getSiteID() == nSiteId) {
+ return pTemp;
+ }
+
+ pTemp = pTemp->getNext();
+ }
+
+ return nullptr;
+ }
+
void CGlass::addPath(unsigned int nSiteId)
{
CPath* pPath = new CPath(nSiteId);
@@ -79,25 +114,102 @@
if (ar.IsStoring())
{
Lock();
+ ar << (int)m_type;
WriteString(ar, m_strID);
ar << (ULONGLONG)m_pPath;
if (m_pPath != nullptr) {
m_pPath->serialize(ar);
}
+ char temp[JOBDATAS_SIZE] = { 0 };
+ m_jobDataB.serialize(temp, JOBDATAB_SIZE);
+ ar.Write(temp, JOBDATAB_SIZE);
+ m_jobDataS.serialize(temp, JOBDATAS_SIZE);
+ ar.Write(temp, JOBDATAS_SIZE);
+ ar << (ULONGLONG)m_pBuddy;
+ WriteString(ar, m_strBuddyId);
Unlock();
}
else
{
- Lock();
- ReadString(ar, m_strID);
ULONGLONG ullPath;
+ int type;
+
+ Lock();
+ ar >> type;
+ m_type = (MaterialsType)type;
+ ReadString(ar, m_strID);
ar >> ullPath;
if (ullPath != 0) {
m_pPath = new CPath();
m_pPath->serialize(ar);
}
-
+ char temp[JOBDATAS_SIZE];
+ ar.Read(temp, JOBDATAB_SIZE);
+ m_jobDataB.unserialize(temp, JOBDATAB_SIZE);
+ ar.Read(temp, JOBDATAS_SIZE);
+ m_jobDataS.unserialize(temp, JOBDATAS_SIZE);
+ ar >> ullPath; // 这是m_pBuddy, 用不上
+ ReadString(ar, m_strBuddyId);
Unlock();
}
}
+
+ void CGlass::setJobDataB(CJobDataB* pJobDataB)
+ {
+ m_jobDataB.copy(pJobDataB);
+ }
+
+ CJobDataB* CGlass::getJobDataB()
+ {
+ return &m_jobDataB;
+ }
+
+ void CGlass::setJobDataS(CJobDataS* pJobDataS)
+ {
+ m_jobDataS.copy(pJobDataS);
+ }
+
+ CJobDataS* CGlass::getJobDataS()
+ {
+ return &m_jobDataS;
+ }
+
+ BOOL CGlass::setBuddy(CGlass* pGlass)
+ {
+ 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_strBuddyId = m_pBuddy->getID();
+
+ return TRUE;
+ }
+
+ CGlass* CGlass::getBuddy()
+ {
+ return m_pBuddy;
+ }
+
+ std::string& CGlass::getBuddyId()
+ {
+ return m_strBuddyId;
+ }
+
+ void CGlass::processEnd(unsigned int nSiteId)
+ {
+ CPath* pPath = getPathWithSiteID(nSiteId);
+ if (pPath != nullptr) {
+ pPath->processEnd();
+ }
+ }
+
+ BOOL CGlass::isProcessed(unsigned int nSiteId)
+ {
+ CPath* pPath = getPathWithSiteID(nSiteId);
+ if (pPath == nullptr) return FALSE;
+
+ return pPath->isProcessEnd();
+ }
}
--
Gitblit v1.9.3