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/CPagePortStatus.cpp | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/SourceCode/Bond/Servo/CPagePortStatus.cpp b/SourceCode/Bond/Servo/CPagePortStatus.cpp
index ff38c73..a360f4e 100644
--- a/SourceCode/Bond/Servo/CPagePortStatus.cpp
+++ b/SourceCode/Bond/Servo/CPagePortStatus.cpp
@@ -99,14 +99,15 @@
// 鍒涘缓Job Existence Slots鎺т欢
m_ctrlJobSlotGrid.Create(AfxRegisterWndClass(0), _T("JobSlotGrid"),
- WS_CHILD | WS_VISIBLE, CRect(0, 0, 100, 100), this, 1001);
- m_ctrlJobSlotGrid.SetGridSize(12, 16);
+ WS_CHILD | WS_VISIBLE, CRect(0, 0, 88, 32), this, 1001);
+ m_ctrlJobSlotGrid.SetGridSize(1, 8);
m_ctrlJobSlotGrid.SetColors(RGB(34, 177, 76), RGB(200, 200, 200));
- m_ctrlJobSlotGrid.SetSlotStatus(0, 1, true);
- m_ctrlJobSlotGrid.SetSlotStatus(1, 9, true);
- m_ctrlJobSlotGrid.SetSlotStatus(4, 9, false);
- m_ctrlJobSlotGrid.SetSlotStatus(4, 10, true, TRUE);
+ auto statusMap = m_pPort->getScanCassetteMap();
+ for (int i = 0; i < 8; ++i) {
+ bool isSet = (statusMap >> i) & 1;
+ m_ctrlJobSlotGrid.SetSlotStatus(0, i, isSet);
+ }
return TRUE; // return TRUE unless you set the focus to a control
// 寮傚父: OCX 灞炴�ч〉搴旇繑鍥� FALSE
@@ -144,5 +145,5 @@
GetClientRect(rcClient);
m_ctrlJobSlotGrid.MoveWindow(rcComboBox.left, rcLabel.top,
- rcClient.right - 22 - rcComboBox.left, rcClient.bottom - 12 - rcLabel.top);
+ 34 * 8, 32);
}
\ No newline at end of file
--
Gitblit v1.9.3