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/CControlJobManagerDlg.h | 37 ++++++++++++++++++++++++++++++++++++-
1 files changed, 36 insertions(+), 1 deletions(-)
diff --git a/SourceCode/Bond/Servo/CControlJobManagerDlg.h b/SourceCode/Bond/Servo/CControlJobManagerDlg.h
index ebc1f11..031ed7c 100644
--- a/SourceCode/Bond/Servo/CControlJobManagerDlg.h
+++ b/SourceCode/Bond/Servo/CControlJobManagerDlg.h
@@ -1,6 +1,11 @@
锘�#pragma once
#include "CCjPage1.h"
+#include "CCjPage2.h"
+#include "CCjPage3.h"
+#include "ApredTreeCtrl2.h"
+
+#define WM_AFTER_TVCHECK (WM_USER + 1000)
// CControlJobManagerDlg 瀵硅瘽妗�
@@ -11,12 +16,34 @@
public:
CControlJobManagerDlg(CWnd* pParent = nullptr); // 鏍囧噯鏋勯�犲嚱鏁�
virtual ~CControlJobManagerDlg();
+ static void FreeState();
private:
void Resize();
+ void UpdateCtrlState();
+ void UpdateControlJob();
+ bool AddPorcessJob(SERVO::CProcessJob* pj);
+ bool RemovePorcessJob(SERVO::CProcessJob* pj);
+ void UpProcessJobId(PJWarp* pjWarp);
+ void UpControlJobId(SERVO::CControlJob* pControlJob);
+ void InitData();
+ void LoadState();
+ void SaveState();
+ int ShowPage(int index);
private:
- CCjPage1* m_pPage1;
+ std::vector<CCjPageBase*> m_pages;
+ SERVO::CControlJob* m_pControlJob;
+ std::vector<PJWarp> m_pjWarps;
+ CApredTreeCtrl2 m_tree;
+
+public:
+ struct State {
+ SERVO::CControlJob* pControlJob = nullptr;
+ std::vector<PJWarp> pjWarps;
+ };
+ static bool m_bHasState;
+ static State m_state;
// 瀵硅瘽妗嗘暟鎹�
#ifdef AFX_DESIGN_TIME
@@ -31,4 +58,12 @@
virtual BOOL OnInitDialog();
afx_msg void OnSize(UINT nType, int cx, int cy);
afx_msg void OnGetMinMaxInfo(MINMAXINFO* lpMMI);
+ afx_msg void OnTvnItemChangedTree(NMHDR* pNMHDR, LRESULT* pResult);
+ afx_msg void OnDestroy();
+ afx_msg void OnBnClickedButtonApply();
+ afx_msg void OnTvnSelchangingTree1(NMHDR* pNMHDR, LRESULT* pResult);
+ afx_msg void OnBnClickedButtonBathCompletion();
+ afx_msg void OnTreeClick(NMHDR* pNMHDR, LRESULT* pResult);
+ afx_msg void OnTreeKeyDown(NMHDR* pNMHDR, LRESULT* pResult);
+ afx_msg LRESULT OnAfterTvCheck(WPARAM wParam, LPARAM lParam);
};
--
Gitblit v1.9.3