From d9e65f3f10d4be89b3deb65ca3e16ce557fb875d Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期一, 02 十二月 2024 09:58:36 +0800
Subject: [PATCH] 1.合并

---
 SourceCode/Bond/BondEq/AxisSettingsDlg.cpp |  820 +++++++++++++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 746 insertions(+), 74 deletions(-)

diff --git a/SourceCode/Bond/BondEq/AxisSettingsDlg.cpp b/SourceCode/Bond/BondEq/AxisSettingsDlg.cpp
index 08b3107..dcdc219 100644
--- a/SourceCode/Bond/BondEq/AxisSettingsDlg.cpp
+++ b/SourceCode/Bond/BondEq/AxisSettingsDlg.cpp
@@ -6,10 +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 瀵硅瘽妗�
 
@@ -25,11 +28,548 @@
 
 CAxisSettingsDlg::~CAxisSettingsDlg()
 {
+	for (auto& pair : m_mapFonts) {
+		if (pair.second) {
+			pair.second->DeleteObject();
+			delete pair.second;
+		}
+	}
+	m_mapFonts.clear();
+}
+
+void CAxisSettingsDlg::SetPLC(CPLC* pPLC)
+{
+	ASSERT(pPLC);
+	m_pPLC = pPLC;
+}
+
+void CAxisSettingsDlg::SetRecipeName(const CString& strRecipeName)
+{
+	m_strRecipeName = strRecipeName;
 }
 
 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);
