From 349f26accd28cd83356334239b11728ce50b7f95 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期三, 14 五月 2025 18:10:21 +0800
Subject: [PATCH] 1.重新理顺Glass的流转，CJobDataB, CJobDataS在CEquipment的列表存储等；
---
SourceCode/Bond/Servo/CGlass.cpp | 90 ++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 88 insertions(+), 2 deletions(-)
diff --git a/SourceCode/Bond/Servo/CGlass.cpp b/SourceCode/Bond/Servo/CGlass.cpp
index e9847f9..410868a 100644
--- a/SourceCode/Bond/Servo/CGlass.cpp
+++ b/SourceCode/Bond/Servo/CGlass.cpp
@@ -5,12 +5,19 @@
namespace SERVO {
CGlass::CGlass()
{
-
+ m_pPath = nullptr;
+ m_type = MaterialsType::G1;
}
CGlass::~CGlass()
{
-
+ CPath* pPath = m_pPath;
+ while (pPath != nullptr) {
+ CPath* pTemp = pPath->getNext();
+ delete pPath;
+ pPath = pTemp;
+ }
+ m_pPath = nullptr;
}
std::string& CGlass::getClassName()
@@ -29,6 +36,16 @@
return strText;
}
+ MaterialsType CGlass::getType()
+ {
+ return m_type;
+ }
+
+ void CGlass::setType(MaterialsType type)
+ {
+ m_type = type;
+ }
+
void CGlass::setID(const char* pszID)
{
m_strID = pszID;
@@ -39,19 +56,88 @@
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;
+ }
+
+ void CGlass::addPath(unsigned int nSiteId)
+ {
+ CPath* pPath = new CPath(nSiteId);
+ if (m_pPath == nullptr) {
+ m_pPath = pPath;
+ }
+ else {
+ m_pPath->addPath(pPath);
+ }
+ }
+
void CGlass::serialize(CArchive& ar)
{
if (ar.IsStoring())
{
Lock();
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);
Unlock();
}
else
{
Lock();
ReadString(ar, m_strID);
+ ULONGLONG ullPath;
+ 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);
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;
+ }
}
--
Gitblit v1.9.3