From 80c5a369c116280921e8d5668e3fcde894668c7e Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期六, 07 十二月 2024 17:08:24 +0800
Subject: [PATCH] 1.轴定位按钮、回原点按钮根据PLC相关位状态闪烁；

---
 SourceCode/Bond/BondEq/View/AxisSettingsDlg.h |   23 +++++++++++++++--------
 1 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/SourceCode/Bond/BondEq/View/AxisSettingsDlg.h b/SourceCode/Bond/BondEq/View/AxisSettingsDlg.h
index e23daaa..b05a8f7 100644
--- a/SourceCode/Bond/BondEq/View/AxisSettingsDlg.h
+++ b/SourceCode/Bond/BondEq/View/AxisSettingsDlg.h
@@ -5,7 +5,7 @@
 #include "CPLC.h"
 
 
-#define BTN_MAX			10
+#define BTN_MAX			15
 #define BTN_PAGE1		0
 #define BTN_PAGE2		1
 #define BTN_PAGE3		2
@@ -14,9 +14,13 @@
 #define BTN_JOG_ADD		5
 #define BTN_JOG_SUB		6
 #define BTN_JOG_SEV		7
-#define BTN_JOG_STOP	8
-#define BTN_JOG_OPR		9
-
+#define BTN_JOG_OPR		8
+#define BTN_JOG_STOP	9
+#define BTN_POINT1		10
+#define BTN_POINT2		11
+#define BTN_POINT3		12
+#define BTN_POINT4		13
+#define BTN_POINT5		14
 
 // CAxisSettingsDlg 瀵硅瘽妗�
 
@@ -59,10 +63,12 @@
 	void AdjustLabelFont(CBLLabel& label);
 	void SetLabelColor(CBLLabel& label, COLORREF color);
 	void updatePageButtonStates();
+	void HideEditCursor(int nCtrlID);
 	int getCurrentSelectedAxisID();
 	void initializeAxisIDCombo();
 	void refreshAxisDetails(int nAxisId);
 	void refreshPositionDetails(int nAxisId, int pageNumber);
+	void UpdatePositionRange(PositionRange& position, int pageNumber, int pageSize, int currentIndex);
 	void updateAxisSelection(int offset);
 	void updateDataFromUI(int nAxisId);
 	void switchToPage(int targetPage);
@@ -83,12 +89,12 @@
 	CString m_strRecipeName;
 
 	// 鎺т欢
-	CBLLabel m_staticFLS, m_staticDOG, m_staticRLS, m_staticReady, m_staticBusy, m_staticErr;
+	CBlButton* m_pBlBtns[BTN_MAX];
+	CBLLabel* m_pBlLabels[6];
 	CComboBox m_comboAxisNO;
 	CStatic m_staticAxisNO, m_staticAxisDescription, m_staticStartAddress;
 	CEdit m_editManualSpeed, m_editAutoSpeed, m_editAccelerationTime, m_editDecelerationTime, m_editJogDistance;
 	
-	CBlButton* m_pBlBtns[BTN_MAX];
 	std::map<int, CRect> m_mapCtrlLayouts;
 	std::map<int, CFont*> m_mapFonts;
 
@@ -107,6 +113,8 @@
 	BOOL m_bReady;
 	BOOL m_bBusy;
 	BOOL m_bErr;
+	DWORD m_nBtnsFlashState6;
+	DWORD m_nBtnsFlashState8;
 
 protected:
 	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV 鏀寔
@@ -129,12 +137,11 @@
 	afx_msg void OnBnClickedButtonAxisAnchorPoint5();
 	afx_msg void OnBnClickedButtonAxisTestOpr();
 	afx_msg void OnBnClickedButtonAxisTestStop();
+	afx_msg void OnBnClickedButtonAxisSev();
 	afx_msg void OnSelchangeComboAxisName();
 	afx_msg void OnBnClickedButtonAxisSave();
 	afx_msg LRESULT OnUpdateDataToUI(WPARAM wParam, LPARAM lParam);
 	afx_msg void OnTimer(UINT_PTR nIDEvent);
 	afx_msg void OnClose();
 	DECLARE_MESSAGE_MAP()
-public:
-	afx_msg void OnBnClickedButtonAxisSev();
 };

--
Gitblit v1.9.3