From fd381da2f50420d8c861ad9cf213d7b1586f0188 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期四, 18 九月 2025 18:06:18 +0800
Subject: [PATCH] 1.Port物料选择控件完善； 2.继续处理CControlJobManagerDlg的功能；
---
SourceCode/Bond/Servo/CControlJobManagerDlg.cpp | 276 +++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 237 insertions(+), 39 deletions(-)
diff --git a/SourceCode/Bond/Servo/CControlJobManagerDlg.cpp b/SourceCode/Bond/Servo/CControlJobManagerDlg.cpp
index da7db7e..0bf7d67 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)
@@ -41,9 +51,14 @@
BEGIN_MESSAGE_MAP(CControlJobManagerDlg, CDialogEx)
ON_WM_SIZE()
ON_WM_GETMINMAXINFO()
- ON_NOTIFY(TVN_SELCHANGED, IDC_TREE1, &CControlJobManagerDlg::OnTvnSelchangedTree1)
+ ON_NOTIFY(TVN_ITEMCHANGED, IDC_TREE1, &CControlJobManagerDlg::OnTvnItemChangedTree)
+ ON_NOTIFY(NM_CLICK, IDC_TREE1, &CControlJobManagerDlg::OnTreeClick) // 鏂板
+ ON_NOTIFY(TVN_KEYDOWN, IDC_TREE1, &CControlJobManagerDlg::OnTreeKeyDown) // 鏂板
+ ON_MESSAGE(WM_AFTER_TVCHECK, &CControlJobManagerDlg::OnAfterTvCheck) // 鏂板
ON_WM_DESTROY()
ON_BN_CLICKED(IDC_BUTTON_APPLY, &CControlJobManagerDlg::OnBnClickedButtonApply)
+ ON_NOTIFY(TVN_SELCHANGING, IDC_TREE1, &CControlJobManagerDlg::OnTvnSelchangingTree1)
+ ON_BN_CLICKED(IDC_BUTTON_BATH_COMPLETION, &CControlJobManagerDlg::OnBnClickedButtonBathCompletion)
END_MESSAGE_MAP()
@@ -60,7 +75,7 @@
}
else if (1 == code) {
if (contextType == 1) {
- UpProcessJobId((SERVO::CProcessJob*)pContext);
+ UpProcessJobId((PJWarp*)pContext);
}
}
};
@@ -174,8 +189,7 @@
void CControlJobManagerDlg::UpdateCtrlState()
{
- auto& master = theApp.m_model.getMaster();
- GetDlgItem(IDC_BUTTON_BATH_COMPLETION)->EnableWindow(false);
+ GetDlgItem(IDC_BUTTON_BATH_COMPLETION)->EnableWindow(true);
}
void CControlJobManagerDlg::UpdateControlJob()
@@ -186,10 +200,10 @@
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);
- m_tree.SetItemState(hItem, INDEXTOSTATEIMAGEMASK(false ? 2 : 1), TVIS_STATEIMAGEMASK);
+ 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(item.addToCj ? 2 : 1), TVIS_STATEIMAGEMASK);
}
m_tree.Expand(hRoot, TVE_EXPAND);
}
@@ -206,46 +220,133 @@
return m_pControlJob->removePjPointer(pj->id());
}
-void CControlJobManagerDlg::OnTvnSelchangedTree1(NMHDR* pNMHDR, LRESULT* pResult)
+void CControlJobManagerDlg::OnTvnItemChangedTree(NMHDR* pNMHDR, LRESULT* pResult)
+{
+ auto* p = reinterpret_cast<LPNMTREEVIEW>(pNMHDR);
+ UINT oldState = p->itemOld.state, newState = p->itemNew.state;
+ HTREEITEM hItem = p->itemNew.hItem;
+
+ if (((oldState ^ newState) & TVIS_STATEIMAGEMASK) != 0) {
+ const int idx = (newState & TVIS_STATEIMAGEMASK) >> 12; // 1=鏈��,2=宸查��
+ const bool checked = (idx == 2);
+
+ PJWarp* pjWarp = (PJWarp*)m_tree.GetItemData(hItem);
+ if (pjWarp != nullptr) {
+ CString s; s.Format("%s %d", ((SERVO::CProcessJob*)pjWarp->pj)->id().c_str(),
+ checked ? "" : "");
+ AfxMessageBox(s);
+ }
+ }
+
+
+ *pResult = 0;
+}
+
+// 鍛戒腑澶嶉�夋锛氱敤 NM_CLICK 鍋氬懡涓祴璇曪紝鐒跺悗鈥滄粸鍚庘�濊鍙栨柊鐘舵��
+void CControlJobManagerDlg::OnTreeClick(NMHDR* pNMHDR, LRESULT* pResult)
+{
+ *pResult = 0;
+
+ DWORD pos = ::GetMessagePos();
+ CPoint pt(GET_X_LPARAM(pos), GET_Y_LPARAM(pos));
+ m_tree.ScreenToClient(&pt);
+
+ TVHITTESTINFO ht{}; ht.pt = pt;
+ HTREEITEM hItem = m_tree.HitTest(&ht);
+ if (hItem && (ht.flags & TVHT_ONITEMSTATEICON)) {
+ // 璁� TreeView 鍏堝垏鎹紝鍐嶅紓姝ヨ鍙栨渶缁堢姸鎬�
+ PostMessage(WM_AFTER_TVCHECK, (WPARAM)hItem, 0);
+ }
+}
+
+// 绌烘牸閿篃浼氬垏鎹㈠閫夋
+void CControlJobManagerDlg::OnTreeKeyDown(NMHDR* pNMHDR, LRESULT* pResult)
+{
+ *pResult = 0;
+ auto* p = reinterpret_cast<LPNMTVKEYDOWN>(pNMHDR);
+ if (p->wVKey == VK_SPACE) {
+ HTREEITEM hItem = m_tree.GetSelectedItem();
+ if (hItem) PostMessage(WM_AFTER_TVCHECK, (WPARAM)hItem, 0);
+ }
+}
+
+// 缁熶竴澶勭悊锛堣鏈�缁堢姸鎬� + 浣犵殑涓氬姟锛�
+LRESULT CControlJobManagerDlg::OnAfterTvCheck(WPARAM wParam, LPARAM /*lParam*/)
+{
+ HTREEITEM hItem = (HTREEITEM)wParam;
+ if (!hItem) return 0;
+
+ // 鍙鐞嗙浜屽眰锛氭牴鐨勭洿鎺ュ瓙鑺傜偣锛堝彲閫夛級
+ auto getLevel = [&](HTREEITEM h) {
+ int lv = 0; for (HTREEITEM p = m_tree.GetParentItem(h); p; p = m_tree.GetParentItem(p)) ++lv; return lv;
+ };
+ if (getLevel(hItem) != 1) return 0;
+
+ BOOL checked = m_tree.GetCheck(hItem);
+
+ // 浣犵殑涓氬姟閫昏緫锛堜慨姝ｄ簡 CString::Format 鐨勫弬鏁扮被鍨嬶級
+ auto* pjWarp = reinterpret_cast<PJWarp*>(m_tree.GetItemData(hItem));
+ if (pjWarp) {
+ pjWarp->addToCj = checked;
+ }
+
+ return 0;
+}
+
+void CControlJobManagerDlg::OnTvnSelchangingTree1(NMHDR* pNMHDR, LRESULT* pResult)
{
LPNMTREEVIEW pNMTreeView = reinterpret_cast<LPNMTREEVIEW>(pNMHDR);
+ bool allow = FALSE;
+ HTREEITEM hOldSel = pNMTreeView->itemOld.hItem;
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);
+ if (0 == ShowPage(2)) {
+
+ }
}
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);
-
- std::vector<std::string> names;
- for (auto item : m_processJobs) {
- if (item != pj) {
- names.push_back(item->id());
- }
+ if (0 == ShowPage(1)) {
+ PJWarp* pjWarp = (PJWarp*)m_tree.GetItemData(hSel);
+ ((CCjPage2*)m_pages[1])->SetPjWarps(m_pjWarps);
+ m_pages[1]->SetContext(pjWarp, 1);
}
- ((CCjPage2*)m_pages[1])->SetExclusionNames(names);
+ else {
+ allow = TRUE;
+ }
}
else {
// 鏈夌鍏� 鈫� 绗笁灞傚強浠ヤ笅 鈫� Glass
}
}
- *pResult = 0;
+ *pResult = allow;
+}
+
+int CControlJobManagerDlg::ShowPage(int index)
+{
+ ASSERT(0 <= index && index <= 2);
+
+ for (int i = 0; i < 3; i++) {
+ if (m_pages[i]->IsWindowVisible()) {
+ int ret = m_pages[i]->OnApply();
+ if (ret != 0) return -1;
+ }
+
+ m_pages[i]->ShowWindow(index == i ? SW_SHOW : SW_HIDE);
+ }
+
+ return 0;
}
void CControlJobManagerDlg::OnDestroy()
{
CDialogEx::OnDestroy();
+ SaveState();
for (auto page : m_pages) {
page->DestroyWindow();
@@ -255,26 +356,34 @@
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);
}
}
void CControlJobManagerDlg::OnBnClickedButtonApply()
{
for (auto item : m_pages) {
- item->OnApply();
+ if (item->IsWindowVisible()) {
+ if (0 == item->OnApply()) {
+ GetDlgItem(IDC_BUTTON_APPLY)->EnableWindow(FALSE);
+ }
+ }
}
- GetDlgItem(IDC_BUTTON_APPLY)->EnableWindow(FALSE);
}
-void CControlJobManagerDlg::UpProcessJobId(SERVO::CProcessJob* pJob)
+void CControlJobManagerDlg::UpProcessJobId(PJWarp* pjWarp)
{
// 鏇存柊鏍戞帶浠�
// 閬嶅巻鏍硅妭鐐�
@@ -284,8 +393,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 +404,91 @@
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;
+}
+
+void CControlJobManagerDlg::OnBnClickedButtonBathCompletion()
+{
+ // 鍏堝簲鐢�
+ for (int i = 0; i < 3; i++) {
+ if (m_pages[i]->IsWindowVisible()) {
+ int ret = m_pages[i]->OnApply();
+ if (ret != 0) return ;
+ }
+ }
+ GetDlgItem(IDC_BUTTON_APPLY)->EnableWindow(FALSE);
+
+
+ // 鍏堟鏌ユ暟鎹纭��
+ int checkCount = 0;
+ for (auto item : m_pjWarps) {
+ if (!item.addToCj) continue;
+ checkCount++;
+ }
+ if (checkCount == 0) {
+ AfxMessageBox(_T("鎮ㄦ病鏈夐�夋嫨瑕佽繘琛屽伐鑹哄鐞嗙殑Process Job!\n璇峰湪瑕佽繘琛屽伐鑹哄鐞嗙殑Process Job鍓嶆墦鍕俱��"));
+ return;
+ }
+
+
+
+ auto& master = theApp.m_model.getMaster();
+
+ std::vector<SERVO::CProcessJob*> pjs;
+ for (auto item : m_pjWarps) {
+ if (!item.addToCj) continue;
+ if (item.port == -1) continue;
+ BOOL bCheck = FALSE;
+ for (int i = 0; i < 8; i++) {
+ if (item.checkSlot[i]) {
+ bCheck = TRUE;
+ break;
+ }
+ }
+ if (!bCheck) continue;
+
+
+ SERVO::CProcessJob* pScr = (SERVO::CProcessJob*)item.pj;
+ SERVO::CProcessJob * pj = new SERVO::CProcessJob(pScr->id());
+ pj->setRecipe(SERVO::RecipeMethod::NoTuning, pScr->recipeSpec());
+
+ std::vector<SERVO::CarrierSlotInfo> carriers;
+ SERVO::CarrierSlotInfo csi;
+ csi.carrierId = "Port" + std::to_string(item.port + 1);
+ for (int i = 0; i < 8; i++) {
+ if (item.checkSlot[i]) {
+ csi.slots.push_back(i);
+ }
+ }
+ carriers.push_back(csi);
+ pj->setCarriers(carriers);
+ pjs.push_back(pj);
+
+ m_pControlJob->addPJ(pScr->id());
+ }
+
+
+ if (pjs.empty()) {
+ AfxMessageBox(_T("娌℃湁闇�瑕佽繘琛屽伐鑹哄鐞嗙殑Process Job!\n鍙兘鏈�夋嫨Port鎴栭�夋嫨浠讳綍鐗╂枡銆�"));
+ return;
+ }
+
+
+ m_pControlJob->setPJs(pjs);
+ int nRet = master.setProcessJobs(pjs);
+ master.setControlJob(*m_pControlJob);
+}
--
Gitblit v1.9.3