From 2cd3e98d5d0bdf341d772b7e75869cd6f2b39280 Mon Sep 17 00:00:00 2001
From: LAPTOP-T815PCOQ\25526 <mr.liuyang@126.com>
Date: 星期三, 27 十一月 2024 09:40:09 +0800
Subject: [PATCH] 1. 监听按钮按下抬起事件
---
SourceCode/Bond/BondEq/View/AxisSettingsDlg.h | 39 +++++++++++++++++++++++++++++++++++----
1 files changed, 35 insertions(+), 4 deletions(-)
diff --git a/SourceCode/Bond/BondEq/View/AxisSettingsDlg.h b/SourceCode/Bond/BondEq/View/AxisSettingsDlg.h
index dfc219a..bd1f4d6 100644
--- a/SourceCode/Bond/BondEq/View/AxisSettingsDlg.h
+++ b/SourceCode/Bond/BondEq/View/AxisSettingsDlg.h
@@ -1,9 +1,22 @@
锘�#pragma once
#include "afxdialogex.h"
+#include "BlButton.h"
#include "BLLabel.h"
#include "CPLC.h"
// 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
{
@@ -15,6 +28,7 @@
public:
void SetPLC(CPLC* pPLC);
+ void SetRecipeName(const CString& strRecipeName);
// 瀵硅瘽妗嗘暟鎹�
#ifdef AFX_DESIGN_TIME
@@ -29,22 +43,39 @@
void AdjustControlFont(CWnd* pWnd, int nWidth, int nHeight);
void AdjustLabelFont(CBLLabel& label);
void SetStatusColor(CBLLabel& label, BOOL bStatus);
+ 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(int nAxisId);
+ void switchToPage(int targetPage);
+ void writeAxisDataToPLC(int nAxisId);
+ void handleAxisOperation(AxisOperationType eOpType, bool bPressed);
+
private:
CPLC* m_pPLC;
int m_nInitialWidth;
int m_nInitialHeight;
+ // 褰撳墠閫変腑鐨勫畾浣嶉〉闈㈢储寮�
+ 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;
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;
@@ -52,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);
@@ -68,10 +100,9 @@
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();
afx_msg void OnTimer(UINT_PTR nIDEvent);
DECLARE_MESSAGE_MAP()
};
--
Gitblit v1.9.3