From 1c8098f74227411b5417c560eb7e6d7c0a61ae6e Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期四, 04 九月 2025 16:28:52 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang
---
SourceCode/Bond/Servo/PageRecipe.cpp | 215 +++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 157 insertions(+), 58 deletions(-)
diff --git a/SourceCode/Bond/Servo/PageRecipe.cpp b/SourceCode/Bond/Servo/PageRecipe.cpp
index bbbfe21..7ed085b 100644
--- a/SourceCode/Bond/Servo/PageRecipe.cpp
+++ b/SourceCode/Bond/Servo/PageRecipe.cpp
@@ -9,6 +9,7 @@
#include "InputDialog.h"
#include "RecipeDeviceBindDlg.h"
+
// CPageRecipe 瀵硅瘽妗�
IMPLEMENT_DYNAMIC(CPageRecipe, CDialogEx)
@@ -172,48 +173,43 @@
m_listPPID.SetColumnWidth(nColCount - 1, LVSCW_AUTOSIZE_USEHEADER);
}
-void CPageRecipe::FillRecipeListToListCtrl(SERVO::CRecipeList* pList)
+void CPageRecipe::FillRecipeListToListCtrl(SERVO::CEquipment* pEq)
{
+ SERVO::CRecipeList* pRecipeList = pEq->getRecipeList(0);
CListCtrl* pListCtrl = (CListCtrl*)GetDlgItem(IDC_LIST_PPID);
if (pListCtrl == nullptr || !::IsWindow(pListCtrl->m_hWnd)) {
return;
}
- CComboBox* pComboBox = (CComboBox*)GetDlgItem(IDC_COMBO_EQUIPMENT);
- if (pComboBox == nullptr || !::IsWindow(pComboBox->m_hWnd)) {
- return;
- }
-
- int nEqSel = pComboBox->GetCurSel();
- if (nEqSel == CB_ERR) {
- return;
- }
-
- auto& mgr = RecipeManager::getInstance();
- SERVO::CEquipment* pEq = (SERVO::CEquipment*)pComboBox->GetItemDataPtr(nEqSel);
- if (pEq == nullptr) {
- return;
- }
-
// 娓呯┖褰撳墠CListCtrl涓殑鎵�鏈夐」
pListCtrl->DeleteAllItems();
- if (pList == nullptr) {
+ if (pRecipeList == nullptr) {
return;
}
// 閬嶅巻鏁版嵁骞舵彃鍏ュ埌CListCtrl涓�
- std::map<int, short>& ids = pList->getIds();
+ auto& mgr = RecipeManager::getInstance();
+ std::map<int, short>& ids = pRecipeList->getIds();
+ auto rawDatas = pRecipeList->getParamsRawData();
for (auto item : ids) {
int index = m_listPPID.InsertItem(m_listPPID.GetItemCount(), _T(""));
m_listPPID.SetItemText(index, 1, std::to_string(item.first).c_str());
m_listPPID.SetItemText(index, 2, std::to_string(item.second).c_str());
std::string strRecipeName = mgr.getDeviceRecipeName(pEq->getName(), item.second);
+ m_listPPID.SetItemText(index, 3, strRecipeName.c_str());
+
+ auto iter = rawDatas.find(item.second);
+ if (iter != rawDatas.end()) {
+ std::string strDescription;
+ pEq->parsingParams((const char*)iter->second.data(), iter->second.size(), strDescription);
+ m_listPPID.SetItemText(index, 4, strDescription.c_str());
+ }
+
if (strRecipeName.empty()) {
strRecipeName = std::to_string(item.second);
mgr.addDeviceRecipe(pEq->getName(), item.second, strRecipeName);
}
- m_listPPID.SetItemText(index, 3, strRecipeName.c_str());
}
// 鑾峰彇鍒楁暟
@@ -374,8 +370,12 @@
pEq[i] == nullptr ? _T("Master") : pEq[i]->getName().c_str());
pComboBox->SetItemDataPtr(i, pEq[i]);
+ // 璇诲彇鍥炴潵
+ char szBuffer[_MAX_PATH];
if (pEq[i]) {
- pEq[i]->masterRecipeListRequest(0, nullptr);
+ sprintf_s(szBuffer, _MAX_PATH, "%s\\Recipe\\EQ%d_Unit0.recipelist", (LPTSTR)(LPCTSTR)theApp.m_strAppDir, pEq[i]->getID());
+ std::string strFilepath(szBuffer);
+ pEq[i]->readRecipeList(0, strFilepath);
}
}
pComboBox->SetCurSel(0);
@@ -547,32 +547,11 @@
FillDataToListCtrl(vecData);
}
else {
- // enable port
- CMsgDlg msgDlg("璇风瓑寰�", "姝ｅ湪鑾峰彇閰嶆柟...");
- pEq->masterRecipeListRequest(0, [&, pEq](int status) -> void {
- if (status == SS_FAILED || status == SS_TIMEOUT) {
- CString strMsg;
- strMsg.Format(status == SS_FAILED ? _T("鑾峰彇閰嶆柟澶辫触锛�") : _T("鑾峰彇閰嶆柟瓒呮椂锛�"));
- msgDlg.DelayClose(3000);
- msgDlg.SetIcon(MSG_BOX_ERROR);
- msgDlg.SetTitle(_T("鎿嶄綔澶辫触"));
- msgDlg.SetMessage((LPTSTR)(LPCTSTR)strMsg);
- msgDlg.SetMarquee(FALSE, 0);
- msgDlg.SetCompleteCode(-1);
- }
- else if (status == SS_COMPLETE) {
- CString strMsg;
- strMsg.Format(_T("鑾峰彇閰嶆柟瀹屾垚锛�"));
- msgDlg.DelayClose(3000);
- msgDlg.SetIcon(MSG_BOX_SUCCEED);
- msgDlg.SetTitle(_T("鎿嶄綔鎴愬姛"));
- msgDlg.SetMessage((LPTSTR)(LPCTSTR)strMsg);
- msgDlg.SetMarquee(FALSE, 0);
- msgDlg.SetCompleteCode(0);
- SERVO::CRecipeList* pRecipeList = pEq->getRecipeList(0);
- FillRecipeListToListCtrl(pRecipeList);
- }
- });
+ // 鑾峰彇閰嶆柟鍒楄〃
+ CMsgDlg msgDlg("璇风瓑寰�", "姝ｅ湪鑾峰彇閰嶆柟鍒楄〃...");
+ msgDlg.SetData((DWORD_PTR)this);
+ msgDlg.SetDataEx((DWORD_PTR)pEq);
+ msgDlg.BeginThread(SyncThreadFunction);
msgDlg.DoModal();
}
}
@@ -592,9 +571,9 @@
int nEqSel = pComboBox->GetCurSel();
GetDlgItem(IDC_BUTTON_NEW)->EnableWindow(nEqSel == 0);
- GetDlgItem(IDC_BUTTON_MODIFY)->EnableWindow(nItem > 0);
- GetDlgItem(IDC_BUTTON_DELETE)->EnableWindow(nEqSel == 0 && nItem > 0);
- GetDlgItem(IDC_BUTTON_DELETE_ALL)->EnableWindow(nEqSel == 0 && nItem > 0);
+ GetDlgItem(IDC_BUTTON_MODIFY)->EnableWindow(nItem != -1);
+ GetDlgItem(IDC_BUTTON_DELETE)->EnableWindow(nEqSel == 0 && nItem != -1);
+ GetDlgItem(IDC_BUTTON_DELETE_ALL)->EnableWindow(nEqSel == 0 && nItem != -1);
}
void CPageRecipe::OnDblclkListPPID(NMHDR* pNMHDR, LRESULT* pResult)
@@ -625,12 +604,12 @@
{
CComboBox* pComboBox = (CComboBox*)GetDlgItem(IDC_COMBO_EQUIPMENT);
int nEqSel = pComboBox->GetCurSel();
- int selectedCount = ListView_GetSelectedCount(m_listPPID.GetSafeHwnd());
+ int nItem = ListView_GetSelectedCount(m_listPPID.GetSafeHwnd());
- GetDlgItem(IDC_BUTTON_NEW)->EnableWindow(nEqSel == 0/* && selectedCount > 0*/);
- GetDlgItem(IDC_BUTTON_MODIFY)->EnableWindow(nEqSel == 0 && selectedCount > 0);
- GetDlgItem(IDC_BUTTON_DELETE)->EnableWindow(nEqSel == 0 && selectedCount > 0);
- GetDlgItem(IDC_BUTTON_DELETE_ALL)->EnableWindow(nEqSel == 0 && selectedCount > 0);
+ GetDlgItem(IDC_BUTTON_NEW)->EnableWindow(nEqSel == 0);
+ GetDlgItem(IDC_BUTTON_MODIFY)->EnableWindow(nEqSel == 0 && nItem != -1);
+ GetDlgItem(IDC_BUTTON_DELETE)->EnableWindow(nEqSel == 0 && nItem != -1);
+ GetDlgItem(IDC_BUTTON_DELETE_ALL)->EnableWindow(nEqSel == 0 && nItem != -1);
GetDlgItem(IDC_EDIT_KEYWORD)->EnableWindow(nEqSel == 0);
GetDlgItem(IDC_BUTTON_SEARCH)->EnableWindow(nEqSel == 0);
@@ -642,7 +621,127 @@
}
else {
InitListCtrlHeaderForDevice();
- SERVO::CRecipeList* pRecipeList = pEq->getRecipeList(0);
- FillRecipeListToListCtrl(pRecipeList);
+ FillRecipeListToListCtrl(pEq);
}
-}
\ No newline at end of file
+}
+
+UINT CPageRecipe::SyncThreadFunction(LPVOID lpvData)
+{
+ CMsgDlg* pMsgDlg = (CMsgDlg*)lpvData;
+ CPageRecipe* pPageRecipe = (CPageRecipe*)pMsgDlg->GetData();
+ return pPageRecipe->SyncThreadFunctionInner(pMsgDlg);
+}
+
+UINT CPageRecipe::SyncThreadFunctionInner(CMsgDlg* pMsgDlg)
+{
+ SERVO::CEquipment* pEq = (SERVO::CEquipment*)pMsgDlg->GetDataEx();
+ HANDLE hEvent = ::CreateEvent(NULL, TRUE, FALSE, NULL);
+ int nStep = 0;
+
+ // 鍑嗗閰嶆柟璺緞
+ char szBuffer[_MAX_PATH];
+ sprintf_s(szBuffer, _MAX_PATH, "%s\\Recipe\\EQ%d_Unit0.recipelist", (LPTSTR)(LPCTSTR)theApp.m_strAppDir, pEq->getID());
+ std::string strFilepath(szBuffer);
+
+ pEq->masterRecipeListRequest(0, [&, pEq, pMsgDlg, hEvent](int status) -> void {
+ Sleep(300);
+ if (status == SS_FAILED || status == SS_TIMEOUT) {
+ CString strMsg;
+ strMsg.Format(status == SS_FAILED ? _T("鑾峰彇閰嶆柟鍒楄〃澶辫触锛�") : _T("鑾峰彇閰嶆柟鍒楄〃瓒呮椂锛�"));
+ pMsgDlg->SetIcon(MSG_BOX_ERROR);
+ pMsgDlg->SetTitle(_T("鎿嶄綔澶辫触"));
+ pMsgDlg->SetMessage((LPTSTR)(LPCTSTR)strMsg);
+ SetEvent(hEvent);
+ }
+ else if (status == SS_LIST_COMPLETE) {
+ CString strMsg;
+ strMsg.Format(_T("鑾峰彇閰嶆柟鍒楄〃瀹屾垚锛�"));
+ pMsgDlg->SetTitle(_T("鎿嶄綔鎴愬姛"));
+ pMsgDlg->SetMessage((LPTSTR)(LPCTSTR)strMsg);
+ SERVO::CRecipeList* pRecipeList = pEq->getRecipeList(0);
+ if (pRecipeList != nullptr && !pRecipeList->getIds().empty()) {
+ nStep = 1;
+ }
+ SetEvent(hEvent);
+ }
+ });
+ ::WaitForSingleObject(hEvent, INFINITE);
+ if (nStep != 1) {
+ pEq->saveRecipeList(0, strFilepath);
+ pMsgDlg->SetIcon(MSG_BOX_SUCCEED);
+ pMsgDlg->SetMarquee(FALSE, 0);
+ pMsgDlg->SetCompleteCode(-1);
+ pMsgDlg->DelayClose(3000);
+ }
+ ResetEvent(hEvent);
+
+
+ // 鍙傛暟鍒楄〃
+ if (nStep == 1) {
+ SERVO::CRecipeList* pRecipeList = pEq->getRecipeList(0);
+ ASSERT(pRecipeList);
+ auto& ids = pRecipeList->getIds();
+ pMsgDlg->SetTitle(_T("姝ｅ湪鑾峰彇鍙傛暟"));
+ for (auto item : ids) {
+ int recipeId = item.second;
+ CString strMsg;
+ strMsg.Format(_T("姝ｅ湪鑾峰彇閰嶆柟 %d 鍙傛暟..."), item.second);
+ pMsgDlg->SetMessage((LPTSTR)(LPCTSTR)strMsg);
+ pEq->recipeParameterRequest(0, recipeId, 0, [&, pEq, pMsgDlg, recipeId, hEvent](int status) -> void {
+ Sleep(500);
+ if (status == SS_FAILED || status == SS_TIMEOUT) {
+ CString strMsg;
+ strMsg.Format(status == SS_FAILED ? _T("鑾峰彇閰嶆柟 %d 鍙傛暟澶辫触锛�") : _T("鑾峰彇閰嶆柟 %d 鍙傛暟瓒呮椂锛�"), recipeId);
+ pMsgDlg->SetMessage((LPTSTR)(LPCTSTR)strMsg);
+
+ Sleep(30);
+ SetEvent(hEvent);
+ }
+ else if (status == SS_PARAMS_COMPLETE) {
+ CString strMsg;
+ strMsg.Format(_T("鑾峰彇閰嶆柟 %d 鍙傛暟瀹屾垚锛�"), item.second);
+ pMsgDlg->SetMessage((LPTSTR)(LPCTSTR)strMsg);
+
+ Sleep(30);
+ SetEvent(hEvent);
+ }
+ });
+ ::WaitForSingleObject(hEvent, INFINITE);
+ ResetEvent(hEvent);
+ }
+
+
+ pEq->saveRecipeList(0, strFilepath);
+ pMsgDlg->SetIcon(MSG_BOX_SUCCEED);
+ pMsgDlg->SetTitle(_T("鎿嶄綔瀹屾垚"));
+ pMsgDlg->SetCompleteCode(0);
+ pMsgDlg->SetMarquee(FALSE, 0);
+ pMsgDlg->DelayClose(3000);
+ };
+
+ FillRecipeListToListCtrl(pEq);
+ CloseHandle(hEvent);
+
+
+ // 鍦ㄦ鎵撳嵃閰嶆柟鍙傛暟浠ヤ究鏍稿鏁版嵁
+ SERVO::CRecipeList* pRecipeList = pEq->getRecipeList(0);
+ ASSERT(pRecipeList);
+ auto rawDatas = pRecipeList->getParamsRawData();
+ for (auto item : rawDatas) {
+ TRACE("================= 閰嶆柟 %d\n", item.first);
+
+ std::vector<CParam> params;
+ pEq->parsingParams((const char*)item.second.data(), item.second.size(), params);
+ for (auto p : params) {
+ if (p.getValueType() == PVT_INT) {
+ TRACE("%s: %d\n", p.getName().c_str(), p.getIntValue());
+ }
+ else if (p.getValueType() == PVT_DOUBLE) {
+ TRACE("%s: %f\n", p.getName().c_str(), p.getDoubleValue());
+ }
+ }
+
+ }
+
+ return 0;
+}
--
Gitblit v1.9.3