From fc8d367963a16de61dfbc4a0ff34c78c91ec2cfe Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期五, 05 九月 2025 09:21:28 +0800
Subject: [PATCH] Merge branch 'liuyang' into clh
---
SourceCode/Bond/Servo/PageRecipe.cpp | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/SourceCode/Bond/Servo/PageRecipe.cpp b/SourceCode/Bond/Servo/PageRecipe.cpp
index 7ed085b..f19cae0 100644
--- a/SourceCode/Bond/Servo/PageRecipe.cpp
+++ b/SourceCode/Bond/Servo/PageRecipe.cpp
@@ -199,16 +199,16 @@
std::string strRecipeName = mgr.getDeviceRecipeName(pEq->getName(), item.second);
m_listPPID.SetItemText(index, 3, strRecipeName.c_str());
+ std::string strDescription;
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);
+ mgr.addDeviceRecipe(pEq->getName(), item.second, strRecipeName, strDescription);
}
}
@@ -482,7 +482,8 @@
AfxMessageBox(_T("閰嶆柟鍚嶇О涓嶈兘涓虹┖锛�"));
return;
}
- if (RecipeManager::getInstance().updateDeviceRecipe(pEq->getName(), _ttoi(strID), std::string(CT2A(strText)))) {
+
+ if (RecipeManager::getInstance().updateDeviceRecipeName(pEq->getName(), _ttoi(strID), std::string(CT2A(strText)))) {
m_listPPID.SetItemText(nLine, 3, strText);
}
}
--
Gitblit v1.9.3