From 35199ad4aaa3f35ff82da77d7108a4e9f136443e Mon Sep 17 00:00:00 2001
From: LAPTOP-T815PCOQ\25526 <mr.liuyang@126.com>
Date: 星期五, 06 十二月 2024 17:49:56 +0800
Subject: [PATCH] 1.修改配方管理模块,定位点等参数有最大值最小值 2.同步修改合并轴管理界面3.IO界面显示16个,16个为一组

---
 SourceCode/Bond/BondEq/View/AxisSettingsDlg.cpp |  639 +++++++++++++++++++++++++++++++++++++++------------------
 1 files changed, 433 insertions(+), 206 deletions(-)

diff --git a/SourceCode/Bond/BondEq/View/AxisSettingsDlg.cpp b/SourceCode/Bond/BondEq/View/AxisSettingsDlg.cpp
index 7ac933d..bbddb7b 100644
--- a/SourceCode/Bond/BondEq/View/AxisSettingsDlg.cpp
+++ b/SourceCode/Bond/BondEq/View/AxisSettingsDlg.cpp
@@ -9,8 +9,10 @@
 #include <cctype>
 #include <algorithm>
 
-#define TIMER_INIT				1
-#define TIMER_READ_PLC_DATA		2
+#define TIMER_INIT					1
+#define TIMER_READ_PLC_DATA			2
+
+#define ID_MSG_UPDATA_DATA_TO_UI	WM_USER + 101
 
 // CAxisSettingsDlg 瀵硅瘽妗�
 
@@ -22,8 +24,29 @@
 	m_nInitialWidth = 0;
 	m_nInitialHeight = 0;
 	m_pPLC = nullptr;
-	m_bJogAddState = FALSE;
-	m_bJogSubState = FALSE;
+
+	m_bSEV = FALSE;
+	m_fCurPos = 0.0;
+	m_fManualSpeed = 0.0;
+	m_fAutoSpeed = 0.0;
+	m_fPrm = 0.0;
+	m_nLoad = 0;
+	m_nErrCode = 0;
+	m_nAlarmCode = 0;
+	m_bFLS = FALSE;
+	m_bDOG = FALSE;
+	m_bRLS = FALSE;
+	m_bReady = FALSE;
+	m_bBusy = FALSE;
+	m_bErr = FALSE;
+
+	for (int i = 0; i < 9; i++) {
+		m_pBlBtns[i] = new CBlButton();
+	}
+
+	for (int i = 0; i < 6; i++) {
+		m_pBlLabels[i] = new CBLLabel();
+	}
 }
 
 CAxisSettingsDlg::~CAxisSettingsDlg()
@@ -35,6 +58,14 @@
 		}
 	}
 	m_mapFonts.clear();
+
+	for (int i = 0; i < 9; i++) {
+		delete m_pBlBtns[i];
+	}
+
+	for (int i = 0; i < 6; i++) {
+		delete m_pBlLabels[i];
+	}
 }
 
 void CAxisSettingsDlg::SetPLC(CPLC* pPLC)
@@ -51,12 +82,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);
@@ -66,11 +91,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)
@@ -191,24 +211,31 @@
 	label.UpdateWindow();
 }
 
-void CAxisSettingsDlg::SetLabelColor(CBLLabel& label, COLORREF clr)
+void CAxisSettingsDlg::SetLabelColor(CBLLabel& label, COLORREF color)
 {
-	label.SetBkColor(clr);
-	label.Invalidate();               // 鏍囪鍖哄煙鏃犳晥
-	label.UpdateWindow();             // 绔嬪嵆鍒锋柊
+	label.SetBkColor(color);
+	label.Invalidate();              // 鏍囪鍖哄煙鏃犳晥
+	label.UpdateWindow();            // 绔嬪嵆鍒锋柊
 }
 
 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));	// 榛樿鑳屾櫙鑹�
-		}
+		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);
+	}
+}
 
