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/BondEq/ToolUnits.cpp |  106 +++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 103 insertions(+), 3 deletions(-)

diff --git a/SourceCode/Bond/BondEq/ToolUnits.cpp b/SourceCode/Bond/BondEq/ToolUnits.cpp
index 69be431..ad4d92e 100644
--- a/SourceCode/Bond/BondEq/ToolUnits.cpp
+++ b/SourceCode/Bond/BondEq/ToolUnits.cpp
@@ -150,12 +150,12 @@
 	return (attributes != INVALID_FILE_ATTRIBUTES && (attributes & FILE_ATTRIBUTE_DIRECTORY));
 }
 
-double CToolUnits::toInt32(const char* pBuffer)
+int CToolUnits::toInt32(const char* pBuffer)
 {
-	return (pBuffer[0] & 0xff) | (pBuffer[1] & 0xff) << 8 | (pBuffer[2] & 0xff) << 16 | (pBuffer[3] & 0xff) << 24;
+	return (pBuffer[0] & 0xff) | ((pBuffer[1] & 0xff) << 8) | ((pBuffer[2] & 0xff) << 16) | ((pBuffer[3] & 0xff) << 24);
 }
 
-double CToolUnits::toInt16(const char* pBuffer)
+int CToolUnits::toInt16(const char* pBuffer)
 {
 	return (pBuffer[0] & 0xff) | (pBuffer[1] & 0xff) << 8;
 }
@@ -195,9 +195,109 @@
 	return FALSE;
 }
 
+void CToolUnits::setBit(char* p, int index)
+{
+	int byteIndex = 0;
+	byte b = 0;
+	if (index >= 8) byteIndex = 1;
+	switch (index)
+	{
+	case 0:
+	case 8:
+		b = 0x1;
+		break;
+	case 1:
+	case 9:
+		b = 0x2;
+		break;
+	case 2:
+	case 0xA:
+		b = 0x4;
+		break;
+	case 3:
+	case 0xB:
+		b = 0x8;
+		break;
+	case 4:
+	case 0xC:
+		b = 0x10;
+		break;
+	case 5:
+	case 0xD:
+		b = 0x20;
+		break;
+	case 6:
+	case 0xE:
+		b = 0x40;
+		break;
+	case 7:
+	case 0xF:
+		b = 0x80;
+		break;
+	default:
+		break;
+	}
+
+	p[byteIndex] = b;
+}
+
 void CToolUnits::setDlgItemDouble(CWnd* pWnd, int nCtrlId, double value)
 {
 	CString strText;
 	strText.Format(_T("%.03f"), value);
 	pWnd->SetDlgItemText(nCtrlId, strText);
 }
+
+std::vector<CString> CToolUnits::GetFileNamesInDirectory(const CString& strFolderPath, const CString& strExtension)
+{
+	std::vector<CString> fileNames;
+
+	// 确保目录路径最后有反斜杠
+	CString strSearchPath = strFolderPath;
+	if (strSearchPath[strSearchPath.GetLength() - 1] != '\\') {
+		strSearchPath += '\\';
+	}
+
+	CString finalExtension = strExtension;
+	if (finalExtension.Find('.') == -1) {
+		finalExtension = '.' + finalExtension;
+	}
+	strSearchPath += "*" + finalExtension;
+
+	std::unique_ptr<CFileFind> finder = std::make_unique<CFileFind>();
+	BOOL bWorking = finder->FindFile(strSearchPath);
+
+	// 遍历文件夹
+	while (bWorking) {
+		bWorking = finder->FindNextFile();
+		if (!finder->IsDirectory()) {
+			CString fileName = finder->GetFileName();
+			int dotPos = fileName.ReverseFind('.');
+			if (dotPos != -1) {
+				fileName = fileName.Left(dotPos);
+			}
+			fileNames.push_back(fileName);
+		}
+	}
+
+	return fileNames;
+}
+
+std::string CToolUnits::getRecipePath()
+{
+	return getCurrentExePath() + "\\Recipe";
+}
+
+std::string CToolUnits::getCurrentTimeString()
+{
+	struct tm ltm;
+	time_t now = time(0);
+	localtime_s(&ltm, &now);  // 使用安全的 localtime_s 函数
+
+	char buffer[256];
+	sprintf_s(buffer, sizeof(buffer), "%04d-%02d-%02d %02d:%02d:%02d",
+		ltm.tm_year + 1900, ltm.tm_mon + 1, ltm.tm_mday,
+		ltm.tm_hour, ltm.tm_min, ltm.tm_sec);
+
+	return std::string(buffer);
+}
\ No newline at end of file

--
Gitblit v1.9.3