From 74401edd0fb47294538d7253ad15e6a8d3d1fc5a Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期五, 27 六月 2025 09:00:43 +0800
Subject: [PATCH] 1. 防止定时器重复刷新手臂的状态 2. 手臂显示的位置通过配置文件读取
---
SourceCode/Bond/Servo/CGlass.h | 19 ++++++++-----------
1 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/SourceCode/Bond/Servo/CGlass.h b/SourceCode/Bond/Servo/CGlass.h
index ffeeccc..f5e1945 100644
--- a/SourceCode/Bond/Servo/CGlass.h
+++ b/SourceCode/Bond/Servo/CGlass.h
@@ -6,20 +6,16 @@
#include "CJobDataB.h"
#include "CJobDataC.h"
#include "CJobDataS.h"
+#include "ServoCommo.h"
namespace SERVO {
- enum MaterialsType {
- G1 = 0,
- G2 = 1,
- G1G2 = 2
- };
-
class CGlass : public CContext
{
public:
CGlass();
virtual ~CGlass();
+ void reset();
public:
virtual std::string& getClassName();
@@ -28,23 +24,24 @@
void setType(MaterialsType type);
void setID(const char* pszID);
std::string& getID();
- CPath* getPathWithSiteID(unsigned int nSiteId);
+ CPath* getPathWithEq(unsigned int nEqId, unsigned int nUnit);
CPath* getPath();
- void addPath(unsigned int nSiteId);
+ void addPath(unsigned int nEqId, unsigned int nUnit);
void serialize(CArchive& ar);
- void setJobDataB(CJobDataB* pJobDataB);
- CJobDataB* getJobDataB();
void setJobDataS(CJobDataS* pJobDataS);
+ void updateJobDataS(CJobDataS* pJobDataS);
CJobDataS* getJobDataS();
BOOL setBuddy(CGlass* pGlass);
+ BOOL forceSetBuddy(CGlass* pGlass);
CGlass* getBuddy();
std::string& getBuddyId();
+ void processEnd(unsigned int nEqId, unsigned int nUnit);
+ BOOL isProcessed(unsigned int nEqId, unsigned int nUnit);
private:
MaterialsType m_type;
std::string m_strID;
CPath* m_pPath;
- CJobDataB m_jobDataB;
CJobDataS m_jobDataS;
CGlass* m_pBuddy;
std::string m_strBuddyId;
--
Gitblit v1.9.3