+	DDX_Control(pDX, IDC_STATIC_START_ADDRESS, m_staticStartAddress);
+	DDX_Control(pDX, IDC_EDIT_AXIS_MODITFY_POS, m_editManualSpeed);
+	DDX_Control(pDX, IDC_EDIT_AXIS_MODITFY_AUTO_SPEED, m_editAutoSpeed);
+	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)
+{
+	// 灏嗚祫婧愭枃浠朵腑瀹氫箟鐨勬帶浠跺悕绉板拰 ID 鍔犺浇鍒颁竴涓槧灏勪腑
+	static const std::map<CString, UINT> controlIdMap = {
+		{"IDC_EDIT_AXIS_ANCHOR_POINT_DESCRIP1", IDC_EDIT_AXIS_ANCHOR_POINT_DESCRIP1},
+		{"IDC_EDIT_AXIS_ANCHOR_POINT_DESCRIP2", IDC_EDIT_AXIS_ANCHOR_POINT_DESCRIP2},
+		{"IDC_EDIT_AXIS_ANCHOR_POINT_DESCRIP3", IDC_EDIT_AXIS_ANCHOR_POINT_DESCRIP3},
+		{"IDC_EDIT_AXIS_ANCHOR_POINT_DESCRIP4", IDC_EDIT_AXIS_ANCHOR_POINT_DESCRIP4},
+		{"IDC_EDIT_AXIS_ANCHOR_POINT_DESCRIP5", IDC_EDIT_AXIS_ANCHOR_POINT_DESCRIP5},
+		{"IDC_EDIT_AXIS_ANCHOR_POINT1", IDC_EDIT_AXIS_ANCHOR_POINT1},
+		{"IDC_EDIT_AXIS_ANCHOR_POINT2", IDC_EDIT_AXIS_ANCHOR_POINT2},
+		{"IDC_EDIT_AXIS_ANCHOR_POINT3", IDC_EDIT_AXIS_ANCHOR_POINT3},
+		{"IDC_EDIT_AXIS_ANCHOR_POINT4", IDC_EDIT_AXIS_ANCHOR_POINT4},
+		{"IDC_EDIT_AXIS_ANCHOR_POINT5", IDC_EDIT_AXIS_ANCHOR_POINT5}
+		// 鍙互缁х画娣诲姞鍏朵粬鎺т欢鍚嶇О鍜� ID
+	};
+
+	// 鏌ユ壘鎺т欢鍚嶇О鏄惁鍦ㄦ槧灏勪腑
+	auto it = controlIdMap.find(strControlID);
+	if (it != controlIdMap.end()) {
+		return it->second;
+	}
+
+	return 0;
+}
+
+CFont* CAxisSettingsDlg::GetOrCreateFont(int nFontSize)
+{
+	auto it = m_mapFonts.find(nFontSize);
+	if (it != m_mapFonts.end()) {
+		return it->second;
+	}
+
+	CFont* font = new CFont();
+	LOGFONT logFont = { 0 };
+	_tcscpy_s(logFont.lfFaceName, _T("Segoe UI"));
+	logFont.lfHeight = -nFontSize;
+	logFont.lfQuality = CLEARTYPE_QUALITY;
+	font->CreateFontIndirect(&logFont);
+	m_mapFonts[nFontSize] = font;
+
+	return font;
+}
+
+void CAxisSettingsDlg::SetDefaultFont()
+{
+	CFont* defaultFont = GetOrCreateFont(12);
+
+	// 閬嶅巻鎵�鏈夋帶浠讹紝搴旂敤榛樿瀛椾綋
+	CWnd* pWnd = GetWindow(GW_CHILD);
+	while (pWnd) {
+		pWnd->SetFont(defaultFont, TRUE);
+		pWnd = pWnd->GetNextWindow();
+	}
+}
+
+void CAxisSettingsDlg::AdjustControls(float dScaleX, float dScaleY)
+{
+	CWnd* pWnd = GetWindow(GW_CHILD);
+	while (pWnd) {
+		int nCtrlID = pWnd->GetDlgCtrlID();
+		if (nCtrlID != -1 && m_mapCtrlLayouts.find(nCtrlID) != m_mapCtrlLayouts.end())
+		{
+			CRect originalRect = m_mapCtrlLayouts[nCtrlID];
+			CRect newRect(
+				static_cast<int>(originalRect.left * dScaleX),
+				static_cast<int>(originalRect.top * dScaleY),
+				static_cast<int>(originalRect.right * dScaleX),
+				static_cast<int>(originalRect.bottom * dScaleY));
+
+			TCHAR szClassName[256];
+			GetClassName(pWnd->m_hWnd, szClassName, sizeof(szClassName));
+
+			if (_tcsicmp(szClassName, _T("ComboBox")) == 0) {
+				CComboBox* pComboBox = (CComboBox*)pWnd;
+				pComboBox->SetItemHeight(-1, newRect.Height());  // -1 琛ㄧず鎵�鏈夐」鐨勯珮搴�
+			}
+
+			pWnd->MoveWindow(&newRect);
+			AdjustControlFont(pWnd, newRect.Width(), newRect.Height());
+		}
+		pWnd = pWnd->GetNextWindow();
+	}
+}
+
+void CAxisSettingsDlg::AdjustControlFont(CWnd* pWnd, int nWidth, int nHeight)
+{
+	// 鏍规嵁鎺т欢楂樺害鍔ㄦ�佽皟鏁村瓧浣撳ぇ灏�
+	int fontSize = nHeight / 2;
+	if (fontSize < 8) fontSize = 8;
+	if (fontSize > 24) fontSize = 24;  // 鏈�澶у瓧浣撳ぇ灏�
+
+	// 鑾峰彇鎴栧垱寤哄瓧浣�
+	CFont* pFont = GetOrCreateFont(fontSize);
+
+	pWnd->SetFont(pFont);
+	pWnd->Invalidate(); // 鍒锋柊鎺т欢鏄剧ず
+}
+
+void CAxisSettingsDlg::AdjustLabelFont(CBLLabel& label)
+{
+	// 鑾峰彇鎺т欢鐨勭煩褰㈠尯鍩�
+	CRect rect;
+	label.GetClientRect(&rect);
+
+	// 鍔ㄦ�佽绠楀瓧浣撳ぇ灏忥紝鍩轰簬鎺т欢鐨勯珮搴�
+	int fontSize = rect.Height() / 2; // 鎺т欢楂樺害鐨勪竴鍗婁綔涓哄瓧浣撳ぇ灏�
+	if (fontSize < 8) fontSize = 8;   // 鏈�灏忓瓧浣撳ぇ灏�
+	if (fontSize > 30) fontSize = 30; // 鏈�澶у瓧浣撳ぇ灏�
+
+	// 璁剧疆瀛椾綋澶у皬
+	label.SetFontSize(fontSize);
+
+	// 鍒锋柊鎺т欢鏄剧ず
+	label.Invalidate();
+	label.UpdateWindow();
+}
+
+void CAxisSettingsDlg::SetStatusColor(CBLLabel& label, BOOL bStatus)
+{
+	if (bStatus) {
+		label.SetBkColor(RGB(0, 255, 0)); // 缁胯壊
+	}
+	else {
+		label.SetBkColor(RGB(255, 0, 0)); // 绾㈣壊
+	}
+
+	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));	// 榛樿鑳屾櫙鑹�
+		}
+
+		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()
+{
+	// 妫�鏌ラ厤鏂规槸鍚﹀姞杞芥垚鍔�
+	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();
+
+	// 濉厖鏁版嵁鍒颁笅鎷夋
+	for (const auto& axisID : axisNumbers) {
+		CString axisCString;
+		axisCString.Format(_T("%d"), axisID);
+		m_comboAxisNO.AddString(axisCString);
+	}
+
+	// 榛樿閫夋嫨绗竴椤�
+	if (m_comboAxisNO.GetCount() > 0) {
+		m_comboAxisNO.SetCurSel(0);
+	}
+}
+
+void CAxisSettingsDlg::refreshAxisDetails(int nAxisId)
+{
+	// 鑾峰彇杞存暟鎹�
+	RecipeManager& recipeManager = RecipeManager::getInstance();
+	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()));					// 杞寸紪鍙�
+	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 nAxisId, int pageNumber)
+{
+	RecipeManager& recipeManager = RecipeManager::getInstance();
+	// 姣忛〉鏄剧ず鐨勫畾浣嶇偣鏁伴噺
+	const int pageSize = 5;
+
+	// 鑾峰彇瀹氫綅鐐规暟鎹�
+	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;
+	}
+
+	int newIndex = currentIndex + offset;
+	if (newIndex < 0 || newIndex >= m_comboAxisNO.GetCount()) {
+		CString error;
+		error.Format(_T("宸茬粡鍒拌揪%s涓�涓酱锛�"), offset < 0 ? _T("涓�") : _T("涓�"));
+		AfxMessageBox(error);
+		return;
+	}
+
+	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) {
+		int index = (m_currentPage - 1) * pageSize + i;
+
+		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);
+
+			CEdit* pDescriptionEdit = (CEdit*)GetDlgItem(FindIDByName(descriptionName));
+			CEdit* pPositionEdit = (CEdit*)GetDlgItem(FindIDByName(positionName));
+
+			if (pDescriptionEdit && pPositionEdit) {
+				CString description, positionValue;
+				pDescriptionEdit->GetWindowText(description);
+				pPositionEdit->GetWindowText(positionValue);
+
+				// 鏇存柊 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);
+		}
+	});
 }
 
 
