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 | 29 ++++++++++++++++++++---------
1 files changed, 20 insertions(+), 9 deletions(-)
diff --git a/SourceCode/Bond/BondEq/View/AxisSettingsDlg.h b/SourceCode/Bond/BondEq/View/AxisSettingsDlg.h
index 688f61b..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 {
@@ -45,10 +59,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);
@@ -68,17 +84,13 @@
// 閰嶆柟鍚嶇О
CString m_strRecipeName;
- // 鎸変笅鏍囪瘑
- BOOL m_bJogAddPressed;
- BOOL m_bJogSubPressed;
-
// 鎺т欢
- 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_pageButtons[5];
-
+
std::map<int, CRect> m_mapCtrlLayouts;
std::map<int, CFont*> m_mapFonts;
@@ -119,12 +131,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