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/CCjPage1.cpp | 63 ++++---------------------------
1 files changed, 9 insertions(+), 54 deletions(-)
diff --git a/SourceCode/Bond/Servo/CCjPage1.cpp b/SourceCode/Bond/Servo/CCjPage1.cpp
index f81f8dd..cb35ba1 100644
--- a/SourceCode/Bond/Servo/CCjPage1.cpp
+++ b/SourceCode/Bond/Servo/CCjPage1.cpp
@@ -9,13 +9,11 @@
// CPjPage1 瀵硅瘽妗�
-IMPLEMENT_DYNAMIC(CCjPage1, CDialogEx)
+IMPLEMENT_DYNAMIC(CCjPage1, CCjPageBase)
CCjPage1::CCjPage1(CWnd* pParent /*=nullptr*/)
- : CDialogEx(IDD_CJ_PAGE1, pParent)
+ : CCjPageBase(IDD_CJ_PAGE1, pParent)
{
- m_crBkgnd = RGB(255, 255, 255);
- m_crBkgndCached = CLR_INVALID;
}
CCjPage1::~CCjPage1()
@@ -24,14 +22,12 @@
void CCjPage1::DoDataExchange(CDataExchange* pDX)
{
- CDialogEx::DoDataExchange(pDX);
+ CCjPageBase::DoDataExchange(pDX);
}
-BEGIN_MESSAGE_MAP(CCjPage1, CDialogEx)
- ON_WM_CTLCOLOR()
+BEGIN_MESSAGE_MAP(CCjPage1, CCjPageBase)
ON_WM_DESTROY()
- ON_WM_SIZE()
END_MESSAGE_MAP()
@@ -40,65 +36,23 @@
BOOL CCjPage1::OnInitDialog()
{
- CDialogEx::OnInitDialog();
- Resize();
+ CCjPageBase::OnInitDialog();
return TRUE; // return TRUE unless you set the focus to a control
// 寮傚父: OCX 灞炴�ч〉搴旇繑鍥� FALSE
}
-
-HBRUSH CCjPage1::OnCtlColor(CDC* pDC, CWnd* pWnd, UINT nCtlColor)
-{
- HBRUSH hbr = CDialogEx::OnCtlColor(pDC, pWnd, nCtlColor);
-
- // 鎯崇粰鍝簺鎺т欢鏀瑰簳鑹插氨鎶婂畠浠殑绫诲瀷鍐欒繘鏉ワ細
- const bool needCustomBg =
- (nCtlColor == CTLCOLOR_STATIC) ||
- (nCtlColor == CTLCOLOR_DLG) || // 瀵硅瘽妗嗗簳鑹�
- (nCtlColor == CTLCOLOR_BTN); // 鎸夐挳锛堝彲閫夛級
-
- if (needCustomBg)
- {
- // 鑻ョ涓�娆″垱寤猴紝鎴栭鑹叉敼鍙樺垯閲嶅缓
- if (m_brBkgnd.GetSafeHandle() == nullptr || m_crBkgndCached != m_crBkgnd)
- {
- if (m_brBkgnd.GetSafeHandle())
- m_brBkgnd.DeleteObject();
-
- m_brBkgnd.CreateSolidBrush(m_crBkgnd);
- m_crBkgndCached = m_crBkgnd;
- }
-
- // 鏂囨湰鍓嶆櫙/鑳屾櫙璁剧疆锛堜粎褰卞搷鏂囨湰缁樺埗锛�
- pDC->SetBkColor(m_crBkgnd);
- pDC->SetTextColor(RGB(0, 0, 0));
- // 濡傞渶璁╅潤鎬佹枃鏈�忔槑鍙犲湪搴曡壊涓婏紝鍙敤锛�
- // pDC->SetBkMode(TRANSPARENT);
-
- return (HBRUSH)m_brBkgnd; // 瀹夊叏鐨勯殣寮忚浆鎹�
- }
-
- // 鍏朵粬鎺т欢绫诲瀷娌跨敤鍩虹被榛樿鐨勫埛瀛�
- return hbr;
-}
-
void CCjPage1::OnDestroy()
{
- CDialogEx::OnDestroy();
+ CCjPageBase::OnDestroy();
// TODO: 鍦ㄦ澶勬坊鍔犳秷鎭鐞嗙▼搴忎唬鐮�
}
-void CCjPage1::OnSize(UINT nType, int cx, int cy)
-{
- CDialogEx::OnSize(nType, cx, cy);
- if (GetDlgItem(IDC_LABEL_NO_SEL) == nullptr) return;
- Resize();
-}
-
void CCjPage1::Resize()
{
+ CCjPageBase::Resize();
+ /*
CWnd* pItem;
CRect rcClient, rcItem;
GetClientRect(&rcClient);
@@ -107,4 +61,5 @@
pItem->MoveWindow((rcClient.Width() - rcItem.Width()) / 2,
(rcClient.Height() - rcItem.Height()) / 2,
rcItem.Width(), rcItem.Height());
+ */
}
--
Gitblit v1.9.3