From aedb3b85fed48cb2cf0abb5fafa8e7591644c9f4 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期一, 02 十二月 2024 08:53:06 +0800
Subject: [PATCH] Merge branch 'liuyang' into clh
---
SourceCode/Bond/BondEq/View/AxisSettingsDlg.h | 31 +++++++++++++++++++++++++------
1 files changed, 25 insertions(+), 6 deletions(-)
diff --git a/SourceCode/Bond/BondEq/View/AxisSettingsDlg.h b/SourceCode/Bond/BondEq/View/AxisSettingsDlg.h
index 5db1535..bd1f4d6 100644
--- a/SourceCode/Bond/BondEq/View/AxisSettingsDlg.h
+++ b/SourceCode/Bond/BondEq/View/AxisSettingsDlg.h
@@ -6,6 +6,18 @@
// CAxisSettingsDlg 瀵硅瘽妗�
+enum class AxisOperationType {
+ OPR = 0, // 鍥炲師鐐�
+ JOG_ADD, // 姝ｅ悜鐐瑰姩
+ JOG_SUB, // 鍙嶅悜鐐瑰姩
+ STOP, // 鍋滄鎿嶄綔
+ POSITION_1, // 瀹氫綅鐐�1
+ POSITION_2, // 瀹氫綅鐐�2
+ POSITION_3, // 瀹氫綅鐐�3
+ POSITION_4, // 瀹氫綅鐐�4
+ POSITION_5 // 瀹氫綅鐐�5
+};
+
class CAxisSettingsDlg : public CDialogEx
{
DECLARE_DYNAMIC(CAxisSettingsDlg)
@@ -34,10 +46,14 @@
void updatePageButtonStates();
int getCurrentSelectedAxisID();
void initializeAxisIDCombo();
- void refreshAxisDetails();
- void refreshPositionDetails(int pageNumber);
+ void refreshAxisDetails(int nAxisId);
+ void refreshPositionDetails(int nAxisId, int pageNumber);
void updateAxisSelection(int offset);
- void updateDataFromUI();
+ void updateDataFromUI(int nAxisId);
+ void switchToPage(int targetPage);
+ void writeAxisDataToPLC(int nAxisId);
+ void handleAxisOperation(AxisOperationType eOpType, bool bPressed);
+
private:
CPLC* m_pPLC;
@@ -45,10 +61,14 @@
int m_nInitialHeight;
// 褰撳墠閫変腑鐨勫畾浣嶉〉闈㈢储寮�
- int m_currentPage;
+ int m_currentPage;
// 閰嶆柟鍚嶇О
CString m_strRecipeName;
+
+ // 鎸変笅鏍囪瘑
+ BOOL m_bJogAddPressed;
+ BOOL m_bJogSubPressed;
// 鎺т欢
CBLLabel m_staticFLS, m_staticDOG, m_staticRLS, m_staticReady, m_staticBusy, m_staticErr;
@@ -63,6 +83,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);
@@ -79,8 +100,6 @@
afx_msg void OnBnClickedButtonAxisAnchorPoint4();
afx_msg void OnBnClickedButtonAxisAnchorPoint5();
afx_msg void OnBnClickedButtonAxisTestOpr();
- afx_msg void OnBnClickedButtonAxisTestJogAdd();
- afx_msg void OnBnClickedButtonAxisTestJogSub();
afx_msg void OnBnClickedButtonAxisTestStop();
afx_msg void OnSelchangeComboAxisName();
afx_msg void OnBnClickedButtonAxisSave();
--
Gitblit v1.9.3