From a2e03f3ddd4809b2c3915883d9b98bc56196f471 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期四, 05 十二月 2024 09:13:22 +0800
Subject: [PATCH] 1.恢复原前一页下一页按钮禁用状态变化； 2.修复读PLC数据时如超时回调，窗口不存在会造成闪退的问题；

---
 SourceCode/Bond/BondEq/View/AxisSettingsDlg.h |   10 +++-------
 1 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/SourceCode/Bond/BondEq/View/AxisSettingsDlg.h b/SourceCode/Bond/BondEq/View/AxisSettingsDlg.h
index 971ee59..d94c18b 100644
--- a/SourceCode/Bond/BondEq/View/AxisSettingsDlg.h
+++ b/SourceCode/Bond/BondEq/View/AxisSettingsDlg.h
@@ -51,9 +51,10 @@
 	void updateAxisSelection(int offset);
 	void updateDataFromUI(int nAxisId);
 	void switchToPage(int targetPage);
+	bool ParsePLCAddress(const CString& address, MC::SOFT_COMPONENT& component, int& addr);
 	void writeAxisDataToPLC(int nAxisId);
 	void handleAxisOperation(AxisOperationType eOpType, bool bPressed);
-
+	void readPLCDataToUI(int nAxisId);
 
 private:
 	CPLC* m_pPLC;
@@ -83,6 +84,7 @@
 protected:
 	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV 鏀寔
 	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);
@@ -100,14 +102,8 @@
 	afx_msg void OnBnClickedButtonAxisAnchorPoint5();
 	afx_msg void OnBnClickedButtonAxisTestOpr();
 	afx_msg void OnBnClickedButtonAxisTestStop();
-	afx_msg void OnBnClickedJogAddDown();
-	afx_msg void OnBnClickedJogAddUp();
-	afx_msg void OnBnClickedJogSubDown();
-	afx_msg void OnBnClickedJogSubUp();
 	afx_msg void OnSelchangeComboAxisName();
 	afx_msg void OnBnClickedButtonAxisSave();
 	afx_msg void OnTimer(UINT_PTR nIDEvent);
-	//afx_msg void OnLButtonDown(UINT nFlags, CPoint point);
-	//afx_msg void OnLButtonUp(UINT nFlags, CPoint point);
 	DECLARE_MESSAGE_MAP()
 };

--
Gitblit v1.9.3