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/PlcView.cpp | 37 ++++++++++++++++++++++++++++++++++++-
1 files changed, 36 insertions(+), 1 deletions(-)
diff --git a/SourceCode/Bond/BoounionPLC/PlcView.cpp b/SourceCode/Bond/BoounionPLC/PlcView.cpp
index 9d0926e..2c716b4 100644
--- a/SourceCode/Bond/BoounionPLC/PlcView.cpp
+++ b/SourceCode/Bond/BoounionPLC/PlcView.cpp
@@ -19,12 +19,18 @@
for (int i = 0; i < BTN_MAX; i++) {
m_pBlBtns[i] = new CBlButton();
}
+ m_crPlcNameBack = RGB(228, 228, 228);
+
}
CPlcView::~CPlcView()
{
for (int i = 0; i < BTN_MAX; i++) {
delete m_pBlBtns[i];
+ }
+ if (m_hbrPlcName != nullptr) {
+ ::DeleteObject(m_hbrPlcName);
+ m_hbrPlcName = nullptr;
}
}
@@ -45,6 +51,7 @@
ON_BN_CLICKED(IDC_BUTTON_SOUND_OFF, &CPlcView::OnBnClickedButtonSoundOff)
ON_BN_CLICKED(IDC_BUTTON_RESETTING, &CPlcView::OnBnClickedButtonResetting)
ON_BN_CLICKED(IDC_BUTTON_STOP, &CPlcView::OnBnClickedButtonStop)
+ ON_WM_TIMER()
END_MESSAGE_MAP()
// CComponentData1Dlg 消息处理程序
@@ -275,6 +282,9 @@
SetDlgItemText(IDC_EDIT_DAY_SHIFT_CAPACITY, _T("0"));
SetDlgItemText(IDC_EDIT_NIGHT_SHIFT_CAPACITY, _T("0"));
+
+ SetTimer(1, 1000, nullptr);
+
return TRUE; // return TRUE unless you set the focus to a control
// 异常: OCX 属性页应返回 FALSE
}
@@ -282,9 +292,16 @@
HBRUSH CPlcView::OnCtlColor(CDC* pDC, CWnd* pWnd, UINT nCtlColor)
{
HBRUSH hbr = CBaseView::OnCtlColor(pDC, pWnd, nCtlColor);
+ int nCtrlId = pWnd->GetDlgCtrlID();
if (nCtlColor == CTLCOLOR_STATIC) {
pDC->SetBkColor(m_crBkgnd);
+ }
+
+ if (IDC_LABEL_PLC_NAME == nCtrlId) {
+ pDC->SetBkColor(m_crPlcNameBack);
+ m_hbrPlcName = CreateSolidBrush(m_crPlcNameBack);
+ return m_hbrPlcName;
}
if (m_hbrBkgnd == nullptr) {
@@ -360,4 +377,22 @@
{
// TODO: 在此添加控件通知处理程序代码
HandleOperation(OperationType::STOP);
-}
\ No newline at end of file
+}
+
+void CPlcView::OnTimer(UINT_PTR nIDEvent)
+{
+ if (1 == nIDEvent) {
+ ASSERT(m_pContext);
+ CPLC* pPlc = ((CPLC*)m_pContext);
+
+ CString strText;
+ strText.Format(_T("%d %s"), pPlc->getVelocityRatio(), _T("%"));
+ GetDlgItem(IDC_EDIT_VELOCITY_RATIO)->SetWindowText(strText);
+ strText.Format(_T("%.2f"), pPlc->getTackTime() * 0.01);
+ GetDlgItem(IDC_EDIT_TACT_TIME)->SetWindowText(strText);
+ SetDlgItemInt(IDC_EDIT_DAY_SHIFT_CAPACITY, pPlc->getDayShiftCapacity());
+ SetDlgItemInt(IDC_EDIT_NIGHT_SHIFT_CAPACITY, pPlc->getNightShiftCapacity());
+ }
+
+ CBaseView::OnTimer(nIDEvent);
+}
--
Gitblit v1.9.3