-		m_pageButtons[i].Invalidate();
+void CAxisSettingsDlg::HideEditCursor(int nCtrlID)
+{
+	CEdit* pEdit = (CEdit*)GetDlgItem(nCtrlID);
+	if (pEdit && pEdit->GetSafeHwnd()) {
+		pEdit->EnableWindow(FALSE); // 绂佺敤鎺т欢
+		pEdit->SetReadOnly(TRUE);   // 璁剧疆涓哄彧璇�
+		pEdit->HideCaret();         // 闅愯棌鍏夋爣
 	}
 }
 
@@ -265,14 +292,14 @@
 	};
 
 	// 鏇存柊鎺т欢鏄剧ず
-	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)
@@ -297,17 +324,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);
 	}
 }
 
@@ -343,45 +415,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);
 }
 
@@ -495,7 +571,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);
 		}
@@ -505,7 +581,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);
 		}
@@ -515,7 +591,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);
 		}
@@ -525,7 +601,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);
 		}
@@ -535,7 +611,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);
 		}
@@ -545,22 +621,21 @@
 	});
 
 	// 鍐欏叆瀹氫綅鐐规暟鎹�
-	/*
 	int positionStartAddress = startAddress + 100;
 	for (size_t i = 0; i < axisData.positions.size(); ++i) {
 		const auto& position = axisData.positions[i];
-		unsigned int positionAddress = positionStartAddress + (i * 4);
+		unsigned int positionAddress = positionStartAddress + (i * 2);
 
-		m_pPLC->writeWord(component, positionAddress, (int)position.second, [i](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, addr, value);
+				TRACE("\n鍐欏叆鎴愬姛: 瀹氫綅鐐� %d, 鍦板潃: %d, 鍊�: %lu\n", i + 1, positionAddress, value);
 			}
 			else {
-				TRACE("\n鍐欏叆澶辫触: 瀹氫綅鐐� %d, 鍦板潃: %d, 閿欒鐮�: %d\n", i + 1, addr, flag);
+				TRACE("\n鍐欏叆澶辫触: 瀹氫綅鐐� %d, 鍦板潃: %d, 閿欒鐮�: %d\n", i + 1, positionAddress, flag);
 			}
 		});
 	}
-	*/
 }
 
 void CAxisSettingsDlg::handleAxisOperation(AxisOperationType eOpType, bool bPressed)
@@ -582,11 +657,12 @@
 	}
 
 	// 鏍规嵁鎿嶄綔绫诲瀷璁$畻鐩爣鍦板潃
-	char szWrite[4] = {0x0, 0x0, 0x0, 0x0};
+	int bitIndex = 0;
+	char szWrite[4] = { 0x0, 0x0, 0x0, 0x0 };
 	switch (eOpType) {
 	case AxisOperationType::OPR:
-		startAddress += 0; // OPR 淇″彿鍦板潃 0,闂姩淇℃伅04.0
-		szWrite[0] = 0x1;
+		startAddress += 0; // OPR 淇″彿鍦板潃 0,闂姩淇℃伅06.0
+		szWrite[0] = bPressed ? 0x1 : 0;
 		break;
 	case AxisOperationType::JOG_ADD:
 		startAddress += 01; // JOG+ 淇″彿鍦板潃 c
@@ -597,22 +673,21 @@
 		szWrite[1] = bPressed ? 0x20 : 0;
 		break;
 	case AxisOperationType::STOP:
-		startAddress += 14; // STOP 淇″彿鍦板潃
+		startAddress += 05; // STOP 淇″彿鍦板潃 5.e
+		szWrite[1] = bPressed ? 0x40 : 0;
+		break;
+	case AxisOperationType::SEV_ON:
+		startAddress += 01; // SEV_ON 淇″彿鍦板潃 1.a
+		szWrite[1] = bPressed ? 0x04 : 0;
 		break;
 	case AxisOperationType::POSITION_1:
-		startAddress += 16; // 瀹氫綅鐐� 1 淇″彿鍦板潃
-		break;
 	case AxisOperationType::POSITION_2:
-		startAddress += 18; // 瀹氫綅鐐� 2 淇″彿鍦板潃
-		break;
 	case AxisOperationType::POSITION_3:
-		startAddress += 20; // 瀹氫綅鐐� 3 淇″彿鍦板潃
-		break;
 	case AxisOperationType::POSITION_4:
-		startAddress += 22; // 瀹氫綅鐐� 4 淇″彿鍦板潃
-		break;
 	case AxisOperationType::POSITION_5:
-		startAddress += 24; // 瀹氫綅鐐� 5 淇″彿鍦板潃
+		startAddress += ((m_currentPage - 1) * 5 + ((int)eOpType - (int)AxisOperationType::POSITION_1 + 1)) / 16; 
+		bitIndex = ((m_currentPage-1) * 5 + ((int)eOpType - (int)AxisOperationType::POSITION_1 + 1)) % 16;
+		if(bPressed) CToolUnits::setBit(szWrite, bitIndex);
 		break;
 	default:
 		AfxMessageBox(_T("鏈煡鎿嶄綔绫诲瀷锛�"));
@@ -631,7 +706,7 @@
 }
 
 void CAxisSettingsDlg::readPLCDataToUI(int nAxisId)
