From 6365b1d493ca23688fa1fb9a8fc51513dc6bb6d8 Mon Sep 17 00:00:00 2001 From: LAPTOP-T815PCOQ\25526 <mr.liuyang@126.com> Date: 星期一, 25 十一月 2024 18:10:46 +0800 Subject: [PATCH] 1.完成上下切换轴 2.补全未追踪的文件 --- SourceCode/Bond/BondEq/View/AxisSettingsDlg.h | 18 ++++++++++++------ 1 files changed, 12 insertions(+), 6 deletions(-) diff --git a/SourceCode/Bond/BondEq/View/AxisSettingsDlg.h b/SourceCode/Bond/BondEq/View/AxisSettingsDlg.h index d8bb7f4..dfc219a 100644 --- a/SourceCode/Bond/BondEq/View/AxisSettingsDlg.h +++ b/SourceCode/Bond/BondEq/View/AxisSettingsDlg.h @@ -22,12 +22,18 @@ #endif private: + UINT FindIDByName(const CString& strControlID); CFont* GetOrCreateFont(int nFontSize); void SetDefaultFont(); void AdjustControls(float dScaleX, float dScaleY); void AdjustControlFont(CWnd* pWnd, int nWidth, int nHeight); void AdjustLabelFont(CBLLabel& label); void SetStatusColor(CBLLabel& label, BOOL bStatus); + int getCurrentSelectedAxisID(); + void initializeAxisIDCombo(); + void refreshAxisDetails(); + void refreshPositionDetails(int pageNumber); + void updateAxisSelection(int offset); private: CPLC* m_pPLC; @@ -35,12 +41,11 @@ int m_nInitialHeight; // 鎺т欢 - CBLLabel m_staticFLS; - CBLLabel m_staticDOG; - CBLLabel m_staticRLS; - CBLLabel m_staticReady; - CBLLabel m_staticBusy; - CBLLabel m_staticErr; + 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; + std::map<int, CRect> m_mapCtrlLayouts; std::map<int, CFont*> m_mapFonts; @@ -66,6 +71,7 @@ afx_msg void OnBnClickedButtonAxisTestJogAdd(); afx_msg void OnBnClickedButtonAxisTestJogSub(); afx_msg void OnBnClickedButtonAxisTestStop(); + afx_msg void OnSelchangeComboAxisName(); afx_msg void OnTimer(UINT_PTR nIDEvent); DECLARE_MESSAGE_MAP() }; -- Gitblit v1.9.3