From c36e0403012fda6101c176be7a875846fe383a53 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期二, 16 九月 2025 18:03:05 +0800
Subject: [PATCH] 1.CJ管理功能持续实现中...
---
SourceCode/Bond/Servo/CControlJobManagerDlg.cpp | 267 +++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 255 insertions(+), 12 deletions(-)
diff --git a/SourceCode/Bond/Servo/CControlJobManagerDlg.cpp b/SourceCode/Bond/Servo/CControlJobManagerDlg.cpp
index e801498..e125c68 100644
--- a/SourceCode/Bond/Servo/CControlJobManagerDlg.cpp
+++ b/SourceCode/Bond/Servo/CControlJobManagerDlg.cpp
@@ -5,6 +5,7 @@
#include "Servo.h"
#include "CControlJobManagerDlg.h"
#include "afxdialogex.h"
+#include "ToolUnits.h"
// CControlJobManagerDlg 瀵硅瘽妗�
@@ -14,22 +15,40 @@
CControlJobManagerDlg::CControlJobManagerDlg(CWnd* pParent /*=nullptr*/)
: CDialogEx(IDD_DIALOG_CONTROL_JOB_MANAGER, pParent)
{
- m_pPage1 = nullptr;
+ m_pControlJob = nullptr;
}
CControlJobManagerDlg::~CControlJobManagerDlg()
{
+ for (auto pj : m_processJobs) {
+ delete pj;
+ }
+ m_processJobs.clear();
+
+ if (m_pControlJob != nullptr) {
+ delete m_pControlJob;
+ m_pControlJob = nullptr;
+ }
}
void CControlJobManagerDlg::DoDataExchange(CDataExchange* pDX)
{
CDialogEx::DoDataExchange(pDX);
+ DDX_Control(pDX, IDC_LIST1, m_listBox);
+ DDX_Control(pDX, IDC_TREE1, m_tree);
}
BEGIN_MESSAGE_MAP(CControlJobManagerDlg, CDialogEx)
ON_WM_SIZE()
ON_WM_GETMINMAXINFO()
+ ON_BN_CLICKED(IDC_BUTTON_CREATE_CJ, &CControlJobManagerDlg::OnBnClickedCreateCJ)
+ ON_BN_CLICKED(IDC_BUTTON_CREATE_PJ, &CControlJobManagerDlg::OnBnClickedButtonCreatePj)
+ ON_CLBN_CHKCHANGE(IDC_LIST1, &CControlJobManagerDlg::OnListChkChange) // 澶嶉�夌姸鎬佸彉鏇撮�氱煡
+ ON_LBN_SELCHANGE(IDC_LIST1, &CControlJobManagerDlg::OnLbnSelchangeList1)
+ ON_NOTIFY(TVN_SELCHANGED, IDC_TREE1, &CControlJobManagerDlg::OnTvnSelchangedTree1)
+ ON_WM_DESTROY()
+ ON_BN_CLICKED(IDC_BUTTON_APPLY, &CControlJobManagerDlg::OnBnClickedButtonApply)
END_MESSAGE_MAP()
@@ -40,13 +59,47 @@
{
CDialogEx::OnInitDialog();
-
+ auto onContentChanged = [&](void* pFrom, int code, void* pContext, int contextType) -> void {
+ if (0 == code) {
+ GetDlgItem(IDC_BUTTON_APPLY)->EnableWindow(TRUE);
+ }
+ else if (1 == code) {
+ if (contextType == 1) {
+ UpProcessJobId((SERVO::CProcessJob*)pContext);
+ }
+ }
+ };
+
// page1
- m_pPage1 = new CCjPage1(this);
- m_pPage1->Create(IDD_CJ_PAGE1, this);
- m_pPage1->ShowWindow(SW_SHOW);
+ CCjPage1* pPage1 = new CCjPage1(this);
+ pPage1->Create(IDD_CJ_PAGE1, this);
+ pPage1->SetTitle(_T("鏈�夋嫨"));
+ pPage1->SetOnContentChanged(onContentChanged);
+ pPage1->ShowWindow(SW_SHOW);
+ m_pages.push_back(pPage1);
+
+ // page2
+ CCjPage2* pPage2 = new CCjPage2(this);
+ pPage2->Create(IDD_CJ_PAGE2, this);
+ pPage2->SetTitle(_T("ProcessJob"));
+ pPage2->SetOnContentChanged(onContentChanged);
+ m_pages.push_back(pPage2);
+
+ // page3
+ CCjPage3* pPage3 = new CCjPage3(this);
+ pPage3->Create(IDD_CJ_PAGE3, this);
+ pPage3->SetTitle(_T("ControlJob"));
+ pPage3->SetOnContentChanged(onContentChanged);
+ m_pages.push_back(pPage3);
+ // ListBox
+ m_listBox.ModifyStyle(0, LBS_OWNERDRAWFIXED | LBS_HASSTRINGS);
+ m_listBox.SetCheckStyle(BS_AUTOCHECKBOX);
+ m_listBox.SetItemHeight(0, max(22, ::GetSystemMetrics(SM_CYMENUCHECK) + 4));
+
+
+ UpdateCtrlState();
Resize();
@@ -72,19 +125,25 @@
ScreenToClient(&rcItem);
const int LEFTWIDTH = 218;
- int x = 12;
+ int x = 12, y = 12;
int x2 = rcClient.right - 12;
int y2 = rcClient.bottom - 12;
// 鍏堢Щ鍔ㄦ寜閽�
- pItem = GetDlgItem(IDC_BUTTON_BATH_COMPLETION);
+ pItem = GetDlgItem(IDC_BUTTON_CREATE_PJ);
pItem->GetWindowRect(&rcItem);
pItem->MoveWindow(x, y2 - rcItem.Height(), rcItem.Width(), rcItem.Height());
x += rcItem.Width();
x += 8;
- pItem = GetDlgItem(IDC_BUTTON_BATH_NEW);
+ pItem = GetDlgItem(IDC_BUTTON_CREATE_CJ);
+ pItem->GetWindowRect(&rcItem);
+ pItem->MoveWindow(x, y2 - rcItem.Height(), rcItem.Width(), rcItem.Height());
+ x += rcItem.Width();
+ x += 8;
+
+ pItem = GetDlgItem(IDC_BUTTON_BATH_COMPLETION);
pItem->GetWindowRect(&rcItem);
pItem->MoveWindow(x, y2 - rcItem.Height(), rcItem.Width(), rcItem.Height());
x += rcItem.Width();
@@ -96,25 +155,37 @@
x += rcItem.Width();
x += 8;
- pItem = GetDlgItem(IDCANCEL);
+ pItem = GetDlgItem(IDC_BUTTON_APPLY);
pItem->GetWindowRect(&rcItem);
pItem->MoveWindow(x2 - rcItem.Width(), y2 - rcItem.Height(), rcItem.Width(), rcItem.Height());
y2 -= rcItem.Height();
y2 -= 8;
+ // 鍒楄〃鎺т欢
+ x = 12;
+ y = 12;
+ pItem = GetDlgItem(IDC_LIST1);
+ pItem->MoveWindow(x, y, LEFTWIDTH, 180);
+ x += LEFTWIDTH;
+ x += 5;
+ y += 180;
+ y += 5;
+
+
// 鏍戞帶浠�
x = 12;
pItem = GetDlgItem(IDC_TREE1);
- pItem->MoveWindow(x, 12, LEFTWIDTH, y2 - 12);
+ pItem->MoveWindow(x, y, LEFTWIDTH, y2 - y);
x += LEFTWIDTH;
x += 5;
// 瀛愰〉闈�
- if (m_pPage1 != nullptr) {
- m_pPage1->MoveWindow(x, 12, x2 - x, y2 - 12);
+ for (auto page : m_pages) {
+ page->MoveWindow(x, 12, x2 - x, y2 - 12);
}
+
}
void CControlJobManagerDlg::OnGetMinMaxInfo(MINMAXINFO* lpMMI)
@@ -129,3 +200,175 @@
// lpMMI->ptMaxTrackSize.x = 800;
// lpMMI->ptMaxTrackSize.y = 600;
}
+
+void CControlJobManagerDlg::UpdateCtrlState()
+{
+ auto& master = theApp.m_model.getMaster();
+ auto cj = master.getControlJob();
+ GetDlgItem(IDC_BUTTON_CREATE_PJ)->EnableWindow(TRUE);
+ GetDlgItem(IDC_BUTTON_CREATE_CJ)->EnableWindow(
+ m_pControlJob == nullptr
+ );
+ GetDlgItem(IDC_BUTTON_BATH_COMPLETION)->EnableWindow(false);
+ GetDlgItem(IDC_BUTTON_BATH_DELETE)->EnableWindow(true);
+}
+
+
+void CControlJobManagerDlg::OnBnClickedButtonCreatePj()
+{
+ static int index = 0;
+ char szBuffer[256];
+ sprintf_s(szBuffer, 256, "PJ%03d", ++index);
+ SERVO::CProcessJob* pj = new SERVO::CProcessJob(std::string(szBuffer));
+ m_processJobs.push_back(pj);
+ UpdateProcessJobs();
+ UpdateCtrlState();
+}
+
+void CControlJobManagerDlg::OnBnClickedCreateCJ()
+{
+ if (m_pControlJob != nullptr) {
+ return;
+ }
+
+ m_pControlJob = new SERVO::CControlJob("CJ" + CToolUnits::NowStrSec());
+ UpdateControlJob();
+ UpdateCtrlState();
+}
+
+void CControlJobManagerDlg::UpdateProcessJobs()
+{
+ m_listBox.ResetContent();
+ for (auto item : m_processJobs) {
+ int index = m_listBox.InsertString(m_listBox.GetCount(), item->id().c_str());
+ m_listBox.SetItemDataPtr(index, item);
+ }
+}
+
+void CControlJobManagerDlg::UpdateControlJob()
+{
+ m_tree.DeleteAllItems();
+ if (m_pControlJob == nullptr) return;
+
+ HTREEITEM hRoot = m_tree.InsertItem(m_pControlJob->id().c_str(), 0, 0);
+ m_tree.SetItemData(hRoot, (DWORD_PTR)m_pControlJob);
+ auto& pjs = m_pControlJob->getPjs();
+ for (auto pj : pjs) {
+ HTREEITEM hItem = m_tree.InsertItem(pj->id().c_str(), 0, 0, hRoot);
+ m_tree.SetItemData(hItem, (DWORD_PTR)pj);
+ }
+ m_tree.Expand(hRoot, TVE_EXPAND);
+}
+
+void CControlJobManagerDlg::OnListChkChange()
+{
+ int idx = m_listBox.GetCurSel();
+ if (idx != LB_ERR) {
+ SERVO::CProcessJob* pj = (SERVO::CProcessJob*)m_listBox.GetItemDataPtr(idx);
+ BOOL checked = m_listBox.GetCheck(idx); // 鑻ヤ笁鎬�: 0/1/2
+ if (checked) {
+ if (AddPorcessJob(pj)) {
+ UpdateControlJob();
+ }
+ }
+ else {
+ if (RemovePorcessJob(pj)) {
+ UpdateControlJob();
+ }
+ }
+ }
+}
+
+bool CControlJobManagerDlg::AddPorcessJob(SERVO::CProcessJob* pj)
+{
+ if (m_pControlJob == nullptr) return false;
+ return m_pControlJob->addPjPointer(pj);
+}
+
+bool CControlJobManagerDlg::RemovePorcessJob(SERVO::CProcessJob* pj)
+{
+ if (m_pControlJob == nullptr) return false;
+ return m_pControlJob->removePjPointer(pj->id());
+}
+
+void CControlJobManagerDlg::OnLbnSelchangeList1()
+{
+ int idx = m_listBox.GetCurSel();
+ if (idx != LB_ERR) {
+ SERVO::CProcessJob* pj = (SERVO::CProcessJob*)m_listBox.GetItemDataPtr(idx);
+
+ ASSERT(m_pages.size() == 3);
+ m_pages[0]->ShowWindow(SW_HIDE);
+ m_pages[1]->ShowWindow(SW_SHOW);
+ m_pages[2]->ShowWindow(SW_HIDE);
+
+ m_pages[1]->SetContext(pj, 1);
+ }
+}
+
+void CControlJobManagerDlg::OnTvnSelchangedTree1(NMHDR* pNMHDR, LRESULT* pResult)
+{
+ LPNMTREEVIEW pNMTreeView = reinterpret_cast<LPNMTREEVIEW>(pNMHDR);
+
+ HTREEITEM hSel = pNMTreeView->itemNew.hItem;
+ if (hSel != nullptr) {
+ HTREEITEM hParent = m_tree.GetParentItem(hSel);
+ if (hParent == nullptr) {
+ SERVO::CControlJob* cj = (SERVO::CControlJob*)m_tree.GetItemData(hSel);
+ ASSERT(m_pages.size() == 3);
+ m_pages[0]->ShowWindow(SW_HIDE);
+ m_pages[1]->ShowWindow(SW_HIDE);
+ m_pages[2]->ShowWindow(SW_SHOW);
+ }
+ else if (m_tree.GetParentItem(hParent) == nullptr) {
+ SERVO::CProcessJob* pj = (SERVO::CProcessJob*)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);
+ }
+ else {
+ // 鏈夌鍏� 鈫� 绗笁灞傚強浠ヤ笅 鈫� Glass
+ }
+ }
+
+ *pResult = 0;
+}
+
+void CControlJobManagerDlg::OnDestroy()
+{
+ CDialogEx::OnDestroy();
+
+ for (auto page : m_pages) {
+ page->DestroyWindow();
+ delete page;
+ }
+}
+
+
+void CControlJobManagerDlg::OnBnClickedButtonApply()
+{
+ for (auto item : m_pages) {
+ item->OnApply();
+ }
+ GetDlgItem(IDC_BUTTON_APPLY)->EnableWindow(FALSE);
+}
+
+void CControlJobManagerDlg::UpProcessJobId(SERVO::CProcessJob* pJob)
+{
+ int count = m_listBox.GetCount();
+ for (int idx = 0; idx < count; idx++) {
+ if ((m_listBox.GetItemDataPtr(idx) == (void*)pJob)) {
+ BOOL check = m_listBox.GetCheck(idx);
+ BOOL wasCurSel = (m_listBox.GetCurSel() == idx); // 鍗曢�夋ā寮�
+ m_listBox.DeleteString(idx);
+ int newIdx = m_listBox.InsertString(idx, pJob->id().c_str());
+ m_listBox.SetItemDataPtr(newIdx, pJob);
+ m_listBox.SetCheck(newIdx, check);
+ if (wasCurSel) {
+ m_listBox.SetCurSel(newIdx);
+ }
+ }
+ }
+}
--
Gitblit v1.9.3