From 421aabbb83aa017f10be255b3b5a2e3f69abb816 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期一, 21 七月 2025 08:50:19 +0800
Subject: [PATCH] 1.none
---
SourceCode/Bond/Servo/HsmsPassive.h | 43 ++++++++++++++++++++++++++++++++++---------
1 files changed, 34 insertions(+), 9 deletions(-)
diff --git a/SourceCode/Bond/Servo/HsmsPassive.h b/SourceCode/Bond/Servo/HsmsPassive.h
index f5e8383..7dbbbf6 100644
--- a/SourceCode/Bond/Servo/HsmsPassive.h
+++ b/SourceCode/Bond/Servo/HsmsPassive.h
@@ -103,17 +103,38 @@
unsigned int getCEID(int RPTID);
// define Report
- void defineReport(unsigned int VID, unsigned int RPTID);
+ SERVO::CReport* defineReport(unsigned int RPTID, std::vector<unsigned int>& vids);
// 取消 define report
- void deleteReport(unsigned int RPTID);
-
- // 取消/删除所有 define report
- void deleteAllReport();
+ bool removeReport(int rptid);
+ void clearAllReport();
// 从文件中加载CVariable列表
- int loadVarialbleList(const char* pszFilepath);
+ int loadVarialbles(const char* pszFilepath);
+ // 取得CVariable列表
+ std::vector<SERVO::CVariable*>& getVariables();
+
+ // 取得指定Variable
+ SERVO::CVariable* getVariable(int variableId);
+
+ // 从文件中加载CReport列表
+ int loadReports(const char* pszFilepath);
+
+ // 取得Report列表
+ std::vector<SERVO::CReport*>& getReports();
+
+ // 从文件中加载CCollectionEvent列表
+ int loadCollectionEvents(const char* pszFilepath);
+
+ // 取得CCollectionEvent列表
+ std::vector<SERVO::CCollectionEvent*>& getCollectionEvents();
+
+ // 取消/删除所有CollectionEvent
+ void clearAllCollectionEvent();
+
+
+ SERVO::CReport* getReport(int rptid);
void setListener(SECSListener listener);
unsigned OnCimWork();
@@ -152,6 +173,7 @@
inline void Unlock() { LeaveCriticalSection(&m_criticalSection); }
int onRecvMsg(IMessage* pMessage);
void clearAllVariabel();
+ std::vector<unsigned int> parseVidList(CString& strNums);
private:
CModel* m_pModel;
@@ -180,13 +202,16 @@
// RPTID to Report
std::map<unsigned int, REPORT> m_mapReport;
- // VID to RPTID
- std::map<unsigned int, unsigned int> m_mapValueIdToPRTID;
-
// VID to Report
std::map<unsigned int, VALUE> m_mapValue;
// CVariable vector
std::vector<SERVO::CVariable*> m_variabels;
+
+ // CReport vector
+ std::vector<SERVO::CReport*> m_reports;
+
+ // CollectionEvent vector
+ std::vector<SERVO::CCollectionEvent*> m_collectionEvent;
};
--
Gitblit v1.9.3