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/SGMeasurement/Logger.cpp | 84 +++++++++++++++++++++---------------------
1 files changed, 42 insertions(+), 42 deletions(-)
diff --git a/SourceCode/Bond/SGMeasurement/Logger.cpp b/SourceCode/Bond/SGMeasurement/Logger.cpp
index 1908277..ecc94fd 100644
--- a/SourceCode/Bond/SGMeasurement/Logger.cpp
+++ b/SourceCode/Bond/SGMeasurement/Logger.cpp
@@ -1,10 +1,10 @@
-#include "pch.h"
+锘�#include "pch.h"
#include "Logger.h"
CLogger& CLogger::Instance()
{
- static CLogger instance;
- return instance;
+ static CLogger instance;
+ return instance;
}
CLogger::CLogger()
@@ -14,66 +14,66 @@
CLogger::~CLogger()
{
- CloseLogFile();
+ CloseLogFile();
}
void CLogger::OpenLogFile()
{
- CSingleLock lock(&m_csLogLock, TRUE);
+ CSingleLock lock(&m_csLogLock, TRUE);
- CTime now = CTime::GetCurrentTime();
- CString strLogDir = _T("Log");
+ CTime now = CTime::GetCurrentTime();
+ CString strLogDir = _T("Log");
- if (!PathFileExists(strLogDir)) {
- CreateDirectory(strLogDir, NULL);
- }
+ if (!PathFileExists(strLogDir)) {
+ CreateDirectory(strLogDir, NULL);
+ }
- CString strNewPath;
- strNewPath.Format(_T("%s\\SG_%04d%02d%02d.log"), strLogDir, now.GetYear(), now.GetMonth(), now.GetDay());
+ CString strNewPath;
+ strNewPath.Format(_T("%s\\SG_%04d%02d%02d.log"), strLogDir, now.GetYear(), now.GetMonth(), now.GetDay());
- if (m_strCurrentLogPath.CompareNoCase(strNewPath) != 0 || m_logFile.m_pStream == nullptr) {
- if (m_logFile.m_pStream) {
- m_logFile.Flush();
- m_logFile.Close();
- }
+ if (m_strCurrentLogPath.CompareNoCase(strNewPath) != 0 || m_logFile.m_pStream == nullptr) {
+ if (m_logFile.m_pStream) {
+ m_logFile.Flush();
+ m_logFile.Close();
+ }
- if (m_logFile.Open(strNewPath,
- CFile::modeCreate | CFile::modeNoTruncate | CFile::modeWrite | CFile::typeBinary)) {
+ if (m_logFile.Open(strNewPath,
+ CFile::modeCreate | CFile::modeNoTruncate | CFile::modeWrite | CFile::typeBinary)) {
- if (m_logFile.GetLength() == 0) {
- WCHAR bom = 0xFEFF;
- m_logFile.Write(&bom, sizeof(WCHAR));
- }
+ if (m_logFile.GetLength() == 0) {
+ WCHAR bom = 0xFEFF;
+ m_logFile.Write(&bom, sizeof(WCHAR));
+ }
- m_logFile.SeekToEnd();
- m_strCurrentLogPath = strNewPath;
- }
- }
+ m_logFile.SeekToEnd();
+ m_strCurrentLogPath = strNewPath;
+ }
+ }
}
void CLogger::WriteLine(CString str)
{
- CSingleLock lock(&m_csLogLock, TRUE);
+ CSingleLock lock(&m_csLogLock, TRUE);
- OpenLogFile();
+ OpenLogFile();
- if (m_logFile.m_pStream) {
- CTime now = CTime::GetCurrentTime();
- CString strTime;
- strTime.Format(_T("[%02d:%02d:%02d]"), now.GetHour(), now.GetMinute(), now.GetSecond());
+ if (m_logFile.m_pStream) {
+ CTime now = CTime::GetCurrentTime();
+ CString strTime;
+ strTime.Format(_T("[%02d:%02d:%02d]"), now.GetHour(), now.GetMinute(), now.GetSecond());
- CString strLine = strTime + str + _T("\r\n");
- m_logFile.Write((LPCTSTR)strLine, strLine.GetLength() * sizeof(WCHAR));
- }
+ CString strLine = strTime + str + _T("\r\n");
+ m_logFile.Write((LPCTSTR)strLine, strLine.GetLength() * sizeof(WCHAR));
+ }
}
void CLogger::CloseLogFile()
{
- CSingleLock lock(&m_csLogLock, TRUE);
+ CSingleLock lock(&m_csLogLock, TRUE);
- if (m_logFile.m_pStream) {
- m_logFile.Flush();
- m_logFile.Close();
- m_strCurrentLogPath.Empty();
- }
+ if (m_logFile.m_pStream) {
+ m_logFile.Flush();
+ m_logFile.Close();
+ m_strCurrentLogPath.Empty();
+ }
}
\ No newline at end of file
--
Gitblit v1.9.3