From f2bdc37e5f9d0e0cf55c6117bbc747938ce13d94 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期五, 06 十二月 2024 16:47:10 +0800
Subject: [PATCH] 1.轴设定页面，按钮细节初始完善；
---
SourceCode/Bond/BondEq/View/AxisSettingsDlg.h | 55 ++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 46 insertions(+), 9 deletions(-)
diff --git a/SourceCode/Bond/BondEq/View/AxisSettingsDlg.h b/SourceCode/Bond/BondEq/View/AxisSettingsDlg.h
index 5db1535..d7aef3a 100644
--- a/SourceCode/Bond/BondEq/View/AxisSettingsDlg.h
+++ b/SourceCode/Bond/BondEq/View/AxisSettingsDlg.h
@@ -6,6 +6,19 @@
// CAxisSettingsDlg 瀵硅瘽妗�
+enum class AxisOperationType {
+ OPR = 0, // 鍥炲師鐐�
+ JOG_ADD, // 姝ｅ悜鐐瑰姩
+ JOG_SUB, // 鍙嶅悜鐐瑰姩
+ STOP, // 鍋滄鎿嶄綔
+ SEV_ON, // 浣胯兘
+ POSITION_1, // 瀹氫綅鐐�1
+ POSITION_2, // 瀹氫綅鐐�2
+ POSITION_3, // 瀹氫綅鐐�3
+ POSITION_4, // 瀹氫綅鐐�4
+ POSITION_5 // 瀹氫綅鐐�5
+};
+
class CAxisSettingsDlg : public CDialogEx
{
DECLARE_DYNAMIC(CAxisSettingsDlg)
@@ -30,14 +43,19 @@
void AdjustControls(float dScaleX, float dScaleY);
void AdjustControlFont(CWnd* pWnd, int nWidth, int nHeight);
void AdjustLabelFont(CBLLabel& label);
- void SetStatusColor(CBLLabel& label, BOOL bStatus);
+ void SetLabelColor(CBLLabel& label, COLORREF color);
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);
+ bool ParsePLCAddress(const CString& address, MC::SOFT_COMPONENT& component, int& addr);
+ void writeAxisDataToPLC(int nAxisId);
+ void handleAxisOperation(AxisOperationType eOpType, bool bPressed);
+ void readPLCDataToUI(int nAxisId);
private:
CPLC* m_pPLC;
@@ -45,7 +63,7 @@
int m_nInitialHeight;
// 褰撳墠閫変腑鐨勫畾浣嶉〉闈㈢储寮�
- int m_currentPage;
+ int m_currentPage;
// 閰嶆柟鍚嶇О
CString m_strRecipeName;
@@ -55,14 +73,31 @@
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];
-
+
+ CBlButton* m_pBlBtns[9];
std::map<int, CRect> m_mapCtrlLayouts;
std::map<int, CFont*> m_mapFonts;
+
+ // 璇诲埌鐨勬暟鎹�
+ BOOL m_bSEV;
+ double m_fCurPos;
+ double m_fManualSpeed;
+ double m_fAutoSpeed;
+ double m_fPrm;
+ int m_nLoad;
+ int m_nErrCode;
+ int m_nAlarmCode;
+ BOOL m_bFLS;
+ BOOL m_bDOG;
+ BOOL m_bRLS;
+ BOOL m_bReady;
+ BOOL m_bBusy;
+ BOOL m_bErr;
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,11 +114,13 @@
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 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