From 437d3d047183eed3bbd8eb79e4b40c4a1e0427c9 Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期四, 15 一月 2026 10:39:31 +0800
Subject: [PATCH] 1.修复： CEID 校验恒通过：ceidDefined 返回 true，PauseEvent ID 不做有效性检查。Host 若下发无效 CEID，将被接受但运行时无法触发暂停，风险难以察觉。 指定事件发生时暂停；
---
SourceCode/Bond/Servo/CPageGraph1.cpp | 162 +++++++++++++++++++++++++++++++++++------------------
1 files changed, 106 insertions(+), 56 deletions(-)
diff --git a/SourceCode/Bond/Servo/CPageGraph1.cpp b/SourceCode/Bond/Servo/CPageGraph1.cpp
index 6378512..2ae613e 100644
--- a/SourceCode/Bond/Servo/CPageGraph1.cpp
+++ b/SourceCode/Bond/Servo/CPageGraph1.cpp
@@ -41,6 +41,7 @@
// 瀹氭椂鍣�
#define TIMER_ID_DEVICE_STATUS 1 // 鐢ㄤ簬鍒濆鍖栬澶囩姸鎬�
#define TIMER_ID_ROBOT_STATUS 2 // 鐢ㄤ簬鍛ㄦ湡鍒锋柊鏈哄櫒浜轰綅缃�/鑷傜姸鎬�
+#define TIMER_ID_ROBOT_ANIMATION 3 //
// CPageGraph1 瀵硅瘽妗�
@@ -49,17 +50,29 @@
CPageGraph1::CPageGraph1(CWnd* pParent /*=nullptr*/)
: CDialogEx(IDD_PAGE_GRAPH1, pParent)
{
- m_pGraph = nullptr;
- m_pObserver = nullptr;
- m_bIsRobotMoving = FALSE;
- m_crBkgnd = PAGE_GRPAH1_BACKGROUND_COLOR;
- m_hbrBkgnd = nullptr;
- m_lastRobotPosition = SERVO::ROBOT_POSITION::Port1;
- m_lastArmState[0] = FALSE;
- m_lastArmState[1] = FALSE;
+ // ===== 鍥惧舰鐣岄潰鐩稿叧鎴愬憳鍙橀噺鍒濆鍖� =====
+ m_pGraph = nullptr; // 鍥惧舰缁樺浘瀵硅薄
+ m_pObserver = nullptr; // 瑙傚療鑰呭璞★紙鍙兘鏄簨浠惰瀵熻�咃級
+ m_crBkgnd = PAGE_GRPAH1_BACKGROUND_COLOR; // 鑳屾櫙棰滆壊
+ m_hbrBkgnd = nullptr; // 鑳屾櫙鍒峰彞鏌�
- m_arm1Offset = LoadArmOffset("ARM1");
- m_arm2Offset = LoadArmOffset("ARM2");
+ // ===== 鏈哄櫒浜哄姩鐢荤姸鎬佸垵濮嬪寲 =====
+ m_bIsRobotMoving = FALSE; // 褰撳墠鏄惁姝ｅ湪鍔ㄧ敾绉诲姩
+ m_nRobotMoveStartX = 0; // 鍔ㄧ敾璧峰 X 鍧愭爣
+ m_nRobotMoveEndX = 0; // 鍔ㄧ敾鐩爣 X 鍧愭爣
+ m_nRobotMoveSteps = 30; // 鍔ㄧ敾鎬绘鏁帮紙鍔ㄧ敾閫熷害鎺у埗锛�
+ m_nRobotMoveCurrentStep = 0; // 褰撳墠鍔ㄧ敾姝ユ暟
+ m_nRobotMoveStartAngle = 0.0f; // 鍔ㄧ敾璧峰瑙掑害
+ m_nRobotMoveEndAngle = 0.0f; // 鍔ㄧ敾鐩爣瑙掑害
+
+ // ===== 鏈哄櫒浜轰笂涓�娆＄姸鎬佸垵濮嬪寲 =====
+ m_lastRobotPosition = SERVO::ROBOT_POSITION::Port1; // 涓婃鏈哄櫒浜轰綅缃紙榛樿 Port1锛�
+ m_lastArmState[0] = FALSE; // 涓婃鏈烘鑷�1 鐘舵�侊紙鏈崰鐢級
+ m_lastArmState[1] = FALSE; // 涓婃鏈烘鑷�2 鐘舵�侊紙鏈崰鐢級
+
+ // ===== 鏈烘鑷傜浉瀵瑰亸绉婚噺鍒濆鍖栵紙浠庨厤缃腑鍔犺浇锛� =====
+ m_arm1Offset = LoadArmOffset("ARM1"); // 鍔犺浇鏈烘鑷�1鍋忕Щ
+ m_arm2Offset = LoadArmOffset("ARM2"); // 鍔犺浇鏈烘鑷�2鍋忕Щ
//m_arm1Offset = { -30, -45 }; // ARM1 浠庝腑蹇冨悜宸�47, 鍚戜笂33
//m_arm2Offset = { 27, -45 }; // ARM2 浠庝腑蹇冨悜鍙�10, 鍚戜笂33
@@ -167,7 +180,7 @@
{
CDialogEx::OnInitDialog();
InitRxWindows();
- SetTimer(TIMER_ID_DEVICE_STATUS, 3000, nullptr);
+ SetTimer(TIMER_ID_DEVICE_STATUS, 800, nullptr);
SetTimer(TIMER_ID_ROBOT_STATUS, 1000, nullptr); // 姣� 1000ms 鏇存柊涓�娆＄姸鎬�
// 鍥剧ず
@@ -183,73 +196,73 @@
// Bonder
m_pGraph->AddIndicateBox(INDICATE_BONDER1, 220, 172, 48, RGB(22, 22, 22),
RGB(255, 127, 39), EQ_BOX_OFFLINE);
- m_pGraph->SetBoxText(INDICATE_BONDER1, "10", "Bonder 1");
+ m_pGraph->SetBoxText(INDICATE_BONDER1, "", "Bonder 1");
m_pGraph->AddIndicateBox(INDICATE_BONDER2, 220, 516, 48, RGB(22, 22, 22),
RGB(255, 127, 39), EQ_BOX_OFFLINE);
- m_pGraph->SetBoxText(INDICATE_BONDER2, "11", "Bonder 2");
+ m_pGraph->SetBoxText(INDICATE_BONDER2, "", "Bonder 2");
// 缈昏浆
m_pGraph->AddIndicateBox(INDICATE_FLIPER, 338, 172, 48, RGB(22, 22, 22),
RGB(255, 127, 39), EQ_BOX_OFFLINE);
- m_pGraph->SetBoxText(INDICATE_FLIPER, "8", "Fliper");
+ m_pGraph->SetBoxText(INDICATE_FLIPER, "", "Fliper");
// 瀵逛綅
m_pGraph->AddIndicateBox(INDICATE_ALIGNER, 428, 172, 48, RGB(22, 22, 22),
RGB(255, 127, 39), EQ_BOX_OFFLINE);
- m_pGraph->SetBoxText(INDICATE_ALIGNER, "7", "Aligner");
+ m_pGraph->SetBoxText(INDICATE_ALIGNER, "", "Aligner");
// Load port 4
m_pGraph->AddIndicateBox(INDICATE_LPORT4, 518, 172, 48, RGB(22, 22, 22),
RGB(255, 127, 39), EQ_BOX_OFFLINE);
- m_pGraph->SetBoxText(INDICATE_LPORT4, "4", "LPort4");
+ m_pGraph->SetBoxText(INDICATE_LPORT4, "", "LPort4");
// Load port 3
m_pGraph->AddIndicateBox(INDICATE_LPORT3, 606, 172, 48, RGB(22, 22, 22),
RGB(255, 127, 39), EQ_BOX_OFFLINE);
- m_pGraph->SetBoxText(INDICATE_LPORT3, "3", "LPort3");
+ m_pGraph->SetBoxText(INDICATE_LPORT3, "", "LPort3");
// Load port 2
m_pGraph->AddIndicateBox(INDICATE_LPORT2, 690, 172, 48, RGB(22, 22, 22),
RGB(255, 127, 39), EQ_BOX_OFFLINE);
- m_pGraph->SetBoxText(INDICATE_LPORT2, "2", "LPort2");
+ m_pGraph->SetBoxText(INDICATE_LPORT2, "", "LPort2");
// Load port 1
m_pGraph->AddIndicateBox(INDICATE_LPORT1, 774, 172, 48, RGB(22, 22, 22),
RGB(255, 127, 39), EQ_BOX_OFFLINE);
- m_pGraph->SetBoxText(INDICATE_LPORT1, "1", "LPort1");
+ m_pGraph->SetBoxText(INDICATE_LPORT1, "", "LPort1");
// Robot
m_pGraph->AddIndicateBox(INDICATE_ROBOT_ARM1, 190, 294, 48, RGB(22, 22, 22),
RGB(255, 127, 39), EQ_BOX_OFFLINE);
- m_pGraph->SetBoxText(INDICATE_ROBOT_ARM1, "5", "Robot");
+ m_pGraph->SetBoxText(INDICATE_ROBOT_ARM1, "", "Robot");
m_pGraph->AddIndicateBox(INDICATE_ROBOT_ARM2, 243, 294, 48, RGB(22, 22, 22),
RGB(255, 127, 39), EQ_BOX_OFFLINE);
- m_pGraph->SetBoxText(INDICATE_ROBOT_ARM2, "6", "Robot");
+ m_pGraph->SetBoxText(INDICATE_ROBOT_ARM2, "", "Robot");
// Vacuum bake
m_pGraph->AddIndicateBox(INDICATE_VACUUM_BAKE, 396, 516, 48, RGB(22, 22, 22),
RGB(255, 127, 39), EQ_BOX_OFFLINE);
- m_pGraph->SetBoxText(INDICATE_VACUUM_BAKE, "9", "Vacuum bake");
+ m_pGraph->SetBoxText(INDICATE_VACUUM_BAKE, "", "Vacuum bake");
// Bake cooling
m_pGraph->AddIndicateBox(INDICATE_BAKE_COOLING, 566, 516, 48, RGB(22, 22, 22),
RGB(255, 127, 39), EQ_BOX_OFFLINE);
- m_pGraph->SetBoxText(INDICATE_BAKE_COOLING, "12", "Bake cooling");
+ m_pGraph->SetBoxText(INDICATE_BAKE_COOLING, "", "Bake cooling");
// 绮惧害妫�
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");
+ m_pGraph->SetBoxText(INDICATE_MEASUREMENT, "", "Measurement");
return TRUE; // return TRUE unless you set the focus to a control
@@ -494,6 +507,32 @@
m_lastRobotPosition = position;
}
+void CPageGraph1::StartRobotMoveToPosition(SERVO::ROBOT_POSITION position)
+{
+ auto it = g_positionMap.find(position);
+ if (it == g_positionMap.end()) {
+ TRACE("Invalid robot position: %d\n", static_cast<int>(position));
+ return;
+ }
+
+ const RobotPositionMapping& mapping = it->second;
+
+ auto* pImage = m_pGraph->GetImage(IMAGE_ROBOT);
+ if (!pImage) return;
+
+ m_nRobotMoveStartX = pImage->x;
+ m_nRobotMoveEndX = static_cast<int>(170 + mapping.percentage * (700 - 170));
+
+ m_nRobotMoveStartAngle = pImage->angle; // 璧峰瑙掑害锛堝綋鍓嶈搴︼級
+ m_nRobotMoveEndAngle = mapping.angle; // 鐩爣瑙掑害
+
+ m_nRobotMoveCurrentStep = 0;
+ m_targetRobotPosition = position;
+ m_bIsRobotMoving = TRUE;
+
+ SetTimer(TIMER_ID_ROBOT_ANIMATION, 16, nullptr);
+}
+
POINT CPageGraph1::LoadArmOffset(const std::string& armName)
{
std::string iniPath = GetConfigPath();
@@ -521,37 +560,7 @@
// 绉诲姩鍒版寚瀹氫綅缃� (娴嬭瘯浣跨敤)
if (pGraphNmhdr->dwData == INDICATE_LPORT1) {
- MoveRobotToPosition(SERVO::ROBOT_POSITION::Port1);
- }
- else if (pGraphNmhdr->dwData == INDICATE_LPORT2) {
- MoveRobotToPosition(SERVO::ROBOT_POSITION::Port2);
- }
- else if (pGraphNmhdr->dwData == INDICATE_LPORT3) {
- MoveRobotToPosition(SERVO::ROBOT_POSITION::Port3);
- }
- else if (pGraphNmhdr->dwData == INDICATE_LPORT4) {
- MoveRobotToPosition(SERVO::ROBOT_POSITION::Port4);
- }
- else if (pGraphNmhdr->dwData == INDICATE_ALIGNER) {
- MoveRobotToPosition(SERVO::ROBOT_POSITION::Aligner);
- }
- else if (pGraphNmhdr->dwData == INDICATE_FLIPER) {
- MoveRobotToPosition(SERVO::ROBOT_POSITION::Fliper);
- }
- else if (pGraphNmhdr->dwData == INDICATE_BONDER1) {
- MoveRobotToPosition(SERVO::ROBOT_POSITION::Bonder1);
- }
- else if (pGraphNmhdr->dwData == INDICATE_BONDER2) {
- MoveRobotToPosition(SERVO::ROBOT_POSITION::Bonder2);
- }
- else if (pGraphNmhdr->dwData == INDICATE_VACUUM_BAKE) {
- MoveRobotToPosition(SERVO::ROBOT_POSITION::Bake);
- }
- else if (pGraphNmhdr->dwData == INDICATE_BAKE_COOLING) {
- MoveRobotToPosition(SERVO::ROBOT_POSITION::Cooling);
- }
- else if (pGraphNmhdr->dwData == INDICATE_MEASUREMENT) {
- MoveRobotToPosition(SERVO::ROBOT_POSITION::Measurement);
+
}
*pResult = 0;
@@ -636,9 +645,50 @@
// 浣嶇疆淇℃伅鐘舵�佹樉绀�
if (robotData.position != m_lastRobotPosition) {
- MoveRobotToPosition(robotData.position);
+ StartRobotMoveToPosition(robotData.position);
}
}
+ else if (nIDEvent == TIMER_ID_ROBOT_ANIMATION) {
+ if (!m_bIsRobotMoving) {
+ KillTimer(TIMER_ID_ROBOT_ANIMATION);
+ return;
+ }
+
+ m_nRobotMoveCurrentStep++;
+
+ float progress = static_cast<float>(m_nRobotMoveCurrentStep) / m_nRobotMoveSteps;
+ if (progress >= 1.0f) {
+ progress = 1.0f;
+ m_bIsRobotMoving = FALSE;
+ KillTimer(TIMER_ID_ROBOT_ANIMATION);
+ m_lastRobotPosition = m_targetRobotPosition;
+ }
+
+ // 骞虫粦璁＄畻浣嶇疆
+ int currentX = static_cast<int>(m_nRobotMoveStartX + progress * (m_nRobotMoveEndX - m_nRobotMoveStartX));
+ auto* pImage = m_pGraph->GetImage(IMAGE_ROBOT);
+ if (!pImage) return;
+
+ int cx = currentX + pImage->bmWidth / 2;
+ int y = 270;
+ int cy = y + pImage->bmHeight / 2;
+
+ // 骞虫粦璁＄畻瑙掑害
+ float currentAngle = m_nRobotMoveStartAngle + progress * (m_nRobotMoveEndAngle - m_nRobotMoveStartAngle);
+ float radians = currentAngle * 3.1415926f / 180.0f;
+
+ int rotatedX1 = static_cast<int>(cos(radians) * m_arm1Offset.x - sin(radians) * m_arm1Offset.y);
+ int rotatedY1 = static_cast<int>(sin(radians) * m_arm1Offset.x + cos(radians) * m_arm1Offset.y);
+ int rotatedX2 = static_cast<int>(cos(radians) * m_arm2Offset.x - sin(radians) * m_arm2Offset.y);
+ int rotatedY2 = static_cast<int>(sin(radians) * m_arm2Offset.x + cos(radians) * m_arm2Offset.y);
+
+ m_pGraph->UpdateImageCoordinates(IMAGE_ROBOT, currentX, y);
+ m_pGraph->UpdateIndicateBoxCoordinates(INDICATE_ROBOT_ARM1, cx + rotatedX1, cy + rotatedY1);
+ m_pGraph->UpdateIndicateBoxCoordinates(INDICATE_ROBOT_ARM2, cx + rotatedX2, cy + rotatedY2);
+ m_pGraph->UpdateImageAngle(IMAGE_ROBOT, currentAngle);
+
+ Invalidate();
+ }
CDialogEx::OnTimer(nIDEvent);
}
--
Gitblit v1.9.3