From df0863b2c29fa227d186e6b8aeb4a856dcae12f3 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期一, 02 十二月 2024 13:57:42 +0800
Subject: [PATCH] 1.增加PLC组件页

---
 SourceCode/Bond/BondEq/View/AxisSettingsDlg.cpp |  628 +++++++++++++++++++++++++++++++++++++++++++-------------
 1 files changed, 481 insertions(+), 147 deletions(-)

diff --git a/SourceCode/Bond/BondEq/View/AxisSettingsDlg.cpp b/SourceCode/Bond/BondEq/View/AxisSettingsDlg.cpp
index 2079bf2..dcdc219 100644
--- a/SourceCode/Bond/BondEq/View/AxisSettingsDlg.cpp
+++ b/SourceCode/Bond/BondEq/View/AxisSettingsDlg.cpp
@@ -6,9 +6,13 @@
 #include "afxdialogex.h"
 #include "AxisSettingsDlg.h"
 #include "ToolUnits.h"
+#include <cctype>
+#include <algorithm>
 
 #define TIMER_INIT				1
 #define TIMER_READ_PLC_DATA		2
+#define TIMER_JOG_ADD           3
+#define TIMER_JOG_SUB           4
 
 // CAxisSettingsDlg 瀵硅瘽妗�
 
@@ -39,6 +43,11 @@
 	m_pPLC = pPLC;
 }
 
+void CAxisSettingsDlg::SetRecipeName(const CString& strRecipeName)
+{
+	m_strRecipeName = strRecipeName;
+}
+
 void CAxisSettingsDlg::DoDataExchange(CDataExchange* pDX)
 {
 	CDialogEx::DoDataExchange(pDX);
@@ -57,6 +66,11 @@
 	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)
@@ -190,10 +204,43 @@
 	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));	// 榛樿鑳屾櫙鑹�
+		}
+
+		m_pageButtons[i].Invalidate();
+	}
+}
+
+int CAxisSettingsDlg::getCurrentSelectedAxisID()
+{
+	int currentIndex = m_comboAxisNO.GetCurSel();
+	if (currentIndex == CB_ERR) {
+		return -1;
+	}
+
+	CString strAxisIDStr;
+	m_comboAxisNO.GetLBText(currentIndex, strAxisIDStr);
+	return _ttoi(strAxisIDStr);
+}
+
 void CAxisSettingsDlg::initializeAxisIDCombo()
 {
-	// 鑾峰彇鎵�鏈夎酱鐨勮酱NO
-	auto axisNumbers = AxisManager::getInstance().getUsedAxisIds();
+	// 妫�鏌ラ厤鏂规槸鍚﹀姞杞芥垚鍔�
+	RecipeManager& recipeManager = RecipeManager::getInstance();
+	if (m_strRecipeName.IsEmpty() || !recipeManager.loadRecipe(std::string(CT2A(m_strRecipeName)))) {
+		AfxMessageBox(_T("鍔犺浇閰嶆柟澶辫触锛�"));
+		return;
+	}
+
+	// 鑾峰彇鎵�鏈夎酱鐨勭紪鍙�
+	auto axisNumbers = recipeManager.getAllAxisID();
 
 	// 娓呯┖涓嬫媺妗�
 	m_comboAxisNO.ResetContent();
@@ -211,107 +258,320 @@
 	}
 }
 
-void CAxisSettingsDlg::refreshAxisDetails()
+void CAxisSettingsDlg::refreshAxisDetails(int nAxisId)
 {
-	// 鑾峰彇褰撳墠閫変腑鐨勮酱ID
-	int currentIndex = m_comboAxisNO.GetCurSel();
-	if (currentIndex == CB_ERR) {
-		AfxMessageBox(_T("璇烽�夋嫨涓�涓湁鏁堢殑杞寸紪鍙凤紒"));
-		return;
-	}
+	// 鑾峰彇杞存暟鎹�
+	RecipeManager& recipeManager = RecipeManager::getInstance();
+	auto axisDetails = recipeManager.getAxis(nAxisId);
 
-	CString axisIDStr;
-	m_comboAxisNO.GetLBText(currentIndex, axisIDStr);
-	int axisId = _ttoi(axisIDStr);
-
-	// 鑾峰彇杞翠俊鎭�
-	auto axisDetails = AxisManager::getInstance().getAxis(axisId);
-	if (axisDetails.empty()) {
-		AfxMessageBox(_T("鏈壘鍒拌酱淇℃伅锛�"));
-		return;
-	}
-
-	// 鏍煎紡鍖栨诞鐐规暟涓� 3 浣嶅皬鏁扮殑 CString
-	auto formatDouble = [](const std::string& value) -> CString {
-		char buffer[32];
-		snprintf(buffer, sizeof(buffer), "%.3f", std::stod(value));
-		return CString(buffer);
+	auto formatDouble = [](double value) -> CString {
+		CString str;
+		str.Format(_T("%.3f"), value);
+		return str;
 	};
 
-	// 鍒锋柊鐣岄潰鎺т欢鏁版嵁
-	m_staticAxisNO.SetWindowText(CString(axisDetails[1].c_str()));			// 杞碞O
-	m_staticAxisDescription.SetWindowText(CString(axisDetails[2].c_str())); // 杞存弿杩�
-	m_staticStartAddress.SetWindowText(CString(axisDetails[3].c_str()));	// 璧峰鍦板潃
-	m_editJogDistance.SetWindowText(formatDouble(axisDetails[4]));			// 寰姩閲�
-	m_editManualSpeed.SetWindowText(formatDouble(axisDetails[5]));			// 鎵嬪姩閫熷害
-	m_editAutoSpeed.SetWindowText(formatDouble(axisDetails[8]));			// 鑷姩閫熷害
-	m_editAccelerationTime.SetWindowText(formatDouble(axisDetails[11]));	// 鍔犻�熸椂闂�
-	m_editDecelerationTime.SetWindowText(formatDouble(axisDetails[12]));	// 鍑忛�熸椂闂�
+	// 鏇存柊鎺т欢鏄剧ず
+	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));	// 鍑忛�熸椂闂�
 }
 
