From 02c39baf5375f1588e9c20dc06d89a0605077672 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期一, 10 二月 2025 10:41:44 +0800
Subject: [PATCH] Merge branch 'liuyang' into clh

---
 SourceCode/Bond/BoounionPLC/AxisSettingsDlg.h |   26 +++++++-------------------
 1 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/SourceCode/Bond/BoounionPLC/AxisSettingsDlg.h b/SourceCode/Bond/BoounionPLC/AxisSettingsDlg.h
index 240812f..565a385 100644
--- a/SourceCode/Bond/BoounionPLC/AxisSettingsDlg.h
+++ b/SourceCode/Bond/BoounionPLC/AxisSettingsDlg.h
@@ -1,7 +1,6 @@
 锘�#pragma once
 #include "BlButton.h"
 #include "BLLabel.h"
-#include "RegexEdit.h"
 #include "CBaseDlg.h"
 #include "PLC.h"
 #include "AxisManager.h"
@@ -17,19 +16,6 @@
 #define LABEL_READY		3
 #define LABEL_BUSY		4
 #define LABEL_ERR		5
-
-// RegexEdit鎺т欢
-#define EDIT_MAX			10
-#define EDIT_MANUAL_SPEED	0
-#define EDIT_AUTO_SPEED		1
-#define EDIT_ACCE_TIME		2
-#define EDIT_DECE_TIME		3
-#define EDIT_MICROMENTUM	4
-#define EDIT_ANCHOR_POINT1	5
-#define EDIT_ANCHOR_POINT2	6
-#define EDIT_ANCHOR_POINT3	7
-#define EDIT_ANCHOR_POINT4	8
-#define EDIT_ANCHOR_POINT5	9
 
 // BUTTON鎺т欢
 #define BTN_MAX			15
@@ -88,7 +74,6 @@
 	void SetLabelColor(CBLLabel& label, COLORREF color);
 	void SetLabelColorBasedOnState(CBLLabel& label, BOOL bState, COLORREF colorTrue, COLORREF colorFalse);
 	void UpdateLabels();
-	void UpdateRegexEdit(CRegexEdit* pRegexEdit, const ValueRange& range, const CString& title);
 	void UpdatePageButtonStates();
 	void HideEditCursor(int nCtrlID);
 	int GetCurrentSelectedAxisID();
@@ -105,6 +90,7 @@
 	void ReadPLCDataToUI(int nAxisId);
 	void ShowTipText(const char* pszText, float sec);
 	void HideTip();
+	bool IsFloatInRange(const std::string& strInput, double fLowerBound, double fUpperBound);
 
 private:
 	CPLC* m_pPLC;
@@ -122,7 +108,6 @@
 	// 鎺т欢
 	CBlButton* m_pBlBtns[BTN_MAX];
 	CBLLabel* m_pBlLabels[LABEL_MAX];
-	CRegexEdit* m_pRegexEdit[EDIT_MAX];
 	CComboBox m_comboAxisNO;
 	CStatic m_staticAxisNO, m_staticAxisDescription, m_staticStartAddress;
 
@@ -169,10 +154,13 @@
 	afx_msg void OnBnClickedButtonAxisUpdateUi();
 	afx_msg void OnBnClickedButtonAxisDetailSettings();
 	afx_msg LRESULT OnUpdateDataToUI(WPARAM wParam, LPARAM lParam);
+	afx_msg void OnKillfocusEditAxisModitfyManualSpeed();
+	afx_msg void OnKillfocusEditAxisModitfyAutoSpeed();
+	afx_msg void OnKillfocusEditAxisModitfyDeceTime();
+	afx_msg void OnKillfocusEditAxisModitfyAcceTime();
+	afx_msg void OnEnKillfocusEditAxisModitfyMicromentum();
 	afx_msg void OnTimer(UINT_PTR nIDEvent);
 	afx_msg void OnClose();
-	DECLARE_MESSAGE_MAP()
-public:
 	afx_msg HBRUSH OnCtlColor(CDC* pDC, CWnd* pWnd, UINT nCtlColor);
-	afx_msg void OnEnKillfocusEditAxisModitfyMicromentum();
+	DECLARE_MESSAGE_MAP()
 };

--
Gitblit v1.9.3