From bdf0dc4cb183d3fec40e1d51b3bb94b7e53d0a55 Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期日, 04 一月 2026 10:45:07 +0800
Subject: [PATCH] 1.修复报文字段差异风险： S1F3：项目用 getSubItemU4(0) 取 SVID；日志里有 U2 的情况，可能导致解析失败后回退成 SV=0。 S6F11：项目发送 DATAID(U4) + CEID(U4)；日志样例里第一个字段是 U2，可能存在类型/字段定义不一致。
---
SourceCode/Bond/BondEq/View/AxisSettingsDlg.h | 15 ++-------------
1 files changed, 2 insertions(+), 13 deletions(-)
diff --git a/SourceCode/Bond/BondEq/View/AxisSettingsDlg.h b/SourceCode/Bond/BondEq/View/AxisSettingsDlg.h
index ed1e674..ef66b8f 100644
--- a/SourceCode/Bond/BondEq/View/AxisSettingsDlg.h
+++ b/SourceCode/Bond/BondEq/View/AxisSettingsDlg.h
@@ -4,6 +4,7 @@
#include "BLLabel.h"
#include "RegexEdit.h"
#include "CPLC.h"
+#include "CBaseDlg.h"
// 姣忛〉瀹氫綅鐐规樉绀轰釜鏁�
#define AXIS_PAGE_SIZE 5
@@ -63,7 +64,7 @@
POSITION_5 // 瀹氫綅鐐�5
};
-class CAxisSettingsDlg : public CDialogEx
+class CAxisSettingsDlg : public CBaseDlg
{
DECLARE_DYNAMIC(CAxisSettingsDlg)
@@ -82,10 +83,6 @@
private:
UINT FindIDByName(const CString& strControlID);
- CFont* GetOrCreateFont(int nFontSize);
- void SetDefaultFont();
- void AdjustControls(float dScaleX, float dScaleY);
- void AdjustControlFont(CWnd* pWnd, int nWidth, int nHeight);
void AdjustLabelFont(CBLLabel& label);
void SetLabelColor(CBLLabel& label, COLORREF color);
void SetLabelColorBasedOnState(CBLLabel& label, BOOL bState, COLORREF colorTrue, COLORREF colorFalse);
@@ -108,8 +105,6 @@
private:
CPLC* m_pPLC;
- int m_nInitialWidth;
- int m_nInitialHeight;
// 褰撳墠閫変腑鐨勫畾浣嶉〉闈㈢储寮�
int m_currentPage;
@@ -123,10 +118,6 @@
CRegexEdit* m_pRegexEdit[EDIT_MAX];
CComboBox m_comboAxisNO;
CStatic m_staticAxisNO, m_staticAxisDescription, m_staticStartAddress;
- //CEdit m_editManualSpeed, m_editAutoSpeed, m_editAccelerationTime, m_editDecelerationTime, m_editJogDistance;
-
- std::map<int, CRect> m_mapCtrlLayouts;
- std::map<int, CFont*> m_mapFonts;
// 璇诲埌鐨勬暟鎹�
BOOL m_bSEV;
@@ -151,8 +142,6 @@
virtual BOOL OnInitDialog();
virtual BOOL PreTranslateMessage(MSG* pMsg);
afx_msg void OnSize(UINT nType, int cx, int cy);
- afx_msg void OnSizing(UINT fwSide, LPRECT pRect);
- afx_msg HBRUSH OnCtlColor(CDC* pDC, CWnd* pWnd, UINT nCtlColor);
afx_msg void OnBnClickedButtonAxisLast();
afx_msg void OnBnClickedButtonAxisNext();
afx_msg void OnBnClickedButtonAxisAnchorPointGroup1();
--
Gitblit v1.9.3