From 829fe6c6bc33d53fda9c31fd45a37e1df87befff Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期五, 30 一月 2026 11:16:24 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang
---
SourceCode/Bond/Servo/PageRecipe.cpp | 212 ++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 176 insertions(+), 36 deletions(-)
diff --git a/SourceCode/Bond/Servo/PageRecipe.cpp b/SourceCode/Bond/Servo/PageRecipe.cpp
index 891f274..841a96f 100644
--- a/SourceCode/Bond/Servo/PageRecipe.cpp
+++ b/SourceCode/Bond/Servo/PageRecipe.cpp
@@ -5,7 +5,10 @@
#include "Servo.h"
#include "afxdialogex.h"
#include "PageRecipe.h"
+#include "MsgDlg.h"
+#include "InputDialog.h"
#include "RecipeDeviceBindDlg.h"
+#include "DeviceRecipeParamDlg.h"
// CPageRecipe 瀵硅瘽妗�
@@ -36,7 +39,7 @@
}
m_listPPID.InsertColumn(0, _T(""), LVCFMT_RIGHT, 0); // 闅愯棌鍒�
- m_listPPID.InsertColumn(1, _T("No."), LVCFMT_LEFT, width[1]);
+ m_listPPID.InsertColumn(1, _T("No."), LVCFMT_CENTER, width[1]);
m_listPPID.InsertColumn(2, _T("PPID"), LVCFMT_LEFT, width[2]);
m_listPPID.InsertColumn(3, _T("鐪熺┖鐑樼儰"), LVCFMT_LEFT, width[6]);
m_listPPID.InsertColumn(4, _T("Bonder1"), LVCFMT_LEFT, width[4]);
@@ -55,17 +58,18 @@
CString strIniFile, strItem;
strIniFile.Format(_T("%s\\configuration.ini"), (LPCTSTR)theApp.m_strAppDir);
- int width[] = { 0, 60, 150, 150 };
+ int width[] = { 0, 60, 100, 100, 150 };
- for (int i = 0; i < 4; i++) {
+ for (int i = 0; i < 5; i++) {
strItem.Format(_T("Col_Device_%d_Width"), i);
width[i] = GetPrivateProfileInt(_T("PageRecipeListCtrl"), strItem, width[i], strIniFile);
}
m_listPPID.InsertColumn(0, _T(""), LVCFMT_RIGHT, width[0]);
m_listPPID.InsertColumn(1, _T("No."), LVCFMT_CENTER, width[1]);
- m_listPPID.InsertColumn(2, _T("Recipe ID"), LVCFMT_CENTER, width[2]);
- m_listPPID.InsertColumn(3, _T("Recipe 鍚嶇О"), LVCFMT_CENTER, width[3]);
+ m_listPPID.InsertColumn(2, _T("Recipe ID"), LVCFMT_LEFT, width[2]);
+ m_listPPID.InsertColumn(3, _T("Recipe 鍚嶇О"), LVCFMT_LEFT, width[3]);
+ m_listPPID.InsertColumn(4, _T("Recipe 鍙傛暟"), LVCFMT_LEFT, width[4]);
}
void CPageRecipe::UpdateRecipeByPPID(const CString& strPPID)
@@ -134,9 +138,12 @@
// 閬嶅巻鏁版嵁骞舵彃鍏ュ埌CListCtrl涓�
for (int i = 0; i < static_cast<int>(vecRecipe.size()); ++i) {
const RecipeInfo& recipe = vecRecipe[i];
+ // 鍘熺▼搴忚姹侾PID鏈夊瓙閰嶆柟锛屽厛娉ㄩ噴
+ /*
if (recipe.vecDeviceList.empty() || recipe.vecDeviceList.size() > 6){
continue;
}
+ */
m_listPPID.InsertItem(i, _T("")); // 绗�0鍒楃┖鐧�
@@ -146,8 +153,18 @@
m_listPPID.SetItemText(i, 2, CA2T(recipe.strPPID.c_str()));
for (int j = 0; j < recipe.vecDeviceList.size(); j++){
+ int nRecipeID = recipe.vecDeviceList.at(j).nRecipeID;
+ std::string strDeviceName = recipe.vecDeviceList.at(j).strDeviceName;
+ std::string strRecipeName = RecipeManager::getInstance().getDeviceRecipeName(strDeviceName, nRecipeID);
+
CString str;
- str.Format(_T("%d"), recipe.vecDeviceList.at(j).nRecipeID);
+ if (strRecipeName.empty()) {
+ str.Format(_T("%d"), recipe.vecDeviceList.at(j).nRecipeID);
+ }
+ else {
+ str.Format(_T("%s"), strRecipeName.c_str());
+ }
+
m_listPPID.SetItemText(i, j + 3, str);
}
@@ -175,6 +192,7 @@
}
// 閬嶅巻鏁版嵁骞舵彃鍏ュ埌CListCtrl涓�
+ auto& mgr = RecipeManager::getInstance();
std::map<int, short>& ids = pRecipeList->getIds();
auto rawDatas = pRecipeList->getParamsRawData();
for (auto item : ids) {
@@ -182,10 +200,19 @@
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(SanitizeName(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(SanitizeName(pEq->getName()), item.second, strRecipeName, strDescription);
}
}
@@ -211,7 +238,8 @@
ON_BN_CLICKED(IDC_BUTTON_DELETE, &CPageRecipe::OnBnClickedButtonDelete)
ON_BN_CLICKED(IDC_BUTTON_DELETE_ALL, &CPageRecipe::OnBnClickedButtonDeleteAll)
ON_BN_CLICKED(IDC_BUTTON_REFRESH, &CPageRecipe::OnBnClickedButtonRefresh)
- ON_NOTIFY(LVN_ITEMCHANGED, IDC_LIST_PPID, &CPageRecipe::OnLvnItemChangedListPPID)
+ ON_NOTIFY(NM_CLICK, IDC_LIST_PPID, &CPageRecipe::OnClickListPPID)
+ ON_NOTIFY(NM_DBLCLK, IDC_LIST_PPID, &CPageRecipe::OnDblclkListPPID)
ON_CBN_SELCHANGE(IDC_COMBO_EQUIPMENT, &CPageRecipe::OnCbnSelchangeComboEquipment)
END_MESSAGE_MAP()
@@ -361,13 +389,12 @@
void CPageRecipe::OnBnClickedButtonNew()
{
- // TODO: 鍦ㄦ娣诲姞鎺т欢閫氱煡澶勭悊绋嬪簭浠ｇ爜
- //CComboBox* pComboBox = (CComboBox*)GetDlgItem(IDC_COMBO_EQUIPMENT);
- //int nSel = pComboBox->GetCurSel();
- //SERVO::CEquipment* pEq = (SERVO::CEquipment*)pComboBox->GetItemDataPtr(nSel);
- //if (pEq == nullptr) {
- // return;
- //}
+ int rc = UX_CanExecute(L"recipe");
+ if (rc != 1) {
+ AfxMessageBox("鎿嶄綔鏉冮檺涓嶈冻锛岃鑱旂郴绠＄悊浜哄憳锛�");
+ return;
+ }
+ UX_RecordAction(L"recipe");
CRecipeDeviceBindDlg dlg(this);
if (dlg.DoModal() == IDOK) {
@@ -427,20 +454,60 @@
void CPageRecipe::OnBnClickedButtonModify()
{
+ int rc = UX_CanExecute(L"recipe");
+ if (rc != 1) {
+ AfxMessageBox("鎿嶄綔鏉冮檺涓嶈冻锛岃鑱旂郴绠＄悊浜哄憳锛�");
+ return;
+ }
+ UX_RecordAction(L"recipe");
+
// TODO: 鍦ㄦ娣诲姞鎺т欢閫氱煡澶勭悊绋嬪簭浠ｇ爜
+ CComboBox* pComboBox = (CComboBox*)GetDlgItem(IDC_COMBO_EQUIPMENT);
+ if (pComboBox == nullptr || !::IsWindow(pComboBox->m_hWnd)) {
+ return;
+ }
+
POSITION pos = m_listPPID.GetFirstSelectedItemPosition();
if (!pos) {
AfxMessageBox(_T("璇峰厛閫夋嫨涓�鏉￠厤鏂硅褰曡繘琛屼慨鏀癸紒"));
return;
}
- int nSel = m_listPPID.GetNextSelectedItem(pos);
- CString strPPID = m_listPPID.GetItemText(nSel, 2);
- UpdateRecipeByPPID(strPPID);
+ int nLine = m_listPPID.GetNextSelectedItem(pos);
+ CString strID = m_listPPID.GetItemText(nLine, 2);
+
+ int nSel = pComboBox->GetCurSel();
+ SERVO::CEquipment* pEq = (SERVO::CEquipment*)pComboBox->GetItemDataPtr(nSel);
+ if (pEq == nullptr) {
+ UpdateRecipeByPPID(strID);
+ }
+ else {
+ CInputDialog dlg(_T("淇敼閰嶆柟鍚嶇О"), _T("璇疯緭鍏ラ厤鏂瑰悕绉帮細"));
+ if (dlg.DoModal() != IDOK) {
+ return;
+ }
+
+ CString strText = dlg.GetInputText();
+ if (strText.IsEmpty()) {
+ AfxMessageBox(_T("閰嶆柟鍚嶇О涓嶈兘涓虹┖锛�"));
+ return;
+ }
+
+ if (RecipeManager::getInstance().updateDeviceRecipeName(SanitizeName(pEq->getName()), _ttoi(strID), std::string(CT2A(strText)))) {
+ m_listPPID.SetItemText(nLine, 3, strText);
+ }
+ }
}
void CPageRecipe::OnBnClickedButtonDelete()
{
+ int rc = UX_CanExecute(L"recipe");
+ if (rc != 1) {
+ AfxMessageBox("鎿嶄綔鏉冮檺涓嶈冻锛岃鑱旂郴绠＄悊浜哄憳锛�");
+ return;
+ }
+ UX_RecordAction(L"recipe");
+
// TODO: 鍦ㄦ娣诲姞鎺т欢閫氱煡澶勭悊绋嬪簭浠ｇ爜
POSITION pos = m_listPPID.GetFirstSelectedItemPosition();
if (!pos) {
@@ -467,6 +534,13 @@
void CPageRecipe::OnBnClickedButtonDeleteAll()
{
+ int rc = UX_CanExecute(L"recipe");
+ if (rc != 1) {
+ AfxMessageBox("鎿嶄綔鏉冮檺涓嶈冻锛岃鑱旂郴绠＄悊浜哄憳锛�");
+ return;
+ }
+ UX_RecordAction(L"recipe");
+
// TODO: 鍦ㄦ娣诲姞鎺т欢閫氱煡澶勭悊绋嬪簭浠ｇ爜
if (IDYES != AfxMessageBox(_T("纭畾瑕佸垹闄ゅ叏閮ㄩ厤鏂硅褰曞悧锛�"), MB_YESNO | MB_ICONWARNING)) {
return;
@@ -507,31 +581,68 @@
}
}
-void CPageRecipe::OnLvnItemChangedListPPID(NMHDR* pNMHDR, LRESULT* pResult)
+void CPageRecipe::OnClickListPPID(NMHDR* pNMHDR, LRESULT* pResult)
{
- LPNMLISTVIEW pNMLV = reinterpret_cast<LPNMLISTVIEW>(pNMHDR);
+ LPNMITEMACTIVATE pNMItemActivate = reinterpret_cast<LPNMITEMACTIVATE>(pNMHDR);
+ // TODO: 鍦ㄦ娣诲姞鎺т欢閫氱煡澶勭悊绋嬪簭浠ｇ爜
*pResult = 0;
CComboBox* pComboBox = (CComboBox*)GetDlgItem(IDC_COMBO_EQUIPMENT);
- int nEqSel = pComboBox->GetCurSel();
- int selectedCount = ListView_GetSelectedCount(m_listPPID.GetSafeHwnd());
+ if (pComboBox == nullptr) {
+ return;
+ }
- 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);
+ int nItem = pNMItemActivate->iItem;
+ int nEqSel = pComboBox->GetCurSel();
+
+ GetDlgItem(IDC_BUTTON_NEW)->EnableWindow(nEqSel == 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)
+{
+ LPNMITEMACTIVATE pNMItemActivate = reinterpret_cast<LPNMITEMACTIVATE>(pNMHDR);
+ // TODO: 鍦ㄦ娣诲姞鎺т欢閫氱煡澶勭悊绋嬪簭浠ｇ爜
+ *pResult = 0;
+
+ int nItem = pNMItemActivate->iItem;
+ if (nItem < 0) {
+ return;
+ }
+
+ CString strRecipeID = m_listPPID.GetItemText(nItem, 2);
+ CString strRecipeName = m_listPPID.GetItemText(nItem, 3);
+ CComboBox* pComboBox = (CComboBox*)GetDlgItem(IDC_COMBO_EQUIPMENT);
+ int nEqSel = pComboBox->GetCurSel();
+ if (nEqSel == CB_ERR) {
+ return;
+ }
+
+ int nRecipeID = _ttoi(strRecipeID);
+ SERVO::CEquipment* pEq = (SERVO::CEquipment*)pComboBox->GetItemDataPtr(nEqSel);
+ if (pEq == nullptr) {
+ return;
+ }
+
+ CDeviceRecipeParamDlg dlg(this);
+ dlg.setDeviceRecipeID(nRecipeID);
+ dlg.setDeviceRecipeName(strRecipeName);
+ dlg.setEquipment(pEq);
+ dlg.DoModal();
}
void CPageRecipe::OnCbnSelchangeComboEquipment()
{
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);
@@ -632,7 +743,7 @@
ResetEvent(hEvent);
}
-
+
pEq->saveRecipeList(0, strFilepath);
pMsgDlg->SetIcon(MSG_BOX_SUCCEED);
pMsgDlg->SetTitle(_T("鎿嶄綔瀹屾垚"));
@@ -643,7 +754,6 @@
FillRecipeListToListCtrl(pEq);
CloseHandle(hEvent);
-
// 鍦ㄦ鎵撳嵃閰嶆柟鍙傛暟浠ヤ究鏍稿鏁版嵁
@@ -666,8 +776,38 @@
}
-
-
-
return 0;
}
+
+std::string CPageRecipe::SanitizeName(const std::string& name)
+{
+ std::string result;
+ result.reserve(name.size());
+
+ for (char c : name) {
+ if (c == '(' || c == '锛�') {
+ break;
+ }
+
+ unsigned char uc = static_cast<unsigned char>(c);
+ if (std::isalnum(uc) || c == '_') {
+ result.push_back(c);
+ }
+ else if (std::isspace(uc)) {
+ continue;
+ }
+ else {
+ result.push_back('_');
+ }
+ }
+ return result;
+}
+
+BOOL CPageRecipe::PreTranslateMessage(MSG* pMsg)
+{
+ if (pMsg->wParam == VK_RETURN || pMsg->wParam == VK_ESCAPE) {
+ return TRUE;
+ }
+
+ return CDialogEx::PreTranslateMessage(pMsg);
+}
\ No newline at end of file
--
Gitblit v1.9.3