From f89766c67e39852650fe55cdfee371a204b2b01d Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期五, 06 十二月 2024 18:04:45 +0800
Subject: [PATCH] Merge branch 'liuyang' into clh
---
SourceCode/Bond/BondEq/View/AxisSettingsDlg.h | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/SourceCode/Bond/BondEq/View/AxisSettingsDlg.h b/SourceCode/Bond/BondEq/View/AxisSettingsDlg.h
index 02f8081..012a8ac 100644
--- a/SourceCode/Bond/BondEq/View/AxisSettingsDlg.h
+++ b/SourceCode/Bond/BondEq/View/AxisSettingsDlg.h
@@ -4,6 +4,20 @@
#include "BLLabel.h"
#include "CPLC.h"
+
+#define BTN_MAX 10
+#define BTN_PAGE1 0
+#define BTN_PAGE2 1
+#define BTN_PAGE3 2
+#define BTN_PAGE4 3
+#define BTN_PAGE5 4
+#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
+
+
// CAxisSettingsDlg 瀵硅瘽妗�
enum class AxisOperationType {
@@ -70,12 +84,8 @@
// 閰嶆柟鍚嶇О
CString m_strRecipeName;
- // 鎸変笅鏍囪瘑
- BOOL m_bJogAddPressed;
- BOOL m_bJogSubPressed;
-
// 鎺т欢
- CBlButton* m_pBlBtns[9];
+ CBlButton* m_pBlBtns[BTN_MAX];
CBLLabel* m_pBlLabels[6];
CComboBox m_comboAxisNO;
CStatic m_staticAxisNO, m_staticAxisDescription, m_staticStartAddress;
--
Gitblit v1.9.3