From 592f34bbed79c54aa7b3b323e93534678c5a1cea Mon Sep 17 00:00:00 2001
From: LAPTOP-T815PCOQ\25526 <mr.liuyang@126.com>
Date: 星期二, 26 十一月 2024 18:31:13 +0800
Subject: [PATCH] 1.使用writeWord已经可以写入PLC

---
 SourceCode/Bond/BondEq/View/AxisSettingsDlg.cpp |  486 +++++++++++++++++++++++++++++++++++++-----------------
 1 files changed, 333 insertions(+), 153 deletions(-)

diff --git a/SourceCode/Bond/BondEq/View/AxisSettingsDlg.cpp b/SourceCode/Bond/BondEq/View/AxisSettingsDlg.cpp
index 9f17adf..22d4819 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 瀵硅瘽妗�
 
@@ -218,13 +222,12 @@
 {
 	int currentIndex = m_comboAxisNO.GetCurSel();
 	if (currentIndex == CB_ERR) {
-		AfxMessageBox(_T("璇烽�夋嫨涓�涓湁鏁堢殑杞寸紪鍙凤紒"));
 		return -1;
 	}
 
-	CString axisIDStr;
-	m_comboAxisNO.GetLBText(currentIndex, axisIDStr);
-	return _ttoi(axisIDStr);
+	CString strAxisIDStr;
+	m_comboAxisNO.GetLBText(currentIndex, strAxisIDStr);
+	return _ttoi(strAxisIDStr);
 }
 
 void CAxisSettingsDlg::initializeAxisIDCombo()
@@ -255,23 +258,17 @@
 	}
 }
 
-void CAxisSettingsDlg::refreshAxisDetails()
+void CAxisSettingsDlg::refreshAxisDetails(int nAxisId)
 {
 	// 鑾峰彇褰撳墠閫変腑鐨勮酱ID
 	RecipeManager& recipeManager = RecipeManager::getInstance();
-	int axisId = getCurrentSelectedAxisID();
-
-	auto axisDetails = recipeManager.getAxis(axisId);
-	if (axisDetails.id == -1 || axisDetails.startAddress.empty()) {
-		AfxMessageBox(_T("鏈壘鍒拌酱淇℃伅锛�"));
-		return;
-	}
+	auto axisDetails = recipeManager.getAxis(nAxisId);
 
 	auto formatDouble = [](double value) -> CString {
 		CString str;
 		str.Format(_T("%.3f"), value);
 		return str;
-		};
+	};
 
 	// 鏇存柊鎺т欢鏄剧ず
 	m_staticAxisNO.SetWindowText(CString(axisDetails.number.c_str()));					// 杞寸紪鍙�
@@ -284,20 +281,14 @@
 	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
-	int axisId = getCurrentSelectedAxisID();
-	if (axisId == -1) {
-		return;
-	}
-
 	// 鑾峰彇瀹氫綅鐐规暟鎹�
-	auto positions = recipeManager.getPositions(axisId, pageNumber, pageSize);
+	auto positions = recipeManager.getPositions(nAxisId, pageNumber, pageSize);
 
 	// 鍒锋柊 UI
 	for (int i = 0; i < pageSize; ++i) {
@@ -343,21 +334,17 @@
 	}
 
 	m_comboAxisNO.SetCurSel(newIndex);
-	refreshAxisDetails();
-	refreshPositionDetails(m_currentPage);
+	refreshAxisDetails(newIndex + 1);
+	refreshPositionDetails(newIndex + 1, m_currentPage);
 	updatePageButtonStates();
 }
 