-void CAxisSettingsDlg::refreshPositionDetails(int pageNumber)
+void CAxisSettingsDlg::refreshPositionDetails(int nAxisId, int pageNumber)
 {
+	RecipeManager& recipeManager = RecipeManager::getInstance();
 	// 姣忛〉鏄剧ず鐨勫畾浣嶇偣鏁伴噺
 	const int pageSize = 5;
 
-	// 鑾峰彇褰撳墠閫変腑鐨勮酱ID
+	// 鑾峰彇瀹氫綅鐐规暟鎹�
+	auto positions = recipeManager.getPositions(nAxisId, pageNumber, pageSize);
+
+	// 鍒锋柊 UI
+	for (int i = 0; i < pageSize; ++i) {
+		CString descriptionCtrlName, positionCtrlName;
+		descriptionCtrlName.Format(_T("IDC_EDIT_AXIS_ANCHOR_POINT_DESCRIP%d"), i + 1);
+		positionCtrlName.Format(_T("IDC_EDIT_AXIS_ANCHOR_POINT%d"), i + 1);
+
+		UINT descriptionCtrlId = FindIDByName(descriptionCtrlName);
+		UINT positionCtrlId = FindIDByName(positionCtrlName);
+
+		CWnd* pDescriptionCtrl = GetDlgItem(descriptionCtrlId);
+		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);
+
+			if (pDescriptionCtrl) pDescriptionCtrl->SetWindowText(description);
+			if (pPositionCtrl) pPositionCtrl->SetWindowText(value);
+		}
+		else {
+			if (pDescriptionCtrl) pDescriptionCtrl->SetWindowText(_T(""));
+			if (pPositionCtrl) pPositionCtrl->SetWindowText(_T(""));
+		}
+	}
+}
+
+void CAxisSettingsDlg::updateAxisSelection(int offset)
+{
 	int currentIndex = m_comboAxisNO.GetCurSel();
 	if (currentIndex == CB_ERR) {
 		AfxMessageBox(_T("璇烽�夋嫨涓�涓湁鏁堢殑杞寸紪鍙凤紒"));
 		return;
 	}
 
-	CString axisIDStr;
-	m_comboAxisNO.GetLBText(currentIndex, axisIDStr);
-	int axisId = _ttoi(axisIDStr);
+	int newIndex = currentIndex + offset;
+	if (newIndex < 0 || newIndex >= m_comboAxisNO.GetCount()) {
+		CString error;
+		error.Format(_T("宸茬粡鍒拌揪%s涓�涓酱锛�"), offset < 0 ? _T("涓�") : _T("涓�"));
+		AfxMessageBox(error);
+		return;
+	}
 
-	// 鑾峰彇瀹氫綅鐐规暟鎹�
-	auto positions = AxisManager::getInstance().getPositions(axisId, pageNumber, pageSize);
+	m_comboAxisNO.SetCurSel(newIndex);
+	refreshAxisDetails(newIndex + 1);
+	refreshPositionDetails(newIndex + 1, m_currentPage);
+	updatePageButtonStates();
+}
 
