From c6edbd1df725b75f0b1ed97ca178ea4e3231b25f Mon Sep 17 00:00:00 2001
From: LAPTOP-T815PCOQ\25526 <mr.liuyang@126.com>
Date: 星期一, 09 十二月 2024 14:18:11 +0800
Subject: [PATCH] 1. axis设定先写入PLC，间隔2秒后更新界面和配方 2. IO模块如果是可以点击的信号，移动到控件上鼠标显示点击图标 3. io模块添加圆角功能

---
 SourceCode/Bond/BondEq/View/AxisSettingsDlg.cpp |  554 +++++++++++++++++++++++++++++++++++++++++-------------
 1 files changed, 417 insertions(+), 137 deletions(-)

diff --git a/SourceCode/Bond/BondEq/View/AxisSettingsDlg.cpp b/SourceCode/Bond/BondEq/View/AxisSettingsDlg.cpp
index 8e82048..4b4027d 100644
--- a/SourceCode/Bond/BondEq/View/AxisSettingsDlg.cpp
+++ b/SourceCode/Bond/BondEq/View/AxisSettingsDlg.cpp
@@ -9,9 +9,12 @@
 #include <cctype>
 #include <algorithm>
 
-#define TIMER_INIT				1
-#define TIMER_READ_PLC_DATA		2
+#define COLOR_GREEN_ON    RGB(0, 255, 0)  // 姝ｅ父鐘舵�佺豢鑹�
+#define COLOR_GREEN_OFF   RGB(0, 180, 0)  // 鍋忕豢鐘舵��
+#define COLOR_RED         RGB(255, 0, 0)  // 閿欒鐘舵�佺孩鑹�
 
+#define TIMER_INIT					1
+#define TIMER_READ_PLC_DATA			2
 
 #define ID_MSG_UPDATA_DATA_TO_UI	WM_USER + 101
 
@@ -40,9 +43,16 @@
 	m_bReady = FALSE;
 	m_bBusy = FALSE;
 	m_bErr = FALSE;
-	for (int i = 0; i < 9; i++) {
+	for (int i = 0; i < BTN_MAX; i++) {
 		m_pBlBtns[i] = new CBlButton();
 	}
+
+	for (int i = 0; i < LABEL_MAX; i++) {
+		m_pBlLabels[i] = new CBLLabel();
+	}
+	
+	m_nBtnsFlashState6 = 0;
+	m_nBtnsFlashState8 = 0;
 }
 
 CAxisSettingsDlg::~CAxisSettingsDlg()
@@ -55,8 +65,12 @@
 	}
 	m_mapFonts.clear();
 
-	for (int i = 0; i < 9; i++) {
+	for (int i = 0; i < BTN_MAX; i++) {
 		delete m_pBlBtns[i];
+	}
+
+	for (int i = 0; i < LABEL_MAX; i++) {
+		delete m_pBlLabels[i];
 	}
 }
 
@@ -74,12 +88,6 @@
 void CAxisSettingsDlg::DoDataExchange(CDataExchange* pDX)
 {
 	CDialogEx::DoDataExchange(pDX);
-	DDX_Control(pDX, IDC_STATIC_AXIS_TEST_FLS, m_staticFLS);
-	DDX_Control(pDX, IDC_STATIC_AXIS_TEST_DOG, m_staticDOG);
-	DDX_Control(pDX, IDC_STATIC_AXIS_TEST_RLS, m_staticRLS);
-	DDX_Control(pDX, IDC_STATIC_AXIS_TEST_READY, m_staticReady);
-	DDX_Control(pDX, IDC_STATIC_AXIS_TEST_BUSY, m_staticBusy);
-	DDX_Control(pDX, IDC_STATIC_AXIS_TEST_ERR, m_staticErr);
 	DDX_Control(pDX, IDC_COMBO_AXIS_NAME, m_comboAxisNO);
 	DDX_Control(pDX, IDC_STATIC_AXIS_NUMBER, m_staticAxisNO);
 	DDX_Control(pDX, IDC_STATIC_AXIS_DESCRIP, m_staticAxisDescription);
@@ -216,14 +224,37 @@
 	label.UpdateWindow();            // 绔嬪嵆鍒锋柊
 }
 
+void CAxisSettingsDlg::SetLabelColorBasedOnState(CBLLabel& label, BOOL bState, COLORREF colorTrue, COLORREF colorFalse) {
+	SetLabelColor(label, bState ? colorTrue : colorFalse);
+}
+
+void CAxisSettingsDlg::UpdateLabels() {
+	SetLabelColorBasedOnState(*m_pBlLabels[LABEL_FLS], m_bFLS, COLOR_GREEN_ON, COLOR_GREEN_OFF);
+	SetLabelColorBasedOnState(*m_pBlLabels[LABEL_DOG], m_bDOG, COLOR_GREEN_ON, COLOR_GREEN_OFF);
+	SetLabelColorBasedOnState(*m_pBlLabels[LABEL_RLS], m_bRLS, COLOR_GREEN_ON, COLOR_GREEN_OFF);
+	SetLabelColorBasedOnState(*m_pBlLabels[LABEL_READY], m_bReady, COLOR_GREEN_ON, COLOR_GREEN_OFF);
+	SetLabelColorBasedOnState(*m_pBlLabels[LABEL_BUSY], m_bBusy, COLOR_GREEN_ON, COLOR_GREEN_OFF);
+	SetLabelColorBasedOnState(*m_pBlLabels[LABEL_ERR], m_bErr, COLOR_RED, COLOR_GREEN_OFF);
+}
+
 void CAxisSettingsDlg::updatePageButtonStates()
 {
-	for (int i = 0; i < 5; ++i) {
+	for (int i = 0; i < AXIS_PAGE_SIZE; ++i) {
 		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);
+	}
+}
+
+void CAxisSettingsDlg::HideEditCursor(int nCtrlID)
+{
+	CEdit* pEdit = (CEdit*)GetDlgItem(nCtrlID);
+	if (pEdit && pEdit->GetSafeHwnd()) {
+		pEdit->EnableWindow(FALSE); // 绂佺敤鎺т欢
+		pEdit->SetReadOnly(TRUE);   // 璁剧疆涓哄彧璇�
+		pEdit->HideCaret();         // 闅愯棌鍏夋爣
 	}
 }
 
@@ -280,21 +311,21 @@
 	};
 
 	// 鏇存柊鎺т欢鏄剧ず