-void CAxisSettingsDlg::updateDataFromUI()
+void CAxisSettingsDlg::updateDataFromUI(int nAxisId)
 {
 	const int pageSize = 5; // 姣忛〉鏄剧ず 5 涓畾浣嶇偣
 
-	// 鑾峰彇褰撳墠閫変腑鐨勮酱 ID
-	int axisId = getCurrentSelectedAxisID();
-	if (axisId == -1) return;
-
 	RecipeManager& recipeManager = RecipeManager::getInstance();
-	auto axisData = recipeManager.getAxis(axisId);
+	auto axisData = recipeManager.getAxis(nAxisId);
 
 	// 鑾峰彇鐣岄潰涓婄殑淇敼鍙傛暟
 	CString text;
@@ -404,6 +391,188 @@
 	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)
 	ON_BN_CLICKED(IDC_BUTTON_AXIS_NEXT, &CAxisSettingsDlg::OnBnClickedButtonAxisNext)
@@ -418,15 +587,19 @@
 	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_BN_SETFOCUS(IDC_BUTTON_AXIS_TEST_JOG_ADD, &CAxisSettingsDlg::OnBnClickedJogAddDown)
+	ON_BN_KILLFOCUS(IDC_BUTTON_AXIS_TEST_JOG_ADD, &CAxisSettingsDlg::OnBnClickedJogAddUp)
+	ON_BN_SETFOCUS(IDC_BUTTON_AXIS_TEST_JOG_SUB, &CAxisSettingsDlg::OnBnClickedJogSubDown)
+	ON_BN_KILLFOCUS(IDC_BUTTON_AXIS_TEST_JOG_SUB, &CAxisSettingsDlg::OnBnClickedJogSubUp)
 	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()
 	ON_WM_TIMER()
+	//ON_WM_LBUTTONDOWN()
+	//ON_WM_LBUTTONUP()
 END_MESSAGE_MAP()
 
 
@@ -456,16 +629,9 @@
 	m_currentPage = 1;
 	updatePageButtonStates();
 
-	try {
-		initializeAxisIDCombo();
-		refreshAxisDetails();
-		refreshPositionDetails(m_currentPage);
-	}
-	catch (const std::exception& ex) {
-		CString errorMsg;
-		errorMsg.Format(_T("鍒濆鍖栨帶浠跺け璐ワ細%s"), CString(ex.what()));
-		AfxMessageBox(errorMsg, MB_ICONERROR);
-	}
+	initializeAxisIDCombo();
+	refreshAxisDetails(1);
+	refreshPositionDetails(1, m_currentPage);
 
 	CRect screenRect, dlgRect, clientRect;
 	GetClientRect(&clientRect);
