From 6747bc043d0af20d6fa02a6cf385d81eb44643d0 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期六, 28 六月 2025 11:29:42 +0800
Subject: [PATCH] 1.自绘按钮，修改为支持文字在按钮下，或在按钮右。 2.日志页，修改为“包含”和“排除”关键字，以及正则表达式的支持，便于在调试过程中快速观察日志
---
SourceCode/Bond/Servo/CPageGraph1.h | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/SourceCode/Bond/Servo/CPageGraph1.h b/SourceCode/Bond/Servo/CPageGraph1.h
index 405af87..7609a49 100644
--- a/SourceCode/Bond/Servo/CPageGraph1.h
+++ b/SourceCode/Bond/Servo/CPageGraph1.h
@@ -1,12 +1,19 @@
锘�#pragma once
#include "ServoGraph.h"
-
+#include "ServoCommo.h"
enum DeviceStatus {
ONLINE, // 鍦ㄧ嚎
OFFLINE, // 绂荤嚎
+ OCCUPIED // 鏈夌墖锛堝崰鐢級
};
+struct RobotPositionMapping {
+ SERVO::ROBOT_POSITION position;
+ float percentage;
+ float angle;
+ int arm; // 0 琛ㄧず ARM1锛�1 琛ㄧず ARM2
+};
// CPageGraph1 瀵硅瘽妗�
@@ -24,6 +31,8 @@
void UpdateDeviceStatus(int id, DeviceStatus status);
void UpdateRobotPosition(float percentage);
void RotateRobot(float angleInDegrees);
+ void BindEquipmentToGraph();
+ void MoveRobotToPosition(SERVO::ROBOT_POSITION position);
private:
IObserver* m_pObserver;
@@ -31,6 +40,7 @@
BOOL m_bIsRobotMoving;
COLORREF m_crBkgnd;
HBRUSH m_hbrBkgnd;
+ SERVO::ROBOT_POSITION m_lastRobotPosition;
// 瀵硅瘽妗嗘暟鎹�
#ifdef AFX_DESIGN_TIME
--
Gitblit v1.9.3