From d64036c0510cf06009a7252e318d828fbc2658f0 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期四, 11 九月 2025 09:22:02 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang
---
SourceCode/Bond/Servo/CPath.h | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/SourceCode/Bond/Servo/CPath.h b/SourceCode/Bond/Servo/CPath.h
index 832ee07..61f8955 100644
--- a/SourceCode/Bond/Servo/CPath.h
+++ b/SourceCode/Bond/Servo/CPath.h
@@ -7,11 +7,12 @@
{
public:
CPath();
- CPath(unsigned int nEqId, unsigned int nUnit);
+ CPath(unsigned int nEqId, unsigned int nUnit, unsigned int nSlot);
virtual ~CPath();
public:
void getDescription(std::string& strOut);
+ void getSimpleDescription(std::string& strOut);
void serialize(CArchive& ar);
CPath* getPrev();
CPath* getNext();
@@ -20,6 +21,7 @@
CPath* getHeadPath();
unsigned int getEqID();
unsigned int getUnit();
+ unsigned int getSlot();
void setInTime(ULONGLONG time);
ULONGLONG getInTime();
void setOutTime(ULONGLONG time);
@@ -32,6 +34,7 @@
private:
unsigned int m_nEqID;
unsigned int m_nUnit;
+ unsigned int m_nSlot;
ULONGLONG m_timeIn;
ULONGLONG m_timeOut;
BOOL m_bProcessed;
--
Gitblit v1.9.3