From e7a450d2fdc99bd501e1af7dd7c16c477cfea75e Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期六, 15 三月 2025 11:56:44 +0800
Subject: [PATCH] 1.CimMessageClear(清除Cim消息)测试通过； 2.增加VCREanbleStep(启用/禁用)VCR;
---
SourceCode/Bond/Servo/ServoDlg.cpp | 85 ++++++++++++++++++++++++++++++------------
1 files changed, 60 insertions(+), 25 deletions(-)
diff --git a/SourceCode/Bond/Servo/ServoDlg.cpp b/SourceCode/Bond/Servo/ServoDlg.cpp
index bfed47e..6e52d61 100644
--- a/SourceCode/Bond/Servo/ServoDlg.cpp
+++ b/SourceCode/Bond/Servo/ServoDlg.cpp
@@ -128,6 +128,10 @@
ON_UPDATE_COMMAND_UI(ID_MENU_WND_LOG, &CServoDlg::OnUpdateMenuWndLog)
ON_COMMAND(ID_MENU_WND_ALARM, &CServoDlg::OnMenuWndAlarm)
ON_UPDATE_COMMAND_UI(ID_MENU_WND_ALARM, &CServoDlg::OnUpdateMenuWndAlarm)
+ ON_COMMAND(ID_MENU_TEST_MESSAGE_SET, &CServoDlg::OnMenuTestMessageSet)
+ ON_UPDATE_COMMAND_UI(ID_MENU_TEST_MESSAGE_SET, &CServoDlg::OnUpdateMenuTestMessageSet)
+ ON_COMMAND(ID_MENU_TEST_MESSAGE_CLEAR, &CServoDlg::OnMenuTestMessageClear)
+ ON_UPDATE_COMMAND_UI(ID_MENU_TEST_MESSAGE_CLEAR, &CServoDlg::OnUpdateMenuTestMessageClear)
ON_COMMAND(ID_MENU_HELP_ABOUT, &CServoDlg::OnMenuHelpAbout)
ON_WM_INITMENUPOPUP()
ON_WM_TIMER()
@@ -179,7 +183,7 @@
ASSERT(pEquipment);
ASSERT(m_pPanelEquipment);
ASSERT(m_pPanelAttributes);
- m_pPanelEquipment->SetEquipment(pEquipment);
+ m_pPanelEquipment->loadDataFromEquipment(pEquipment);
m_pPanelAttributes->ShowWindow(SW_HIDE);
if (!m_pPanelEquipment->IsWindowVisible()) {
m_pPanelEquipment->ShowWindow(SW_SHOW);
@@ -264,55 +268,55 @@
// 添加指示器
// Bonder
m_pGraph->AddIndicateBox(INDICATE_BONDER1, 220, 172, 48, RGB(22, 22, 22),
- RGB(255, 127, 39), RGB(0, 176, 80));
+ RGB(255, 127, 39), EQ_BOX_OFFLINE);
m_pGraph->SetBoxText(INDICATE_BONDER1, "10", "Bonder 1");
m_pGraph->AddIndicateBox(INDICATE_BONDER2, 220, 516, 48, RGB(22, 22, 22),
- RGB(255, 127, 39), RGB(0, 176, 80));
+ RGB(255, 127, 39), EQ_BOX_OFFLINE);
m_pGraph->SetBoxText(INDICATE_BONDER2, "11", "Bonder 2");
// 翻转
m_pGraph->AddIndicateBox(INDICATE_FLIPER, 338, 172, 48, RGB(22, 22, 22),
- RGB(255, 127, 39), RGB(0, 176, 80));
+ RGB(255, 127, 39), EQ_BOX_OFFLINE);
m_pGraph->SetBoxText(INDICATE_FLIPER, "8", "Fliper");
// 对位
m_pGraph->AddIndicateBox(INDICATE_ALIGNER, 428, 172, 48, RGB(22, 22, 22),
- RGB(255, 127, 39), RGB(0, 176, 80));
+ RGB(255, 127, 39), EQ_BOX_OFFLINE);
m_pGraph->SetBoxText(INDICATE_ALIGNER, "7", "Aligner");
// Load port 4
m_pGraph->AddIndicateBox(INDICATE_LPORT4, 518, 172, 48, RGB(22, 22, 22),
- RGB(255, 127, 39), RGB(0, 176, 80));
+ RGB(255, 127, 39), EQ_BOX_OFFLINE);
m_pGraph->SetBoxText(INDICATE_LPORT4, "4", "LPort4");
// Load port 3
m_pGraph->AddIndicateBox(INDICATE_LPORT3, 606, 172, 48, RGB(22, 22, 22),
- RGB(255, 127, 39), RGB(0, 176, 80));
+ RGB(255, 127, 39), EQ_BOX_OFFLINE);
m_pGraph->SetBoxText(INDICATE_LPORT3, "3", "LPort3");
// Load port 2
m_pGraph->AddIndicateBox(INDICATE_LPORT2, 690, 172, 48, RGB(22, 22, 22),
- RGB(255, 127, 39), RGB(0, 176, 80));
+ RGB(255, 127, 39), EQ_BOX_OFFLINE);
m_pGraph->SetBoxText(INDICATE_LPORT2, "2", "LPort2");
// Load port 1
m_pGraph->AddIndicateBox(INDICATE_LPORT1, 774, 172, 48, RGB(22, 22, 22),
- RGB(255, 127, 39), RGB(0, 176, 80));
+ RGB(255, 127, 39), EQ_BOX_OFFLINE);
m_pGraph->SetBoxText(INDICATE_LPORT1, "1", "LPort1");
// Robot
m_pGraph->AddIndicateBox(INDICATE_ROBOT_ARM1, 190, 294, 48, RGB(22, 22, 22),
- RGB(255, 127, 39), RGB(0, 176, 80));
+ RGB(255, 127, 39), EQ_BOX_OFFLINE);
m_pGraph->SetBoxText(INDICATE_ROBOT_ARM1, "5", "Robot");
m_pGraph->AddIndicateBox(INDICATE_ROBOT_ARM2, 243, 294, 48, RGB(22, 22, 22),
- RGB(255, 127, 39), RGB(0, 176, 80));
+ RGB(255, 127, 39), EQ_BOX_OFFLINE);
m_pGraph->SetBoxText(INDICATE_ROBOT_ARM2, "6", "Robot");
@@ -320,19 +324,19 @@
// Vacuum bake
m_pGraph->AddIndicateBox(INDICATE_VACUUM_BAKE, 396, 516, 48, RGB(22, 22, 22),
- RGB(255, 127, 39), RGB(0, 176, 80));
+ RGB(255, 127, 39), EQ_BOX_OFFLINE);
m_pGraph->SetBoxText(INDICATE_VACUUM_BAKE, "9", "Vacuum bake");
// Bake cooling
m_pGraph->AddIndicateBox(INDICATE_BAKE_COOLING, 566, 516, 48, RGB(22, 22, 22),
- RGB(255, 127, 39), RGB(0, 176, 80));
+ RGB(255, 127, 39), EQ_BOX_OFFLINE);
m_pGraph->SetBoxText(INDICATE_BAKE_COOLING, "12", "Bake cooling");
- // Bake cooling
- m_pGraph->AddIndicateBox(INDICATE_MEASUREMENT, 736, 516, 48, RGB(22, 22, 22),
- RGB(255, 127, 39), RGB(0, 176, 80));
+ // 精度检
+ m_pGraph->AddIndicateBox(INDICATE_MEASUREMENT, 737, 516, 48, RGB(22, 22, 22),
+ RGB(255, 127, 39), EQ_BOX_OFFLINE);
m_pGraph->SetBoxText(INDICATE_MEASUREMENT, "13", "Measurement");
@@ -552,6 +556,34 @@
pCmdUI->Enable(TRUE);
}
+void CServoDlg::OnMenuTestMessageSet()
+{
+ SERVO::CEquipment* pEquipment = m_pPanelMaster->GetActiveEquipment();
+ if (pEquipment != nullptr) {
+ SERVO::CEqCimMessageCmdStep* pStep = (SERVO::CEqCimMessageCmdStep*)pEquipment->getStepWithName(STEP_CIM_MESSAGE_CMD);
+ pStep->setCimMessage("HELLO 5007", 2, 3);
+ }
+}
+
+void CServoDlg::OnUpdateMenuTestMessageSet(CCmdUI* pCmdUI)
+{
+ pCmdUI->Enable(m_pPanelMaster->GetActiveEquipment() != nullptr);
+}
+
+void CServoDlg::OnMenuTestMessageClear()
+{
+ SERVO::CEquipment* pEquipment = m_pPanelMaster->GetActiveEquipment();
+ if (pEquipment != nullptr) {
+ SERVO::CEqCimMessageClearStep* pStep = (SERVO::CEqCimMessageClearStep*)pEquipment->getStepWithName(STEP_CIM_MESSAGE_CLEAR);
+ pStep->clearCimMessage(2, 3);
+ }
+}
+
+void CServoDlg::OnUpdateMenuTestMessageClear(CCmdUI* pCmdUI)
+{
+ pCmdUI->Enable(TRUE);
+}
+
void CServoDlg::OnMenuHelpAbout()
{
CAboutDlg dlgAbout;
@@ -658,6 +690,7 @@
CRect rcWnd;
GetWindowRect(&rcWnd);
int nHeight = GetSystemMetrics(SM_CYSCREEN) - rcWnd.bottom - 38;
+ if (nHeight < 280) nHeight = 280;
m_pAlarmDlg->MoveWindow(rcWnd.left, rcWnd.bottom - 8, rcWnd.Width(), nHeight);
}
ASSERT(m_pAlarmDlg);
@@ -686,11 +719,12 @@
CRect rcWnd;
GetWindowRect(&rcWnd);
int nHeight = GetSystemMetrics(SM_CYSCREEN) - rcWnd.bottom - 38;
+ if (nHeight < 280) nHeight = 280;
m_pLogDlg->MoveWindow(rcWnd.left, rcWnd.bottom - 8, rcWnd.Width(), nHeight);
}
ASSERT(m_pLogDlg);
m_pLogDlg->ShowWindow(m_bShowLogWnd ? SW_SHOW : SW_HIDE);
-
+
UpdateLogBtn();
}
@@ -825,14 +859,14 @@
switch (status) {
case ONLINE:
- newBackgroundColor = RGB(0, 255, 0);
- newFrameColor1 = RGB(22, 22, 22);
- newFrameColor2 = RGB(255, 127, 39);
+ newBackgroundColor = EQ_BOX_ONLINE;
+ newFrameColor1 = EQ_BOX_FRAME1;
+ newFrameColor2 = EQ_BOX_FRAME2;
break;
case OFFLINE:
- newBackgroundColor = RGB(255, 0, 0);
- newFrameColor1 = RGB(22, 22, 22);
- newFrameColor2 = RGB(255, 127, 39);
+ newBackgroundColor = RGB(222, 222, 222);
+ newFrameColor1 = EQ_BOX_FRAME1;
+ newFrameColor2 = EQ_BOX_FRAME2;
break;
default:
newBackgroundColor = RGB(255, 255, 255); // 默认白色背景
@@ -853,6 +887,7 @@
CDialogEx::OnSize(nType, cx, cy);
if (GetDlgItem(IDC_SERVO_GRAPH1) == nullptr) return;
Resize();
+ Invalidate();
}
void CServoDlg::Resize()
@@ -945,13 +980,13 @@
if (m_pLogDlg != nullptr && !m_pLogDlg->IsZoomed()) {
CRect rcWnd;
GetWindowRect(&rcWnd);
- m_pLogDlg->MoveWindow(rcWnd.left, rcWnd.bottom - 8, rcWnd.Width(), 200);
+ m_pLogDlg->SetWindowPos(nullptr, rcWnd.left, rcWnd.bottom - 8, 0, 0, SWP_NOSIZE);
}
if (m_pAlarmDlg != nullptr && !m_pAlarmDlg->IsZoomed()) {
CRect rcWnd;
GetWindowRect(&rcWnd);
- m_pAlarmDlg->MoveWindow(rcWnd.left, rcWnd.bottom - 8, rcWnd.Width(), 200);
+ m_pAlarmDlg->SetWindowPos(nullptr, rcWnd.left, rcWnd.bottom - 8, 0, 0, SWP_NOSIZE);
}
CDialogEx::OnMove(x, y);
--
Gitblit v1.9.3