From bc7f1c4e028e69be51079b59dae4ae5c4d43f5bb Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期六, 31 一月 2026 21:54:56 +0800
Subject: [PATCH] 1.状态指示图，目前灰色表示掉线，绿色表示在线。增加Slot的小点表示有没有料，及加工状态 。 2.增加图示
---
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