-	m_staticAxisNO.SetWindowText(CString(axisDetails.number.c_str()));					// 杞寸紪鍙�
-	m_staticAxisDescription.SetWindowText(CString(axisDetails.description.c_str()));	// 杞存弿杩�
-	m_staticStartAddress.SetWindowText(CString(axisDetails.startAddress.c_str()));		// 璧峰鍦板潃
-	m_editJogDistance.SetWindowText(formatDouble(axisDetails.jogDistance));				// 寰姩閲�
-	m_editManualSpeed.SetWindowText(formatDouble(axisDetails.manualSpeed));				// 鎵嬪姩閫熷害
-	m_editAutoSpeed.SetWindowText(formatDouble(axisDetails.autoSpeed));					// 鑷姩閫熷害
-	m_editAccelerationTime.SetWindowText(formatDouble(axisDetails.accelerationTime));	// 鍔犻�熸椂闂�
-	m_editDecelerationTime.SetWindowText(formatDouble(axisDetails.decelerationTime));	// 鍑忛�熸椂闂�
+	m_staticAxisNO.SetWindowText(CString(axisDetails.number.c_str()));								// 杞寸紪鍙�
+	m_staticAxisDescription.SetWindowText(CString(axisDetails.description.c_str()));				// 杞存弿杩�
+	m_staticStartAddress.SetWindowText(CString(axisDetails.startAddress.c_str()));					// 璧峰鍦板潃
+	m_editJogDistance.SetWindowText(formatDouble(axisDetails.jogDistance.currentValue));			// 寰姩閲�
+	m_editManualSpeed.SetWindowText(formatDouble(axisDetails.manualSpeed.currentValue));			// 鎵嬪姩閫熷害
+	m_editAutoSpeed.SetWindowText(formatDouble(axisDetails.autoSpeed.currentValue));				// 鑷姩閫熷害
+	m_editAccelerationTime.SetWindowText(formatDouble(axisDetails.accelerationTime.currentValue));	// 鍔犻�熸椂闂�
+	m_editDecelerationTime.SetWindowText(formatDouble(axisDetails.decelerationTime.currentValue));	// 鍑忛�熸椂闂�
 }
 
 void CAxisSettingsDlg::refreshPositionDetails(int nAxisId, int pageNumber)
 {
 	RecipeManager& recipeManager = RecipeManager::getInstance();
 	// 姣忛〉鏄剧ず鐨勫畾浣嶇偣鏁伴噺
-	const int pageSize = 5;
+	const int pageSize = AXIS_PAGE_SIZE;
 
 	// 鑾峰彇瀹氫綅鐐规暟鎹�
 	auto positions = recipeManager.getPositions(nAxisId, pageNumber, pageSize);
@@ -312,17 +343,62 @@
 		CWnd* pPositionCtrl = GetDlgItem(positionCtrlId);
 
 		if (i < positions.size()) {
-			CString description = CString(positions[i].first.c_str());
-			CString value;
-			value.Format(_T("%.3f"), positions[i].second);
+			const PositionRange& position = positions[i];
 
+			// 鏄剧ず瀹氫綅鐐圭殑鎻忚堪
+			CString description = CString(position.description.c_str());
 			if (pDescriptionCtrl) pDescriptionCtrl->SetWindowText(description);
+
+			// 鏄剧ず瀹氫綅鐐圭殑褰撳墠浣嶇疆
+			CString value;
+			value.Format(_T("%.3f"), position.range.currentValue);
 			if (pPositionCtrl) pPositionCtrl->SetWindowText(value);
 		}
 		else {
+			// 娓呯┖鎺т欢鍐呭
 			if (pDescriptionCtrl) pDescriptionCtrl->SetWindowText(_T(""));
 			if (pPositionCtrl) pPositionCtrl->SetWindowText(_T(""));
 		}
+	}
+}
+
+void CAxisSettingsDlg::UpdatePositionRange(PositionRange& position, int pageNumber, int pageSize, int currentIndex)
+{
+	// 鑾峰彇褰撳墠杈撳叆妗嗕腑鐨勬枃鏈�
+	CString strText;
+	GetDlgItem(IDC_EDIT_AXIS_CURR_POS)->GetWindowText(strText);
+	if (strText.IsEmpty()) {
+		return;
+	}
+
+	CString descriptionCtrlName, positionCtrlName;
+	descriptionCtrlName.Format(_T("IDC_EDIT_AXIS_ANCHOR_POINT_DESCRIP%d"), currentIndex + 1);
+	positionCtrlName.Format(_T("IDC_EDIT_AXIS_ANCHOR_POINT%d"), currentIndex + 1);
+
+	UINT descriptionCtrlId = FindIDByName(descriptionCtrlName);
+	UINT positionCtrlId = FindIDByName(positionCtrlName);
+
+	CWnd* pDescriptionCtrl = GetDlgItem(descriptionCtrlId);
+	CWnd* pPositionCtrl = GetDlgItem(positionCtrlId);
+
+	if (pDescriptionCtrl == nullptr || pPositionCtrl == nullptr) {
+		return;
+	}
+
+	double enteredValue = _ttof(strText);
+	double minValue = position.range.minValue;
+	double maxValue = position.range.maxValue;
+
+	// 鍒ゆ柇杈撳叆鐨勫�兼槸鍚﹀湪鍚堟硶鑼冨洿鍐�
+	if (enteredValue < minValue || enteredValue > maxValue) {
+		CString strError;
+		strError.Format(_T("瀹氫綅鐐圭殑鍊煎繀椤诲湪 %f 鍜� %f 涔嬮棿锛�"), minValue, maxValue);
+		pDescriptionCtrl->SetWindowText(strError);
+	}
+	else {
+		position.range.currentValue = enteredValue;
+		pDescriptionCtrl->SetWindowText(CString(position.description.c_str()));
+		pPositionCtrl->SetWindowText(strText);
 	}
 }
 
