From 3bf6df412c3b681e8901d6dcddd803a9c3235484 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期一, 09 十二月 2024 08:52:34 +0800
Subject: [PATCH] 1.代码合并、消除警告；

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

diff --git a/SourceCode/Bond/BondEq/View/AxisSettingsDlg.h b/SourceCode/Bond/BondEq/View/AxisSettingsDlg.h
index b05a8f7..5093409 100644
--- a/SourceCode/Bond/BondEq/View/AxisSettingsDlg.h
+++ b/SourceCode/Bond/BondEq/View/AxisSettingsDlg.h
@@ -4,7 +4,19 @@
 #include "BLLabel.h"
 #include "CPLC.h"
 
+// 姣忛〉瀹氫綅鐐规樉绀轰釜鏁�
+#define AXIS_PAGE_SIZE	5
 
+// LABEL鎺т欢
+#define LABEL_MAX		6
+#define LABEL_FLS		0
+#define LABEL_DOG		1
+#define LABEL_RLS		2
+#define LABEL_READY		3
+#define LABEL_BUSY		4
+#define LABEL_ERR		5
+
+// BUTTON鎺т欢
 #define BTN_MAX			15
 #define BTN_PAGE1		0
 #define BTN_PAGE2		1
@@ -62,6 +74,8 @@
 	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);
+	void UpdateLabels();
 	void updatePageButtonStates();
 	void HideEditCursor(int nCtrlID);
 	int getCurrentSelectedAxisID();
@@ -90,7 +104,7 @@
 
 	// 鎺т欢
 	CBlButton* m_pBlBtns[BTN_MAX];
-	CBLLabel* m_pBlLabels[6];
+	CBLLabel* m_pBlLabels[LABEL_MAX];
 	CComboBox m_comboAxisNO;
 	CStatic m_staticAxisNO, m_staticAxisDescription, m_staticStartAddress;
 	CEdit m_editManualSpeed, m_editAutoSpeed, m_editAccelerationTime, m_editDecelerationTime, m_editJogDistance;

--
Gitblit v1.9.3