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 | 31 ++++++++++++++++++++++++------- 1 files changed, 24 insertions(+), 7 deletions(-) diff --git a/SourceCode/Bond/BondEq/View/AxisSettingsDlg.h b/SourceCode/Bond/BondEq/View/AxisSettingsDlg.h index d94c18b..d7aef3a 100644 --- a/SourceCode/Bond/BondEq/View/AxisSettingsDlg.h +++ b/SourceCode/Bond/BondEq/View/AxisSettingsDlg.h @@ -11,6 +11,7 @@ JOG_ADD, // 姝ｅ悜鐐瑰姩 JOG_SUB, // 鍙嶅悜鐐瑰姩 STOP, // 鍋滄鎿嶄綔 + SEV_ON, // 浣胯兘 POSITION_1, // 瀹氫綅鐐�1 POSITION_2, // 瀹氫綅鐐�2 POSITION_3, // 瀹氫綅鐐�3 @@ -42,7 +43,7 @@ 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(); @@ -67,19 +68,31 @@ // 閰嶆柟鍚嶇О 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]; - + + 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 鏀寔 @@ -104,6 +117,10 @@ 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