-{	
+{
 	// 浠� RecipeManager 鑾峰彇杞存暟鎹�
 	RecipeManager& recipeManager = RecipeManager::getInstance();
 	auto axisData = recipeManager.getAxis(nAxisId);
@@ -644,80 +719,30 @@
 	endAddress = startAddress + 300;
 	readSize = (endAddress - startAddress + 1) * 2;
 
-	{
-		auto funOnReadData = [&, startAddress, readSize](IMcChannel* pChannel, int addr, char* pData, unsigned int nDataSize, int flag) -> void {
-			if (nDataSize == readSize && flag == 0 && ::IsWindow(m_hWnd)) {
-				double fCurPos = CToolUnits::toInt32(&pData[20*2]) * 0.001;
-				double fManualSpeed = CToolUnits::toInt32(&pData[82 * 2]) * 0.001;
-				double fAutoSpeed = CToolUnits::toInt32(&pData[84 * 2]) * 0.001;
-				double fPrm = CToolUnits::toInt32(&pData[50 * 2]) * 0.1;
-				int nLoad = CToolUnits::toInt16(&pData[54 * 2]);
-				int nErrCode = CToolUnits::toInt16(&pData[26 * 2]);
-				int nAlarmCode = CToolUnits::toInt16(&pData[27 * 2]);
-				CToolUnits::setDlgItemDouble(this, IDC_EDIT_AXIS_CURR_POS, fCurPos);
-				CToolUnits::setDlgItemDouble(this, IDC_EDIT_AXIS_CURR_MANUAL_SPEED, fManualSpeed);
-				CToolUnits::setDlgItemDouble(this, IDC_EDIT_AXIS_CURR_AUTO_SPEED, fAutoSpeed);
-				CToolUnits::setDlgItemDouble(this, IDC_EDIT_AXIS_CURR_ROTA_SPEED, fPrm);
-				SetDlgItemInt(IDC_EDIT_AXIS_CURR_LOAD, nLoad);
-				SetDlgItemInt(IDC_EDIT_AXIS_CURR_ERROR_NUMBER, nErrCode);
-				SetDlgItemInt(IDC_EDIT_AXIS_CURR_ALARM_NUMBER, nAlarmCode);
+	auto funOnReadData = [&, 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;
+			m_fAutoSpeed = CToolUnits::toInt32(&pData[84 * 2]) * 0.001;
+			m_fPrm = CToolUnits::toInt32(&pData[50 * 2]) * 0.1;
+			m_nLoad = CToolUnits::toInt16(&pData[54 * 2]);
+			m_nErrCode = CToolUnits::toInt16(&pData[26 * 2]);
+			m_nAlarmCode = CToolUnits::toInt16(&pData[27 * 2]);
 
-				// OPR 淇″彿
-				BOOL bFLS = CToolUnits::getBit(pData[10 * 2], 1);
-				if (bFLS) {
-					SetLabelColor(m_staticFLS, RGB(0, 255, 0));
-				}
-				else {
-					SetLabelColor(m_staticFLS, RGB(0, 180, 0));
-				}
+			m_bSEV = CToolUnits::getBit(pData[1 * 2 + 1], 0xa - 8);
+			m_bFLS = CToolUnits::getBit(pData[10 * 2], 1);
+			m_bDOG = CToolUnits::getBit(pData[10 * 2], 6);
+			m_bRLS = CToolUnits::getBit(pData[10 * 2], 0);
+			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);
 
-				BOOL bDOG = CToolUnits::getBit(pData[10 * 2], 6);
-				if (bDOG) {
-					SetLabelColor(m_staticDOG, RGB(0, 255, 0));
-				}
-				else {
-					SetLabelColor(m_staticDOG, RGB(0, 180, 0));
-				}
-
-				BOOL bRLS = CToolUnits::getBit(pData[10 * 2], 0);
-				if (bRLS) {
-					SetLabelColor(m_staticRLS, RGB(0, 255, 0));
-				}
-				else {
-					SetLabelColor(m_staticRLS, RGB(0, 180, 0));
-				}
-
-				BOOL bReady = CToolUnits::getBit(pData[10 * 2 + 1], 0xA - 8);
-				if (bReady) {
-					SetLabelColor(m_staticReady, RGB(0, 255, 0));
-				}
-				else {
-					SetLabelColor(m_staticReady, RGB(0, 180, 0));
-				}
-
-				BOOL bBusy = CToolUnits::getBit(pData[10 * 2 + 1], 0xB - 8);
-				if (bBusy) {
-					SetLabelColor(m_staticBusy, RGB(0, 255, 0));
-				}
-				else {
-					SetLabelColor(m_staticBusy, RGB(0, 180, 0));
-				}
-
-				BOOL bErr = CToolUnits::getBit(pData[10 * 2 + 1], 0xF - 8);
-				if (bErr) {
-					SetLabelColor(m_staticErr, RGB(255, 0, 0));
-				}
-				else {
-					SetLabelColor(m_staticErr, RGB(0, 180, 0));
-				}
-
-				m_bJogAddState = CToolUnits::getBit(pData[1 + 1], 0xC - 8);	// 1.D
-				m_bJogSubState = CToolUnits::getBit(pData[1+1], 0xD - 8);	// 1.D
-			}
-		};
-		m_pPLC->readData(component, startAddress, readSize, funOnReadData);
-	}
+			PostMessage(ID_MSG_UPDATA_DATA_TO_UI);
+		}
+	};
+	m_pPLC->readData(component, startAddress, readSize, funOnReadData);
 }
