From 8ffc831c6bf37a73961e22efc145be4e8c8f1241 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期四, 19 六月 2025 10:05:07 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang
---
SourceCode/Bond/Servo/CGlass.h | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/SourceCode/Bond/Servo/CGlass.h b/SourceCode/Bond/Servo/CGlass.h
index 4fa6b33..3374f84 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,14 +24,20 @@
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);
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;
@@ -43,6 +45,8 @@
CPath* m_pPath;
CJobDataB m_jobDataB;
CJobDataS m_jobDataS;
+ CGlass* m_pBuddy;
+ std::string m_strBuddyId;
};
}
--
Gitblit v1.9.3