+void CAxisSettingsDlg::updateDataFromUI(int nAxisId)
+{
+	const int pageSize = 5; // 姣忛〉鏄剧ず 5 涓畾浣嶇偣
+
+	RecipeManager& recipeManager = RecipeManager::getInstance();
+	auto axisData = recipeManager.getAxis(nAxisId);
+
+	// 鑾峰彇鐣岄潰涓婄殑淇敼鍙傛暟
+	CString text;
+	m_editManualSpeed.GetWindowText(text);
+	axisData.manualSpeed = _ttof(text);
+
+	m_editAutoSpeed.GetWindowText(text);
+	axisData.autoSpeed = _ttof(text);
+
+	m_editAccelerationTime.GetWindowText(text);
+	axisData.accelerationTime = _ttof(text);
+
+	m_editDecelerationTime.GetWindowText(text);
+	axisData.decelerationTime = _ttof(text);
+
+	m_editJogDistance.GetWindowText(text);
+	axisData.jogDistance = _ttof(text);
+
+	// 鏇存柊瀹氫綅鐐规暟鎹�
 	for (int i = 0; i < pageSize; ++i) {
-		// 鍔ㄦ�佹瀯閫犳帶浠跺悕绉�
-		CString descriptionName;
-		CString positionName;
+		int index = (m_currentPage - 1) * pageSize + i;
 
-		// IDC_EDIT_AXIS_ANCHOR_POINT_DESCRIP1;
-		// IDC_EDIT_AXIS_ANCHOR_POINT1;
-		descriptionName.Format(_T("IDC_EDIT_AXIS_ANCHOR_POINT_DESCRIP%d"), i + 1);
-		positionName.Format(_T("IDC_EDIT_AXIS_ANCHOR_POINT%d"), i + 1);
+		if (index < axisData.positions.size()) {
+			CString descriptionName, positionName;
+			descriptionName.Format(_T("IDC_EDIT_AXIS_ANCHOR_POINT_DESCRIP%d"), i + 1);
+			positionName.Format(_T("IDC_EDIT_AXIS_ANCHOR_POINT%d"), i + 1);
 
-		// 鑾峰彇鎺т欢鎸囬拡
-		UINT unDescription = FindIDByName(descriptionName);
-		UINT unPosition = FindIDByName(positionName);
+			CEdit* pDescriptionEdit = (CEdit*)GetDlgItem(FindIDByName(descriptionName));
+			CEdit* pPositionEdit = (CEdit*)GetDlgItem(FindIDByName(positionName));
 
-		TRACE("CAxisSettingsDlg::refreshPositionDetails %unDescription[%d], unPosition[%d]\n", unDescription, unPosition);
-		if (unDescription == 0 || unPosition == 0) {
-			continue;
-		}
+			if (pDescriptionEdit && pPositionEdit) {
+				CString description, positionValue;
+				pDescriptionEdit->GetWindowText(description);
+				pPositionEdit->GetWindowText(positionValue);
 
-		CWnd* pDescription = GetDlgItem(unDescription);
-		CWnd* pPosition = GetDlgItem(unPosition);
-
-		if (i < positions.size() 
-			&& !positions[i][2].empty()
-			&& !positions[i][3].empty()) {
-			// 鏈夋暟鎹紝鍒锋柊鎻忚堪鍜屼綅缃�
-			CString description = CString(positions[i][2].c_str()); // 瀹氫綅鐐规弿杩�
-			CString positionValue;
-
-			// 淇濈暀3浣嶅皬鏁�
-			char buffer[32];
-			snprintf(buffer, sizeof(buffer), "%.3f", std::stod(positions[i][3]));
-			positionValue = CString(buffer);
-
-			if (pDescription) pDescription->SetWindowText(description);
-			if (pPosition) pPosition->SetWindowText(positionValue);
-		}
-		else {
-			// 鏃犳暟鎹紝娓呯┖鎺т欢鍐呭
-			if (pDescription) pDescription->SetWindowText(_T(""));
-			if (pPosition) pPosition->SetWindowText(_T(""));
+				// 鏇存柊 RecipeManager 涓殑鏁版嵁
+				axisData.positions[index].first = CT2A(description);
+				axisData.positions[index].second = _ttof(positionValue);
+			}
 		}
 	}
+
+	// 淇濆瓨鍥� RecipeManager
+	recipeManager.updateAxis(axisData);
 }
+
+void CAxisSettingsDlg::switchToPage(int targetPage)
+{
+	try {
+		// 濡傛灉褰撳墠椤甸潰宸茬粡鏄洰鏍囬〉闈紝鐩存帴杩斿洖
+		if (m_currentPage == targetPage) {
+			return;
+		}
+
+		// 鑾峰彇褰撳墠閫変腑鐨勮酱 ID
+		int axisId = getCurrentSelectedAxisID();
+		if (axisId == -1) {
+			AfxMessageBox(_T("璇烽�夋嫨涓�涓湁鏁堢殑杞寸紪鍙凤紒"));
+			return;
+		}
+
+		// 鏇存柊 UI 鏁版嵁鍒板唴瀛�
+		updateDataFromUI(axisId);
+
+		// 鍒囨崲椤甸潰
+		m_currentPage = targetPage;
+		refreshPositionDetails(axisId, targetPage);
+		updatePageButtonStates();
+	}
+	catch (const std::exception& ex) {
+		CString errorMsg;
+		errorMsg.Format(_T("鍒锋柊瀹氫綅缁�%d澶辫触锛�%s"), targetPage, CString(ex.what()));
+		AfxMessageBox(errorMsg, MB_ICONERROR);
+	}
+}
+
+void CAxisSettingsDlg::writeAxisDataToPLC(int nAxisId)
+{
+	// 浠� RecipeManager 鑾峰彇杞存暟鎹�
+	RecipeManager& recipeManager = RecipeManager::getInstance();
+	auto axisData = recipeManager.getAxis(nAxisId);
+
+	// 鍘婚櫎闈炴暟瀛楀瓧绗﹀苟杞崲璧峰鍦板潃
+	std::string cleanAddress = axisData.startAddress;
+	cleanAddress.erase(std::remove_if(cleanAddress.begin(), cleanAddress.end(),
+		[](char c) { return !std::isdigit(c); }), cleanAddress.end());
+	if (cleanAddress.empty()) {
+		AfxMessageBox(_T("鏃犳晥鐨勮捣濮嬪湴鍧�锛�"));
+		return;
+	}
+	int startAddress = std::stoi(cleanAddress);
+
+	// 鍐欏叆鎵嬪姩閫熷害
+	m_pPLC->writeWord(MC::SOFT_COMPONENT::D, 5120, (int)axisData.manualSpeed, [](IMcChannel* pChannel, int addr, DWORD value, int flag) {
+		if (flag == 0) {
+			TRACE("\n鍐欏叆鎴愬姛: 鎵嬪姩閫熷害, 鍦板潃: %d, 鍊�: %lu\n", addr, value);
+		}
+		else {
+			TRACE("\n鍐欏叆澶辫触: 鎵嬪姩閫熷害, 鍦板潃: %d, 閿欒鐮�: %d\n", addr, flag);
+		}
+	});
+
+	// 鍐欏叆鑷姩閫熷害
+	m_pPLC->writeWord(MC::SOFT_COMPONENT::D, startAddress + 2, (int)axisData.autoSpeed, [](IMcChannel* pChannel, int addr, DWORD value, int flag) {
+		if (flag == 0) {
+			TRACE("\n鍐欏叆鎴愬姛: 鑷姩閫熷害, 鍦板潃: %d, 鍊�: %lu\n", addr, value);
+		}
+		else {
+			TRACE("\n鍐欏叆澶辫触: 鑷姩閫熷害, 鍦板潃: %d, 閿欒鐮�: %d\n", addr, flag);
+		}
+	});
+
+	// 鍐欏叆鍔犻�熸椂闂�, 杞崲涓烘绉�
+	m_pPLC->writeWord(MC::SOFT_COMPONENT::D, startAddress + 4, (int)(axisData.accelerationTime * 1000), [](IMcChannel* pChannel, int addr, DWORD value, int flag) {
+		if (flag == 0) {
+			TRACE("\n鍐欏叆鎴愬姛: 鍔犻�熸椂闂�, 鍦板潃: %d, 鍊�: %lu\n", addr, value);
+		}
+		else {
+			TRACE("\n鍐欏叆澶辫触: 鍔犻�熸椂闂�, 鍦板潃: %d, 閿欒鐮�: %d\n", addr, flag);
+		}
+	});
+
+	// 鍐欏叆鍑忛�熸椂闂�, 杞崲涓烘绉�
+	m_pPLC->writeWord(MC::SOFT_COMPONENT::D, startAddress + 6, (int)(axisData.decelerationTime * 1000), [](IMcChannel* pChannel, int addr, DWORD value, int flag) {
+		if (flag == 0) {
+			TRACE("\n鍐欏叆鎴愬姛: 鍑忛�熸椂闂�, 鍦板潃: %d, 鍊�: %lu\n", addr, value);
+		}
+		else {
+			TRACE("\n鍐欏叆澶辫触: 鍑忛�熸椂闂�, 鍦板潃: %d, 閿欒鐮�: %d\n", addr, flag);
+		}
+	});
+
+	// 鍐欏叆寰姩閲�
+	m_pPLC->writeWord(MC::SOFT_COMPONENT::D, startAddress + 8, (int)axisData.jogDistance, [](IMcChannel* pChannel, int addr, DWORD value, int flag) {
+		if (flag == 0) {
+			TRACE("\n鍐欏叆鎴愬姛: 寰姩閲�, 鍦板潃: %d, 鍊�: %lu\n", addr, value);
+		}
+		else {
+			TRACE("\n鍐欏叆澶辫触: 寰姩閲�, 鍦板潃: %d, 閿欒鐮�: %d\n", addr, flag);
+		}
+	});
+
+	// 鍐欏叆瀹氫綅鐐规暟鎹�
+	int positionStartAddress = startAddress + 10;
+	for (size_t i = 0; i < axisData.positions.size(); ++i) {
+		const auto& position = axisData.positions[i];
+		int positionAddress = positionStartAddress + (i * 2);
+
+		m_pPLC->writeWord(MC::SOFT_COMPONENT::D, positionAddress, (int)position.second, [i](IMcChannel* pChannel, int addr, DWORD value, int flag) {
+			if (flag == 0) {
+				TRACE("\n鍐欏叆鎴愬姛: 瀹氫綅鐐� %d, 鍦板潃: %d, 鍊�: %lu\n", i + 1, addr, value);
+			}
+			else {
+				TRACE("\n鍐欏叆澶辫触: 瀹氫綅鐐� %d, 鍦板潃: %d, 閿欒鐮�: %d\n", i + 1, addr, flag);
+			}
+		});
+	}
+}
+
+void CAxisSettingsDlg::handleAxisOperation(AxisOperationType eOpType, bool bPressed)
+{
+	int nAxisId = getCurrentSelectedAxisID();
+	if (nAxisId == -1) {
+		AfxMessageBox(_T("鏈�夋嫨鏈夋晥鐨勮酱缂栧彿锛�"));
+		return;
+	}
+
+	// 鑾峰彇杞存暟鎹�
+	RecipeManager& recipeManager = RecipeManager::getInstance();
+	auto axisData = recipeManager.getAxis(nAxisId);
+
+	std::string strCleanAddress = axisData.startAddress;
+	strCleanAddress.erase(std::remove_if(strCleanAddress.begin(), strCleanAddress.end(),
+		[](unsigned char c) { return !std::isdigit(c); }), strCleanAddress.end());
+	if (strCleanAddress.empty()) {
+		AfxMessageBox(_T("鏃犳晥鐨勮捣濮嬪湴鍧�锛�"));
+		return;
+	}
+
+	int nStartAddress = std::stoi(strCleanAddress);
+
+	// 鏍规嵁鎿嶄綔绫诲瀷璁＄畻鐩爣鍦板潃
+	int nTargetAddress = nStartAddress;
+	switch (eOpType) {
+	case AxisOperationType::OPR:
+		nTargetAddress += 10; // OPR 淇″彿鍦板潃
+		break;
+	case AxisOperationType::JOG_ADD:
+		nTargetAddress += 12; // JOG+ 淇″彿鍦板潃
+		break;
+	case AxisOperationType::JOG_SUB:
+		nTargetAddress += 13; // JOG- 淇″彿鍦板潃
+		break;
+	case AxisOperationType::STOP:
+		nTargetAddress += 14; // STOP 淇″彿鍦板潃
+		break;
+	case AxisOperationType::POSITION_1:
+		nTargetAddress += 16; // 瀹氫綅鐐� 1 淇″彿鍦板潃
+		break;
+	case AxisOperationType::POSITION_2:
+		nTargetAddress += 18; // 瀹氫綅鐐� 2 淇″彿鍦板潃
+		break;
+	case AxisOperationType::POSITION_3:
+		nTargetAddress += 20; // 瀹氫綅鐐� 3 淇″彿鍦板潃
+		break;
+	case AxisOperationType::POSITION_4:
+		nTargetAddress += 22; // 瀹氫綅鐐� 4 淇″彿鍦板潃
+		break;
+	case AxisOperationType::POSITION_5:
+		nTargetAddress += 24; // 瀹氫綅鐐� 5 淇″彿鍦板潃
+		break;
+	default:
+		AfxMessageBox(_T("鏈煡鎿嶄綔绫诲瀷锛�"));
+		return;
+	}
+
+	// 鍚� PLC 鍐欏叆淇″彿
+	m_pPLC->writeBit(MC::SOFT_COMPONENT::D, nTargetAddress, bPressed, [eOpType, nTargetAddress, bPressed](IMcChannel* pChannel, int nAddr, DWORD nValue, int nFlag) {
+		if (nFlag == 0) {
+			TRACE("鎿嶄綔鎴愬姛锛氱被鍨�=%d锛屽湴鍧�=%d锛屽��=%d\n", static_cast<int>(eOpType), nAddr, bPressed);
+		}
+		else {
+			TRACE("鎿嶄綔澶辫触锛氱被鍨�=%d锛屽湴鍧�=%d锛岄敊璇爜=%d\n", static_cast<int>(eOpType), nAddr, nFlag);
+		}
+	});
+}
+
 
 BEGIN_MESSAGE_MAP(CAxisSettingsDlg, CDialogEx)
 	ON_BN_CLICKED(IDC_BUTTON_AXIS_LAST, &CAxisSettingsDlg::OnBnClickedButtonAxisLast)
@@ -327,10 +587,9 @@
 	ON_BN_CLICKED(IDC_BUTTON_AXIS_ANCHOR_POINT4, &CAxisSettingsDlg::OnBnClickedButtonAxisAnchorPoint4)
 	ON_BN_CLICKED(IDC_BUTTON_AXIS_ANCHOR_POINT5, &CAxisSettingsDlg::OnBnClickedButtonAxisAnchorPoint5)
 	ON_BN_CLICKED(IDC_BUTTON_AXIS_TEST_OPR, &CAxisSettingsDlg::OnBnClickedButtonAxisTestOpr)
-	ON_BN_CLICKED(IDC_BUTTON_AXIS_TEST_JOG_ADD, &CAxisSettingsDlg::OnBnClickedButtonAxisTestJogAdd)
-	ON_BN_CLICKED(IDC_BUTTON_AXIS_TEST_JOG_SUB, &CAxisSettingsDlg::OnBnClickedButtonAxisTestJogSub)
 	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_WM_SIZE()
 	ON_WM_CTLCOLOR()
 	ON_WM_SIZING()
@@ -346,7 +605,9 @@
 	CDialogEx::OnInitDialog();
 
 	// TODO:  鍦ㄦ娣诲姞棰濆鐨勫垵濮嬪寲
-	SetWindowText(_T("Axis璁惧畾"));
+	CString strTitle;
+	strTitle.Format(_T("Axis璁惧畾(閰嶆柟: %s)"), m_strRecipeName);
+	SetWindowText(strTitle);
 
 	// 璁剧疆娴嬭瘯鐘舵��
 	CBLLabel* pLabels[] = { &m_staticFLS, &m_staticDOG, &m_staticRLS, &m_staticReady, &m_staticBusy, &m_staticErr };
@@ -358,16 +619,13 @@
 		pLabel->SetDynamicFont(TRUE);
 	}
 
