From 3e0ceaf4e569ea1f57a14de2f6135d1f1a50d080 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期三, 27 八月 2025 13:47:31 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang
---
SourceCode/Bond/Servo/CGlass.cpp | 185 +++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 181 insertions(+), 4 deletions(-)
diff --git a/SourceCode/Bond/Servo/CGlass.cpp b/SourceCode/Bond/Servo/CGlass.cpp
index a9e88eb..974859c 100644
--- a/SourceCode/Bond/Servo/CGlass.cpp
+++ b/SourceCode/Bond/Servo/CGlass.cpp
@@ -8,6 +8,10 @@
m_pPath = nullptr;
m_type = MaterialsType::G1;
m_pBuddy = nullptr;
+ m_nOriginPort = 0;
+ m_nOriginSlot = 0;
+ m_bScheduledForProcessing = FALSE;
+ m_pProcessJob = nullptr;
}
CGlass::~CGlass()
@@ -66,6 +70,38 @@
return m_strID;
}
+ void CGlass::setOriginPort(int port, int slot)
+ {
+ m_nOriginPort = port;
+ m_nOriginSlot = slot;
+ }
+
+ void CGlass::getOrginPort(int& port, int& slot)
+ {
+ port = m_nOriginPort;
+ slot = m_nOriginSlot;
+ }
+
+ BOOL CGlass::isScheduledForProcessing()
+ {
+ return m_bScheduledForProcessing;
+ }
+
+ void CGlass::setScheduledForProcessing(BOOL bProcessing)
+ {
+ m_bScheduledForProcessing = bProcessing;
+ }
+
+ CProcessJob* CGlass::getProcessJob()
+ {
+ return m_pProcessJob;
+ }
+
+ void CGlass::setProcessJob(CProcessJob* pProcessJob)
+ {
+ m_pProcessJob = pProcessJob;
+ }
+
CPath* CGlass::getPath()
{
return m_pPath;
@@ -103,6 +139,9 @@
Lock();
ar << (int)m_type;
WriteString(ar, m_strID);
+ ar << m_nOriginPort;
+ ar << m_nOriginSlot;
+ ar << m_bScheduledForProcessing;
ar << (ULONGLONG)m_pPath;
if (m_pPath != nullptr) {
m_pPath->serialize(ar);
@@ -123,6 +162,9 @@
ar >> type;
m_type = (MaterialsType)type;
ReadString(ar, m_strID);
+ ar >> m_nOriginPort;
+ ar >> m_nOriginSlot;
+ ar >> m_bScheduledForProcessing;
ar >> ullPath;
if (ullPath != 0) {
m_pPath = new CPath();
@@ -140,6 +182,11 @@
void CGlass::setJobDataS(CJobDataS* pJobDataS)
{
m_jobDataS.copy(pJobDataS);
+ }
+
+ void CGlass::updateJobDataS(CJobDataS* pJobDataS)
+ {
+ m_jobDataS.update(pJobDataS);
}
CJobDataS* CGlass::getJobDataS()
@@ -177,12 +224,13 @@
return m_strBuddyId;
}
- void CGlass::processEnd(unsigned int nEqId, unsigned int nUnit)
+ int CGlass::processEnd(unsigned int nEqId, unsigned int nUnit)
{
CPath* pPath = getPathWithEq(nEqId, nUnit);
- if (pPath != nullptr) {
- pPath->processEnd();
- }
+ if (pPath == nullptr) return -1;
+
+ pPath->processEnd();
+ return 0;
}
BOOL CGlass::isProcessed(unsigned int nEqId, unsigned int nUnit)
@@ -192,4 +240,133 @@
return pPath->isProcessEnd();
}
+
+ int CGlass::setInspResult(unsigned int nEqId, unsigned int nUnit, InspResult result)
+ {
+ CPath* pPath = getPathWithEq(nEqId, nUnit);
+ if (pPath == nullptr) return -1;
+
+ pPath->setInspResult(result);
+ return 0;
+ }
+
+ InspResult CGlass::getInspResult(unsigned int nEqId, unsigned int nUnit)
+ {
+ CPath* pPath = getPathWithEq(nEqId, nUnit);
+ if (pPath == nullptr) return InspResult::NotInspected;
+
+ return pPath->getInspResult();
+ }
+
+ std::string CGlass::getStateText()
+ {
+ switch (m_state)
+ {
+ case SERVO::GlsState::NoState:
+ return "NoState";
+ break;
+ case SERVO::GlsState::Queued:
+ return "Queued";
+ break;
+ case SERVO::GlsState::InProcess:
+ return "InProcess";
+ break;
+ case SERVO::GlsState::Paused:
+ return "Queued";
+ break;
+ case SERVO::GlsState::Completed:
+ return "Queued";
+ break;
+ case SERVO::GlsState::Aborted:
+ return "Aborted";
+ break;
+ case SERVO::GlsState::Failed:
+ return "Failed";
+ break;
+ default:
+ break;
+ }
+
+ return "";
+ }
+
+ bool CGlass::queue() {
+ if (m_state != GlsState::NoState) return false;
+ markQueued();
+ return true;
+ }
+
+ bool CGlass::start() {
+ if (m_state != GlsState::Queued && m_state != GlsState::Paused)
+ return false;
+ if (!m_tStart.has_value()) markStart();
+ m_state = GlsState::InProcess;
+ return true;
+ }
+
+ bool CGlass::pause() {
+ if (m_state != GlsState::InProcess) return false;
+ m_state = GlsState::Paused;
+ return true;
+ }
+
+ bool CGlass::resume() {
+ if (m_state != GlsState::Paused) return false;
+ m_state = GlsState::InProcess;
+ return true;
+ }
+
+ bool CGlass::complete() {
+ if (m_state != GlsState::InProcess && m_state != GlsState::Paused) return false;
+ m_state = GlsState::Completed;
+ markEnd();
+ return true;
+ }
+
+ bool CGlass::abort() {
+ if (m_state == GlsState::Completed || m_state == GlsState::Aborted || m_state == GlsState::Failed)
+ return false;
+ m_state = GlsState::Aborted;
+ markEnd();
+ return true;
+ }
+
+ bool CGlass::fail(std::string reason)
+ {
+ m_failReason = trimCopy(reason);
+ clampString(m_failReason, 128);
+ m_state = GlsState::Failed;
+ markEnd();
+ return true;
+ }
+
+ std::string CGlass::trimCopy(std::string s)
+ {
+ auto notspace = [](int ch) { return !std::isspace(ch); };
+ s.erase(s.begin(), std::find_if(s.begin(), s.end(), notspace));
+ s.erase(std::find_if(s.rbegin(), s.rend(), notspace).base(), s.end());
+ return s;
+ }
+
+ void CGlass::clampString(std::string& s, size_t maxLen)
+ {
+ if (s.size() > maxLen) s.resize(maxLen);
+ }
+
+ // —— 时间戳 & 工具 ——
+ void CGlass::markQueued()
+ {
+ m_state = GlsState::Queued;
+ m_tQueued = std::chrono::system_clock::now();
+ }
+
+ void CGlass::markStart()
+ {
+ m_tStart = std::chrono::system_clock::now();
+ }
+
+ void CGlass::markEnd()
+ {
+ m_tEnd = std::chrono::system_clock::now();
+ }
}
--
Gitblit v1.9.3