From 47718a637fa239dcbec0fffca736f3c3b1cf7887 Mon Sep 17 00:00:00 2001
From: LAPTOP-T815PCOQ\25526 <mr.liuyang@126.com>
Date: 星期二, 10 十二月 2024 08:35:17 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang
---
SourceCode/Bond/BondEq/View/AxisSettingsDlg.h | 44 ++++++++++++++++++++++++++++++++++++++------
1 files changed, 38 insertions(+), 6 deletions(-)
diff --git a/SourceCode/Bond/BondEq/View/AxisSettingsDlg.h b/SourceCode/Bond/BondEq/View/AxisSettingsDlg.h
index 02f8081..1aa0a27 100644
--- a/SourceCode/Bond/BondEq/View/AxisSettingsDlg.h
+++ b/SourceCode/Bond/BondEq/View/AxisSettingsDlg.h
@@ -4,6 +4,36 @@
#include "BLLabel.h"
#include "CPLC.h"
+// 姣忛〉瀹氫綅鐐规樉绀轰釜鏁�
+#define AXIS_PAGE_SIZE 5
+
+// 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
+#define BTN_PAGE4 3
+#define BTN_PAGE5 4
+#define BTN_JOG_ADD 5
+#define BTN_JOG_SUB 6
+#define BTN_JOG_SEV 7
+#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 瀵硅瘽妗�
enum class AxisOperationType {
@@ -44,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();
@@ -70,13 +102,9 @@
// 閰嶆柟鍚嶇О
CString m_strRecipeName;
- // 鎸変笅鏍囪瘑
- BOOL m_bJogAddPressed;
- BOOL m_bJogSubPressed;
-
// 鎺т欢
- CBlButton* m_pBlBtns[9];
- CBLLabel* m_pBlLabels[6];
+ CBlButton* m_pBlBtns[BTN_MAX];
+ 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;
@@ -99,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 鏀寔
@@ -124,6 +154,8 @@
afx_msg void OnBnClickedButtonAxisSev();
afx_msg void OnSelchangeComboAxisName();
afx_msg void OnBnClickedButtonAxisSave();
+ afx_msg void OnBnClickedButtonAxisUpdateUi();
+ afx_msg void OnBnClickedButtonAxisDetailSettings();
afx_msg LRESULT OnUpdateDataToUI(WPARAM wParam, LPARAM lParam);
afx_msg void OnTimer(UINT_PTR nIDEvent);
afx_msg void OnClose();
--
Gitblit v1.9.3