From bea6407b376a4e426f0b120bae569fba6ab867db Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期六, 08 十一月 2025 17:55:47 +0800
Subject: [PATCH] 1.CMaster.cpp 第 1644/1667/1691 行在记录 SV 曲线时通过 getGlassFromSlot(0) 取玻璃，而各设备的 initSlots() 都是从 1 开始编号（例如 CBonder.cpp (line 408)、CVacuumBake.cpp (line 415) 等）。槽位 0 永远不存在，所以 pGlass 始终是 nullptr，pGlass->addSVData(...) 的分支从未执行。结果 SERVO::CGlass::m_svDatas 里没有任何曲线数据，GlassJson::ToPrettyString 生成的 pretty 字符串也就没有 sv_datas，导出 CSV 时自然读不到曲线。 同一段代码还有一个潜在 Bug：虽然判断了 channel - 1 < bonderTypes.size()，但真正索引却用的是 bonderTypes[channel]。索引偏移会导致数据类型错位，最后一个通道甚至可能越界。即使修正了槽位，这里也需要同步改成 bonderTypes[channel - 1]（另外两处 vacuumbakeTypes、coolingTypes 也一样）。
---
SourceCode/Bond/Servo/CCollectionEvent.cpp | 63 +++++++++++++++++++++++++++++++
1 files changed, 63 insertions(+), 0 deletions(-)
diff --git a/SourceCode/Bond/Servo/CCollectionEvent.cpp b/SourceCode/Bond/Servo/CCollectionEvent.cpp
index 89095b7..ce5d1a2 100644
--- a/SourceCode/Bond/Servo/CCollectionEvent.cpp
+++ b/SourceCode/Bond/Servo/CCollectionEvent.cpp
@@ -8,6 +8,16 @@
m_nCEID = 0;
}
+ CCollectionEvent::CCollectionEvent(unsigned int id, const char* pszName, const char* pszDescription, std::vector<unsigned int>& prtids)
+ {
+ m_nCEID = id;
+ m_strName = pszName;
+ m_strDescription = pszDescription;
+ for (auto item : prtids) {
+ m_rptids.push_back(item);
+ }
+ }
+
CCollectionEvent::~CCollectionEvent()
{
@@ -16,6 +26,16 @@
unsigned int CCollectionEvent::getEventId()
{
return m_nCEID;
+ }
+
+ std::string& CCollectionEvent::getName()
+ {
+ return m_strName;
+ }
+
+ std::string& CCollectionEvent::getDescription()
+ {
+ return m_strDescription;
}
BOOL CCollectionEvent::addReport(CReport* pReport)
@@ -27,6 +47,22 @@
m_reports.push_back(pReport);
return TRUE;
+ }
+
+ void CCollectionEvent::setReport(CReport* pReport)
+ {
+ m_rptids.clear();
+ m_reports.clear();
+ if (pReport != nullptr) {
+ m_rptids.push_back(pReport->getReportId());
+ m_reports.push_back(pReport);
+ }
+ }
+
+ unsigned int CCollectionEvent::getFirstPortID()
+ {
+ if (m_reports.empty()) return -1;
+ return m_reports.front()->getReportId();
}
BOOL CCollectionEvent::deleteReport(unsigned int nReportId)
@@ -53,4 +89,31 @@
return nullptr;
}
+
+ CReport* CCollectionEvent::getFirstReport()
+ {
+ if (m_reports.empty()) return nullptr;
+ return m_reports.front();
+ }
+
+ std::vector<CReport*>& CCollectionEvent::getReports()
+ {
+ return m_reports;
+ }
+
+ std::string CCollectionEvent::getReportIdsText()
+ {
+ std::string strResult, strName;
+ for (int i = 0; i < m_rptids.size(); i++) {
+ strResult += std::to_string(m_rptids[i]);// (getReport(m_rptids[i]) ?
+ if (nullptr == getReport(m_rptids[i])) {
+ strResult += "?";
+ }
+ if (i != m_rptids.size() - 1) {
+ strResult += ",";
+ }
+ }
+
+ return strResult;
+ }
}
--
Gitblit v1.9.3