+
 
 BEGIN_MESSAGE_MAP(CAxisSettingsDlg, CDialogEx)
 	ON_BN_CLICKED(IDC_BUTTON_AXIS_LAST, &CAxisSettingsDlg::OnBnClickedButtonAxisLast)
@@ -736,10 +761,13 @@
 	ON_BN_CLICKED(IDC_BUTTON_AXIS_TEST_STOP, &CAxisSettingsDlg::OnBnClickedButtonAxisTestStop)
 	ON_CBN_SELCHANGE(IDC_COMBO_AXIS_NAME, &CAxisSettingsDlg::OnSelchangeComboAxisName)
 	ON_BN_CLICKED(IDC_BUTTON_AXIS_SAVE, &CAxisSettingsDlg::OnBnClickedButtonAxisSave)
+	ON_MESSAGE(ID_MSG_UPDATA_DATA_TO_UI, &CAxisSettingsDlg::OnUpdateDataToUI)
 	ON_WM_SIZE()
 	ON_WM_CTLCOLOR()
 	ON_WM_SIZING()
 	ON_WM_TIMER()
+	ON_WM_CLOSE()
+	ON_BN_CLICKED(IDC_BUTTON_AXIS_SEV, &CAxisSettingsDlg::OnBnClickedButtonAxisSev)
 END_MESSAGE_MAP()
 
 
