From da96e6da0b677c6a4e96308aaecd3d619a8e4db2 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期四, 26 六月 2025 08:46:11 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang
---
SourceCode/Bond/Servo/CGlass.h | 21 +++++++++++++++++++--
1 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/SourceCode/Bond/Servo/CGlass.h b/SourceCode/Bond/Servo/CGlass.h
index 38ecaf2..f5e1945 100644
--- a/SourceCode/Bond/Servo/CGlass.h
+++ b/SourceCode/Bond/Servo/CGlass.h
@@ -6,6 +6,7 @@
#include "CJobDataB.h"
#include "CJobDataC.h"
#include "CJobDataS.h"
+#include "ServoCommo.h"
namespace SERVO {
@@ -14,20 +15,36 @@
public:
CGlass();
virtual ~CGlass();
+ void reset();
public:
virtual std::string& getClassName();
virtual std::string toString();
+ MaterialsType getType();
+ 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 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;
+ CJobDataS m_jobDataS;
+ CGlass* m_pBuddy;
+ std::string m_strBuddyId;
};
}
--
Gitblit v1.9.3