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/BoounionPLC/TopToolbar.cpp | 34 +++++++++++++++++-----------------
1 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/SourceCode/Bond/BoounionPLC/TopToolbar.cpp b/SourceCode/Bond/BoounionPLC/TopToolbar.cpp
index 56f41a9..72b0cc3 100644
--- a/SourceCode/Bond/BoounionPLC/TopToolbar.cpp
+++ b/SourceCode/Bond/BoounionPLC/TopToolbar.cpp
@@ -26,10 +26,10 @@
void CTopToolbar::DoDataExchange(CDataExchange* pDX)
{
CDialogEx::DoDataExchange(pDX);
- DDX_Control(pDX, IDC_BUTTON_RUN, m_btnRun);
- DDX_Control(pDX, IDC_BUTTON_STOP, m_btnStop);
- DDX_Control(pDX, IDC_BUTTON_ALARM, m_btnAlarm);
+ DDX_Control(pDX, IDC_BUTTON_ADD, m_btnAdd);
+ DDX_Control(pDX, IDC_BUTTON_DELETE, m_btnDelete);
DDX_Control(pDX, IDC_BUTTON_SETTINGS, m_btnSettings);
+ DDX_Control(pDX, IDC_BUTTON_ALARM, m_btnAlarm);
DDX_Control(pDX, IDC_BUTTON_OPERATOR, m_btnOperator);
}
@@ -49,10 +49,10 @@
{
CDialogEx::OnInitDialog();
- InitBtn(m_btnRun, "Run_High_32.ico", "Run_Gray_32.ico");
- InitBtn(m_btnStop, "Stop_High_32.ico", "Stop_Gray_32.ico");
- InitBtn(m_btnAlarm, "Alarm_o_32.ico", "Alarm_gray_32.ico");
+ InitBtn(m_btnAdd, "Add_blue_32.ico", "Add_Gray_32.ico");
+ InitBtn(m_btnDelete, "delete_blue_32.ico", "delete_Gray_32.ico");
InitBtn(m_btnSettings, "Settings_High_32.ico", "Settings_Gray_32.ico");
+ InitBtn(m_btnAlarm, "Alarm_o_32.ico", "Alarm_Gray_32.ico");
InitBtn(m_btnOperator, "Operator_High_32.ico", "Operator_Gray_32.ico");
HMENU hMenu = LoadMenu(AfxGetInstanceHandle(), MAKEINTRESOURCEA(IDR_MENU_OPEATOR));
m_btnOperator.SetMenu(hMenu);
@@ -92,7 +92,7 @@
void CTopToolbar::OnSize(UINT nType, int cx, int cy)
{
CDialogEx::OnSize(nType, cx, cy);
- if (GetDlgItem(IDC_BUTTON_RUN) == nullptr) return;
+ if (GetDlgItem(IDC_BUTTON_ADD) == nullptr) return;
Resize();
}
@@ -106,17 +106,12 @@
int nBthHeight = (rcClient.Height() - 10);
int x = 2, y = 3;
- pItem = GetDlgItem(IDC_BUTTON_RUN);
+ pItem = GetDlgItem(IDC_BUTTON_ADD);
pItem->MoveWindow(x, y, BTN_WIDTH, nBthHeight);
x += BTN_WIDTH;
x += 2;
- pItem = GetDlgItem(IDC_BUTTON_STOP);
- pItem->MoveWindow(x, y, BTN_WIDTH, nBthHeight);
- x += BTN_WIDTH;
- x += 2;
-
- pItem = GetDlgItem(IDC_BUTTON_ALARM);
+ pItem = GetDlgItem(IDC_BUTTON_DELETE);
pItem->MoveWindow(x, y, BTN_WIDTH, nBthHeight);
x += BTN_WIDTH;
x += 2;
@@ -126,6 +121,11 @@
x += 4;
pItem = GetDlgItem(IDC_BUTTON_SETTINGS);
+ pItem->MoveWindow(x, y, BTN_WIDTH, nBthHeight);
+ x += BTN_WIDTH;
+ x += 2;
+
+ pItem = GetDlgItem(IDC_BUTTON_ALARM);
pItem->MoveWindow(x, y, BTN_WIDTH, nBthHeight);
x += BTN_WIDTH;
x += 2;
@@ -174,10 +174,10 @@
BOOL CTopToolbar::OnCommand(WPARAM wParam, LPARAM lParam)
{
switch (LOWORD(wParam)) {
- case IDC_BUTTON_RUN:
- case IDC_BUTTON_STOP:
- case IDC_BUTTON_ALARM:
+ case IDC_BUTTON_ADD:
+ case IDC_BUTTON_DELETE:
case IDC_BUTTON_SETTINGS:
+ case IDC_BUTTON_ALARM:
GetParent()->SendMessage(ID_MSG_TOOLBAR_BTN_CLICKED, 0, LOWORD(wParam));
break;
}
--
Gitblit v1.9.3