From 009eda749899fc85d3a75ad2016371f27436bf36 Mon Sep 17 00:00:00 2001
From: LAPTOP-T815PCOQ\25526 <mr.liuyang@126.com>
Date: 星期四, 09 一月 2025 14:04:16 +0800
Subject: [PATCH] Merge branch 'liuyang' into chenluhua
---
SourceCode/Bond/BoounionPLC/PagePlcList.cpp | 25 ++++++++++++++++++++++---
1 files changed, 22 insertions(+), 3 deletions(-)
diff --git a/SourceCode/Bond/BoounionPLC/PagePlcList.cpp b/SourceCode/Bond/BoounionPLC/PagePlcList.cpp
index a153ccb..980fac0 100644
--- a/SourceCode/Bond/BoounionPLC/PagePlcList.cpp
+++ b/SourceCode/Bond/BoounionPLC/PagePlcList.cpp
@@ -35,6 +35,7 @@
ON_WM_CTLCOLOR()
ON_WM_DESTROY()
ON_WM_SIZE()
+ ON_MESSAGE(ID_MSG_TREE_CLICK_ITEM, OnTreeClickItem)
END_MESSAGE_MAP()
@@ -160,10 +161,28 @@
rcItem.Width(), rcItem.Height());
}
+LRESULT CPagePlcList::OnTreeClickItem(WPARAM wParam, LPARAM lParam)
+{
+ HTREEITEM hItem = (HTREEITEM)wParam;
+ ASSERT(hItem);
+ CPLC* pPlc = (CPLC*)m_treeCtrl.GetItemData(hItem);
+ ASSERT(pPlc);
+ theApp.m_model.notifyPtr(RX_CODE_SELECT_PLC, pPlc);
+
+ return 0;
+}
+
void CPagePlcList::ReadPLCList()
{
- //m_treeCtrl.InsertItem("PLC1", nullptr, nullptr);
- //m_treeCtrl.InsertItem("PLC2", nullptr, nullptr);
+ std::map<std::string, CPLC*>& plcs = theApp.m_model.getPlcMap();
+ for (auto item : plcs) {
+ HTREEITEM hItem = m_treeCtrl.InsertItem(item.second->getName().c_str(), nullptr, nullptr);
+ m_treeCtrl.SetItemData(hItem, (DWORD_PTR)item.second);
+ }
+ if (!plcs.empty()) {
+ m_treeCtrl.ShowWindow(SW_SHOW);
+ GetDlgItem(IDC_LABEL_NO_PLC)->ShowWindow(SW_HIDE);
+ }
}
BOOL CPagePlcList::PreTranslateMessage(MSG* pMsg)
@@ -186,4 +205,4 @@
}
return nullptr;
-}
\ No newline at end of file
+}
--
Gitblit v1.9.3