@@ -350,7 +426,7 @@
 
 void CAxisSettingsDlg::updateDataFromUI(int nAxisId)
 {
-	const int pageSize = 5; // 姣忛〉鏄剧ず 5 涓畾浣嶇偣
+	const int pageSize = AXIS_PAGE_SIZE; // 姣忛〉鏄剧ず 5 涓畾浣嶇偣
 
 	RecipeManager& recipeManager = RecipeManager::getInstance();
 	auto axisData = recipeManager.getAxis(nAxisId);
@@ -358,45 +434,49 @@
 	// 鑾峰彇鐣岄潰涓婄殑淇敼鍙傛暟
 	CString text;
 	m_editManualSpeed.GetWindowText(text);
-	axisData.manualSpeed = _ttof(text);
+	axisData.manualSpeed.currentValue = _ttof(text);
 
 	m_editAutoSpeed.GetWindowText(text);
-	axisData.autoSpeed = _ttof(text);
+	axisData.autoSpeed.currentValue = _ttof(text);
 
 	m_editAccelerationTime.GetWindowText(text);
-	axisData.accelerationTime = _ttof(text);
+	axisData.accelerationTime.currentValue = _ttof(text);
 
 	m_editDecelerationTime.GetWindowText(text);
-	axisData.decelerationTime = _ttof(text);
+	axisData.decelerationTime.currentValue = _ttof(text);
 
 	m_editJogDistance.GetWindowText(text);
-	axisData.jogDistance = _ttof(text);
+	axisData.jogDistance.currentValue = _ttof(text);
 
 	// 鏇存柊瀹氫綅鐐规暟鎹�
 	for (int i = 0; i < pageSize; ++i) {
 		int index = (m_currentPage - 1) * pageSize + i;
 
 		if (index < axisData.positions.size()) {
-			CString descriptionName, positionName;
+			// 鏋勫缓鎺т欢鍚嶇О
+			CString descriptionName, positionName, minValueName, maxValueName;
 			descriptionName.Format(_T("IDC_EDIT_AXIS_ANCHOR_POINT_DESCRIP%d"), i + 1);
 			positionName.Format(_T("IDC_EDIT_AXIS_ANCHOR_POINT%d"), i + 1);
 
+			// 鑾峰彇鎺т欢
 			CEdit* pDescriptionEdit = (CEdit*)GetDlgItem(FindIDByName(descriptionName));
 			CEdit* pPositionEdit = (CEdit*)GetDlgItem(FindIDByName(positionName));
 
 			if (pDescriptionEdit && pPositionEdit) {
-				CString description, positionValue;
+				CString description, positionValue, minValue, maxValue;
+
+				// 鑾峰彇鎺т欢涓殑鏂囨湰
 				pDescriptionEdit->GetWindowText(description);
 				pPositionEdit->GetWindowText(positionValue);
 
 				// 鏇存柊 RecipeManager 涓殑鏁版嵁
-				axisData.positions[index].first = CT2A(description);
-				axisData.positions[index].second = _ttof(positionValue);
+				axisData.positions[index].description = CT2A(description);
+				axisData.positions[index].range.currentValue = _ttof(positionValue);
 			}
 		}
 	}
 
-	// 淇濆瓨鍥� RecipeManager
+	// 淇濆瓨 RecipeManager
 	recipeManager.updateAxis(axisData);
 }
 
@@ -510,7 +590,7 @@
 	}
 
 	// 鍐欏叆鎵嬪姩閫熷害