-	try {
-		initializeAxisIDCombo();
-		refreshAxisDetails();
-		refreshPositionDetails(1);
-	}
-	catch (const std::exception& ex) {
-		CString errorMsg;
-		errorMsg.Format(_T("鍒濆鍖栨帶浠跺け璐ワ細%s"), CString(ex.what()));
-		AfxMessageBox(errorMsg, MB_ICONERROR);
-	}
+	// 鍒濆鍖栧綋鍓嶉〉闈负绗竴椤�
+	m_currentPage = 1;
+	updatePageButtonStates();
+
+	initializeAxisIDCombo();
+	refreshAxisDetails(1);
+	refreshPositionDetails(1, m_currentPage);
 
 	CRect screenRect, dlgRect, clientRect;
 	GetClientRect(&clientRect);
@@ -416,6 +674,56 @@
 	// 寮傚父: OCX 灞炴�ч〉搴旇繑鍥� FALSE
 }
 
+BOOL CAxisSettingsDlg::PreTranslateMessage(MSG* pMsg)
+{
+	// TODO: 鍦ㄦ娣诲姞涓撶敤浠ｇ爜鍜�/鎴栬皟鐢ㄥ熀绫�
+
+	if (pMsg->message == WM_LBUTTONDOWN)
+	{
+		if (pMsg->hwnd == GetDlgItem(IDC_BUTTON_AXIS_TEST_JOG_ADD)->m_hWnd)
+		{
+			TRACE("JOG+ 鎸夐挳鎸変笅\n");
+			m_bJogAddPressed = TRUE;
+
+			// 鍚姩瀹氭椂鍣ㄨ繛缁彂閫佷俊鍙�
+			SetTimer(TIMER_JOG_ADD, 200, nullptr);
+			handleAxisOperation(AxisOperationType::JOG_ADD, true);
+		}
+		else if (pMsg->hwnd == GetDlgItem(IDC_BUTTON_AXIS_TEST_JOG_SUB)->m_hWnd)
+		{
+			TRACE("JOG- 鎸夐挳鎸変笅\n");
+			m_bJogSubPressed = TRUE;
+
+			// 鍚姩瀹氭椂鍣ㄨ繛缁彂閫佷俊鍙�
+			SetTimer(TIMER_JOG_SUB, 200, nullptr);
+			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");
+			m_bJogAddPressed = FALSE;
+
+			// 鍋滄瀹氭椂鍣�
+			KillTimer(TIMER_JOG_ADD);
+			handleAxisOperation(AxisOperationType::JOG_ADD, false);
+		}
+		else if (pMsg->hwnd == GetDlgItem(IDC_BUTTON_AXIS_TEST_JOG_SUB)->m_hWnd)
+		{
+			TRACE("JOG- 鎸夐挳鏉惧紑\n");
+			m_bJogSubPressed = FALSE;
+
+			// 鍋滄瀹氭椂鍣�
+			KillTimer(TIMER_JOG_SUB);
+			handleAxisOperation(AxisOperationType::JOG_SUB, false);
+		}
+	}
+
+	return CDialogEx::PreTranslateMessage(pMsg);
+}
+
 void CAxisSettingsDlg::OnSize(UINT nType, int cx, int cy)
 {
 	CDialogEx::OnSize(nType, cx, cy);
@@ -435,6 +743,28 @@
 	CBLLabel* pLabels[] = { &m_staticFLS, &m_staticDOG, &m_staticRLS, &m_staticReady, &m_staticBusy, &m_staticErr };
 	for (auto pLabel : pLabels) {
 		AdjustLabelFont(*pLabel);
+	}
+
+	// 璋冩暣涓嬫媺妗嗛珮搴�
+	CComboBox* pComboBox = (CComboBox*)GetDlgItem(IDC_COMBO_AXIS_NAME);
+	CButton* pButtonLeft = (CButton*)GetDlgItem(IDC_BUTTON_AXIS_LAST);
+	CButton* pButtonRight = (CButton*)GetDlgItem(IDC_BUTTON_AXIS_NEXT);
+
+	if (pComboBox && pButtonLeft && pButtonRight) {
+		CRect rectButton;
+		pButtonLeft->GetWindowRect(&rectButton);	// 鑾峰彇鎸夐挳灏哄
+		ScreenToClient(&rectButton);				// 杞崲涓哄鎴风鍧愭爣
+
+		CRect rectComboBox;
+		pComboBox->GetWindowRect(&rectComboBox);
+		ScreenToClient(&rectComboBox);
+
+		// 璋冩暣涓嬫媺妗嗛珮搴�
+		int heightAdjustment = 2;
+		rectComboBox.top = rectButton.top;
+		rectComboBox.bottom = rectButton.bottom + heightAdjustment;
+		pComboBox->MoveWindow(&rectComboBox);
+		pComboBox->SetItemHeight(-1, rectButton.Height() - 6);
 	}
 }
 
