From 1cc8012fac8508796e50653fb26bcc003bc02b9d Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期二, 13 一月 2026 08:24:52 +0800
Subject: [PATCH] 1.实现DVID的加载，获取等；
---
SourceCode/Bond/Servo/HsmsPassive.h | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/SourceCode/Bond/Servo/HsmsPassive.h b/SourceCode/Bond/Servo/HsmsPassive.h
index c81a935..938a4ec 100644
--- a/SourceCode/Bond/Servo/HsmsPassive.h
+++ b/SourceCode/Bond/Servo/HsmsPassive.h
@@ -9,6 +9,7 @@
#include "CCollectionEvent.h"
#include "ProcessJob.h"
#include "CControlJob.h"
+#include "CDataVariable.h"
#define EQCONSTANT_VALUE_MAX 64
@@ -146,14 +147,19 @@
// 浠庢枃浠朵腑鍔犺浇CVariable鍒楄〃
int loadVarialbles(const char* pszFilepath);
+ // 浠庢枃浠朵腑鍔犺浇CDataVariable鍒楄〃
+ int loadDataVarialbles(const char* pszFilepath);
// 鍙栧緱CVariable鍒楄〃
std::vector<SERVO::CVariable*>& getVariables();
unsigned int getMaxVariableId() const;
+ std::vector<SERVO::CDataVariable*>& getDataVariables();
// 鍙栧緱鎸囧畾Variable
SERVO::CVariable* getVariable(int variableId);
SERVO::CVariable* getVariable(const char* pszName);
+ SERVO::CDataVariable* getDataVariable(int dvid);
+ SERVO::CDataVariable* getDataVariable(const char* pszName);
int getCurrentControlState();
bool isHostCommandAllowed();
int deleteVariable(int variableId);
@@ -239,6 +245,7 @@
int replyEstablishCommunications(IMessage* pRecv);
int replySelectedEquipmentStatusData(IMessage* pRecv);
int replyStatusVariableNamelistRequest(IMessage* pRecv); // S1F11/S1F12
+ int replyDataVariableNamelistRequest(IMessage* pRecv); // S1F21/S1F22
int replyCollectionEventNamelistRequest(IMessage* pRecv); // S1F23/S1F24
int replyOnLine(IMessage* pRecv);
int replyOffLine(IMessage* pRecv);
@@ -265,8 +272,10 @@
inline void Unlock() { LeaveCriticalSection(&m_criticalSection); }
int onRecvMsg(IMessage* pMessage);
void clearAllVariabel();
+ void clearAllDataVariabel();
std::vector<unsigned int> parseVidList(CString& strNums);
int writeVariablesToFile(const std::string& filepath);
+ int writeDataVariablesToFile(const std::string& filepath);
int writeReportsToFile(const std::string& filepath);
int writeCollectionEventsToFile(const std::string& filepath);
@@ -289,6 +298,9 @@
std::string m_strVariableFilepath;
bool m_bVariableUtf8{ false };
bool m_bVariableUtf8Bom{ false };
+ std::string m_strDataVariableFilepath;
+ bool m_bDataVariableUtf8{ false };
+ bool m_bDataVariableUtf8Bom{ false };
std::string m_strReportFilepath;
bool m_bReportUtf8{ false };
bool m_bReportUtf8Bom{ false };
@@ -305,6 +317,8 @@
private:
// CVariable vector
std::vector<SERVO::CVariable*> m_variabels;
+ // CDataVariable vector
+ std::vector<SERVO::CDataVariable*> m_dataVariabels;
// CReport vector
std::vector<SERVO::CReport*> m_reports;
--
Gitblit v1.9.3