From 2a21061d88d5533065dc57cfae0b1f2c1952e06f Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期五, 22 八月 2025 16:01:32 +0800
Subject: [PATCH] 1.PorcessJob和Glass关系绑定； 2.对话框显示ProcessJob、Glass等数据；
---
SourceCode/Bond/Servo/CControlJobDlg.cpp | 30 ++++++++++++++++++++++--------
1 files changed, 22 insertions(+), 8 deletions(-)
diff --git a/SourceCode/Bond/Servo/CControlJobDlg.cpp b/SourceCode/Bond/Servo/CControlJobDlg.cpp
index a372529..7365c3d 100644
--- a/SourceCode/Bond/Servo/CControlJobDlg.cpp
+++ b/SourceCode/Bond/Servo/CControlJobDlg.cpp
@@ -58,10 +58,12 @@
HIMAGELIST imageList = ImageList_Create(24, 24, ILC_COLOR24, 1, 1);
ListView_SetImageList(m_listCtrl.GetSafeHwnd(), imageList, LVSIL_SMALL);
m_listCtrl.ModifyStyle(0, LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS);
- m_listCtrl.InsertColumn(0, _T("鍚嶇О"), LVCFMT_LEFT, 180);
- m_listCtrl.InsertColumn(1, _T("鐘舵��"), LVCFMT_LEFT, 120);
- m_listCtrl.InsertColumn(2, _T("鎻忚堪"), LVCFMT_LEFT, 260);
- m_listCtrl.InsertColumn(3, _T("閰嶆柟"), LVCFMT_LEFT, 180);
+ m_listCtrl.InsertColumn(0, _T("ID"), LVCFMT_LEFT, 180);
+ m_listCtrl.InsertColumn(1, _T("绫诲瀷"), LVCFMT_LEFT, 120);
+ m_listCtrl.InsertColumn(2, _T("鐘舵��"), LVCFMT_LEFT, 120);
+ m_listCtrl.InsertColumn(3, _T("閰嶆柟"), LVCFMT_LEFT, 120);
+ m_listCtrl.InsertColumn(4, _T("Port / Carrier / Slot"), LVCFMT_LEFT, 180);
+ m_listCtrl.InsertColumn(5, _T("鎻忚堪"), LVCFMT_LEFT, 220);
// 鎺т欢鐘舵��
@@ -135,15 +137,27 @@
m_listCtrl.DeleteAllItems();
if (m_pControlJob != nullptr) {
- auto* root1 = m_listCtrl.InsertRoot({ m_pControlJob->id().c_str(),
+ auto* root1 = m_listCtrl.InsertRoot({ m_pControlJob->id().c_str(), _T("ControlJob"),
m_pControlJob->getStateText().c_str(), _T("") });
auto pjs = m_pControlJob->getPjs();
for (auto pj : pjs) {
- auto* root2 = m_listCtrl.InsertChild(root1, {pj->id().c_str(),
- pj->getStateText().c_str(), _T(""), pj->recipeSpec().c_str()});
+ auto* root2 = m_listCtrl.InsertChild(root1, {pj->id().c_str(), _T("ProcessJob"),
+ pj->getStateText().c_str(), pj->recipeSpec().c_str(), _T(""), _T(""), _T("") });
auto cs = pj->carriers();
for (auto c : cs) {
- m_listCtrl.InsertChild(root2, {c.carrierId.c_str(), _T(""), _T("") });
+ for (auto g : c.contexts) {
+ SERVO::CGlass* pGlass = (SERVO::CGlass*)g;
+ if (pGlass != nullptr) {
+ int port, slot;
+ pGlass->getOrginPort(port, slot);
+ std::string carrier = c.carrierId + " / Port" + std::to_string(port + 1) + " / Slot" + std::to_string(slot + 1);
+ m_listCtrl.InsertChild(root2, { pGlass->getID().c_str(), _T("Glass"),
+ pGlass->getStateText().c_str(), _T(""), carrier.c_str(), _T("") });
+ }
+ else {
+ m_listCtrl.InsertChild(root2, { "Null", _T("Glass"), _T(""), _T(""), c.carrierId.c_str(), _T("") });
+ }
+ }
}
root2->expanded = true;
}
--
Gitblit v1.9.3