From 4897210a25e7c98ddacb1fa4ecee3e8bdd1ae98e Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期四, 12 六月 2025 14:18:16 +0800
Subject: [PATCH] 1.手臂选择匹配问题，
---
SourceCode/Bond/Servo/CGlass.h | 14 ++++++--------
1 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/SourceCode/Bond/Servo/CGlass.h b/SourceCode/Bond/Servo/CGlass.h
index ffeeccc..d2f4197 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,9 +24,9 @@
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();
@@ -39,6 +35,8 @@
BOOL setBuddy(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;
--
Gitblit v1.9.3