From 893975d8197b1ed7241ca630490f8f6b3f7d32ea Mon Sep 17 00:00:00 2001 From: LAPTOP-T815PCOQ\25526 <mr.liuyang@126.com> Date: 星期二, 26 十一月 2024 14:54:28 +0800 Subject: [PATCH] 1. 轴设定界面基本完成 2.轴设定不保存数据库,而是保存.xml文件 --- SourceCode/Bond/BondEq/View/AxisSettingsDlg.h | 30 ++++++++++++++++++++++++------ 1 files changed, 24 insertions(+), 6 deletions(-) diff --git a/SourceCode/Bond/BondEq/View/AxisSettingsDlg.h b/SourceCode/Bond/BondEq/View/AxisSettingsDlg.h index d8bb7f4..5db1535 100644 --- a/SourceCode/Bond/BondEq/View/AxisSettingsDlg.h +++ b/SourceCode/Bond/BondEq/View/AxisSettingsDlg.h @@ -1,5 +1,6 @@ 锘�#pragma once #include "afxdialogex.h" +#include "BlButton.h" #include "BLLabel.h" #include "CPLC.h" @@ -15,6 +16,7 @@ public: void SetPLC(CPLC* pPLC); + void SetRecipeName(const CString& strRecipeName); // 瀵硅瘽妗嗘暟鎹� #ifdef AFX_DESIGN_TIME @@ -22,25 +24,39 @@ #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); + void updatePageButtonStates(); + int getCurrentSelectedAxisID(); + void initializeAxisIDCombo(); + void refreshAxisDetails(); + void refreshPositionDetails(int pageNumber); + void updateAxisSelection(int offset); + void updateDataFromUI(); private: CPLC* m_pPLC; int m_nInitialWidth; int m_nInitialHeight; + // 褰撳墠閫変腑鐨勫畾浣嶉〉闈㈢储寮� + int m_currentPage; + + // 閰嶆柟鍚嶇О + CString m_strRecipeName; + // 鎺т欢 - 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; + CBlButton m_pageButtons[5]; + std::map<int, CRect> m_mapCtrlLayouts; std::map<int, CFont*> m_mapFonts; @@ -66,6 +82,8 @@ 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