From 58c44e7934c94f4a2327252fc017c19b9f802491 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期五, 06 六月 2025 10:40:02 +0800
Subject: [PATCH] 1.绑定关系的保存和还原； 2.BakeCooling内部搬运检测逻辑(Bake->Cooling)；
---
SourceCode/Bond/Servo/ServoDlg.cpp | 61 ++++++++++++++++++++++++------
1 files changed, 49 insertions(+), 12 deletions(-)
diff --git a/SourceCode/Bond/Servo/ServoDlg.cpp b/SourceCode/Bond/Servo/ServoDlg.cpp
index 1921443..80117a5 100644
--- a/SourceCode/Bond/Servo/ServoDlg.cpp
+++ b/SourceCode/Bond/Servo/ServoDlg.cpp
@@ -84,6 +84,7 @@
m_pPageRecipe = nullptr;
m_pTopToolbar = nullptr;
m_pMyStatusbar = nullptr;
+ m_pRobotTaskDlg = nullptr;
}
void CServoDlg::DoDataExchange(CDataExchange* pDX)
@@ -119,6 +120,7 @@
ON_MESSAGE(ID_MSG_PANEL_RESIZE, OnPanelResize)
ON_NOTIFY(BYHMTAB_SEL_CHANGED, IDC_TAB1, &CServoDlg::OnTabSelChanged)
ON_MESSAGE(ID_MSG_TOOLBAR_BTN_CLICKED, &CServoDlg::OnToolbarBtnClicked)
+ ON_MESSAGE(ID_MSG_STATUSBAR_BTN_CLICKED, &CServoDlg::OnStatusbarBtnClicked)
END_MESSAGE_MAP()
@@ -186,18 +188,26 @@
}
}
else if (RX_CODE_EQ_ROBOT_TASK == code) {
- SERVO::CRobotTask* pTask = theApp.m_model.getMaster().getActiveRobotTask();
- if (pTask == nullptr) {
- m_pMyStatusbar->setCurTaskBtnText("无");
- }
- else {
- SERVO::CEquipment* pEq1, * pEq2;
- pEq1 = theApp.m_model.getMaster().getEquipment(pTask->getSrcPosition());
- pEq2 = theApp.m_model.getMaster().getEquipment(pTask->getTarPosition());
- if (pEq1 != nullptr && pEq2 != nullptr) {
- CString strText;
- strText.Format(_T("%s --> %s"), pEq1->getName().c_str(), pEq2->getName().c_str());
- m_pMyStatusbar->setCurTaskBtnText((LPTSTR)(LPCTSTR)strText);
+ int exCode;
+ if (pAny->getIntValue("exCode", exCode)) {
+ if (exCode == ROBOT_EVENT_CREATE) {
+ SERVO::CRobotTask* pTask = theApp.m_model.getMaster().getActiveRobotTask();
+ ASSERT(pTask);
+ if (m_pRobotTaskDlg) {
+ m_pRobotTaskDlg->SetRobotTask(pTask);
+ }
+
+ SERVO::CEquipment* pEq1, * pEq2;
+ pEq1 = theApp.m_model.getMaster().getEquipment(pTask->getSrcPosition());
+ pEq2 = theApp.m_model.getMaster().getEquipment(pTask->getTarPosition());
+ if (pEq1 != nullptr && pEq2 != nullptr) {
+ CString strText;
+ strText.Format(_T("%s --> %s"), pEq1->getName().c_str(), pEq2->getName().c_str());
+ m_pMyStatusbar->setCurTaskBtnText((LPTSTR)(LPCTSTR)strText);
+ }
+ }
+ else if (exCode == ROBOT_EVENT_FINISH) {
+ m_pMyStatusbar->setCurTaskBtnText("无");
}
}
}
@@ -562,6 +572,12 @@
m_pMyStatusbar = nullptr;
}
+ if (m_pRobotTaskDlg != nullptr) {
+ m_pRobotTaskDlg->DestroyWindow();
+ delete m_pRobotTaskDlg;
+ m_pRobotTaskDlg = nullptr;
+ }
+
if (m_pTerminalDisplayDlg != nullptr) {
m_pTerminalDisplayDlg->DestroyWindow();
delete m_pTerminalDisplayDlg;
@@ -793,6 +809,27 @@
return 0;
}
+LRESULT CServoDlg::OnStatusbarBtnClicked(WPARAM wParam, LPARAM lParam)
+{
+ int id = (int)lParam;
+ int x = (int)wParam;
+ if (id == IDC_BUTTON_ROBOTTASK) {
+ if (m_pRobotTaskDlg == nullptr) {
+ m_pRobotTaskDlg = new CRobotTaskDlg();
+ m_pRobotTaskDlg->Create(IDD_DIALOG_ROBOT_TASK, this);
+ }
+
+ CRect rcBar;
+ int h = 258;
+ int w = 388;
+ m_pRobotTaskDlg->SetRobotTask(theApp.m_model.getMaster().getActiveRobotTask());
+ m_pMyStatusbar->GetWindowRect(rcBar);
+ m_pRobotTaskDlg->MoveWindow(x, rcBar.top - h, w, h);
+ m_pRobotTaskDlg->ShowWindow(SW_SHOW);
+ }
+ return 0;
+}
+
CString& CServoDlg::GetRuntimeFormatText(CString& strText, const char* pszSuffix)
{
ULONGLONG ullRunTime = (ULONGLONG)(theApp.m_model.getMaster().getRunTime() * 0.001);
--
Gitblit v1.9.3