@@ -755,15 +783,72 @@
 	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) {
-		pLabel->SetBkColor(RGB(255, 255, 255));
+	m_pBlLabels[0]->SubclassDlgItem(IDC_STATIC_AXIS_TEST_FLS, this);
+	m_pBlLabels[1]->SubclassDlgItem(IDC_STATIC_AXIS_TEST_DOG, this);
+	m_pBlLabels[2]->SubclassDlgItem(IDC_STATIC_AXIS_TEST_RLS, this);
+	m_pBlLabels[3]->SubclassDlgItem(IDC_STATIC_AXIS_TEST_READY, this);
+	m_pBlLabels[4]->SubclassDlgItem(IDC_STATIC_AXIS_TEST_BUSY, this);
+	m_pBlLabels[5]->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));
 		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;
@@ -823,54 +908,114 @@
 BOOL CAxisSettingsDlg::PreTranslateMessage(MSG* pMsg)
 {
 	// TODO: 鍦ㄦ娣诲姞涓撶敤浠g爜鍜�/鎴栬皟鐢ㄥ熀绫�
+	CWnd* pWnd = CWnd::FromHandle(pMsg->hwnd);
 
-	if (pMsg->message == WM_LBUTTONDOWN)
-	{
-		if (pMsg->hwnd == GetDlgItem(IDC_BUTTON_AXIS_TEST_JOG_ADD)->m_hWnd)
-		{
-			int nSleep = 100 - int(GetTickCount64() - m_ullJogPressedTick);
-			if (!m_bJogAddState) {
-				m_bJogAddState = !m_bJogAddState;
-				Sleep(nSleep < 0 ? 0 : nSleep);
+	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, 5, 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));
+			}
+		}
+
+		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);
-				m_ullJogPressedTick = GetTickCount64();
-				TRACE("JOG+ 鎸夐挳鎸変笅 %d\n", nSleep);
 			}
-		}
-		else if (pMsg->hwnd == GetDlgItem(IDC_BUTTON_AXIS_TEST_JOG_SUB)->m_hWnd)
-		{
-			int nSleep = 100 - int(GetTickCount64() - m_ullJogPressedTick);
-			if (!m_bJogSubState) {
-				m_bJogSubState = !m_bJogSubState;
-				Sleep(nSleep < 0 ? 0 : nSleep);
+			else if (pMsg->hwnd == GetDlgItem(IDC_BUTTON_AXIS_TEST_JOG_SUB)->m_hWnd) {
+				TRACE("JOG- 鎸夐挳鎸変笅\n");
+				// 鍚姩瀹氭椂鍣ㄨ繛缁彂閫佷俊鍙�
 				handleAxisOperation(AxisOperationType::JOG_SUB, true);
-				m_ullJogPressedTick = GetTickCount64();
-				TRACE("JOG- 鎸夐挳鎸変笅%d\n", nSleep);
 			}
 		}
-	}
-	else if (pMsg->message == WM_LBUTTONUP)
-	{
-		if (pMsg->hwnd == GetDlgItem(IDC_BUTTON_AXIS_TEST_JOG_ADD)->m_hWnd)
-		{
-			int nSleep = 100 - int(GetTickCount64() - m_ullJogPressedTick);
-			if (m_bJogAddState) {
-				m_bJogAddState = !m_bJogAddState;
-				Sleep(nSleep < 0 ? 0 : nSleep);
+		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);
-				m_ullJogPressedTick = GetTickCount64();
-				TRACE("JOG+ 鎸夐挳鏉惧紑 %d\n", nSleep);
 			}
-		}
-		else if (pMsg->hwnd == GetDlgItem(IDC_BUTTON_AXIS_TEST_JOG_SUB)->m_hWnd)
-		{
-			int nSleep = 100 - int(GetTickCount64() - m_ullJogPressedTick);
-			if (m_bJogSubState) {
-				m_bJogSubState = !m_bJogSubState;
-				Sleep(nSleep < 0 ? 0 : nSleep);
+			else if (pMsg->hwnd == GetDlgItem(IDC_BUTTON_AXIS_TEST_JOG_SUB)->m_hWnd) {
+				TRACE("JOG- 鎸夐挳鏉惧紑\n");
 				handleAxisOperation(AxisOperationType::JOG_SUB, false);
-				m_ullJogPressedTick = GetTickCount64();
-				TRACE("JOG- 鎸夐挳鏉惧紑%d\n", nSleep);
 			}
 		}
 	}