@@ -47,9 +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()
@@ -59,34 +599,129 @@
 
 // CAxisSettingsDlg 娑堟伅澶勭悊绋嬪簭
 
-void CAxisSettingsDlg::SetPLC(CPLC* pPLC)
-{
-	ASSERT(pPLC);
-	m_pPLC = pPLC;
-}
 
 BOOL CAxisSettingsDlg::OnInitDialog()
 {
 	CDialogEx::OnInitDialog();
 
 	// TODO:  鍦ㄦ娣诲姞棰濆鐨勫垵濮嬪寲
-	//ModifyStyle(0, WS_THICKFRAME | WS_SIZEBOX);
+	CString strTitle;
+	strTitle.Format(_T("Axis璁惧畾(閰嶆柟: %s)"), m_strRecipeName);
+	SetWindowText(strTitle);
 
-	CRect rect;
-	GetClientRect(&rect);
-	m_nInitialWidth = rect.Width();
-	m_nInitialHeight = rect.Height();
+	// 璁剧疆娴嬭瘯鐘舵��
+	CBLLabel* pLabels[] = { &m_staticFLS, &m_staticDOG, &m_staticRLS, &m_staticReady, &m_staticBusy, &m_staticErr };
+	for (auto pLabel : pLabels) {
+		SetStatusColor(*pLabel, FALSE);
+		pLabel->ModifyStyle(0, SS_NOTIFY);
+		pLabel->SetTextColor(RGB(255, 255, 255));
+		pLabel->SetAlignment(AlignCenter);
+		pLabel->SetDynamicFont(TRUE);
+	}
 
-	rect.right *= 1.5;
-	rect.bottom *= 1.5;
-	// 璋冩暣瀵硅瘽妗嗗ぇ灏�
-	MoveWindow(rect);
+	// 鍒濆鍖栧綋鍓嶉〉闈负绗竴椤�
+	m_currentPage = 1;
+	updatePageButtonStates();
 
+	initializeAxisIDCombo();
+	refreshAxisDetails(1);
+	refreshPositionDetails(1, m_currentPage);
+
+	CRect screenRect, dlgRect, clientRect;
+	GetClientRect(&clientRect);
+	m_nInitialWidth = clientRect.Width();
+	m_nInitialHeight = clientRect.Height();
+
+	// 鍒濆鍖栭粯璁ゅ瓧浣�
+	CFont* pDefaultFont = GetOrCreateFont(12);
+
+	// 閬嶅巻鎵�鏈夊瓙鎺т欢锛岃褰曞垵濮嬩綅缃苟璁剧疆榛樿瀛椾綋
+	CWnd* pWnd = GetWindow(GW_CHILD);
+	while (pWnd) {
+		int nCtrlID = pWnd->GetDlgCtrlID();
+		if (nCtrlID != -1) {
+			// 璁板綍鎺т欢鍒濆甯冨眬
+			CRect ctrlRect;
+			pWnd->GetWindowRect(&ctrlRect);
+			ScreenToClient(&ctrlRect);
+			m_mapCtrlLayouts[nCtrlID] = ctrlRect;
+
+			// 璁剧疆榛樿瀛椾綋
+			pWnd->SetFont(pDefaultFont);
+		}
+		pWnd = pWnd->GetNextWindow();
+	}
+
+	GetWindowRect(&dlgRect);
+	int dlgWidth = dlgRect.Width() * 2;
+	int dlgHeight = dlgRect.Height() * 2;
+
+	SystemParametersInfo(SPI_GETWORKAREA, 0, &screenRect, 0);
+	if (dlgWidth > screenRect.Width()) {
+		dlgWidth = screenRect.Width();
+	}
+	if (dlgHeight > screenRect.Height()) {
+		dlgHeight = screenRect.Height();
+	}
+
+	int centerX = screenRect.left + (screenRect.Width() - dlgWidth) / 2;
+	int centerY = screenRect.top + (screenRect.Height() - dlgHeight) / 2;
+	MoveWindow(centerX, centerY, dlgWidth, dlgHeight);
+	
 	SetTimer(TIMER_READ_PLC_DATA, 500, nullptr);
-
 
 	return TRUE;  // return TRUE unless you set the focus to a control
 	// 寮傚父: 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)
@@ -94,11 +729,43 @@
 	CDialogEx::OnSize(nType, cx, cy);
 
 	// TODO: 鍦ㄦ澶勬坊鍔犳秷鎭鐞嗙▼搴忎唬鐮�
-	CRect rect;
-	GetClientRect(&rect);
+	if (nType == SIZE_MINIMIZED || m_mapCtrlLayouts.empty()) {
+		return;
+	}
+
+	float dScaleX = static_cast<float>(cx) / m_nInitialWidth;
+	float dScaleY = static_cast<float>(cy) / m_nInitialHeight;
 
 	// 閬嶅巻瀵硅瘽妗嗕腑鐨勬墍鏈夋帶浠�
-	AdjustControls(rect.Width(), rect.Height());
+	AdjustControls(dScaleX, dScaleY);
+
+	// 鍔ㄦ�佽皟鏁村悇涓� CBLLabel 鐨勫瓧浣撳ぇ灏�
+	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);
+	}
 }
 
 void CAxisSettingsDlg::OnSizing(UINT fwSide, LPRECT pRect)
