From df4d0e875ccfe40add25100a75dedee54e566aaa Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期四, 18 九月 2025 09:06:24 +0800
Subject: [PATCH] 1.CConrolJobManagerDlg临时数据存储。
---
SourceCode/Bond/Servo/CControlJobManagerDlg.cpp | 77 ++++++++++++++++++++++++++------------
1 files changed, 52 insertions(+), 25 deletions(-)
diff --git a/SourceCode/Bond/Servo/CControlJobManagerDlg.cpp b/SourceCode/Bond/Servo/CControlJobManagerDlg.cpp
index da7db7e..e9b9479 100644
--- a/SourceCode/Bond/Servo/CControlJobManagerDlg.cpp
+++ b/SourceCode/Bond/Servo/CControlJobManagerDlg.cpp
@@ -8,6 +8,9 @@
#include "ToolUnits.h"
+bool CControlJobManagerDlg::m_bHasState = false;
+CControlJobManagerDlg::State CControlJobManagerDlg::m_state{};
+
// CControlJobManagerDlg 瀵硅瘽妗�
IMPLEMENT_DYNAMIC(CControlJobManagerDlg, CDialogEx)
@@ -20,15 +23,22 @@
CControlJobManagerDlg::~CControlJobManagerDlg()
{
- for (auto pj : m_processJobs) {
- delete pj;
- }
- m_processJobs.clear();
- if (m_pControlJob != nullptr) {
- delete m_pControlJob;
- m_pControlJob = nullptr;
+}
+
+void CControlJobManagerDlg::FreeState()
+{
+ if (!m_bHasState) return;
+ for (auto item : m_state.pjWarps) {
+ delete (SERVO::CProcessJob*)item.pj;
}
+ m_state.pjWarps.clear();
+
+ if (m_state.pControlJob != nullptr) {
+ delete m_state.pControlJob;
+ m_state.pControlJob = nullptr;
+ }
+ m_bHasState = false;
}
void CControlJobManagerDlg::DoDataExchange(CDataExchange* pDX)
@@ -60,7 +70,7 @@
}
else if (1 == code) {
if (contextType == 1) {
- UpProcessJobId((SERVO::CProcessJob*)pContext);
+ UpProcessJobId((PJWarp*)pContext);
}
}
};
@@ -186,9 +196,9 @@
HTREEITEM hRoot = m_tree.InsertItem(m_pControlJob->id().c_str(), 0, 0);
m_tree.SetItemData(hRoot, (DWORD_PTR)m_pControlJob);
m_tree.SetItemState(hRoot, 0, TVIS_STATEIMAGEMASK);
- for (auto pj : m_processJobs) {
- HTREEITEM hItem = m_tree.InsertItem(pj->id().c_str(), 0, 0, hRoot);
- m_tree.SetItemData(hItem, (DWORD_PTR)pj);
+ for (auto& item : m_pjWarps) {
+ HTREEITEM hItem = m_tree.InsertItem(((SERVO::CProcessJob*)item.pj)->id().c_str(), 0, 0, hRoot);
+ m_tree.SetItemData(hItem, (DWORD_PTR)&item);
m_tree.SetItemState(hItem, INDEXTOSTATEIMAGEMASK(false ? 2 : 1), TVIS_STATEIMAGEMASK);
}
m_tree.Expand(hRoot, TVE_EXPAND);
@@ -221,19 +231,13 @@
m_pages[2]->ShowWindow(SW_SHOW);
}
else if (m_tree.GetParentItem(hParent) == nullptr) {
- SERVO::CProcessJob* pj = (SERVO::CProcessJob*)m_tree.GetItemData(hSel);
+ PJWarp* pjWarp = (PJWarp*)m_tree.GetItemData(hSel);
m_pages[0]->ShowWindow(SW_HIDE);
m_pages[1]->ShowWindow(SW_SHOW);
m_pages[2]->ShowWindow(SW_HIDE);
- m_pages[1]->SetContext(pj, 1);
+ m_pages[1]->SetContext(pjWarp, 1);
- std::vector<std::string> names;
- for (auto item : m_processJobs) {
- if (item != pj) {
- names.push_back(item->id());
- }
- }
- ((CCjPage2*)m_pages[1])->SetExclusionNames(names);
+ ((CCjPage2*)m_pages[1])->SetPjWarps(m_pjWarps);
}
else {
// 鏈夌鍏� 鈫� 绗笁灞傚強浠ヤ笅 鈫� Glass
@@ -246,6 +250,7 @@
void CControlJobManagerDlg::OnDestroy()
{
CDialogEx::OnDestroy();
+ SaveState();
for (auto page : m_pages) {
page->DestroyWindow();
@@ -255,14 +260,19 @@
void CControlJobManagerDlg::InitData()
{
- ASSERT(m_pControlJob == nullptr);
+ LoadState();
+ if (m_pControlJob != nullptr) return;
+
m_pControlJob = new SERVO::CControlJob("CJ" + CToolUnits::NowStrSec());
char szBuffer[256];
for (int i = 0; i < 4; i++) {
sprintf_s(szBuffer, 256, "PJ%03d", i + 1);
SERVO::CProcessJob* pj = new SERVO::CProcessJob(std::string(szBuffer));
- m_processJobs.push_back(pj);
+ PJWarp pjWarp;
+ pjWarp.pj = pj;
+ pjWarp.port = -1;
+ m_pjWarps.push_back(pjWarp);
}
}
@@ -274,7 +284,7 @@
GetDlgItem(IDC_BUTTON_APPLY)->EnableWindow(FALSE);
}
-void CControlJobManagerDlg::UpProcessJobId(SERVO::CProcessJob* pJob)
+void CControlJobManagerDlg::UpProcessJobId(PJWarp* pjWarp)
{
// 鏇存柊鏍戞帶浠�
// 閬嶅巻鏍硅妭鐐�
@@ -284,8 +294,9 @@
HTREEITEM hChild = m_tree.GetChildItem(hRoot);
while (hChild) {
DWORD_PTR data = m_tree.GetItemData(hChild);
- if ((void*)data == pJob) {
- m_tree.SetItemText(hChild, pJob->id().c_str());
+ if ((void*)data == pjWarp) {
+ SERVO::CProcessJob* pj = (SERVO::CProcessJob*)pjWarp->pj;
+ m_tree.SetItemText(hChild, pj->id().c_str());
return; // 鎵惧埌灏辫繑鍥�
}
hChild = m_tree.GetNextSiblingItem(hChild);
@@ -294,3 +305,19 @@
hRoot = m_tree.GetNextSiblingItem(hRoot);
}
}
+
+void CControlJobManagerDlg::LoadState()
+{
+ if (!m_bHasState) return;
+
+ // 鎶� s_state -> 鎴愬憳鍙橀噺
+ m_pControlJob = m_state.pControlJob;
+ m_pjWarps = m_state.pjWarps;
+}
+
+void CControlJobManagerDlg::SaveState()
+{
+ m_state.pControlJob = m_pControlJob;
+ m_state.pjWarps = m_pjWarps;
+ m_bHasState = true;
+}
--
Gitblit v1.9.3