From 4ec3b6e0317c579c856ceb9f4c7c5146753af5bf Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期四, 05 六月 2025 08:40:08 +0800
Subject: [PATCH] Merge branch 'clh'
---
SourceCode/Bond/Servo/CGlass.h | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/SourceCode/Bond/Servo/CGlass.h b/SourceCode/Bond/Servo/CGlass.h
index ffeeccc..1235c8e 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();
@@ -30,6 +26,7 @@
std::string& getID();
CPath* getPathWithSiteID(unsigned int nSiteId);
CPath* getPath();
+ CPath* getPathWithSiteId(unsigned int nSiteId);
void addPath(unsigned int nSiteId);
void serialize(CArchive& ar);
void setJobDataB(CJobDataB* pJobDataB);
@@ -39,6 +36,8 @@
BOOL setBuddy(CGlass* pGlass);
CGlass* getBuddy();
std::string& getBuddyId();
+ void processEnd(unsigned int nSiteId);
+ BOOL isProcessed(unsigned int nSiteId);
private:
MaterialsType m_type;
--
Gitblit v1.9.3