@@ -894,8 +1039,7 @@
 	AdjustControls(dScaleX, dScaleY);
 
 	// 鍔ㄦ�佽皟鏁村悇涓� CBLLabel 鐨勫瓧浣撳ぇ灏�
-	CBLLabel* pLabels[] = { &m_staticFLS, &m_staticDOG, &m_staticRLS, &m_staticReady, &m_staticBusy, &m_staticBusy };
-	for (auto pLabel : pLabels) {
+	for (auto pLabel : m_pBlLabels) {
 		AdjustLabelFont(*pLabel);
 	}
 
@@ -949,90 +1093,109 @@
 void CAxisSettingsDlg::OnBnClickedButtonAxisLast()
 {
 	// TODO: 鍦ㄦ娣诲姞鎺т欢閫氱煡澶勭悊绋嬪簭浠g爜
-	//updateAxisSelection(-1);
+	updateAxisSelection(-1);
 }
 
 void CAxisSettingsDlg::OnBnClickedButtonAxisNext()
 {
 	// TODO: 鍦ㄦ娣诲姞鎺т欢閫氱煡澶勭悊绋嬪簭浠g爜
-	//updateAxisSelection(1);
+	updateAxisSelection(1);
 }
 
 void CAxisSettingsDlg::OnBnClickedButtonAxisAnchorPointGroup1()
 {
 	// TODO: 鍦ㄦ娣诲姞鎺т欢閫氱煡澶勭悊绋嬪簭浠g爜
-	//switchToPage(1);
+	switchToPage(1);
 }
 
 void CAxisSettingsDlg::OnBnClickedButtonAxisAnchorPointGroup2()
 {
 	// TODO: 鍦ㄦ娣诲姞鎺т欢閫氱煡澶勭悊绋嬪簭浠g爜
-	//switchToPage(2);
+	switchToPage(2);
 }
 
 void CAxisSettingsDlg::OnBnClickedButtonAxisAnchorPointGroup3()
 {
 	// TODO: 鍦ㄦ娣诲姞鎺т欢閫氱煡澶勭悊绋嬪簭浠g爜
-	//switchToPage(3);
+	switchToPage(3);
 }
 
 void CAxisSettingsDlg::OnBnClickedButtonAxisAnchorPointGroup4()
 {
 	// TODO: 鍦ㄦ娣诲姞鎺т欢閫氱煡澶勭悊绋嬪簭浠g爜
-	//switchToPage(4);
+	switchToPage(4);
 }
 
 void CAxisSettingsDlg::OnBnClickedButtonAxisAnchorPointGroup5()
 {
 	// TODO: 鍦ㄦ娣诲姞鎺т欢閫氱煡澶勭悊绋嬪簭浠g爜
-	//switchToPage(5);
+	switchToPage(5);
 }
 
 void CAxisSettingsDlg::OnBnClickedButtonAxisAnchorPoint1()
 {
 	// TODO: 鍦ㄦ娣诲姞鎺т欢閫氱煡澶勭悊绋嬪簭浠g爜
-	//handleAxisOperation(AxisOperationType::POSITION_1, true);
+	handleAxisOperation(AxisOperationType::POSITION_1, true);
+	Sleep(200);
+	handleAxisOperation(AxisOperationType::POSITION_1, false);
 }
 
 void CAxisSettingsDlg::OnBnClickedButtonAxisAnchorPoint2()
 {
 	// TODO: 鍦ㄦ娣诲姞鎺т欢閫氱煡澶勭悊绋嬪簭浠g爜
-	//handleAxisOperation(AxisOperationType::POSITION_2, true);
+	handleAxisOperation(AxisOperationType::POSITION_2, true);
+	Sleep(200);
+	handleAxisOperation(AxisOperationType::POSITION_2, false);
 }
 
 void CAxisSettingsDlg::OnBnClickedButtonAxisAnchorPoint3()
 {
 	// TODO: 鍦ㄦ娣诲姞鎺т欢閫氱煡澶勭悊绋嬪簭浠g爜
-	//handleAxisOperation(AxisOperationType::POSITION_3, true);
+	handleAxisOperation(AxisOperationType::POSITION_3, true);
+	Sleep(200);
+	handleAxisOperation(AxisOperationType::POSITION_3, false);
 }
 
 void CAxisSettingsDlg::OnBnClickedButtonAxisAnchorPoint4()
 {
 	// TODO: 鍦ㄦ娣诲姞鎺т欢閫氱煡澶勭悊绋嬪簭浠g爜
-	//handleAxisOperation(AxisOperationType::POSITION_4, true);
+	handleAxisOperation(AxisOperationType::POSITION_4, true);
+	Sleep(200);
+	handleAxisOperation(AxisOperationType::POSITION_4, false);
 }
 
 void CAxisSettingsDlg::OnBnClickedButtonAxisAnchorPoint5()
 {
 	// TODO: 鍦ㄦ娣诲姞鎺т欢閫氱煡澶勭悊绋嬪簭浠g爜
-	//handleAxisOperation(AxisOperationType::POSITION_5, true);
+	handleAxisOperation(AxisOperationType::POSITION_5, true);
+	Sleep(200);
+	handleAxisOperation(AxisOperationType::POSITION_5, false);
 }
 
 void CAxisSettingsDlg::OnBnClickedButtonAxisTestOpr()
 {
 	// TODO: 鍦ㄦ娣诲姞鎺т欢閫氱煡澶勭悊绋嬪簭浠g爜
-	//handleAxisOperation(AxisOperationType::OPR, true);
+	handleAxisOperation(AxisOperationType::OPR, true);
+	Sleep(200);
+	handleAxisOperation(AxisOperationType::OPR, false);
 }
 
 void CAxisSettingsDlg::OnBnClickedButtonAxisTestStop()
 {
 	// TODO: 鍦ㄦ娣诲姞鎺т欢閫氱煡澶勭悊绋嬪簭浠g爜
-	//handleAxisOperation(AxisOperationType::STOP, true);
+	handleAxisOperation(AxisOperationType::STOP, true);
+	Sleep(200);
+	handleAxisOperation(AxisOperationType::STOP, false);
+}
+
+void CAxisSettingsDlg::OnBnClickedButtonAxisSev()
+{
+	// TODO: 鍦ㄦ娣诲姞鎺т欢閫氱煡澶勭悊绋嬪簭浠g爜
+	handleAxisOperation(AxisOperationType::SEV_ON, !m_bSEV);
 }
 
 void CAxisSettingsDlg::OnSelchangeComboAxisName()
 {
-
 	// TODO: 鍦ㄦ娣诲姞鎺т欢閫氱煡澶勭悊绋嬪簭浠g爜
 	int axisId = getCurrentSelectedAxisID();
 	if (axisId == -1) {
@@ -1047,7 +1210,6 @@
 
 void CAxisSettingsDlg::OnBnClickedButtonAxisSave()
 {
-
 	// TODO: 鍦ㄦ娣诲姞鎺т欢閫氱煡澶勭悊绋嬪簭浠g爜
 	int axisId = getCurrentSelectedAxisID();
 	if (axisId == -1) {
@@ -1076,17 +1238,82 @@
 	AfxMessageBox(cstrMessage);
 }
 
+LRESULT CAxisSettingsDlg::OnUpdateDataToUI(WPARAM wParam, LPARAM lParam)
+{
+	CToolUnits::setDlgItemDouble(this, IDC_EDIT_AXIS_CURR_POS, m_fCurPos);
+	CToolUnits::setDlgItemDouble(this, IDC_EDIT_AXIS_CURR_MANUAL_SPEED, m_fManualSpeed);
+	CToolUnits::setDlgItemDouble(this, IDC_EDIT_AXIS_CURR_AUTO_SPEED, m_fAutoSpeed);
+	CToolUnits::setDlgItemDouble(this, IDC_EDIT_AXIS_CURR_ROTA_SPEED, m_fPrm);
+	SetDlgItemInt(IDC_EDIT_AXIS_CURR_LOAD, m_nLoad);
+	SetDlgItemInt(IDC_EDIT_AXIS_CURR_ERROR_NUMBER, m_nErrCode);
+	SetDlgItemInt(IDC_EDIT_AXIS_CURR_ALARM_NUMBER, m_nAlarmCode);
+
+	//OPR 淇″彿
+	if (m_bFLS) {
+		SetLabelColor(*m_pBlLabels[0], RGB(0, 255, 0));
+	}
+	else {
+		SetLabelColor(*m_pBlLabels[0], RGB(0, 180, 0));
+	}
+
+	if (m_bDOG) {
+		SetLabelColor(*m_pBlLabels[1], RGB(0, 255, 0));
+	}
+	else {
+		SetLabelColor(*m_pBlLabels[1], RGB(0, 180, 0));
+	}
+
+	if (m_bRLS) {
+		SetLabelColor(*m_pBlLabels[2], RGB(0, 255, 0));
+	}
+	else {
+		SetLabelColor(*m_pBlLabels[2], RGB(0, 180, 0));
+	}
+
+	if (m_bReady) {
+		SetLabelColor(*m_pBlLabels[3], RGB(0, 255, 0));
+	}
+	else {
+		SetLabelColor(*m_pBlLabels[3], RGB(0, 180, 0));
+	}
+
+	if (m_bBusy) {
+		SetLabelColor(*m_pBlLabels[4], RGB(0, 255, 0));
+	}
+	else {
+		SetLabelColor(*m_pBlLabels[4], RGB(0, 180, 0));
+	}
+
+	if (m_bErr) {
+		SetLabelColor(*m_pBlLabels[5], RGB(255, 0, 0));
+	}
+	else {
+		SetLabelColor(*m_pBlLabels[5], RGB(0, 180, 0));
+	}
+
+	return 0;
+}
+
 void CAxisSettingsDlg::OnTimer(UINT_PTR nIDEvent)
 {
 	if (TIMER_READ_PLC_DATA == nIDEvent) {
 		ASSERT(m_pPLC);
 
 		int nAxisId = getCurrentSelectedAxisID();
-		if (nAxisId != -1) {
-			readPLCDataToUI(nAxisId);
+		if (nAxisId == -1) {
+			return;
 		}
+
+		readPLCDataToUI(nAxisId);
 	}	
 
-
 	CDialogEx::OnTimer(nIDEvent);
 }
+
+void CAxisSettingsDlg::OnClose()
+{
+	// TODO: 鍦ㄦ娣诲姞娑堟伅澶勭悊绋嬪簭浠g爜鍜�/鎴栬皟鐢ㄩ粯璁ゅ��
+	KillTimer(TIMER_READ_PLC_DATA);
+
+	CDialogEx::OnClose();
+}

--
Gitblit v1.9.3