From 8e2b7558c6dce11bfbb144a5d6bf329d41d43827 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期三, 17 九月 2025 17:35:34 +0800
Subject: [PATCH] 1.调整CControlJobManagerDlg的版面；
---
SourceCode/Bond/Servo/CControlJobManagerDlg.cpp | 173 ++++++++++++---------------------------------------------
1 files changed, 38 insertions(+), 135 deletions(-)
diff --git a/SourceCode/Bond/Servo/CControlJobManagerDlg.cpp b/SourceCode/Bond/Servo/CControlJobManagerDlg.cpp
index 6783528..da7db7e 100644
--- a/SourceCode/Bond/Servo/CControlJobManagerDlg.cpp
+++ b/SourceCode/Bond/Servo/CControlJobManagerDlg.cpp
@@ -34,7 +34,6 @@
void CControlJobManagerDlg::DoDataExchange(CDataExchange* pDX)
{
CDialogEx::DoDataExchange(pDX);
- DDX_Control(pDX, IDC_LIST1, m_listBox);
DDX_Control(pDX, IDC_TREE1, m_tree);
}
@@ -42,10 +41,6 @@
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)
@@ -93,12 +88,12 @@
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));
+ // tree
+ m_tree.ModifyStyle(0, TVS_CHECKBOXES);
+ InitData();
+ UpdateControlJob();
UpdateCtrlState();
Resize();
@@ -131,50 +126,25 @@
// 鍏堢Щ鍔ㄦ寜閽�
- 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_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();
- x += 8;
-
- pItem = GetDlgItem(IDC_BUTTON_BATH_DELETE);
- pItem->GetWindowRect(&rcItem);
- pItem->MoveWindow(x, y2 - rcItem.Height(), rcItem.Width(), rcItem.Height());
- x += rcItem.Width();
- x += 8;
-
pItem = GetDlgItem(IDC_BUTTON_APPLY);
pItem->GetWindowRect(&rcItem);
pItem->MoveWindow(x2 - rcItem.Width(), y2 - rcItem.Height(), rcItem.Width(), rcItem.Height());
+ x2 -= rcItem.Width();
+ x2 -= 8;
+
+ pItem = GetDlgItem(IDC_BUTTON_BATH_COMPLETION);
+ pItem->GetWindowRect(&rcItem);
+ pItem->MoveWindow(x2 - rcItem.Width(), y2 - rcItem.Height(), rcItem.Width(), rcItem.Height());
+ x += rcItem.Width();
+ x += 8;
+
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;
+ y = 12;
pItem = GetDlgItem(IDC_TREE1);
pItem->MoveWindow(x, y, LEFTWIDTH, y2 - y);
x += LEFTWIDTH;
@@ -182,6 +152,7 @@
// 瀛愰〉闈�
+ x2 = rcClient.right - 12;
for (auto page : m_pages) {
page->MoveWindow(x, 12, x2 - x, y2 - 12);
}
@@ -204,45 +175,7 @@
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()
@@ -252,31 +185,13 @@
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) {
+ 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);
+ m_tree.SetItemState(hItem, INDEXTOSTATEIMAGEMASK(false ? 2 : 1), TVIS_STATEIMAGEMASK);
}
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)
@@ -289,21 +204,6 @@
{
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)
@@ -325,8 +225,15 @@
m_pages[0]->ShowWindow(SW_HIDE);
m_pages[1]->ShowWindow(SW_SHOW);
m_pages[2]->ShowWindow(SW_HIDE);
-
m_pages[1]->SetContext(pj, 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);
}
else {
// 鏈夌鍏� 鈫� 绗笁灞傚強浠ヤ笅 鈫� Glass
@@ -346,6 +253,18 @@
}
}
+void CControlJobManagerDlg::InitData()
+{
+ ASSERT(m_pControlJob == nullptr);
+ 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);
+ }
+}
void CControlJobManagerDlg::OnBnClickedButtonApply()
{
@@ -357,22 +276,6 @@
void CControlJobManagerDlg::UpProcessJobId(SERVO::CProcessJob* pJob)
{
- // 鏇存柊listbox
- 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);
- }
- }
- }
-
// 鏇存柊鏍戞帶浠�
// 閬嶅巻鏍硅妭鐐�
HTREEITEM hRoot = m_tree.GetRootItem();
--
Gitblit v1.9.3