@@ -585,201 +751,160 @@
 void CAxisSettingsDlg::OnBnClickedButtonAxisLast()
 {
 	// TODO: 鍦ㄦ娣诲姞鎺т欢閫氱煡澶勭悊绋嬪簭浠ｇ爜
-	try {
-		updateAxisSelection(-1);
-	}
-	catch (const std::exception& ex) {
-		CString errorMsg;
-		errorMsg.Format(_T("鑾峰彇涓嬩竴涓酱澶辫触锛�%s"), CString(ex.what()));
-		AfxMessageBox(errorMsg, MB_ICONERROR);
-	}
+	updateAxisSelection(-1);
 }
 
 void CAxisSettingsDlg::OnBnClickedButtonAxisNext()
 {
 	// TODO: 鍦ㄦ娣诲姞鎺т欢閫氱煡澶勭悊绋嬪簭浠ｇ爜
-	try {
-		updateAxisSelection(1);
-	}
-	catch (const std::exception& ex) {
-		CString errorMsg;
-		errorMsg.Format(_T("鑾峰彇涓婁竴涓酱澶辫触锛�%s"), CString(ex.what()));
-		AfxMessageBox(errorMsg, MB_ICONERROR);
-	}
+	updateAxisSelection(1);
 }
 
 void CAxisSettingsDlg::OnBnClickedButtonAxisAnchorPointGroup1()
 {
 	// TODO: 鍦ㄦ娣诲姞鎺т欢閫氱煡澶勭悊绋嬪簭浠ｇ爜
-	try {
-		if (m_currentPage == 1) {
-			return;
-		}
-		updateDataFromUI();
-
-		m_currentPage = 1;
-		refreshPositionDetails(1);
-		updatePageButtonStates();
-	}
-	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 {
-		if (m_currentPage == 2) {
-			return;
-		}
-		updateDataFromUI();
-
-		m_currentPage = 2;
-		refreshPositionDetails(2);
-		updatePageButtonStates();
-	}
-	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 {
-		if (m_currentPage == 3) {
-			return;
-		}
-		updateDataFromUI();
-
-		m_currentPage = 3;
-		refreshPositionDetails(3);
-		updatePageButtonStates();
-	}
-	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 {
-		if (m_currentPage == 4) {
-			return;
-		}
-		updateDataFromUI();
-
-		m_currentPage = 4;
-		refreshPositionDetails(4);
-		updatePageButtonStates();
-	}
-	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 {
-		if (m_currentPage == 5) {
-			return;
-		}
-		updateDataFromUI();
-
-		m_currentPage = 5;
-		refreshPositionDetails(5);
-		updatePageButtonStates();
-	}
-	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::OnBnClickedJogAddDown()
+{
+	TRACE("JOG+ 鎸夐挳鎸変笅\n");
+	m_bJogAddPressed = TRUE;
+
+	// 鍚姩瀹氭椂鍣ㄨ繛缁彂閫佷俊鍙�
+	SetTimer(TIMER_JOG_ADD, 100, nullptr); // 姣� 100ms 鎵ц涓�娆�
+	handleAxisOperation(AxisOperationType::JOG_ADD, true);
+}
+
+void CAxisSettingsDlg::OnBnClickedJogAddUp()
+{
+	TRACE("JOG+ 鎸夐挳鏉惧紑\n");
+	m_bJogAddPressed = FALSE;
+
+	// 鍋滄瀹氭椂鍣�
+	KillTimer(TIMER_JOG_ADD);
+	handleAxisOperation(AxisOperationType::JOG_ADD, false);
+}
+
+void CAxisSettingsDlg::OnBnClickedJogSubDown()
+{
+	TRACE("JOG- 鎸夐挳鎸変笅\n");
+	m_bJogSubPressed = TRUE;
+
+	// 鍚姩瀹氭椂鍣ㄨ繛缁彂閫佷俊鍙�
+	SetTimer(TIMER_JOG_SUB, 100, nullptr); // 姣� 100ms 鎵ц涓�娆�
+	handleAxisOperation(AxisOperationType::JOG_SUB, true);
+}
+
+void CAxisSettingsDlg::OnBnClickedJogSubUp()
+{
+	TRACE("JOG- 鎸夐挳鏉惧紑\n");
+	m_bJogSubPressed = FALSE;
+
+	// 鍋滄瀹氭椂鍣�
+	KillTimer(TIMER_JOG_SUB);
+	handleAxisOperation(AxisOperationType::JOG_SUB, false);
 }
 
 void CAxisSettingsDlg::OnSelchangeComboAxisName()
 {
 	// TODO: 鍦ㄦ娣诲姞鎺т欢閫氱煡澶勭悊绋嬪簭浠ｇ爜
-	try {
-		refreshAxisDetails();
-		refreshPositionDetails(m_currentPage);
-		updatePageButtonStates();
+	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] 鍙傛暟锛�"), getCurrentSelectedAxisID());
+	cstrMessage.Format(_T("鏄惁淇濆瓨杞� [%d] 鍙傛暟锛�"), axisId);
 	int ret = AfxMessageBox(_T(cstrMessage), MB_OKCANCEL | MB_ICONEXCLAMATION);
 	if (ret != IDOK) {
 		return;
 	}
 
-	updateDataFromUI();
+	updateDataFromUI(axisId);
 	if (RecipeManager::getInstance().saveRecipe(std::string(CT2A(m_strRecipeName)))) {
+		writeAxisDataToPLC(axisId);
 		AfxMessageBox(_T("淇濆瓨鎴愬姛锛�"));
 	}
 	else {
@@ -815,7 +940,62 @@
 			}
 		};
 		m_pPLC->readData(MC::SOFT_COMPONENT::D, addr1, readSize, funOnReadData);
+	}	
+	else if (nIDEvent == TIMER_JOG_ADD && m_bJogAddPressed) {
+		handleAxisOperation(AxisOperationType::JOG_ADD, true); // 鎸佺画鍙戦�� JOG+
+	}
+	else if (nIDEvent == TIMER_JOG_SUB && m_bJogSubPressed) {
+		handleAxisOperation(AxisOperationType::JOG_SUB, true); // 鎸佺画鍙戦�� JOG-
 	}
 
 	CDialogEx::OnTimer(nIDEvent);
 }
