From 789af4f4a7baee07bd6c2c03588afcb19555343b Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期三, 16 七月 2025 14:00:32 +0800
Subject: [PATCH] 1.CollectionEvent列表从文件加载，界面上显示；
---
SourceCode/Bond/Servo/HsmsPassive.h | 25 ++++++++++++++++++++-----
1 files changed, 20 insertions(+), 5 deletions(-)
diff --git a/SourceCode/Bond/Servo/HsmsPassive.h b/SourceCode/Bond/Servo/HsmsPassive.h
index 0436b2c..742c7fc 100644
--- a/SourceCode/Bond/Servo/HsmsPassive.h
+++ b/SourceCode/Bond/Servo/HsmsPassive.h
@@ -108,9 +108,6 @@
// 取消 define report
void deleteReport(unsigned int RPTID);
- // 取消/删除所有 define report
- void deleteAllReport();
-
// 从文件中加载CVariable列表
int loadVarialbles(const char* pszFilepath);
@@ -120,10 +117,25 @@
// 取得指定Variable
SERVO::CVariable* getVariable(int variableId);
- // 从文件中加载CReport表表
+ // 从文件中加载CReport列表
int loadReports(const char* pszFilepath);
+ // 取消/删除所有 define report
+ void deleteAllReport();
+
+ // 取得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();
@@ -162,7 +174,7 @@
inline void Unlock() { LeaveCriticalSection(&m_criticalSection); }
int onRecvMsg(IMessage* pMessage);
void clearAllVariabel();
- std::vector<int> parseVidList(CString& strNums);
+ std::vector<unsigned int> parseVidList(CString& strNums);
void clearAllReport();
private:
@@ -203,5 +215,8 @@
// CReport vector
std::vector<SERVO::CReport*> m_reports;
+
+ // CollectionEvent vector
+ std::vector<SERVO::CCollectionEvent*> m_collectionEvent;
};
--
Gitblit v1.9.3