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 | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/SourceCode/Bond/BondEq/View/AxisSettingsDlg.h b/SourceCode/Bond/BondEq/View/AxisSettingsDlg.h index e23daaa..012a8ac 100644 --- a/SourceCode/Bond/BondEq/View/AxisSettingsDlg.h +++ b/SourceCode/Bond/BondEq/View/AxisSettingsDlg.h @@ -59,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); @@ -83,12 +85,12 @@ CString m_strRecipeName; // 鎺т欢 - 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_pBlBtns[BTN_MAX]; std::map<int, CRect> m_mapCtrlLayouts; std::map<int, CFont*> m_mapFonts; @@ -129,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