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/stdafx.h | 36 ++++++++++++++++++++++++++++++++++++ 1 files changed, 36 insertions(+), 0 deletions(-) diff --git a/SourceCode/Bond/Servo/stdafx.h b/SourceCode/Bond/Servo/stdafx.h index 9b9a811..8e4739a 100644 --- a/SourceCode/Bond/Servo/stdafx.h +++ b/SourceCode/Bond/Servo/stdafx.h @@ -33,10 +33,46 @@ #include <afxcontrolbars.h> // 功能区和控件条的 MFC 支持 + +// 控件样式 +static UINT g_nGridFixCellColor = RGB(144, 200, 246); +static UINT g_nGridFixFontColor = RGB(0, 0, 0); +static UINT g_nGridCellColor = RGB(255, 255, 224); +static UINT g_nGridCellColor_NonSelect = RGB(150, 150, 150); +static UINT g_nGridCellReadyColor = RGB(255, 255, 0); +static UINT g_nGridCellOnColor = RGB(255, 69, 0); +static UINT g_nGridCellOffColor = RGB(128, 191, 255); +static UINT g_nPropertyGridFixCellColor = RGB(150, 150, 150); +static UINT g_nPropertyGridFixFontColor = RGB(0, 0, 0); + // GDI+ #include <gdiplus.h> using namespace Gdiplus; +// CC-LINK模块 +#include "..\MELSECSDK\include\Mdfunc.h" +#pragma comment(lib, "..\\MELSECSDK\\lib\\MdFunc32.lib") + +// 数据库模块 +#include "..\DatabaseSDK\include\Database.h" +#include "..\DatabaseSDK\include\MySQLDatabase.h" +#include "..\DatabaseSDK\include\SQLiteDatabase.h" + +#if defined(_WIN64) +#if defined(_DEBUG) +#pragma comment(lib, "..\\DatabaseSDK\\lib\\x64\\Debug\\DatabaseEx.lib") +#else +#pragma comment(lib, "..\\DatabaseSDK\\lib\\x64\\Release\\DatabaseEx.lib") +#endif +#else +#if defined(_DEBUG) +#pragma comment(lib, "..\\DatabaseSDK\\lib\\Win32\\Debug\\DatabaseEx.lib") +#else +#pragma comment(lib, "..\\DatabaseSDK\\lib\\Win32\\Release\\DatabaseEx.lib") +#endif +#endif + + #include "..\RxWindows1.0\include\RxWindowsLib.h" #include "..\HSMSSDK\Include\HSMSSDK.h" -- Gitblit v1.9.3