From 04d89bc9216553adcd0df87985a7665882924093 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期五, 22 八月 2025 17:56:10 +0800
Subject: [PATCH] 1. 优化Notch计算周长，使用比例的形式计算
---
EdgeInspector_App/Data/TransDataManager.h | 50 +++++++++++++++++++++++++-------------------------
1 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/EdgeInspector_App/Data/TransDataManager.h b/EdgeInspector_App/Data/TransDataManager.h
index 3d3a302..8b52c07 100644
--- a/EdgeInspector_App/Data/TransDataManager.h
+++ b/EdgeInspector_App/Data/TransDataManager.h
@@ -1,4 +1,4 @@
-#pragma once
+锘�#pragma once
#include <map>
@@ -12,7 +12,7 @@
eAscii = 0,
eUnsignedDec
};
-class CTransDataPack //拱幅 沥焊 class.
+class CTransDataPack //鎷卞箙 娌ョ剨 class.
{
protected:
int m_nIndex;
@@ -66,10 +66,10 @@
}
}
- int GetIndex() {return m_nIndex;}; //拱幅 沥焊狼 鉴辑
- int GetByte() {return m_nByte;}; //拱幅 沥焊狼 辨捞.
+ int GetIndex() {return m_nIndex;}; //鎷卞箙 娌ョ剨鐙� 閴磋緫
+ int GetByte() {return m_nByte;}; //鎷卞箙 娌ョ剨鐙� 杈ㄦ崬.
EnumPackType GetPackType() {return m_ePackType;}
- char* GetValue() {return m_pstrData;}; //拱幅 沥焊狼 蔼
+ char* GetValue() {return m_pstrData;}; //鎷卞箙 娌ョ剨鐙� 钄�
void SetValue(char* pstrData)
{
@@ -92,42 +92,42 @@
virtual ~CTransDataManager();
CTransDataManager& operator=(const CTransDataManager& rhs);
- // 檬扁拳
+ // 妾墎鎷�
void ResetPackData();
- // 16柳荐 -> 10柳荐(int)
+ // 16鏌宠崘 -> 10鏌宠崘(int)
int Hex2Dec(CString hex_str);
- // 16柳荐 -> 何龋绝绰 10柳荐(short)
+ // 16鏌宠崘 -> 浣曢緥缁濈话 10鏌宠崘(short)
short Hex2SignedDec(CString hex_str);
- // 酒胶虐 -> 16柳荐 巩磊凯
+ // 閰掕兌铏� -> 16鏌宠崘 宸╃鍑�
CString Asc2Hex(CStringA hex_str);
- // 胶飘傅 -> 16柳荐
+ // 鑳堕鍌� -> 16鏌宠崘
BOOL StrToHex(CHAR* pchData, CHAR* pchDataSrc, INT nLength, BOOL bWordReverse = FALSE);
- // 16柳荐 -> 何龋乐绰 10柳荐
+ // 16鏌宠崘 -> 浣曢緥涔愮话 10鏌宠崘
UINT Hex2UnsignedDec(CString hex_str);
- // 况靛 -> 10柳荐
+ // 鍐甸潧 -> 10鏌宠崘
UINT GetDataWord2Dec(CString buff, int ap, BOOL hi_bit);
- // 况靛 -> 巩磊凯
+ // 鍐甸潧 -> 宸╃鍑�
CString GetDataWord2Str(CString& value, int& addr, int length);
- // 拱幅 沥焊 辑摹
+ // 鎷卞箙 娌ョ剨 杈戞懝
BOOL SearchValueInMap(CString Name, CString& ReturnValue, int& ByteLength);
- // 拱幅 沥焊 辑摹
+ // 鎷卞箙 娌ョ剨 杈戞懝
BOOL SearchValueInMap(CString Name, int& nReturnValue, int& ByteLength);
- // PLC 单捞磐 -> 甘
+ // PLC 鍗曟崬纾� -> 鐢�
BOOL InsertPLCValueToPack(CString keyName, char* pstrData);
- // 蔼 辑摹
+ // 钄� 杈戞懝
BOOL GetPackDataAll(CString &Name, int Index, int &Byte, CString &Value);
- // 拱幅 单捞磐 傈眉 墨款飘
+ // 鎷卞箙 鍗曟崬纾� 鍌堢湁 澧ㄦ椋�
int GetDataPackTotalNumber();
- // 拱幅 单捞磐 傈眉 官捞飘
+ // 鎷卞箙 鍗曟崬纾� 鍌堢湁 瀹樻崬椋�
int GetDataPackTotalByteSize(){return m_DataPackTotalByteSize;};
- // PLC 单捞磐 -> 甘
+ // PLC 鍗曟崬纾� -> 鐢�
BOOL InsertPLCValueToMap(char* pstrRawData,int nLength);
- // 拱幅单捞磐 器杆 殿废
+ // 鎷卞箙鍗曟崬纾� 鍣ㄦ潌 娈垮簾
void InsertTransItemToMap(CString ItemName, int ItemByte, int Key=-1, EnumPackType ePackType = eAscii);
- // 拱幅单捞磐 器杆 佬扁
+ // 鎷卞箙鍗曟崬纾� 鍣ㄦ潌 浣墎
BOOL LoadTransItemFromFile(CString FilePath);
CString GetItemName(int nIndex);
@@ -136,7 +136,7 @@
void ResetData();
private:
int m_DataPackTotalByteSize;
- std::map<CString,CTransDataPack*> m_TransDataPackMap; //拱幅沥焊 捞抚, 辨捞, 蔼俊 措茄 甘 牧抛捞呈
- std::map<CString,CTransDataPack*>::iterator m_TransDataPackMapiterator; //拱幅 沥焊 啊府虐绰 器牢磐
- std::vector<CString> m_vTransDataList; //拱幅 沥焊 府胶飘
+ std::map<CString,CTransDataPack*> m_TransDataPackMap; //鎷卞箙娌ョ剨 鎹炴姎, 杈ㄦ崬, 钄间繆 鎺寗 鐢� 鐗ф姏鎹炲憟
+ std::map<CString,CTransDataPack*>::iterator m_TransDataPackMapiterator; //鎷卞箙 娌ョ剨 鍟婂簻铏愮话 鍣ㄧ墷纾�
+ std::vector<CString> m_vTransDataList; //鎷卞箙 娌ョ剨 搴滆兌椋�
};
--
Gitblit v1.9.3