From 357b6294d03c0537b4abb74ed4b3f0a54f9d9915 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期五, 05 九月 2025 15:31:27 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang
---
SourceCode/Bond/Servo/CProcessData.h | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/SourceCode/Bond/Servo/CProcessData.h b/SourceCode/Bond/Servo/CProcessData.h
index 2bae1aa..93684de 100644
--- a/SourceCode/Bond/Servo/CProcessData.h
+++ b/SourceCode/Bond/Servo/CProcessData.h
@@ -1,6 +1,7 @@
#pragma once
#include <list>
#include "CAttributeVector.h"
+#include "CParam.h"
namespace SERVO {
@@ -11,25 +12,28 @@
virtual ~CProcessData();
public:
+ short getCassetteSequenceNo();
+ short getJobSequenceNo();
std::string& getGlassId();
void setGlassId(const char* pszId);
std::string& getStartTime();
std::string& getEndTime();
unsigned int getTotalParameter();
- const std::list<std::string>& getParameters();
- void getParameters(std::list<std::string>& list);
+ std::vector<uint8_t>& getParamsRawData();
int serialize(char* pszBuffer, int nBufferSize);
int unserialize(const char* pszBuffer, int nBufferSize);
void getAttributeVector(CAttributeVector& attrubutes, int beginWeight);
private:
+ short m_nCassetteSequenceNo;
+ short m_nJobSequenceNo;
std::string m_strGlassId;
std::string m_strStartTime;
std::string m_strEndTime;
unsigned int m_nTotalParameter;
unsigned int m_nTotalGroup;
unsigned int m_nCurrentGroup;
- std::list<std::string> m_params;
+ std::vector<uint8_t> m_paramsRawData;
};
}
--
Gitblit v1.9.3