@@ -128,134 +795,129 @@
 void CAxisSettingsDlg::OnBnClickedButtonAxisLast()
 {
 	// TODO: 鍦ㄦ娣诲姞鎺т欢閫氱煡澶勭悊绋嬪簭浠ｇ爜
+	updateAxisSelection(-1);
 }
 
 void CAxisSettingsDlg::OnBnClickedButtonAxisNext()
 {
 	// TODO: 鍦ㄦ娣诲姞鎺т欢閫氱煡澶勭悊绋嬪簭浠ｇ爜
+	updateAxisSelection(1);
 }
 
 void CAxisSettingsDlg::OnBnClickedButtonAxisAnchorPointGroup1()
 {
 	// TODO: 鍦ㄦ娣诲姞鎺т欢閫氱煡澶勭悊绋嬪簭浠ｇ爜
+	switchToPage(1);
 }
 
 void CAxisSettingsDlg::OnBnClickedButtonAxisAnchorPointGroup2()
 {
 	// TODO: 鍦ㄦ娣诲姞鎺т欢閫氱煡澶勭悊绋嬪簭浠ｇ爜
+	switchToPage(2);
 }
 
 void CAxisSettingsDlg::OnBnClickedButtonAxisAnchorPointGroup3()
 {
 	// TODO: 鍦ㄦ娣诲姞鎺т欢閫氱煡澶勭悊绋嬪簭浠ｇ爜
+	switchToPage(3);
 }
 
 void CAxisSettingsDlg::OnBnClickedButtonAxisAnchorPointGroup4()
 {
 	// TODO: 鍦ㄦ娣诲姞鎺т欢閫氱煡澶勭悊绋嬪簭浠ｇ爜
+	switchToPage(4);
 }
 
 void CAxisSettingsDlg::OnBnClickedButtonAxisAnchorPointGroup5()
 {
 	// TODO: 鍦ㄦ娣诲姞鎺т欢閫氱煡澶勭悊绋嬪簭浠ｇ爜
+	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::AdjustControls(int nWidth, int nHeight)
+void CAxisSettingsDlg::OnSelchangeComboAxisName()
 {
-	CWnd* pWnd = GetWindow(GW_CHILD);
-	while (pWnd) {
-		UINT nCtrlID = pWnd->GetDlgCtrlID();
-
-		CRect ctrlRect;
-		pWnd->GetWindowRect(&ctrlRect);
-		ScreenToClient(&ctrlRect);
-
-		// 璁＄畻鎺т欢鐨勬柊浣嶇疆鍜屽ぇ灏忥紝鎸夋瘮渚嬭皟鏁�
-		int newX = (int)(ctrlRect.left * (nWidth / (float)m_nInitialWidth));
-		int newY = (int)(ctrlRect.top * (nHeight / (float)m_nInitialHeight));
-		int newWidth = (int)(ctrlRect.Width() * (nWidth / (float)m_nInitialWidth));
-		int newHeight = (int)(ctrlRect.Height() * (nHeight / (float)m_nInitialHeight));
-
-		pWnd->MoveWindow(newX, newY, newWidth, newHeight);
-		AdjustControlFont(pWnd, newWidth, newHeight);
-
-		// 鑾峰彇涓嬩竴涓帶浠�
-		pWnd = pWnd->GetNextWindow();
-	}
-}
-
-void CAxisSettingsDlg::AdjustControlFont(CWnd* pWnd, int nWidth, int nHeight)
-{
-	TCHAR szClassName[256];
-	GetClassName(pWnd->m_hWnd, szClassName, sizeof(szClassName));
-
-	if (_tcsicmp(szClassName, _T("Static")) == 0) {
-		CStatic* pStatic = (CStatic*)pWnd;
-		pStatic->ModifyStyle(0, SS_CENTER | SS_CENTERIMAGE);
+	// TODO: 鍦ㄦ娣诲姞鎺т欢閫氱煡澶勭悊绋嬪簭浠ｇ爜
+	int axisId = getCurrentSelectedAxisID();
+	if (axisId == -1) {
+		AfxMessageBox(_T("璇烽�夋嫨涓�涓湁鏁堢殑杞寸紪鍙凤紒"));
 		return;
 	}
 
-	if (_tcsicmp(szClassName, _T("ComboBox")) == 0) {
-		CComboBox* pComboBox = (CComboBox*)pWnd;
-		pComboBox->SetItemHeight(-1, nHeight);  // -1 琛ㄧず鎵�鏈夐」鐨勯珮搴�
+	refreshAxisDetails(axisId);
+	refreshPositionDetails(axisId, m_currentPage);
+	updatePageButtonStates();
+}
+
+void CAxisSettingsDlg::OnBnClickedButtonAxisSave()
+{
+	// TODO: 鍦ㄦ娣诲姞鎺т欢閫氱煡澶勭悊绋嬪簭浠ｇ爜
+	int axisId = getCurrentSelectedAxisID();
+	if (axisId == -1) {
+		AfxMessageBox(_T("璇烽�夋嫨涓�涓湁鏁堢殑杞寸紪鍙凤紒"));
+		return;
 	}
 
-	int fontSize = nHeight - 10;
-	CFont* pCurrentFont = pWnd->GetFont();
-	LOGFONT logFont;
-	pCurrentFont->GetLogFont(&logFont);
-	logFont.lfHeight = -fontSize;
+	CString cstrMessage;
+	cstrMessage.Format(_T("鏄惁淇濆瓨杞� [%d] 鍙傛暟锛�"), axisId);
+	int ret = AfxMessageBox(_T(cstrMessage), MB_OKCANCEL | MB_ICONEXCLAMATION);
+	if (ret != IDOK) {
+		return;
+	}
 
-	CFont newFont;
-	newFont.CreateFontIndirect(&logFont);
+	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)));
+	}
 
-	pWnd->SetFont(&newFont);
-	pWnd->Invalidate();
+	AfxMessageBox(cstrMessage);
 }
 
 void CAxisSettingsDlg::OnTimer(UINT_PTR nIDEvent)
@@ -286,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