From 7ec50101cc28996eee747962eb06b8fa52e016ed Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期三, 27 八月 2025 12:03:14 +0800
Subject: [PATCH] 1. 设备配方列表添加显示配方名称
---
SourceCode/Bond/Servo/PageRecipe.cpp | 504 ++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 439 insertions(+), 65 deletions(-)
diff --git a/SourceCode/Bond/Servo/PageRecipe.cpp b/SourceCode/Bond/Servo/PageRecipe.cpp
index 85f369a..9d9d83c 100644
--- a/SourceCode/Bond/Servo/PageRecipe.cpp
+++ b/SourceCode/Bond/Servo/PageRecipe.cpp
@@ -5,8 +5,8 @@
#include "Servo.h"
#include "afxdialogex.h"
#include "PageRecipe.h"
-#include "SECSRuntimeManager.h"
-
+#include "MsgDlg.h"
+#include "RecipeDeviceBindDlg.h"
// CPageRecipe 瀵硅瘽妗�
@@ -22,9 +22,109 @@
{
}
-void CPageRecipe::FillDataToListCtrl(const std::vector<std::string>& vecData) {
+void CPageRecipe::InitListCtrlHeaderForMaster()
+{
+ m_listPPID.DeleteAllItems();
+ while (m_listPPID.DeleteColumn(0));
+
+ CString strIniFile, strItem;
+ strIniFile.Format(_T("%s\\configuration.ini"), (LPTSTR)(LPCTSTR)theApp.m_strAppDir);
+ int width[12] = { 0, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 180 };
+ for (int i = 0; i < 12; i++) {
+ strItem.Format(_T("Col_%d_Width"), i);
+ width[i] = GetPrivateProfileInt("PageRecipeListCtrl", strItem, width[i], strIniFile);
+ }
+
+ m_listPPID.InsertColumn(0, _T(""), LVCFMT_RIGHT, 0); // 闅愯棌鍒�
+ m_listPPID.InsertColumn(1, _T("No."), LVCFMT_LEFT, 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]);
+ m_listPPID.InsertColumn(5, _T("Bonder2"), LVCFMT_LEFT, width[5]);
+ m_listPPID.InsertColumn(6, _T("鍚庣儤鍐峰嵈"), LVCFMT_LEFT, width[7]);
+ m_listPPID.InsertColumn(7, _T("绮惧害妫�鏌�"), LVCFMT_LEFT, width[8]);
+ m_listPPID.InsertColumn(8, _T("EFEM"), LVCFMT_LEFT, width[3]);
+ m_listPPID.InsertColumn(9, _T("鍒涘缓鏃堕棿"), LVCFMT_LEFT, width[9]);
+ m_listPPID.InsertColumn(10, _T("鎻忚堪"), LVCFMT_LEFT, width[10]);
+}
+
+void CPageRecipe::InitListCtrlHeaderForDevice()
+{
+ m_listPPID.DeleteAllItems();
+ while (m_listPPID.DeleteColumn(0));
+
+ CString strIniFile, strItem;
+ strIniFile.Format(_T("%s\\configuration.ini"), (LPCTSTR)theApp.m_strAppDir);
+ int width[] = { 0, 60, 150, 150 };
+
+ for (int i = 0; i < 4; 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]);
+}
+
+void CPageRecipe::UpdateRecipeByPPID(const CString& strPPID)
+{
+ if (strPPID.IsEmpty()) {
+ AfxMessageBox(_T("璇烽�夋嫨涓�涓厤鏂癸紒"));
+ return;
+ }
+
+ auto& mgr = RecipeManager::getInstance();
+
+ // 鏌ヨ閫変腑閰嶆柟鐨勮缁嗘暟鎹�
+ std::string oldPPID = CT2A(strPPID);
+ RecipeInfo oldRecipe = mgr.getRecipeByPPID(oldPPID);
+ if (oldRecipe.strPPID.empty()) {
+ AfxMessageBox(_T("鑾峰彇閰嶆柟鏁版嵁澶辫触锛�"));
+ return;
+ }
+
+ // 寮瑰嚭缂栬緫瀵硅瘽妗嗭紝骞跺垵濮嬪寲涓哄綋鍓嶅唴瀹�
+ CRecipeDeviceBindDlg dlg(this);
+ dlg.SetRecipeInfo(oldRecipe);
+
+ if (dlg.DoModal() == IDOK) {
+ const RecipeInfo& newRecipe = dlg.GetRecipeInfo();
+
+ bool success = false;
+ // 鍒ゆ柇PPID鏄惁鏈夋敼鍔�
+ if (oldRecipe.strPPID != newRecipe.strPPID) {
+ // 鍏堟洿鏂癙PID锛屽啀鏁翠綋鏇存柊鍐呭
+ if (mgr.updatePPID(oldRecipe.strPPID, newRecipe.strPPID)) {
+ success = mgr.updateRecipe(newRecipe);
+ if (!success) {
+ AfxMessageBox(_T("宸叉洿鏀筆PID锛屼絾鏇存柊閰嶆柟鍐呭澶辫触锛岃妫�鏌ユ棩蹇�"));
+ }
+ }
+ else {
+ AfxMessageBox(_T("鏇存柊PPID澶辫触锛岃妫�鏌ユ棩蹇�"));
+ return;
+ }
+ }
+ else {
+ // 鍙洿鏂板唴瀹�
+ success = mgr.updateRecipe(newRecipe);
+ if (!success) {
+ AfxMessageBox(_T("鏇存柊閰嶆柟澶辫触锛岃妫�鏌ユ棩蹇�"));
+ }
+ }
+
+ if (success) {
+ auto vecData = mgr.getAllRecipes();
+ FillDataToListCtrl(vecData);
+ }
+ }
+}
+
+void CPageRecipe::FillDataToListCtrl(const std::vector<RecipeInfo>& vecRecipe) {
CListCtrl* pListCtrl = (CListCtrl*)GetDlgItem(IDC_LIST_PPID);
- if (pListCtrl == nullptr || pListCtrl->m_hWnd == nullptr) {
+ if (pListCtrl == nullptr || !::IsWindow(pListCtrl->m_hWnd)) {
return;
}
@@ -32,44 +132,79 @@
pListCtrl->DeleteAllItems();
// 閬嶅巻鏁版嵁骞舵彃鍏ュ埌CListCtrl涓�
- for (int i = 0; i < static_cast<int>(vecData.size()); ++i) {
- // 鎻掑叆琛�
- pListCtrl->InsertItem(i, _T(""));
-
- // 璁剧疆 Recipe No锛堢1鍒楋級
- CString strRecipeNo;
- strRecipeNo.Format(_T("%d"), i);
- pListCtrl->SetItemText(i, 1, strRecipeNo);
-
- // 璁剧疆 PPID锛堢2鍒楋級
- CString strPPID = CA2T(vecData[i].c_str());
- if (strPPID.CompareNoCase(_T("NULL")) == 0) {
- strPPID.Empty();
+ for (int i = 0; i < static_cast<int>(vecRecipe.size()); ++i) {
+ const RecipeInfo& recipe = vecRecipe[i];
+ if (recipe.vecDeviceList.empty() || recipe.vecDeviceList.size() > 6){
+ continue;
}
- pListCtrl->SetItemText(i, 2, strPPID);
+
+ m_listPPID.InsertItem(i, _T("")); // 绗�0鍒楃┖鐧�
+
+ CString strNo;
+ strNo.Format(_T("%d"), i + 1);
+ m_listPPID.SetItemText(i, 1, strNo);
+ m_listPPID.SetItemText(i, 2, CA2T(recipe.strPPID.c_str()));
+
+ for (int j = 0; j < recipe.vecDeviceList.size(); j++){
+ CString str;
+ str.Format(_T("%d"), recipe.vecDeviceList.at(j).nRecipeID);
+ m_listPPID.SetItemText(i, j + 3, str);
+ }
+
+ m_listPPID.SetItemText(i, 9, CA2T(recipe.strCreateTime.c_str()));
+ m_listPPID.SetItemText(i, 10, CA2T(recipe.strDescription.c_str()));
}
// 鑾峰彇鍒楁暟
- int nColCount = pListCtrl->GetHeaderCtrl()->GetItemCount();
- pListCtrl->SetColumnWidth(nColCount - 1, LVSCW_AUTOSIZE_USEHEADER);
+ int nColCount = m_listPPID.GetHeaderCtrl()->GetItemCount();
+ m_listPPID.SetColumnWidth(nColCount - 1, LVSCW_AUTOSIZE_USEHEADER);
+}
+
+void CPageRecipe::FillRecipeListToListCtrl(SERVO::CRecipeList* pList)
+{
+ CListCtrl* pListCtrl = (CListCtrl*)GetDlgItem(IDC_LIST_PPID);
+ if (pListCtrl == nullptr || !::IsWindow(pListCtrl->m_hWnd)) {
+ return;
+ }
+
+ // 娓呯┖褰撳墠CListCtrl涓殑鎵�鏈夐」
+ pListCtrl->DeleteAllItems();
+ if (pList == nullptr) {
+ return;
+ }
+
+ // 閬嶅巻鏁版嵁骞舵彃鍏ュ埌CListCtrl涓�
+ std::map<int, short>& ids = pList->getIds();
+ 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());
+ }
+
+ // 鑾峰彇鍒楁暟
+ int nColCount = m_listPPID.GetHeaderCtrl()->GetItemCount();
+ m_listPPID.SetColumnWidth(nColCount - 1, LVSCW_AUTOSIZE_USEHEADER);
}
void CPageRecipe::DoDataExchange(CDataExchange* pDX)
{
CDialogEx::DoDataExchange(pDX);
DDX_Control(pDX, IDC_LIST_PPID, m_listPPID);
- DDX_Control(pDX, IDC_EDIT_PPID, m_editPPID);
}
BEGIN_MESSAGE_MAP(CPageRecipe, CDialogEx)
+ ON_WM_SIZE()
+ ON_WM_DESTROY()
+ ON_WM_SHOWWINDOW()
+ ON_BN_CLICKED(IDC_BUTTON_NEW, &CPageRecipe::OnBnClickedButtonNew)
ON_BN_CLICKED(IDC_BUTTON_SEARCH, &CPageRecipe::OnBnClickedButtonSearch)
ON_BN_CLICKED(IDC_BUTTON_MODIFY, &CPageRecipe::OnBnClickedButtonModify)
ON_BN_CLICKED(IDC_BUTTON_DELETE, &CPageRecipe::OnBnClickedButtonDelete)
ON_BN_CLICKED(IDC_BUTTON_DELETE_ALL, &CPageRecipe::OnBnClickedButtonDeleteAll)
- ON_BN_CLICKED(IDC_BUTTON_SAVE, &CPageRecipe::OnBnClickedButtonSave)
ON_BN_CLICKED(IDC_BUTTON_REFRESH, &CPageRecipe::OnBnClickedButtonRefresh)
ON_NOTIFY(LVN_ITEMCHANGED, IDC_LIST_PPID, &CPageRecipe::OnLvnItemChangedListPPID)
+ ON_CBN_SELCHANGE(IDC_COMBO_EQUIPMENT, &CPageRecipe::OnCbnSelchangeComboEquipment)
END_MESSAGE_MAP()
@@ -88,85 +223,297 @@
HIMAGELIST imageList = ImageList_Create(24, 24, ILC_COLOR24, 1, 1);
ListView_SetImageList(pListCtrl->GetSafeHwnd(), imageList, LVSIL_SMALL);
- pListCtrl->InsertColumn(0, _T(""), LVCFMT_RIGHT, 0);
- pListCtrl->InsertColumn(1, _T("Recipe No"), LVCFMT_LEFT, 100);
- pListCtrl->InsertColumn(2, _T("PPID"), LVCFMT_LEFT, 100);
- pListCtrl->SetColumnWidth(2, LVSCW_AUTOSIZE_USEHEADER);
+ InitListCtrlHeaderForMaster();
// 鑾峰彇鎵�鏈夋暟鎹�
- auto vecData = SECSRuntimeManager::getInstance().getAllPPID();
+ auto vecData = RecipeManager::getInstance().getAllRecipes();
FillDataToListCtrl(vecData);
return TRUE; // return TRUE unless you set the focus to a control
// 寮傚父: OCX 灞炴�ч〉搴旇繑鍥� FALSE
}
-void CPageRecipe::OnBnClickedButtonSearch()
+void CPageRecipe::OnSize(UINT nType, int cx, int cy)
{
- // TODO: 鍦ㄦ娣诲姞鎺т欢閫氱煡澶勭悊绋嬪簭浠ｇ爜
- CString strInput;
- m_editPPID.GetWindowText(strInput);
+ CDialogEx::OnSize(nType, cx, cy);
- int nCount = m_listPPID.GetItemCount();
- for (int i = 0; i < nCount; ++i) {
- CString strItemText = m_listPPID.GetItemText(i, 2); // 绗�2鍒椾负PPID
- if (strItemText == strInput) {
- m_listPPID.SetItemState(i, LVIS_SELECTED, LVIS_SELECTED);
- m_listPPID.EnsureVisible(i, FALSE);
- break;
+ if (!m_listPPID.GetSafeHwnd())
+ return;
+
+
+ // 宸︿晶鍒楄〃瀹介珮鑷�傚簲
+ int margin = 12;
+ int buttonWidth = 80;
+ int buttonHeight = 30;
+ int buttonSpacing = 10;
+
+ CWnd* pItem;
+ CRect rect, rcItem;
+ GetClientRect(&rect);
+
+ pItem = GetDlgItem(IDC_EDIT_KEYWORD);
+ ASSERT(pItem);
+ pItem->GetWindowRect(rcItem);
+ ScreenToClient(&rcItem);
+
+ int y = rcItem.bottom;
+ y += 12;
+ int listWidth = rect.Width() - buttonWidth - 3 * margin;
+ m_listPPID.MoveWindow(margin, y, listWidth, rect.bottom - 12 - y);
+
+
+ // 鎸夐挳绔栫洿鎺掑垪鍦ㄥ彸渚�
+ CWnd* buttons[] = {
+ GetDlgItem(IDC_BUTTON_REFRESH),
+ GetDlgItem(IDC_BUTTON_NEW),
+ GetDlgItem(IDC_BUTTON_MODIFY),
+ GetDlgItem(IDC_BUTTON_DELETE),
+ GetDlgItem(IDC_BUTTON_DELETE_ALL)
+ };
+
+ for (auto pBtn : buttons) {
+ if (pBtn && pBtn->GetSafeHwnd()) {
+ pBtn->MoveWindow(rect.right - buttonWidth - margin, y, buttonWidth, buttonHeight);
+ y += buttonHeight + buttonSpacing;
}
}
+}
+
+void CPageRecipe::OnDestroy()
+{
+ CComboBox* pComboBox = (CComboBox*)GetDlgItem(IDC_COMBO_EQUIPMENT);
+ int nSel = pComboBox->GetCurSel();
+ SERVO::CEquipment* pEq = (SERVO::CEquipment*)pComboBox->GetItemDataPtr(nSel);
+
+ // 淇濆瓨鍒楀
+ CString strIniFile, strItem, strTemp;
+ strIniFile.Format(_T("%s\\configuration.ini"), (LPCTSTR)theApp.m_strAppDir);
+ CHeaderCtrl* pHeader = m_listPPID.GetHeaderCtrl();
+
+ if (!pHeader || pHeader->GetItemCount() == 0) {
+ return;
+ }
+
+ for (int i = 0; i < pHeader->GetItemCount(); i++) {
+ RECT rect;
+ if (!pHeader->GetItemRect(i, &rect)) {
+ continue;
+ }
+
+ if (pEq == nullptr) {
+ strItem.Format(_T("Col_%d_Width"), i);
+ }
+ else {
+ strItem.Format(_T("Col_Device_%d_Width"), i);
+ }
+
+ strTemp.Format(_T("%d"), rect.right - rect.left);
+ WritePrivateProfileString(_T("PageRecipeListCtrl"), strItem, strTemp, strIniFile);
+ }
+
+ CDialogEx::OnDestroy();
+}
+
+void CPageRecipe::OnShowWindow(BOOL bShow, UINT nStatus)
+{
+ CDialogEx::OnShowWindow(bShow, nStatus);
+
+ if (bShow) {
+ CComboBox* pComboBox = (CComboBox*)GetDlgItem(IDC_COMBO_EQUIPMENT);
+ if (pComboBox->GetCount() == 0) {
+ SERVO::CMaster& master = theApp.m_model.getMaster();
+ SERVO::CEquipment* pEq[] = {
+ nullptr,
+ master.getEquipment(EQ_ID_EFEM),
+ master.getEquipment(EQ_ID_Bonder1),
+ master.getEquipment(EQ_ID_Bonder2),
+ master.getEquipment(EQ_ID_BAKE_COOLING),
+ master.getEquipment(EQ_ID_VACUUMBAKE),
+ master.getEquipment(EQ_ID_MEASUREMENT),
+ };
+
+ CComboBox* pComboBox = (CComboBox*)GetDlgItem(IDC_COMBO_EQUIPMENT);
+ for (int i = 0; i < sizeof(pEq) / sizeof(pEq[0]); i++) {
+ pComboBox->InsertString(i,
+ pEq[i] == nullptr ? _T("Master") : pEq[i]->getName().c_str());
+ pComboBox->SetItemDataPtr(i, pEq[i]);
+
+ if (pEq[i]) {
+ pEq[i]->masterRecipeListRequest(0, nullptr);
+ }
+ }
+ pComboBox->SetCurSel(0);
+ }
+ }
+}
+
+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;
+ //}
+
+ CRecipeDeviceBindDlg dlg(this);
+ if (dlg.DoModal() == IDOK) {
+ const RecipeInfo& newRecipe = dlg.GetRecipeInfo();
+
+ auto& mgr = RecipeManager::getInstance();
+ if (mgr.ppidExists(newRecipe.strPPID)) {
+ // 宸插瓨鍦紝璇㈤棶鏄惁瑕嗙洊
+ int ret = AfxMessageBox(_T("璇� PPID 宸插瓨鍦紝鏄惁瑕嗙洊鍘熼厤鏂癸紵"), MB_YESNO | MB_ICONQUESTION);
+ if (ret == IDYES) {
+ if (mgr.updateRecipe(newRecipe)) {
+ auto vecData = mgr.getAllRecipes();
+ FillDataToListCtrl(vecData);
+ }
+ else {
+ AfxMessageBox(_T("鏇存柊閰嶆柟澶辫触锛岃妫�鏌ユ棩蹇�"));
+ }
+ }
+ }
+ else {
+ // 涓嶅瓨鍦紝鐩存帴鏂板
+ if (mgr.addRecipe(newRecipe)) {
+ auto vecData = mgr.getAllRecipes();
+ FillDataToListCtrl(vecData);
+ }
+ else {
+ AfxMessageBox(_T("娣诲姞閰嶆柟澶辫触锛岃妫�鏌ユ棩蹇�"));
+ }
+ }
+ }
+}
+
+void CPageRecipe::OnBnClickedButtonSearch()
+{
+ CString strKeyword;
+ GetDlgItemText(IDC_EDIT_KEYWORD, strKeyword);
+ strKeyword.Trim();
+
+ std::vector<RecipeInfo> vecData;
+ if (strKeyword.IsEmpty()) {
+ // 鍏抽敭璇嶄负绌猴紝鏄剧ず鍏ㄩ儴閰嶆柟
+ vecData = RecipeManager::getInstance().getAllRecipes();
+ }
+ else {
+ // 鏍规嵁鍏抽敭璇嶆悳绱㈤厤鏂�
+ vecData = RecipeManager::getInstance().getRecipesByKeyword(std::string(CT2A(strKeyword)));
+ }
+
+ // 濡傛灉娌℃湁鏁版嵁锛屽脊鍑烘彁绀�
+ if (vecData.empty()) {
+ AfxMessageBox(_T("鏈壘鍒板尮閰嶇殑閰嶆柟锛�"));
+ return;
+ }
+
+ FillDataToListCtrl(vecData);
}
void CPageRecipe::OnBnClickedButtonModify()
{
// TODO: 鍦ㄦ娣诲姞鎺т欢閫氱煡澶勭悊绋嬪簭浠ｇ爜
POSITION pos = m_listPPID.GetFirstSelectedItemPosition();
- if (!pos) return;
+ if (!pos) {
+ AfxMessageBox(_T("璇峰厛閫夋嫨涓�鏉￠厤鏂硅褰曡繘琛屼慨鏀癸紒"));
+ return;
+ }
int nSel = m_listPPID.GetNextSelectedItem(pos);
-
- CString strNewPPID;
- m_editPPID.GetWindowText(strNewPPID);
- m_listPPID.SetItemText(nSel, 2, strNewPPID);
+ CString strPPID = m_listPPID.GetItemText(nSel, 2);
+ UpdateRecipeByPPID(strPPID);
}
void CPageRecipe::OnBnClickedButtonDelete()
{
// TODO: 鍦ㄦ娣诲姞鎺т欢閫氱煡澶勭悊绋嬪簭浠ｇ爜
POSITION pos = m_listPPID.GetFirstSelectedItemPosition();
- if (!pos) return;
+ if (!pos) {
+ return;
+ }
int nSel = m_listPPID.GetNextSelectedItem(pos);
- m_listPPID.SetItemText(nSel, 2, _T(""));
+ CString strPPID = m_listPPID.GetItemText(nSel, 2);
+ std::string ppid = CT2A(strPPID);
+
+ if (!ppid.empty()) {
+ CString msg;
+ msg.Format(_T("纭畾瑕佸垹闄ら厤鏂� [%s] 鍚楋紵"), strPPID);
+ if (IDYES == AfxMessageBox(msg, MB_YESNO | MB_ICONQUESTION)) {
+ if (RecipeManager::getInstance().deleteRecipeByPPID(ppid)) {
+ m_listPPID.DeleteItem(nSel);
+ }
+ else {
+ AfxMessageBox(_T("鍒犻櫎澶辫触"));
+ }
+ }
+ }
}
void CPageRecipe::OnBnClickedButtonDeleteAll()
{
// TODO: 鍦ㄦ娣诲姞鎺т欢閫氱煡澶勭悊绋嬪簭浠ｇ爜
- int nCount = m_listPPID.GetItemCount();
- for (int i = 0; i < nCount; ++i) {
- m_listPPID.SetItemText(i, 2, _T(""));
+ if (IDYES != AfxMessageBox(_T("纭畾瑕佸垹闄ゅ叏閮ㄩ厤鏂硅褰曞悧锛�"), MB_YESNO | MB_ICONWARNING)) {
+ return;
}
-}
-void CPageRecipe::OnBnClickedButtonSave()
-{
- // TODO: 鍦ㄦ娣诲姞鎺т欢閫氱煡澶勭悊绋嬪簭浠ｇ爜
- std::vector<std::string> vecPPID;
+ // 鑾峰彇鎵�鏈� PPID
int nCount = m_listPPID.GetItemCount();
for (int i = 0; i < nCount; ++i) {
- CString str = m_listPPID.GetItemText(i, 2);
- vecPPID.emplace_back(CT2A(str));
+ CString strPPID = m_listPPID.GetItemText(i, 2);
+ std::string ppid = CT2A(strPPID);
+ if (!ppid.empty()) {
+ RecipeManager::getInstance().deleteRecipeByPPID(ppid);
+ }
}
- SECSRuntimeManager::getInstance().setAllPPID(vecPPID);
+
+ // 娓呯┖鍒楄〃鏄剧ず
+ m_listPPID.DeleteAllItems();
}
void CPageRecipe::OnBnClickedButtonRefresh()
{
- // TODO: 鍦ㄦ娣诲姞鎺т欢閫氱煡澶勭悊绋嬪簭浠ｇ爜
- auto vecData = SECSRuntimeManager::getInstance().getAllPPID();
- FillDataToListCtrl(vecData);
+ CComboBox* pComboBox = (CComboBox*)GetDlgItem(IDC_COMBO_EQUIPMENT);
+ int nSel = pComboBox->GetCurSel();
+ SERVO::CEquipment* pEq = (SERVO::CEquipment*)pComboBox->GetItemDataPtr(nSel);
+
+ if (pEq == nullptr) {
+ // 鑾峰彇master閰嶆柟(鏈湴)
+ auto vecData = RecipeManager::getInstance().getAllRecipes();
+ 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);
+ }
+ });
+ msgDlg.DoModal();
+ }
}
void CPageRecipe::OnLvnItemChangedListPPID(NMHDR* pNMHDR, LRESULT* pResult)
@@ -174,11 +521,38 @@
LPNMLISTVIEW pNMLV = reinterpret_cast<LPNMLISTVIEW>(pNMHDR);
*pResult = 0;
- if ((pNMLV->uChanged & LVIF_STATE) &&
- (pNMLV->uNewState & LVIS_SELECTED)) {
+ CComboBox* pComboBox = (CComboBox*)GetDlgItem(IDC_COMBO_EQUIPMENT);
+ int nEqSel = pComboBox->GetCurSel();
+ int selectedCount = ListView_GetSelectedCount(m_listPPID.GetSafeHwnd());
- int nItem = pNMLV->iItem;
- CString strPPID = m_listPPID.GetItemText(nItem, 2);
- m_editPPID.SetWindowText(strPPID);
+ 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);
+}
+
+void CPageRecipe::OnCbnSelchangeComboEquipment()
+{
+ CComboBox* pComboBox = (CComboBox*)GetDlgItem(IDC_COMBO_EQUIPMENT);
+ int nEqSel = pComboBox->GetCurSel();
+ int selectedCount = 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_EDIT_KEYWORD)->EnableWindow(nEqSel == 0);
+ GetDlgItem(IDC_BUTTON_SEARCH)->EnableWindow(nEqSel == 0);
+
+ SERVO::CEquipment* pEq = (SERVO::CEquipment*)pComboBox->GetItemDataPtr(nEqSel);
+ if (pEq == nullptr) {
+ InitListCtrlHeaderForMaster();
+ auto vecData = RecipeManager::getInstance().getAllRecipes();
+ FillDataToListCtrl(vecData);
}
-}
\ No newline at end of file
+ else {
+ InitListCtrlHeaderForDevice();
+ SERVO::CRecipeList* pRecipeList = pEq->getRecipeList(0);
+ FillRecipeListToListCtrl(pRecipeList);
+ }
+}
--
Gitblit v1.9.3