-	m_pPLC->writeDWord(component, startAddress + 82, (int)axisData.manualSpeed * 1000, [](IMcChannel* pChannel, int addr, DWORD value, int flag) {
+	m_pPLC->writeDWord(component, startAddress + 82, (int)axisData.manualSpeed.currentValue * 1000, [](IMcChannel* pChannel, int addr, DWORD value, int flag) {
 		if (flag == 0) {
 			TRACE("\n鍐欏叆鎴愬姛: 鎵嬪姩閫熷害, 鍦板潃: %d, 鍊�: %lu\n", addr, value);
 		}
@@ -520,7 +600,7 @@
 	});
 
 	// 鍐欏叆鑷姩閫熷害
-	m_pPLC->writeDWord(component, startAddress + 84, (int)(axisData.autoSpeed * 1000.0), [](IMcChannel* pChannel, int addr, DWORD value, int flag) {
+	m_pPLC->writeDWord(component, startAddress + 84, (int)(axisData.autoSpeed.currentValue * 1000.0), [](IMcChannel* pChannel, int addr, DWORD value, int flag) {
 		if (flag == 0) {
 			TRACE("\n鍐欏叆鎴愬姛: 鑷姩閫熷害, 鍦板潃: %d, 鍊�: %lu\n", addr, value);
 		}
@@ -530,7 +610,7 @@
 	});
 
 	// 鍐欏叆鍔犻�熸椂闂�, 杞崲涓烘绉�
-	m_pPLC->writeDWord(component, startAddress + 62, (int)(axisData.accelerationTime * 1000.0), [](IMcChannel* pChannel, int addr, DWORD value, int flag) {
+	m_pPLC->writeDWord(component, startAddress + 62, (int)(axisData.accelerationTime.currentValue * 1000.0), [](IMcChannel* pChannel, int addr, DWORD value, int flag) {
 		if (flag == 0) {
 			TRACE("\n鍐欏叆鎴愬姛: 鍔犻�熸椂闂�, 鍦板潃: %d, 鍊�: %lu\n", addr, value);
 		}
@@ -540,7 +620,7 @@
 	});
 
 	// 鍐欏叆鍑忛�熸椂闂�, 杞崲涓烘绉�
-	m_pPLC->writeDWord(component, startAddress + 64, (int)(axisData.decelerationTime * 1000.0), [](IMcChannel* pChannel, int addr, DWORD value, int flag) {
+	m_pPLC->writeDWord(component, startAddress + 64, (int)(axisData.decelerationTime.currentValue * 1000.0), [](IMcChannel* pChannel, int addr, DWORD value, int flag) {
 		if (flag == 0) {
 			TRACE("\n鍐欏叆鎴愬姛: 鍑忛�熸椂闂�, 鍦板潃: %d, 鍊�: %lu\n", addr, value);
 		}
@@ -550,7 +630,7 @@
 	});
 
 	// 鍐欏叆寰姩閲�
-	m_pPLC->writeWord(component, startAddress + 81, (int)(axisData.jogDistance * 1000.0), [](IMcChannel* pChannel, int addr, DWORD value, int flag) {
+	m_pPLC->writeWord(component, startAddress + 81, (int)(axisData.jogDistance.currentValue * 1000.0), [](IMcChannel* pChannel, int addr, DWORD value, int flag) {
 		if (flag == 0) {
 			TRACE("\n鍐欏叆鎴愬姛: 寰姩閲�, 鍦板潃: %d, 鍊�: %lu\n", addr, value);
 		}
@@ -561,20 +641,20 @@
 
 	// 鍐欏叆瀹氫綅鐐规暟鎹�
 	int positionStartAddress = startAddress + 100;
-	for (size_t i = 0; i < axisData.positions.size(); ++i) {
+	for (int i = 0; i < axisData.positions.size(); ++i) {
 		const auto& position = axisData.positions[i];
 		unsigned int positionAddress = positionStartAddress + (i * 2);
 
-		m_pPLC->writeDWord(component, positionAddress, (int)(position.second * 1000), [i, positionAddress](IMcChannel* pChannel, int addr, DWORD value, int flag) {
+		double valueToWrite = position.range.currentValue;
+		m_pPLC->writeDWord(component, positionAddress, (int)(valueToWrite * 1000), [i, positionAddress](IMcChannel* pChannel, int addr, DWORD value, int flag) {
 			if (flag == 0) {
-					TRACE("\n鍐欏叆鎴愬姛: 瀹氫綅鐐� %d, 鍦板潃: %d, 鍊�: %lu\n", i + 1, positionAddress, value);
+				TRACE("\n鍐欏叆鎴愬姛: 瀹氫綅鐐� %d, 鍦板潃: %d, 鍊�: %lu\n", i + 1, positionAddress, value);
 			}
 			else {
-					TRACE("\n鍐欏叆澶辫触: 瀹氫綅鐐� %d, 鍦板潃: %d, 閿欒鐮�: %d\n", i + 1, positionAddress, flag);
+				TRACE("\n鍐欏叆澶辫触: 瀹氫綅鐐� %d, 鍦板潃: %d, 閿欒鐮�: %d\n", i + 1, positionAddress, flag);
 			}
 		});
 	}
-	
 }
 
 void CAxisSettingsDlg::handleAxisOperation(AxisOperationType eOpType, bool bPressed)
@@ -648,7 +728,7 @@
 {
 	// 浠� RecipeManager 鑾峰彇杞存暟鎹�
 	RecipeManager& recipeManager = RecipeManager::getInstance();
-	auto axisData = recipeManager.getAxis(nAxisId);
+	AxisInfo axisData = recipeManager.getAxis(nAxisId);
 
 	MC::SOFT_COMPONENT component;
 	int startAddress, endAddress, readSize;
@@ -658,7 +738,7 @@
 	endAddress = startAddress + 300;
 	readSize = (endAddress - startAddress + 1) * 2;
 
-	auto funOnReadData = [&, startAddress, readSize](IMcChannel* pChannel, int addr, char* pData, unsigned int nDataSize, int flag) -> void {
+	auto funOnReadData = [this, nAxisId, startAddress, readSize](IMcChannel* pChannel, int addr, char* pData, unsigned int nDataSize, int flag) -> void {
 		if (nDataSize == readSize && flag == 0 && ::IsWindow(m_hWnd)) {
 			m_fCurPos = CToolUnits::toInt32(&pData[20 * 2]) * 0.001;
 			m_fManualSpeed = CToolUnits::toInt32(&pData[82 * 2]) * 0.001;
@@ -675,6 +755,33 @@
 			m_bReady = CToolUnits::getBit(pData[10 * 2 + 1], 0xA - 8);
 			m_bBusy = CToolUnits::getBit(pData[10 * 2 + 1], 0xB - 8);
 			m_bErr = CToolUnits::getBit(pData[10 * 2 + 1], 0xF - 8);
+
+			// 璁板綍鎸夐挳鍒锋柊鐘舵��
+			// 6,7,8,9涓哄師鐐瑰拰25涓偣浣嶇姸鎬佸拰瀹屾垚鐘舵��
+			// ZR 06.0 鍜� 08.0
+			// 鍥炲師鐐硅繍鍔ㄤ腑锛孼R06.0鍦�0鍜�1涓垏鎹紝鍥炲師鐐瑰畬鎴愶紝 08.0涓�1
+			// 瀹氫綅1
+			// ZR 06.1 鍜� 08.1
+			// ...
+			int b = 6 * 2;
+			m_nBtnsFlashState6 = ((BYTE)pData[b] | (BYTE)pData[b + 1] << 8);
+			m_nBtnsFlashState6 |= ((BYTE)pData[b + 2] << 16 | (BYTE)pData[b + 3] << 24);
+			m_nBtnsFlashState8 = ((BYTE)pData[b + 4] | (BYTE)pData[b + 5] << 8);
+			m_nBtnsFlashState8 |= ((BYTE)pData[b + 6] << 16 | (BYTE)pData[b + 7] << 24);
+
+			AxisInfo axisInfo = RecipeManager::getInstance().getAxis(nAxisId);
+			axisInfo.autoSpeed.currentValue = m_fAutoSpeed;												// 鑷姩閫熷害
+			axisInfo.manualSpeed.currentValue = m_fManualSpeed;											// 鎵嬪姩閫熷害	
+			axisInfo.jogDistance.currentValue = CToolUnits::toInt32(&pData[81 * 2]) * 0.001;			// 寰姩閲�
+			axisInfo.accelerationTime.currentValue = CToolUnits::toInt32(&pData[62 * 2]) * 0.001;		// 鍔犻�熸椂闂�
+			axisInfo.decelerationTime.currentValue = CToolUnits::toInt32(&pData[64 * 2]) * 0.001;		// 鍑忛�熸椂闂�
+
+			// 璇诲彇瀹氫綅鐐规暟鎹�
+			for (int i = 0; i < axisInfo.positions.size(); ++i) {
+				unsigned int positionAddress = 100 + (i * 2);
+				axisInfo.positions[i].range.currentValue = CToolUnits::toInt32(&pData[positionAddress * 2]) * 0.001;
+			}
+			RecipeManager::getInstance().updateAxis(axisInfo);
 
 			PostMessage(ID_MSG_UPDATA_DATA_TO_UI);
 		}
@@ -722,9 +829,31 @@
 	strTitle.Format(_T("Axis璁惧畾(閰嶆柟: %s)"), m_strRecipeName);
 	SetWindowText(strTitle);
 
+	// 闅愯棌鍏夋爣
+	//HideEditCursor(IDC_EDIT_AXIS_CURR_POS);
+	HideEditCursor(IDC_EDIT_AXIS_CURR_MANUAL_SPEED);
+	HideEditCursor(IDC_EDIT_AXIS_CURR_AUTO_SPEED);
+	HideEditCursor(IDC_EDIT_AXIS_CURR_ROTA_SPEED);
+	HideEditCursor(IDC_EDIT_AXIS_CURR_LOAD);
+	HideEditCursor(IDC_EDIT_AXIS_CURR_ERROR_NUMBER);
+	HideEditCursor(IDC_EDIT_AXIS_CURR_ALARM_NUMBER);
+
+	// 娴嬭瘯
+	{
+		CEdit* pEdit = (CEdit*)GetDlgItem(IDC_EDIT_AXIS_CURR_POS);
+		pEdit->EnableWindow(TRUE);
+		pEdit->SetReadOnly(FALSE);
+	}
+
 	// 璁剧疆娴嬭瘯鐘舵��
-	CBLLabel* pLabels[] = { &m_staticFLS, &m_staticDOG, &m_staticRLS, &m_staticReady, &m_staticBusy, &m_staticErr };
-	for (auto pLabel : pLabels) {
+	m_pBlLabels[LABEL_FLS]->SubclassDlgItem(IDC_STATIC_AXIS_TEST_FLS, this);
+	m_pBlLabels[LABEL_DOG]->SubclassDlgItem(IDC_STATIC_AXIS_TEST_DOG, this);
+	m_pBlLabels[LABEL_RLS]->SubclassDlgItem(IDC_STATIC_AXIS_TEST_RLS, this);
+	m_pBlLabels[LABEL_READY]->SubclassDlgItem(IDC_STATIC_AXIS_TEST_READY, this);
+	m_pBlLabels[LABEL_BUSY]->SubclassDlgItem(IDC_STATIC_AXIS_TEST_BUSY, this);
+	m_pBlLabels[LABEL_ERR]->SubclassDlgItem(IDC_STATIC_AXIS_TEST_ERR, this);
+
+	for (auto pLabel : m_pBlLabels) {
 		pLabel->SetBkColor(RGB(0, 180, 0));
 		pLabel->ModifyStyle(0, SS_NOTIFY);
 		pLabel->SetTextColor(RGB(255, 255, 255));
@@ -733,40 +862,57 @@
 	}
 	
 	// 鎸夐挳鍒濆鍖�
-	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_pBlBtns[BTN_PAGE1]->SubclassDlgItem(IDC_BUTTON_AXIS_ANCHOR_POINT_GROUP1, this);
+	m_pBlBtns[BTN_PAGE2]->SubclassDlgItem(IDC_BUTTON_AXIS_ANCHOR_POINT_GROUP2, this);
+	m_pBlBtns[BTN_PAGE3]->SubclassDlgItem(IDC_BUTTON_AXIS_ANCHOR_POINT_GROUP3, this);
+	m_pBlBtns[BTN_PAGE4]->SubclassDlgItem(IDC_BUTTON_AXIS_ANCHOR_POINT_GROUP4, this);
+	m_pBlBtns[BTN_PAGE5]->SubclassDlgItem(IDC_BUTTON_AXIS_ANCHOR_POINT_GROUP5, this);
+	m_pBlBtns[BTN_JOG_ADD]->SubclassDlgItem(IDC_BUTTON_AXIS_TEST_JOG_ADD, this);
+	m_pBlBtns[BTN_JOG_ADD]->SetFrameColor(BS_NORMAL, BTN_JOG_FRAME_NORMAL);
+	m_pBlBtns[BTN_JOG_ADD]->SetFrameColor(BS_HOVER, BTN_JOG_FRAME_HOVER);
+	m_pBlBtns[BTN_JOG_ADD]->SetFrameColor(BS_PRESS, BTN_JOG_FRAME_PRESS);
+	m_pBlBtns[BTN_JOG_ADD]->SetBkgndColor(BS_NORMAL, BTN_JOG_BKGND_NORMAL);
+	m_pBlBtns[BTN_JOG_ADD]->SetBkgndColor(BS_HOVER, BTN_JOG_BKGND_HOVER);
+	m_pBlBtns[BTN_JOG_ADD]->SetBkgndColor(BS_PRESS, BTN_JOG_BKGND_PRESS);
+	m_pBlBtns[BTN_JOG_SUB]->SubclassDlgItem(IDC_BUTTON_AXIS_TEST_JOG_SUB, this);
+	m_pBlBtns[BTN_JOG_SUB]->SetFrameColor(BS_NORMAL, BTN_JOG_FRAME_NORMAL);
+	m_pBlBtns[BTN_JOG_SUB]->SetFrameColor(BS_HOVER, BTN_JOG_FRAME_HOVER);
+	m_pBlBtns[BTN_JOG_SUB]->SetFrameColor(BS_PRESS, BTN_JOG_FRAME_PRESS);
+	m_pBlBtns[BTN_JOG_SUB]->SetBkgndColor(BS_NORMAL, BTN_JOG_BKGND_NORMAL);
+	m_pBlBtns[BTN_JOG_SUB]->SetBkgndColor(BS_HOVER, BTN_JOG_BKGND_HOVER);
+	m_pBlBtns[BTN_JOG_SUB]->SetBkgndColor(BS_PRESS, BTN_JOG_BKGND_PRESS);
+	m_pBlBtns[BTN_JOG_SEV]->SubclassDlgItem(IDC_BUTTON_AXIS_SEV, this);
+	m_pBlBtns[BTN_JOG_SEV]->SetFrameColor(BS_NORMAL, BTN_SEV_FRAME_NORMAL);
+	m_pBlBtns[BTN_JOG_SEV]->SetFrameColor(BS_HOVER, BTN_SEV_FRAME_HOVER);
+	m_pBlBtns[BTN_JOG_SEV]->SetFrameColor(BS_PRESS, BTN_SEV_FRAME_PRESS);
+	m_pBlBtns[BTN_JOG_SEV]->SetBkgndColor(BS_NORMAL, BTN_SEV_BKGND_NORMAL);
+	m_pBlBtns[BTN_JOG_SEV]->SetBkgndColor(BS_HOVER, BTN_SEV_BKGND_HOVER);
+	m_pBlBtns[BTN_JOG_SEV]->SetBkgndColor(BS_PRESS, BTN_SEV_BKGND_PRESS);
+	m_pBlBtns[BTN_JOG_STOP]->SubclassDlgItem(IDC_BUTTON_AXIS_TEST_STOP, this);
+	m_pBlBtns[BTN_JOG_STOP]->SetFrameColor(BS_NORMAL, BTN_STOP_FRAME_NORMAL);
+	m_pBlBtns[BTN_JOG_STOP]->SetFrameColor(BS_HOVER, BTN_STOP_FRAME_HOVER);
+	m_pBlBtns[BTN_JOG_STOP]->SetFrameColor(BS_PRESS, BTN_STOP_FRAME_PRESS);
+	m_pBlBtns[BTN_JOG_STOP]->SetBkgndColor(BS_NORMAL, BTN_STOP_BKGND_NORMAL);
+	m_pBlBtns[BTN_JOG_STOP]->SetBkgndColor(BS_HOVER, BTN_STOP_BKGND_HOVER);
+	m_pBlBtns[BTN_JOG_STOP]->SetBkgndColor(BS_PRESS, BTN_STOP_BKGND_PRESS);
+	m_pBlBtns[BTN_JOG_OPR]->SubclassDlgItem(IDC_BUTTON_AXIS_TEST_OPR, this);
+	m_pBlBtns[BTN_JOG_OPR]->SetFrameColor(BS_NORMAL, BTN_OPR_FRAME_NORMAL);
+	m_pBlBtns[BTN_JOG_OPR]->SetFrameColor(BS_HOVER, BTN_OPR_FRAME_HOVER);
+	m_pBlBtns[BTN_JOG_OPR]->SetFrameColor(BS_PRESS, BTN_OPR_FRAME_PRESS);
+	m_pBlBtns[BTN_JOG_OPR]->SetBkgndColor(BS_NORMAL, BTN_OPR_BKGND_NORMAL);
+	m_pBlBtns[BTN_JOG_OPR]->SetBkgndColor(BS_HOVER, BTN_OPR_BKGND_HOVER);
+	m_pBlBtns[BTN_JOG_OPR]->SetBkgndColor(BS_PRESS, BTN_OPR_BKGND_PRESS);
+	static UINT btnPointIds[] = { IDC_BUTTON_AXIS_ANCHOR_POINT1, IDC_BUTTON_AXIS_ANCHOR_POINT2,
+		IDC_BUTTON_AXIS_ANCHOR_POINT3, IDC_BUTTON_AXIS_ANCHOR_POINT4, IDC_BUTTON_AXIS_ANCHOR_POINT5};
+	for (int i = 0; i < 5; i++) {
+		m_pBlBtns[BTN_POINT1 + i]->SubclassDlgItem(btnPointIds[i], this);
+		m_pBlBtns[BTN_POINT1 + i]->SetFrameColor(BS_NORMAL, BTN_POINT_FRAME_NORMAL);
+		m_pBlBtns[BTN_POINT1 + i]->SetFrameColor(BS_HOVER, BTN_POINT_FRAME_HOVER);
+		m_pBlBtns[BTN_POINT1 + i]->SetFrameColor(BS_PRESS, BTN_POINT_FRAME_PRESS);
+		m_pBlBtns[BTN_POINT1 + i]->SetBkgndColor(BS_NORMAL, BTN_POINT_BKGND_NORMAL);
+		m_pBlBtns[BTN_POINT1 + i]->SetBkgndColor(BS_HOVER, BTN_POINT_BKGND_HOVER);
+		m_pBlBtns[BTN_POINT1 + i]->SetBkgndColor(BS_PRESS, BTN_POINT_BKGND_PRESS);
+	}
 
 	// 鍒濆鍖栧綋鍓嶉〉闈负绗竴椤�
 	m_currentPage = 1;
@@ -826,26 +972,115 @@
 BOOL CAxisSettingsDlg::PreTranslateMessage(MSG* pMsg)
 {
 	// TODO: 鍦ㄦ娣诲姞涓撶敤浠ｇ爜鍜�/鎴栬皟鐢ㄥ熀绫�
+	CWnd* pWnd = CWnd::FromHandle(pMsg->hwnd);
 
-	if (pMsg->message == WM_LBUTTONDOWN) {
-		if (pMsg->hwnd == GetDlgItem(IDC_BUTTON_AXIS_TEST_JOG_ADD)->m_hWnd) {
-			TRACE("JOG+ 鎸夐挳鎸変笅\n");
-			handleAxisOperation(AxisOperationType::JOG_ADD, true);
+	if (pWnd) {
+		// 鍒ゆ柇榧犳爣鏄惁杩涘叆鎸囧畾鎺т欢鍖哄煙
+		if (pWnd->GetSafeHwnd() == GetDlgItem(IDC_EDIT_AXIS_ANCHOR_POINT_DESCRIP1)->m_hWnd ||
+			pWnd->GetSafeHwnd() == GetDlgItem(IDC_EDIT_AXIS_ANCHOR_POINT_DESCRIP2)->m_hWnd ||
+			pWnd->GetSafeHwnd() == GetDlgItem(IDC_EDIT_AXIS_ANCHOR_POINT_DESCRIP3)->m_hWnd ||
+			pWnd->GetSafeHwnd() == GetDlgItem(IDC_EDIT_AXIS_ANCHOR_POINT_DESCRIP4)->m_hWnd ||
+			pWnd->GetSafeHwnd() == GetDlgItem(IDC_EDIT_AXIS_ANCHOR_POINT_DESCRIP5)->m_hWnd) {
+			RecipeManager& recipeManager = RecipeManager::getInstance();
+			int currentIndex = -1;
+
+			// 鏍规嵁鎺т欢ID纭畾 currentIndex
+			if (pWnd->GetSafeHwnd() == GetDlgItem(IDC_EDIT_AXIS_ANCHOR_POINT_DESCRIP1)->m_hWnd) {
+				currentIndex = 0;
+			}
+			else if (pWnd->GetSafeHwnd() == GetDlgItem(IDC_EDIT_AXIS_ANCHOR_POINT_DESCRIP2)->m_hWnd) {
+				currentIndex = 1;
+			}
+			else if (pWnd->GetSafeHwnd() == GetDlgItem(IDC_EDIT_AXIS_ANCHOR_POINT_DESCRIP3)->m_hWnd) {
+				currentIndex = 2;
+			}
+			else if (pWnd->GetSafeHwnd() == GetDlgItem(IDC_EDIT_AXIS_ANCHOR_POINT_DESCRIP4)->m_hWnd) {
+				currentIndex = 3;
+			}
+			else if (pWnd->GetSafeHwnd() == GetDlgItem(IDC_EDIT_AXIS_ANCHOR_POINT_DESCRIP5)->m_hWnd) {
+				currentIndex = 4;
+			}
+
+			if (currentIndex == -1) {
+				return CDialogEx::PreTranslateMessage(pMsg);
+			}
+
+			CString descriptionCtrlName, positionCtrlName;
+			descriptionCtrlName.Format(_T("IDC_EDIT_AXIS_ANCHOR_POINT_DESCRIP%d"), currentIndex + 1);
+			positionCtrlName.Format(_T("IDC_EDIT_AXIS_ANCHOR_POINT%d"), currentIndex + 1);
+
+			UINT descriptionCtrlId = FindIDByName(descriptionCtrlName);
+			UINT positionCtrlId = FindIDByName(positionCtrlName);
+
+			CWnd* pDescriptionCtrl = GetDlgItem(descriptionCtrlId);
+			CWnd* pPositionCtrl = GetDlgItem(positionCtrlId);
+
+			if (pDescriptionCtrl == nullptr || pPositionCtrl == nullptr) {
+				return CDialogEx::PreTranslateMessage(pMsg);
+			}
+
+			PositionRange& position = recipeManager.getPositionByIndex(getCurrentSelectedAxisID(), m_currentPage, AXIS_PAGE_SIZE, currentIndex);
+			if (pMsg->message == WM_LBUTTONDOWN || pMsg->message == WM_LBUTTONDBLCLK) {
+				// 澶勭悊榧犳爣鐐瑰嚮浜嬩欢
+				// 璁剧疆榧犳爣涓虹澶村厜鏍�
+				::SetCursor(AfxGetApp()->LoadStandardCursor(IDC_ARROW));
+
+				CString strText;
+				GetDlgItem(IDC_EDIT_AXIS_CURR_POS)->GetWindowText(strText);
+				if (strText.IsEmpty()) {
+					return CDialogEx::PreTranslateMessage(pMsg);;
+				}
+
+				double enteredValue = _ttof(strText);
+				double minValue = position.range.minValue;
+				double maxValue = position.range.maxValue;
+
+				// 鍒ゆ柇杈撳叆鐨勫�兼槸鍚﹀湪鍚堟硶鑼冨洿鍐�
+				if (enteredValue < minValue || enteredValue > maxValue) {
+					CString strError;
+					strError.Format(_T("瀹氫綅鐐圭殑鍊煎繀椤诲湪 %f 鍜� %f 涔嬮棿锛�"), minValue, maxValue);
+					pDescriptionCtrl->SetWindowText(strError);
+				}
+				else {
+					position.range.currentValue = enteredValue;
+					pPositionCtrl->SetWindowText(strText);
+				}
+			}
+			else if (pMsg->message == WM_LBUTTONUP) {
+				// 澶勭悊榧犳爣鎶捣浜嬩欢
+				// 璁剧疆榧犳爣涓烘墜褰㈠厜鏍�
+				::SetCursor(AfxGetApp()->LoadStandardCursor(IDC_HAND));
+
+				CString strText;
+				strText.Format(_T("%s"), position.description.c_str());
+				pDescriptionCtrl->SetWindowText(strText);
+			}
+			else if (pMsg->message == WM_MOUSEMOVE) {
+				// 澶勭悊榧犳爣绉诲姩浜嬩欢
+				::SetCursor(AfxGetApp()->LoadStandardCursor(IDC_HAND));
+			}
 		}
-		else if (pMsg->hwnd == GetDlgItem(IDC_BUTTON_AXIS_TEST_JOG_SUB)->m_hWnd) {
-			TRACE("JOG- 鎸夐挳鎸変笅\n");
-			// 鍚姩瀹氭椂鍣ㄨ繛缁彂閫佷俊鍙�
-			handleAxisOperation(AxisOperationType::JOG_SUB, true);
+
+		if (pMsg->message == WM_LBUTTONDOWN) {
+			if (pMsg->hwnd == GetDlgItem(IDC_BUTTON_AXIS_TEST_JOG_ADD)->m_hWnd) {
+				TRACE("JOG+ 鎸夐挳鎸変笅\n");
+				handleAxisOperation(AxisOperationType::JOG_ADD, true);
+			}
+			else if (pMsg->hwnd == GetDlgItem(IDC_BUTTON_AXIS_TEST_JOG_SUB)->m_hWnd) {
+				TRACE("JOG- 鎸夐挳鎸変笅\n");
+				// 鍚姩瀹氭椂鍣ㄨ繛缁彂閫佷俊鍙�
+				handleAxisOperation(AxisOperationType::JOG_SUB, true);
+			}
 		}
-	}
-	else if (pMsg->message == WM_LBUTTONUP) {
-		if (pMsg->hwnd == GetDlgItem(IDC_BUTTON_AXIS_TEST_JOG_ADD)->m_hWnd) {
-			TRACE("JOG+ 鎸夐挳鏉惧紑\n");
-			handleAxisOperation(AxisOperationType::JOG_ADD, false);
-		}
-		else if (pMsg->hwnd == GetDlgItem(IDC_BUTTON_AXIS_TEST_JOG_SUB)->m_hWnd) {
-			TRACE("JOG- 鎸夐挳鏉惧紑\n");
-			handleAxisOperation(AxisOperationType::JOG_SUB, false);
+		else if (pMsg->message == WM_LBUTTONUP) {
+			if (pMsg->hwnd == GetDlgItem(IDC_BUTTON_AXIS_TEST_JOG_ADD)->m_hWnd) {
+				TRACE("JOG+ 鎸夐挳鏉惧紑\n");
+				handleAxisOperation(AxisOperationType::JOG_ADD, false);
+			}
+			else if (pMsg->hwnd == GetDlgItem(IDC_BUTTON_AXIS_TEST_JOG_SUB)->m_hWnd) {
+				TRACE("JOG- 鎸夐挳鏉惧紑\n");
+				handleAxisOperation(AxisOperationType::JOG_SUB, false);
+			}
 		}
 	}
 
@@ -868,8 +1103,7 @@
 	AdjustControls(dScaleX, dScaleY);
 
 	// 鍔ㄦ�佽皟鏁村悇涓� CBLLabel 鐨勫瓧浣撳ぇ灏�
-	CBLLabel* pLabels[] = { &m_staticFLS, &m_staticDOG, &m_staticRLS, &m_staticReady, &m_staticBusy, &m_staticErr };
-	for (auto pLabel : pLabels) {
+	for (auto pLabel : m_pBlLabels) {
 		AdjustLabelFont(*pLabel);
 	}
 
@@ -968,6 +1202,7 @@
 	handleAxisOperation(AxisOperationType::POSITION_1, true);
 	Sleep(200);
 	handleAxisOperation(AxisOperationType::POSITION_1, false);
+	m_pBlBtns[BTN_POINT1]->Flash(1000);
 }
 
 void CAxisSettingsDlg::OnBnClickedButtonAxisAnchorPoint2()
@@ -1016,6 +1251,18 @@
 	handleAxisOperation(AxisOperationType::STOP, true);
 	Sleep(200);
 	handleAxisOperation(AxisOperationType::STOP, false);
+	m_pBlBtns[BTN_JOG_OPR]->StopFlash();
+	m_pBlBtns[BTN_POINT1]->StopFlash();
+	m_pBlBtns[BTN_POINT2]->StopFlash();
+	m_pBlBtns[BTN_POINT3]->StopFlash();
+	m_pBlBtns[BTN_POINT3]->StopFlash();
+	m_pBlBtns[BTN_POINT4]->StopFlash();
+}
+
+void CAxisSettingsDlg::OnBnClickedButtonAxisSev()
+{
+	// TODO: 鍦ㄦ娣诲姞鎺т欢閫氱煡澶勭悊绋嬪簭浠ｇ爜
+	handleAxisOperation(AxisOperationType::SEV_ON, !m_bSEV);
 }
 
 void CAxisSettingsDlg::OnSelchangeComboAxisName()
@@ -1047,15 +1294,20 @@
 	if (ret != IDOK) {
 		return;
 	}
+	writeAxisDataToPLC(axisId);
 
-	updateDataFromUI(axisId);
+	Sleep(2000);
+
+	refreshAxisDetails(axisId);
+	refreshPositionDetails(axisId, m_currentPage);
 	if (RecipeManager::getInstance().saveRecipe(std::string(CT2A(m_strRecipeName)))) {
-		writeAxisDataToPLC(axisId);
-		cstrMessage.Format(_T("淇濆瓨杞� [%d] 鍙傛暟鎴愬姛锛�"), axisId);
+		cstrMessage.Format(_T("淇濆瓨杞� [%d] 鍙傛暟鍒版枃浠舵垚鍔燂紒"), axisId);
 		SystemLogManager::getInstance().log(SystemLogManager::LogType::Operation, std::string(CT2A(cstrMessage)));
+
+		updateDataFromUI(axisId);
 	}
 	else {
-		cstrMessage.Format(_T("淇濆瓨杞� [%d] 鍙傛暟澶辫触锛�"), axisId);
+		cstrMessage.Format(_T("淇濆瓨杞� [%d] 鍙傛暟鍒版枃浠跺け璐ワ紒"), axisId);
 		SystemLogManager::getInstance().log(SystemLogManager::LogType::Error, std::string(CT2A(cstrMessage)));
 	}
 
@@ -1072,47 +1324,81 @@
 	SetDlgItemInt(IDC_EDIT_AXIS_CURR_ERROR_NUMBER, m_nErrCode);
 	SetDlgItemInt(IDC_EDIT_AXIS_CURR_ALARM_NUMBER, m_nAlarmCode);
 
-	//OPR 淇″彿
-	if (m_bFLS) {
-		SetLabelColor(m_staticFLS, RGB(0, 255, 0));
+	// 鏇存柊Labels鐘舵��
+	UpdateLabels();
+	
+	// OPR鎸夐挳鏄惁瑕侀棯鐑佹垨鍋滄闂儊
+	// 06.0鍜�08.0
+	if (m_nBtnsFlashState6 & 0x01) {
+		// 06.0
+		if (!m_pBlBtns[BTN_JOG_OPR]->IsFlash()) {
+			m_pBlBtns[BTN_JOG_OPR]->Flash(1000);
+		}
 	}
-	else {
-		SetLabelColor(m_staticFLS, RGB(0, 180, 0));
+	else if (m_nBtnsFlashState8 & 0x01) {
+		if (m_pBlBtns[BTN_JOG_OPR]->IsFlash()) {
+			m_pBlBtns[BTN_JOG_OPR]->StopFlash();
+		}
 	}
 
-	if (m_bDOG) {
-		SetLabelColor(m_staticDOG, RGB(0, 255, 0));
-	}
-	else {
-		SetLabelColor(m_staticDOG, RGB(0, 180, 0));
+	int v = 0x02;
+	if (m_currentPage > 1) {
+		v = v << (5 * (m_currentPage - 1));
 	}
 
-	if (m_bRLS) {
-		SetLabelColor(m_staticRLS, RGB(0, 255, 0));
+	if (m_nBtnsFlashState6 & v) {
+		if (!m_pBlBtns[BTN_POINT1]->IsFlash()) {
+			m_pBlBtns[BTN_POINT1]->Flash(1000);
+		}
 	}
-	else {
-		SetLabelColor(m_staticRLS, RGB(0, 180, 0));
+	else if (m_nBtnsFlashState8 & v) {
+		if (m_pBlBtns[BTN_POINT1]->IsFlash()) {
+			m_pBlBtns[BTN_POINT1]->StopFlash();
+		}
 	}
 
-	if (m_bReady) {
-		SetLabelColor(m_staticReady, RGB(0, 255, 0));
+	if (m_nBtnsFlashState6 & (v << 1)) {
+		if (!m_pBlBtns[BTN_POINT2]->IsFlash()) {
+			m_pBlBtns[BTN_POINT2]->Flash(1000);
+		}
 	}
-	else {
-		SetLabelColor(m_staticReady, RGB(0, 180, 0));
+	else if (m_nBtnsFlashState8 & (v << 1)) {
+		if (m_pBlBtns[BTN_POINT2]->IsFlash()) {
+			m_pBlBtns[BTN_POINT2]->StopFlash();
+		}
 	}
 
-	if (m_bBusy) {
-		SetLabelColor(m_staticBusy, RGB(0, 255, 0));
+	if (m_nBtnsFlashState6 & (v << 2)) {
+		if (!m_pBlBtns[BTN_POINT3]->IsFlash()) {
+			m_pBlBtns[BTN_POINT3]->Flash(1000);
+		}
 	}
-	else {
-		SetLabelColor(m_staticBusy, RGB(0, 180, 0));
+	else if (m_nBtnsFlashState8 & (v << 2)) {
+		if (m_pBlBtns[BTN_POINT3]->IsFlash()) {
+			m_pBlBtns[BTN_POINT3]->StopFlash();
+		}
 	}
 
-	if (m_bErr) {
-		SetLabelColor(m_staticErr, RGB(255, 0, 0));
+	if (m_nBtnsFlashState6 & (v << 3)) {
+		if (!m_pBlBtns[BTN_POINT4]->IsFlash()) {
+			m_pBlBtns[BTN_POINT4]->Flash(1000);
+		}
 	}
-	else {
-		SetLabelColor(m_staticErr, RGB(0, 180, 0));
+	else if (m_nBtnsFlashState8 & (v << 3)) {
+		if (m_pBlBtns[BTN_POINT4]->IsFlash()) {
+			m_pBlBtns[BTN_POINT4]->StopFlash();
+		}
+	}
+
+	if (m_nBtnsFlashState6 & (v << 4)) {
+		if (!m_pBlBtns[BTN_POINT5]->IsFlash()) {
+			m_pBlBtns[BTN_POINT5]->Flash(1000);
+		}
+	}
+	else if (m_nBtnsFlashState8 & (v << 4)) {
+		if (m_pBlBtns[BTN_POINT5]->IsFlash()) {
+			m_pBlBtns[BTN_POINT5]->StopFlash();
+		}
 	}
 
 	return 0;
@@ -1140,10 +1426,4 @@
 	KillTimer(TIMER_READ_PLC_DATA);
 
 	CDialogEx::OnClose();
-}
-
-void CAxisSettingsDlg::OnBnClickedButtonAxisSev()
-{
-	// TODO: 鍦ㄦ娣诲姞鎺т欢閫氱煡澶勭悊绋嬪簭浠ｇ爜
-	handleAxisOperation(AxisOperationType::SEV_ON, !m_bSEV);
 }

--
Gitblit v1.9.3