@@ -465,135 +795,129 @@
 void CAxisSettingsDlg::OnBnClickedButtonAxisLast()
 {
 	// TODO: 鍦ㄦ娣诲姞鎺т欢閫氱煡澶勭悊绋嬪簭浠ｇ爜
+	updateAxisSelection(-1);
 }
 
 void CAxisSettingsDlg::OnBnClickedButtonAxisNext()
 {
 	// TODO: 鍦ㄦ娣诲姞鎺т欢閫氱煡澶勭悊绋嬪簭浠ｇ爜
+	updateAxisSelection(1);
 }
 
 void CAxisSettingsDlg::OnBnClickedButtonAxisAnchorPointGroup1()
 {
 	// TODO: 鍦ㄦ娣诲姞鎺т欢閫氱煡澶勭悊绋嬪簭浠ｇ爜
-	try {
-		refreshPositionDetails(1);
-	}
-	catch (const std::exception& ex) {
-		CString errorMsg;
-		errorMsg.Format(_T("鍒锋柊瀹氫綅缁�1澶辫触锛�%s"), CString(ex.what()));
-		AfxMessageBox(errorMsg, MB_ICONERROR);
-	}
+	switchToPage(1);
 }
 
 void CAxisSettingsDlg::OnBnClickedButtonAxisAnchorPointGroup2()
 {
 	// TODO: 鍦ㄦ娣诲姞鎺т欢閫氱煡澶勭悊绋嬪簭浠ｇ爜
-	try {
-		refreshPositionDetails(2);
-	}
-	catch (const std::exception& ex) {
-		CString errorMsg;
-		errorMsg.Format(_T("鍒锋柊瀹氫綅缁�2澶辫触锛�%s"), CString(ex.what()));
-		AfxMessageBox(errorMsg, MB_ICONERROR);
-	}
+	switchToPage(2);
 }
 
 void CAxisSettingsDlg::OnBnClickedButtonAxisAnchorPointGroup3()
 {
 	// TODO: 鍦ㄦ娣诲姞鎺т欢閫氱煡澶勭悊绋嬪簭浠ｇ爜
-	try {
-		refreshPositionDetails(3);
-	}
-	catch (const std::exception& ex) {
-		CString errorMsg;
-		errorMsg.Format(_T("鍒锋柊瀹氫綅缁�3澶辫触锛�%s"), CString(ex.what()));
-		AfxMessageBox(errorMsg, MB_ICONERROR);
-	}
+	switchToPage(3);
 }
 
 void CAxisSettingsDlg::OnBnClickedButtonAxisAnchorPointGroup4()
 {
 	// TODO: 鍦ㄦ娣诲姞鎺т欢閫氱煡澶勭悊绋嬪簭浠ｇ爜
-	try {
-		refreshPositionDetails(4);
-	}
-	catch (const std::exception& ex) {
-		CString errorMsg;
-		errorMsg.Format(_T("鍒锋柊瀹氫綅缁�4澶辫触锛�%s"), CString(ex.what()));
-		AfxMessageBox(errorMsg, MB_ICONERROR);
-	}
+	switchToPage(4);
 }
 
 void CAxisSettingsDlg::OnBnClickedButtonAxisAnchorPointGroup5()
 {
 	// TODO: 鍦ㄦ娣诲姞鎺т欢閫氱煡澶勭悊绋嬪簭浠ｇ爜
-	try {
-		refreshPositionDetails(5);
-	}
-	catch (const std::exception& ex) {
-		CString errorMsg;
-		errorMsg.Format(_T("鍒锋柊瀹氫綅缁�5澶辫触锛�%s"), CString(ex.what()));
-		AfxMessageBox(errorMsg, MB_ICONERROR);
-	}
+	switchToPage(5);
 }
 
 void CAxisSettingsDlg::OnBnClickedButtonAxisAnchorPoint1()
 {
 	// TODO: 鍦ㄦ娣诲姞鎺т欢閫氱煡澶勭悊绋嬪簭浠ｇ爜
+	handleAxisOperation(AxisOperationType::POSITION_1, true);
 }
 
 void CAxisSettingsDlg::OnBnClickedButtonAxisAnchorPoint2()
 {
 	// TODO: 鍦ㄦ娣诲姞鎺т欢閫氱煡澶勭悊绋嬪簭浠ｇ爜
+	handleAxisOperation(AxisOperationType::POSITION_2, true);
 }
 
 void CAxisSettingsDlg::OnBnClickedButtonAxisAnchorPoint3()
 {
 	// TODO: 鍦ㄦ娣诲姞鎺т欢閫氱煡澶勭悊绋嬪簭浠ｇ爜
+	handleAxisOperation(AxisOperationType::POSITION_3, true);
 }
 
 void CAxisSettingsDlg::OnBnClickedButtonAxisAnchorPoint4()
 {
 	// TODO: 鍦ㄦ娣诲姞鎺т欢閫氱煡澶勭悊绋嬪簭浠ｇ爜
+	handleAxisOperation(AxisOperationType::POSITION_4, true);
 }
 
 void CAxisSettingsDlg::OnBnClickedButtonAxisAnchorPoint5()
 {
 	// TODO: 鍦ㄦ娣诲姞鎺т欢閫氱煡澶勭悊绋嬪簭浠ｇ爜
+	handleAxisOperation(AxisOperationType::POSITION_5, true);
 }
 
 void CAxisSettingsDlg::OnBnClickedButtonAxisTestOpr()
 {
 	// TODO: 鍦ㄦ娣诲姞鎺т欢閫氱煡澶勭悊绋嬪簭浠ｇ爜
-}
-
-void CAxisSettingsDlg::OnBnClickedButtonAxisTestJogAdd()
-{
-	// TODO: 鍦ㄦ娣诲姞鎺т欢閫氱煡澶勭悊绋嬪簭浠ｇ爜
-}
-
-void CAxisSettingsDlg::OnBnClickedButtonAxisTestJogSub()
-{
-	// TODO: 鍦ㄦ娣诲姞鎺т欢閫氱煡澶勭悊绋嬪簭浠ｇ爜
+	handleAxisOperation(AxisOperationType::OPR, true);
 }
 
 void CAxisSettingsDlg::OnBnClickedButtonAxisTestStop()
 {
 	// TODO: 鍦ㄦ娣诲姞鎺т欢閫氱煡澶勭悊绋嬪簭浠ｇ爜
+	handleAxisOperation(AxisOperationType::STOP, true);
 }
 
 void CAxisSettingsDlg::OnSelchangeComboAxisName()
 {
 	// TODO: 鍦ㄦ娣诲姞鎺т欢閫氱煡澶勭悊绋嬪簭浠ｇ爜
-	try {
-		refreshAxisDetails();
-		refreshPositionDetails(1);
+	int axisId = getCurrentSelectedAxisID();
+	if (axisId == -1) {
+		AfxMessageBox(_T("璇烽�夋嫨涓�涓湁鏁堢殑杞寸紪鍙凤紒"));
+		return;
 	}
-	catch (const std::exception& ex) {
-		CString errorMsg;
-		errorMsg.Format(_T("鍒锋柊鎺т欢澶辫触锛�%s"), CString(ex.what()));
-		AfxMessageBox(errorMsg, MB_ICONERROR);
+
+	refreshAxisDetails(axisId);
+	refreshPositionDetails(axisId, m_currentPage);
+	updatePageButtonStates();
+}
+
+void CAxisSettingsDlg::OnBnClickedButtonAxisSave()
+{
+	// TODO: 鍦ㄦ娣诲姞鎺т欢閫氱煡澶勭悊绋嬪簭浠ｇ爜
+	int axisId = getCurrentSelectedAxisID();
+	if (axisId == -1) {
+		AfxMessageBox(_T("璇烽�夋嫨涓�涓湁鏁堢殑杞寸紪鍙凤紒"));
+		return;
 	}
+
+	CString cstrMessage;
+	cstrMessage.Format(_T("鏄惁淇濆瓨杞� [%d] 鍙傛暟锛�"), axisId);
+	int ret = AfxMessageBox(_T(cstrMessage), MB_OKCANCEL | MB_ICONEXCLAMATION);
+	if (ret != IDOK) {
+		return;
+	}
+
+	updateDataFromUI(axisId);
+	if (RecipeManager::getInstance().saveRecipe(std::string(CT2A(m_strRecipeName)))) {
+		writeAxisDataToPLC(axisId);
+		cstrMessage.Format(_T("淇濆瓨杞� [%d] 鍙傛暟鎴愬姛锛�"), axisId);
+		SystemLogManager::getInstance().log(SystemLogManager::LogType::Operation, std::string(CT2A(cstrMessage)));
+	}
+	else {
+		cstrMessage.Format(_T("淇濆瓨杞� [%d] 鍙傛暟澶辫触锛�"), axisId);
+		SystemLogManager::getInstance().log(SystemLogManager::LogType::Error, std::string(CT2A(cstrMessage)));
+	}
+
+	AfxMessageBox(cstrMessage);
 }
 
 void CAxisSettingsDlg::OnTimer(UINT_PTR nIDEvent)
@@ -624,6 +948,16 @@
 			}
 		};
 		m_pPLC->readData(MC::SOFT_COMPONENT::D, addr1, readSize, funOnReadData);
+	}	
+	else if (nIDEvent == TIMER_JOG_ADD && m_bJogAddPressed) {
+		TRACE("鎸佺画鍙戦�� JOG+\n");
+		handleAxisOperation(AxisOperationType::JOG_ADD, true); // 鎸佺画鍙戦�� JOG+
+		Sleep(20);
+	}
+	else if (nIDEvent == TIMER_JOG_SUB && m_bJogSubPressed) {
+		TRACE("鎸佺画鍙戦�� JOG-\n");
+		handleAxisOperation(AxisOperationType::JOG_SUB, true); // 鎸佺画鍙戦�� JOG-
+		Sleep(20);
 	}
 
 	CDialogEx::OnTimer(nIDEvent);

--
Gitblit v1.9.3