+
+//void CAxisSettingsDlg::OnLButtonDown(UINT nFlags, CPoint point)
+//{
+//	// TODO: 鍦ㄦ娣诲姞娑堟伅澶勭悊绋嬪簭浠ｇ爜鍜�/鎴栬皟鐢ㄩ粯璁ゅ��
+//	TRACE("CAxisSettingsDlg::OnLButtonDown\n");
+//
+//	// 妫�鏌ラ紶鏍囨槸鍚︾偣鍑诲湪 JOG+ 鎸夐挳涓�
+//	CRect rectJogAdd, rectJogSub;
+//	GetDlgItem(IDC_BUTTON_AXIS_TEST_JOG_ADD)->GetWindowRect(&rectJogAdd);
+//	ScreenToClient(&rectJogAdd);
+//
+//	GetDlgItem(IDC_BUTTON_AXIS_TEST_JOG_SUB)->GetWindowRect(&rectJogSub);
+//	ScreenToClient(&rectJogSub);
+//
+//	if (rectJogAdd.PtInRect(point)) {
+//		m_bJogAddPressed = TRUE;
+//		handleAxisOperation(AxisOperationType::JOG_ADD, true);
+//		SetTimer(TIMER_JOG_ADD, 100, nullptr); // 寮�鍚畾鏃跺櫒
+//	}
+//	else if (rectJogSub.PtInRect(point)) {
+//		m_bJogSubPressed = TRUE;
+//		handleAxisOperation(AxisOperationType::JOG_SUB, true);
+//		SetTimer(TIMER_JOG_SUB, 100, nullptr); // 寮�鍚畾鏃跺櫒
+//	}
+//
+//	CDialogEx::OnLButtonDown(nFlags, point); // 璋冪敤鍩虹被鏂规硶
+//}
+//
+//void CAxisSettingsDlg::OnLButtonUp(UINT nFlags, CPoint point)
+//{
+//	// TODO: 鍦ㄦ娣诲姞娑堟伅澶勭悊绋嬪簭浠ｇ爜鍜�/鎴栬皟鐢ㄩ粯璁ゅ��
+//	TRACE("CAxisSettingsDlg::OnLButtonUp\n");
+//
+//	// 鍋滄 JOG+ 鎸夐挳鐨勬搷浣�
+//	if (m_bJogAddPressed) {
+//		m_bJogAddPressed = FALSE;
+//		handleAxisOperation(AxisOperationType::JOG_ADD, false);
+//		KillTimer(TIMER_JOG_ADD); // 鍋滄瀹氭椂鍣�
+//	}
+//
+//	// 鍋滄 JOG- 鎸夐挳鐨勬搷浣�
+//	if (m_bJogSubPressed) {
+//		m_bJogSubPressed = FALSE;
+//		handleAxisOperation(AxisOperationType::JOG_SUB, false);
+//		KillTimer(TIMER_JOG_SUB); // 鍋滄瀹氭椂鍣�
+//	}
+//
+//	CDialogEx::OnLButtonUp(nFlags, point); // 璋冪敤鍩虹被鏂规硶
+//}

--
Gitblit v1.9.3