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 | 8 +---
SourceCode/Bond/BondEq/View/AxisSettingsDlg.cpp | 64 +++++++++++++++++++++++++------
2 files changed, 53 insertions(+), 19 deletions(-)
diff --git a/SourceCode/Bond/BondEq/View/AxisSettingsDlg.cpp b/SourceCode/Bond/BondEq/View/AxisSettingsDlg.cpp
index 58b0515..8e82048 100644
--- a/SourceCode/Bond/BondEq/View/AxisSettingsDlg.cpp
+++ b/SourceCode/Bond/BondEq/View/AxisSettingsDlg.cpp
@@ -12,6 +12,9 @@
#define TIMER_INIT 1
#define TIMER_READ_PLC_DATA 2
+
+#define ID_MSG_UPDATA_DATA_TO_UI WM_USER + 101
+
// CAxisSettingsDlg 瀵硅瘽妗�
IMPLEMENT_DYNAMIC(CAxisSettingsDlg, CDialogEx)
@@ -37,6 +40,9 @@
m_bReady = FALSE;
m_bBusy = FALSE;
m_bErr = FALSE;
+ for (int i = 0; i < 9; i++) {
+ m_pBlBtns[i] = new CBlButton();
+ }
}
CAxisSettingsDlg::~CAxisSettingsDlg()
@@ -48,6 +54,10 @@
}
}
m_mapFonts.clear();
+
+ for (int i = 0; i < 9; i++) {
+ delete m_pBlBtns[i];
+ }
}
void CAxisSettingsDlg::SetPLC(CPLC* pPLC)
@@ -79,11 +89,6 @@
DDX_Control(pDX, IDC_EDIT_AXIS_MODITFY_ACCE_TIME, m_editAccelerationTime);
DDX_Control(pDX, IDC_EDIT_AXIS_MODITFY_DECE_TIME, m_editDecelerationTime);
DDX_Control(pDX, IDC_EDIT_AXIS_MODITFY_MICROMENTUM, m_editJogDistance);
- DDX_Control(pDX, IDC_BUTTON_AXIS_ANCHOR_POINT_GROUP1, m_pageButtons[0]);
- DDX_Control(pDX, IDC_BUTTON_AXIS_ANCHOR_POINT_GROUP2, m_pageButtons[1]);
- DDX_Control(pDX, IDC_BUTTON_AXIS_ANCHOR_POINT_GROUP3, m_pageButtons[2]);
- DDX_Control(pDX, IDC_BUTTON_AXIS_ANCHOR_POINT_GROUP4, m_pageButtons[3]);
- DDX_Control(pDX, IDC_BUTTON_AXIS_ANCHOR_POINT_GROUP5, m_pageButtons[4]);
}
UINT CAxisSettingsDlg::FindIDByName(const CString& strControlID)
@@ -214,14 +219,11 @@
void CAxisSettingsDlg::updatePageButtonStates()
{
for (int i = 0; i < 5; ++i) {
- if (i + 1 == m_currentPage) {
- m_pageButtons[i].SetFaceColor(RGB(0, 122, 204)); // 閫変腑鑳屾櫙鑹诧紙钃濊壊锛�
- }
- else {
- m_pageButtons[i].SetFaceColor(RGB(240, 240, 240)); // 榛樿鑳屾櫙鑹�
- }
-
- m_pageButtons[i].Invalidate();
+ BOOL bSelect = (i + 1 == m_currentPage);
+ m_pBlBtns[i]->SetFaceColor(bSelect ?
+ BTN_PAGE_FACE_SELECT_COLOR: BTN_PAGE_FACE_NORMAL_COLOR);
+ m_pBlBtns[i]->SetTextColor(bSelect ?
+ BTN_PAGE_TEXT_SELECT_COLOR : BTN_PAGE_TEXT_NORMAL_COLOR);
}
}
@@ -729,6 +731,42 @@
pLabel->SetAlignment(AlignCenter);
pLabel->SetDynamicFont(TRUE);
}
+
+ // 鎸夐挳鍒濆鍖�
+ m_pBlBtns[0]->SubclassDlgItem(IDC_BUTTON_AXIS_ANCHOR_POINT_GROUP1, this);
+ m_pBlBtns[1]->SubclassDlgItem(IDC_BUTTON_AXIS_ANCHOR_POINT_GROUP2, this);
+ m_pBlBtns[2]->SubclassDlgItem(IDC_BUTTON_AXIS_ANCHOR_POINT_GROUP3, this);
+ m_pBlBtns[3]->SubclassDlgItem(IDC_BUTTON_AXIS_ANCHOR_POINT_GROUP4, this);
+ m_pBlBtns[4]->SubclassDlgItem(IDC_BUTTON_AXIS_ANCHOR_POINT_GROUP5, this);
+ m_pBlBtns[5]->SubclassDlgItem(IDC_BUTTON_AXIS_TEST_JOG_ADD, this);
+ m_pBlBtns[5]->SetFrameColor(BS_NORMAL, BTN_JOG_FRAME_NORMAL);
+ m_pBlBtns[5]->SetFrameColor(BS_HOVER, BTN_JOG_FRAME_HOVER);
+ m_pBlBtns[5]->SetFrameColor(BS_PRESS, BTN_JOG_FRAME_PRESS);
+ m_pBlBtns[5]->SetBkgndColor(BS_NORMAL, BTN_JOG_BKGND_NORMAL);
+ m_pBlBtns[5]->SetBkgndColor(BS_HOVER, BTN_JOG_BKGND_HOVER);
+ m_pBlBtns[5]->SetBkgndColor(BS_PRESS, BTN_JOG_BKGND_PRESS);
+ m_pBlBtns[6]->SubclassDlgItem(IDC_BUTTON_AXIS_TEST_JOG_SUB, this);
+ m_pBlBtns[6]->SetFrameColor(BS_NORMAL, BTN_JOG_FRAME_NORMAL);
+ m_pBlBtns[6]->SetFrameColor(BS_HOVER, BTN_JOG_FRAME_HOVER);
+ m_pBlBtns[6]->SetFrameColor(BS_PRESS, BTN_JOG_FRAME_PRESS);
+ m_pBlBtns[6]->SetBkgndColor(BS_NORMAL, BTN_JOG_BKGND_NORMAL);
+ m_pBlBtns[6]->SetBkgndColor(BS_HOVER, BTN_JOG_BKGND_HOVER);
+ m_pBlBtns[6]->SetBkgndColor(BS_PRESS, BTN_JOG_BKGND_PRESS);
+ m_pBlBtns[7]->SubclassDlgItem(IDC_BUTTON_AXIS_SEV, this);
+ m_pBlBtns[7]->SetFrameColor(BS_NORMAL, BTN_SEV_FRAME_NORMAL);
+ m_pBlBtns[7]->SetFrameColor(BS_HOVER, BTN_SEV_FRAME_HOVER);
+ m_pBlBtns[7]->SetFrameColor(BS_PRESS, BTN_SEV_FRAME_PRESS);
+ m_pBlBtns[7]->SetBkgndColor(BS_NORMAL, BTN_SEV_BKGND_NORMAL);
+ m_pBlBtns[7]->SetBkgndColor(BS_HOVER, BTN_SEV_BKGND_HOVER);
+ m_pBlBtns[7]->SetBkgndColor(BS_PRESS, BTN_SEV_BKGND_PRESS);
+ m_pBlBtns[8]->SubclassDlgItem(IDC_BUTTON_AXIS_TEST_STOP, this);
+ m_pBlBtns[8]->SetFrameColor(BS_NORMAL, BTN_STOP_FRAME_NORMAL);
+ m_pBlBtns[8]->SetFrameColor(BS_HOVER, BTN_STOP_FRAME_HOVER);
+ m_pBlBtns[8]->SetFrameColor(BS_PRESS, BTN_STOP_FRAME_PRESS);
+ m_pBlBtns[8]->SetBkgndColor(BS_NORMAL, BTN_STOP_BKGND_NORMAL);
+ m_pBlBtns[8]->SetBkgndColor(BS_HOVER, BTN_STOP_BKGND_HOVER);
+ m_pBlBtns[8]->SetBkgndColor(BS_PRESS, BTN_STOP_BKGND_PRESS);
+
// 鍒濆鍖栧綋鍓嶉〉闈负绗竴椤�
m_currentPage = 1;
diff --git a/SourceCode/Bond/BondEq/View/AxisSettingsDlg.h b/SourceCode/Bond/BondEq/View/AxisSettingsDlg.h
index 688f61b..d7aef3a 100644
--- a/SourceCode/Bond/BondEq/View/AxisSettingsDlg.h
+++ b/SourceCode/Bond/BondEq/View/AxisSettingsDlg.h
@@ -68,17 +68,13 @@
// 閰嶆柟鍚嶇О
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;
--
Gitblit v1.9.3