From 2d8047ec3451b7b411812970ee7b149bf1a9b2d6 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期五, 06 十二月 2024 09:21:46 +0800
Subject: [PATCH] 1.轴参数设定，调试，合并；
---
SourceCode/Bond/BondEq/View/AxisSettingsDlg.h | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/SourceCode/Bond/BondEq/View/AxisSettingsDlg.h b/SourceCode/Bond/BondEq/View/AxisSettingsDlg.h
index d94c18b..d8e18a2 100644
--- a/SourceCode/Bond/BondEq/View/AxisSettingsDlg.h
+++ b/SourceCode/Bond/BondEq/View/AxisSettingsDlg.h
@@ -4,6 +4,7 @@
#include "BLLabel.h"
#include "CPLC.h"
+
// CAxisSettingsDlg 瀵硅瘽妗�
enum class AxisOperationType {
@@ -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 clr);
void updatePageButtonStates();
int getCurrentSelectedAxisID();
void initializeAxisIDCombo();
@@ -68,16 +69,16 @@
CString m_strRecipeName;
// 鎸変笅鏍囪瘑
- BOOL m_bJogAddPressed;
- BOOL m_bJogSubPressed;
+ ULONGLONG m_ullJogPressedTick;
+ BOOL m_bJogSubState;
+ BOOL m_bJogAddState;
// 鎺т欢
CBLLabel m_staticFLS, m_staticDOG, m_staticRLS, m_staticReady, m_staticBusy, m_staticErr;
+ CBlButton m_pageButtons[5];
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;
--
Gitblit v1.9.3