From e693f57ec7079cc8bfee498720b7cf87a67165ed Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期三, 27 八月 2025 18:18:30 +0800
Subject: [PATCH] 1.修复手臂状态显示序号不正确的问题；
---
SourceCode/Bond/Servo/CPath.cpp | 46 ++++++++++++++++++++++++++++++++++++----------
1 files changed, 36 insertions(+), 10 deletions(-)
diff --git a/SourceCode/Bond/Servo/CPath.cpp b/SourceCode/Bond/Servo/CPath.cpp
index 1633b5a..6f71f45 100644
--- a/SourceCode/Bond/Servo/CPath.cpp
+++ b/SourceCode/Bond/Servo/CPath.cpp
@@ -6,22 +6,25 @@
namespace SERVO {
CPath::CPath()
{
- m_nSiteID = 0;
+ m_nEqID = 0;
m_timeOut = 0;
m_timeIn = CToolUnits::getTimestamp();
m_bProcessed = FALSE;
+ m_inspResult = InspResult::NotInspected;
m_pPrev = nullptr;
m_pNext = nullptr;
}
- CPath::CPath(unsigned int nSiteId)
+ CPath::CPath(unsigned int nEqId, unsigned int nUnit)
{
- m_nSiteID = nSiteId;
+ m_nEqID = nEqId;
+ m_nUnit = nUnit;
m_timeOut = 0;
m_timeIn = CToolUnits::getTimestamp();
+ m_bProcessed = FALSE;
+ m_inspResult = InspResult::NotInspected;
m_pPrev = nullptr;
m_pNext = nullptr;
- m_bProcessed = FALSE;
}
CPath::~CPath()
@@ -32,8 +35,10 @@
void CPath::getDescription(std::string& strOut)
{
strOut.clear();
- strOut = "CPath<SiteID:";
- strOut = strOut + std::to_string(m_nSiteID);
+ strOut = "CPath<EqID:";
+ strOut = strOut + std::to_string(m_nEqID);
+ strOut = strOut + ",Unit:";
+ strOut = strOut + std::to_string(m_nUnit);
strOut = strOut + ",InTime:";
strOut = strOut + CToolUnits::timeToString2(m_timeIn);
strOut = strOut + ",OutTime:";
@@ -44,20 +49,26 @@
void CPath::serialize(CArchive& ar)
{
if (ar.IsStoring()) {
- ar << m_nSiteID;
+ ar << m_nEqID;
+ ar << m_nUnit;
ar << m_timeIn;
ar << m_timeOut;
ar << m_bProcessed;
+ ar << (int)m_inspResult;
ar << (ULONGLONG)m_pNext;
if (m_pNext != nullptr) {
m_pNext->serialize(ar);
}
}
else {
- ar >> m_nSiteID;
+ int temp;
+
+ ar >> m_nEqID;
+ ar >> m_nUnit;
ar >> m_timeIn;
ar >> m_timeOut;
ar >> m_bProcessed;
+ ar >> temp; m_inspResult = (InspResult)temp;
ULONGLONG ulNext;
ar >> ulNext;
if ((CPath*)ulNext != nullptr) {
@@ -69,9 +80,14 @@
}
}
- unsigned int CPath::getSiteID()
+ unsigned int CPath::getEqID()
{
- return m_nSiteID;
+ return m_nEqID;
+ }
+
+ unsigned int CPath::getUnit()
+ {
+ return m_nUnit;
}
ULONGLONG CPath::getInTime()
@@ -99,6 +115,16 @@
return m_bProcessed;
}
+ void CPath::setInspResult(InspResult result)
+ {
+ m_inspResult = result;
+ }
+
+ InspResult CPath::getInspResult()
+ {
+ return m_inspResult;
+ }
+
CPath* CPath::getPrev()
{
return m_pPrev;
--
Gitblit v1.9.3