From 3bf6df412c3b681e8901d6dcddd803a9c3235484 Mon Sep 17 00:00:00 2001 From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com> Date: 星期一, 09 十二月 2024 08:52:34 +0800 Subject: [PATCH] 1.代码合并、消除警告； --- SourceCode/Bond/BondEq/View/AxisSettingsDlg.h | 30 +++++++++++++++++++++++++----- 1 files changed, 25 insertions(+), 5 deletions(-) diff --git a/SourceCode/Bond/BondEq/View/AxisSettingsDlg.h b/SourceCode/Bond/BondEq/View/AxisSettingsDlg.h index 012a8ac..5093409 100644 --- a/SourceCode/Bond/BondEq/View/AxisSettingsDlg.h +++ b/SourceCode/Bond/BondEq/View/AxisSettingsDlg.h @@ -4,8 +4,20 @@ #include "BLLabel.h" #include "CPLC.h" +// 姣忛〉瀹氫綅鐐规樉绀轰釜鏁� +#define AXIS_PAGE_SIZE 5 -#define BTN_MAX 10 +// LABEL鎺т欢 +#define LABEL_MAX 6 +#define LABEL_FLS 0 +#define LABEL_DOG 1 +#define LABEL_RLS 2 +#define LABEL_READY 3 +#define LABEL_BUSY 4 +#define LABEL_ERR 5 + +// BUTTON鎺т欢 +#define BTN_MAX 15 #define BTN_PAGE1 0 #define BTN_PAGE2 1 #define BTN_PAGE3 2 @@ -14,9 +26,13 @@ #define BTN_JOG_ADD 5 #define BTN_JOG_SUB 6 #define BTN_JOG_SEV 7 -#define BTN_JOG_STOP 8 -#define BTN_JOG_OPR 9 - +#define BTN_JOG_OPR 8 +#define BTN_JOG_STOP 9 +#define BTN_POINT1 10 +#define BTN_POINT2 11 +#define BTN_POINT3 12 +#define BTN_POINT4 13 +#define BTN_POINT5 14 // CAxisSettingsDlg 瀵硅瘽妗� @@ -58,6 +74,8 @@ void AdjustControlFont(CWnd* pWnd, int nWidth, int nHeight); void AdjustLabelFont(CBLLabel& label); void SetLabelColor(CBLLabel& label, COLORREF color); + void SetLabelColorBasedOnState(CBLLabel& label, BOOL bState, COLORREF colorTrue, COLORREF colorFalse); + void UpdateLabels(); void updatePageButtonStates(); void HideEditCursor(int nCtrlID); int getCurrentSelectedAxisID(); @@ -86,7 +104,7 @@ // 鎺т欢 CBlButton* m_pBlBtns[BTN_MAX]; - CBLLabel* m_pBlLabels[6]; + CBLLabel* m_pBlLabels[LABEL_MAX]; CComboBox m_comboAxisNO; CStatic m_staticAxisNO, m_staticAxisDescription, m_staticStartAddress; CEdit m_editManualSpeed, m_editAutoSpeed, m_editAccelerationTime, m_editDecelerationTime, m_editJogDistance; @@ -109,6 +127,8 @@ BOOL m_bReady; BOOL m_bBusy; BOOL m_bErr; + DWORD m_nBtnsFlashState6; + DWORD m_nBtnsFlashState8; protected: virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV 鏀寔 -- Gitblit v1.9.3