From 6747bc043d0af20d6fa02a6cf385d81eb44643d0 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期六, 28 六月 2025 11:29:42 +0800
Subject: [PATCH] 1.自绘按钮,修改为支持文字在按钮下,或在按钮右。 2.日志页,修改为“包含”和“排除”关键字,以及正则表达式的支持,便于在调试过程中快速观察日志

---
 SourceCode/Bond/Servo/CVcrEventReport.cpp |   26 +++++++++++++++++++++++++-
 1 files changed, 25 insertions(+), 1 deletions(-)

diff --git a/SourceCode/Bond/Servo/CVcrEventReport.cpp b/SourceCode/Bond/Servo/CVcrEventReport.cpp
index 914b0d0..248cd03 100644
--- a/SourceCode/Bond/Servo/CVcrEventReport.cpp
+++ b/SourceCode/Bond/Servo/CVcrEventReport.cpp
@@ -71,7 +71,7 @@
 		return 15 * 2;
 	}
 
-	int CVcrEventReport::unserialize(char* pszBuffer, int nBufferSize)
+	int CVcrEventReport::unserialize(const char* pszBuffer, int nBufferSize)
 	{
 		if (nBufferSize < 640) return -1;
 
@@ -97,6 +97,30 @@
 		return 15 * 2;
 	}
 
+	void CVcrEventReport::getAttributeVector(CAttributeVector& attrubutes, int beginWeight)
+	{
+		unsigned int weight = beginWeight;
+		std::string strTemp;
+
+		attrubutes.addAttribute(new CAttribute("GlassId",
+			m_strGlassId.c_str(), "", weight++));
+
+		attrubutes.addAttribute(new CAttribute("CassetteSequenceNo",
+			std::to_string(m_nCassetteSequenceNo).c_str(), "", weight++));
+
+		attrubutes.addAttribute(new CAttribute("JobSequenceNo",
+			std::to_string(m_nJobSequenceNo).c_str(), "", weight++));
+
+		attrubutes.addAttribute(new CAttribute("UnitNo",
+			std::to_string(m_nUnitNo).c_str(), "", weight++));
+
+		attrubutes.addAttribute(new CAttribute("VcrNo",
+			std::to_string(m_nVcrNo).c_str(), "", weight++));
+
+		attrubutes.addAttribute(new CAttribute("VcrResult",
+			std::to_string(m_nVcrResult).c_str(), "", weight++));
+	}
+
 	std::string& CVcrEventReport::getVcrResultDescription(std::string& strDescription)
 	{
 		static char* pszDescription[4] = {

--
Gitblit v1.9.3