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/UserManagerDlg.cpp | 33 +++++++++++++++++++--------------
1 files changed, 19 insertions(+), 14 deletions(-)
diff --git a/SourceCode/Bond/Servo/UserManagerDlg.cpp b/SourceCode/Bond/Servo/UserManagerDlg.cpp
index 9f87215..7fde4bf 100644
--- a/SourceCode/Bond/Servo/UserManagerDlg.cpp
+++ b/SourceCode/Bond/Servo/UserManagerDlg.cpp
@@ -88,9 +88,10 @@
m_gridUserManager.ExpandLastColumn(); // 鏈�鍚庝竴鍒楀～鍏呯綉鏍�
m_mapRoleDescriptions.clear();
- m_mapRoleDescriptions.emplace(_T("绠＄悊鍛�"), _T("绠＄悊鎵�鏈夌敤鎴凤紝鍒嗛厤鏉冮檺"));
- m_mapRoleDescriptions.emplace(_T("宸ョ▼甯�"), _T("缁存姢绯荤粺锛岃В鍐虫妧鏈棶棰�"));
- m_mapRoleDescriptions.emplace(_T("鎿嶄綔鍛�"), _T("鎵ц鏃ュ父鎿嶄綔浠诲姟"));
+ m_mapRoleDescriptions.emplace(_T("绠＄悊鍛�"), _T("绠＄悊鎵�鏈夌敤鎴疯处鎴凤紝鍒嗛厤鍜岃皟鏁存潈闄愶紝璐熻矗绯荤粺瀹夊叏涓庢暣浣撹繍琛�"));
+ m_mapRoleDescriptions.emplace(_T("鍒剁▼宸ョ▼甯�"), _T("璐熻矗鐢熶骇宸ヨ壓鐨勫埗瀹氥�佷紭鍖栦笌鏀硅繘锛岀‘淇濆伐鑹虹ǔ瀹氬拰鑹巼鎻愬崌"));
+ m_mapRoleDescriptions.emplace(_T("璁惧宸ョ▼甯�"), _T("缁存姢鍜屼繚鍏昏澶囷紝澶勭悊鏁呴殰锛屼繚闅滆澶囩ǔ瀹氳繍琛岋紝鍙備笌鎶�鏈崌绾�"));
+ m_mapRoleDescriptions.emplace(_T("鎿嶄綔鍛�"), _T("鎸夌収鏍囧噯娴佺▼鎵ц鏃ュ父鎿嶄綔浠诲姟锛岀洃鎺х敓浜х姸鍐碉紝鍙婃椂鍙嶉寮傚父"));
FillUserManager();
}
@@ -134,12 +135,13 @@
CStringArray permissions;
permissions.Add(_T("绠＄悊鍛�"));
- permissions.Add(_T("宸ョ▼甯�"));
+ permissions.Add(_T("鍒剁▼宸ョ▼甯�"));
+ permissions.Add(_T("璁惧宸ョ▼甯�"));
permissions.Add(_T("鎿嶄綔鍛�"));
int nCols = m_gridUserManager.GetColumnCount();
for (int i = 1; i < m_gridUserManager.GetRowCount(); ++i) {
- m_gridUserManager.SetItemState(i, 0, GVIS_READONLY); // 绗竴鍒楀彧璇�
+ m_gridUserManager.SetItemState(i, 0, GVIS_READONLY); // 绗竴鍒楀彧璇�
m_gridUserManager.SetItemState(i, nCols - 2, GVIS_READONLY); // 鍊掓暟绗簩鍒楀彧璇�
m_gridUserManager.SetItemState(i, nCols - 1, GVIS_READONLY); // 鏈�鍚庝竴鍒楀彧璇�
@@ -149,13 +151,12 @@
pCell->SetOptions(permissions);
pCell->SetStyle(CBS_DROPDOWNLIST);
- CString cstrRole = m_gridUserManager.GetItemText(i, 3);
- int nRole = _ttoi(cstrRole);
- if (nRole < 0 || nRole > 2) {
+ int nRole = _ttoi(m_gridUserManager.GetItemText(i, 3));
+ if (nRole < 0 || nRole > 3) {
CString cstrMessage;
cstrMessage.Format(_T("鐢ㄦ埛 [%s]锛屾潈闄愬紓甯革紒灏嗚缃垚鎿嶄綔鍛橈紒"), m_gridUserManager.GetItemText(i, 1));
AfxMessageBox(cstrMessage);
- nRole = 2;
+ nRole = 3;
}
m_gridUserManager.SetItemText(i, 3, permissions.GetAt(nRole));
@@ -237,7 +238,8 @@
// 绗洓鍒楄缃紙鏉冮檺鍒楋級涓轰笅鎷夋
CStringArray permissions;
permissions.Add(_T("绠＄悊鍛�"));
- permissions.Add(_T("宸ョ▼甯�"));
+ permissions.Add(_T("鍒剁▼宸ョ▼甯�"));
+ permissions.Add(_T("璁惧宸ョ▼甯�"));
permissions.Add(_T("鎿嶄綔鍛�"));
if (pGridCtrl->SetCellType(newRowIndex, 3, RUNTIME_CLASS(CGridCellCombo))) {
@@ -443,7 +445,8 @@
CStringArray permissions;
permissions.Add(_T("绠＄悊鍛�"));
- permissions.Add(_T("宸ョ▼甯�"));
+ permissions.Add(_T("鍒剁▼宸ョ▼甯�"));
+ permissions.Add(_T("璁惧宸ョ▼甯�"));
permissions.Add(_T("鎿嶄綔鍛�"));
if (m_gridUserManager.SetCellType(row, 3, RUNTIME_CLASS(CGridCellCombo))) {
@@ -527,12 +530,14 @@
if (j == 3) {
if (cellText == _T("绠＄悊鍛�"))
cellString = "0";
- else if (cellText == _T("宸ョ▼甯�"))
+ else if (cellText == _T("鍒剁▼宸ョ▼甯�"))
cellString = "1";
+ else if (cellText == _T("璁惧宸ョ▼甯�"))
+ cellString = "2";
else if (cellText == _T("鎿嶄綔鍛�"))
- cellString = "2";
+ cellString = "3";
else
- cellString = "2";
+ cellString = "3";
}
rowData.push_back(cellString);
--
Gitblit v1.9.3