From 8da35975404dd92801b1006f76f2ea6c200016d2 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期四, 05 十二月 2024 09:03:22 +0800
Subject: [PATCH] 1.IO测试页面；

---
 SourceCode/Bond/BondEq/View/AxisSettingsDlg.cpp |  316 ++++++++++++++++++++++++++++++++--------------------
 1 files changed, 193 insertions(+), 123 deletions(-)

diff --git a/SourceCode/Bond/BondEq/View/AxisSettingsDlg.cpp b/SourceCode/Bond/BondEq/View/AxisSettingsDlg.cpp
index 22d4819..77bc579 100644
--- a/SourceCode/Bond/BondEq/View/AxisSettingsDlg.cpp
+++ b/SourceCode/Bond/BondEq/View/AxisSettingsDlg.cpp
@@ -260,7 +260,7 @@
 
 void CAxisSettingsDlg::refreshAxisDetails(int nAxisId)
 {
-	// 鑾峰彇褰撳墠閫変腑鐨勮酱ID
+	// 鑾峰彇杞存暟鎹�
 	RecipeManager& recipeManager = RecipeManager::getInstance();
 	auto axisDetails = recipeManager.getAxis(nAxisId);
 
@@ -421,24 +421,87 @@
 	}
 }
 
+bool CAxisSettingsDlg::ParsePLCAddress(const CString& address, MC::SOFT_COMPONENT& component, int& addr)
+{
+	if (address.GetLength() < 2) {
+		return false;
+	}
+
+	// 鎻愬彇缁勪欢绫诲瀷锛堢涓�涓瓧绗︼級
+	TCHAR componentChar = address[0];
+	if (address.Left(2) == _T("ZR")) {
+		component = MC::SOFT_COMPONENT::ZR;
+		// 鎻愬彇鏁板瓧閮ㄥ垎锛堝幓闄R鍓嶇紑锛�
+		CString numericAddress = address.Mid(2);
+		addr = _ttoi(numericAddress);
+		return addr != 0 || numericAddress.CompareNoCase(_T("0")) == 0;  // 濡傛灉鏄� "0"锛屼篃璁や负鏈夋晥
+	}
+
+	// 瀵逛簬鍏朵粬缁勪欢锛屾寜鐓у父瑙勮鍒欏鐞�
+	CString hexAddress = address.Mid(1);
+	switch (componentChar) {
+	case 'D':
+		component = MC::SOFT_COMPONENT::D;
+		addr = _ttoi(hexAddress);
+		break;
+	case 'M':
+		component = MC::SOFT_COMPONENT::M;
+		addr = _tcstoul(hexAddress, nullptr, 16);
+		break;
+	case 'X':
+		component = MC::SOFT_COMPONENT::X;
+		addr = _tcstoul(hexAddress, nullptr, 16);
+		break;
+	case 'Y':
+		component = MC::SOFT_COMPONENT::Y;
+		addr = _tcstoul(hexAddress, nullptr, 16);
+		break;
+	case 'W':
+		component = MC::SOFT_COMPONENT::W;
+		addr = _tcstoul(hexAddress, nullptr, 16);
+		break;
+	case 'L':
+		component = MC::SOFT_COMPONENT::L;
+		addr = _tcstoul(hexAddress, nullptr, 16);
+		break;
+	case 'S':
+		component = MC::SOFT_COMPONENT::S;
+		addr = _tcstoul(hexAddress, nullptr, 16);
+		break;
+	case 'B':
+		component = MC::SOFT_COMPONENT::B;
+		addr = _tcstoul(hexAddress, nullptr, 16);
+		break;
+	case 'F':
+		component = MC::SOFT_COMPONENT::F;
+		addr = _tcstoul(hexAddress, nullptr, 16);
+		break;
+	default:
+		return false;
+	}
+
+	// 妫�鏌ュ湴鍧�鏄惁鏈夋晥
+	if (addr == 0 && hexAddress.CompareNoCase(_T("0")) != 0) {
+		return false;
+	}
+
+	return true;
+}
+
 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()) {
+	int startAddress;
+	MC::SOFT_COMPONENT component;
+	if (!ParsePLCAddress(CString(axisData.startAddress.c_str()), component, startAddress)) {
 		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) {
+	m_pPLC->writeDWord(component, startAddress + 82, (int)axisData.manualSpeed * 1000, [](IMcChannel* pChannel, int addr, DWORD value, int flag) {
 		if (flag == 0) {
 			TRACE("\n鍐欏叆鎴愬姛: 鎵嬪姩閫熷害, 鍦板潃: %d, 鍊�: %lu\n", addr, value);
 		}
@@ -448,7 +511,7 @@
 	});
 
 	// 鍐欏叆鑷姩閫熷害
-	m_pPLC->writeWord(MC::SOFT_COMPONENT::D, startAddress + 2, (int)axisData.autoSpeed, [](IMcChannel* pChannel, int addr, DWORD value, int flag) {
+	m_pPLC->writeDWord(component, startAddress + 84, (int)(axisData.autoSpeed * 1000.0), [](IMcChannel* pChannel, int addr, DWORD value, int flag) {
 		if (flag == 0) {
 			TRACE("\n鍐欏叆鎴愬姛: 鑷姩閫熷害, 鍦板潃: %d, 鍊�: %lu\n", addr, value);
 		}
@@ -458,7 +521,7 @@
 	});
 
 	// 鍐欏叆鍔犻�熸椂闂�, 杞崲涓烘绉�
-	m_pPLC->writeWord(MC::SOFT_COMPONENT::D, startAddress + 4, (int)(axisData.accelerationTime * 1000), [](IMcChannel* pChannel, int addr, DWORD value, int flag) {
+	m_pPLC->writeDWord(component, startAddress + 62, (int)(axisData.accelerationTime * 1000.0), [](IMcChannel* pChannel, int addr, DWORD value, int flag) {
 		if (flag == 0) {
 			TRACE("\n鍐欏叆鎴愬姛: 鍔犻�熸椂闂�, 鍦板潃: %d, 鍊�: %lu\n", addr, value);
 		}
@@ -468,7 +531,7 @@
 	});
 
 	// 鍐欏叆鍑忛�熸椂闂�, 杞崲涓烘绉�
-	m_pPLC->writeWord(MC::SOFT_COMPONENT::D, startAddress + 6, (int)(axisData.decelerationTime * 1000), [](IMcChannel* pChannel, int addr, DWORD value, int flag) {
+	m_pPLC->writeDWord(component, startAddress + 64, (int)(axisData.decelerationTime * 1000.0), [](IMcChannel* pChannel, int addr, DWORD value, int flag) {
 		if (flag == 0) {
 			TRACE("\n鍐欏叆鎴愬姛: 鍑忛�熸椂闂�, 鍦板潃: %d, 鍊�: %lu\n", addr, value);
 		}
@@ -478,7 +541,7 @@
 	});
 
 	// 鍐欏叆寰姩閲�
-	m_pPLC->writeWord(MC::SOFT_COMPONENT::D, startAddress + 8, (int)axisData.jogDistance, [](IMcChannel* pChannel, int addr, DWORD value, int flag) {
+	m_pPLC->writeWord(component, startAddress + 81, (int)(axisData.jogDistance * 1000.0), [](IMcChannel* pChannel, int addr, DWORD value, int flag) {
 		if (flag == 0) {
 			TRACE("\n鍐欏叆鎴愬姛: 寰姩閲�, 鍦板潃: %d, 鍊�: %lu\n", addr, value);
 		}
@@ -488,12 +551,13 @@
 	});
 
 	// 鍐欏叆瀹氫綅鐐规暟鎹�
-	int positionStartAddress = startAddress + 10;
+	/*
+	int positionStartAddress = startAddress + 100;
 	for (size_t i = 0; i < axisData.positions.size(); ++i) {
 		const auto& position = axisData.positions[i];
-		int positionAddress = positionStartAddress + (i * 2);
+		unsigned int positionAddress = positionStartAddress + (i * 4);
 
-		m_pPLC->writeWord(MC::SOFT_COMPONENT::D, positionAddress, (int)position.second, [i](IMcChannel* pChannel, int addr, DWORD value, int flag) {
+		m_pPLC->writeWord(component, 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);
 			}
@@ -502,6 +566,7 @@
 			}
 		});
 	}
+	*/
 }
 
 void CAxisSettingsDlg::handleAxisOperation(AxisOperationType eOpType, bool bPressed)
@@ -516,18 +581,14 @@
 	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()) {
+	int startAddress;
+	MC::SOFT_COMPONENT component;
+	if (!ParsePLCAddress(CString(axisData.startAddress.c_str()), component, startAddress)) {
 		AfxMessageBox(_T("鏃犳晥鐨勮捣濮嬪湴鍧�锛�"));
-		return;
 	}
 
-	int nStartAddress = std::stoi(strCleanAddress);
-
 	// 鏍规嵁鎿嶄綔绫诲瀷璁＄畻鐩爣鍦板潃
-	int nTargetAddress = nStartAddress;
+	int nTargetAddress = startAddress + 10;
 	switch (eOpType) {
 	case AxisOperationType::OPR:
 		nTargetAddress += 10; // OPR 淇″彿鍦板潃
@@ -562,7 +623,7 @@
 	}
 
 	// 鍚� PLC 鍐欏叆淇″彿
-	m_pPLC->writeBit(MC::SOFT_COMPONENT::D, nTargetAddress, bPressed, [eOpType, nTargetAddress, bPressed](IMcChannel* pChannel, int nAddr, DWORD nValue, int nFlag) {
+	m_pPLC->writeBit(component, 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);
 		}
@@ -570,6 +631,45 @@
 			TRACE("鎿嶄綔澶辫触锛氱被鍨�=%d锛屽湴鍧�=%d锛岄敊璇爜=%d\n", static_cast<int>(eOpType), nAddr, nFlag);
 		}
 	});
+}
+
+void CAxisSettingsDlg::readPLCDataToUI(int nAxisId)
+{	
+	CBLLabel* pLabels[] = { &m_staticFLS, &m_staticDOG, &m_staticRLS, &m_staticReady, &m_staticBusy, &m_staticErr };
+
+	// 浠� RecipeManager 鑾峰彇杞存暟鎹�
+	RecipeManager& recipeManager = RecipeManager::getInstance();
+	auto axisData = recipeManager.getAxis(nAxisId);
+
+	MC::SOFT_COMPONENT component;
+	int startAddress, endAddress, readSize;
+	if (!ParsePLCAddress(CString(axisData.startAddress.c_str()), component, startAddress)) {
+		AfxMessageBox(_T("鏃犳晥鐨勮捣濮嬪湴鍧�锛�"));
+	}
+
+	// 浠� OPR 淇″彿鍦板潃寮�濮嬭鍙�
+	startAddress += 10;
+	endAddress = startAddress + 24;
+	readSize = endAddress - startAddress + 1;
+
+	// 鍥炶皟澶勭悊杈撳叆鏁版嵁
+	auto funOnReadData = [this, startAddress, &pLabels](IMcChannel* pChannel, int addr, char* pData, unsigned int nDataSize, int flag) {
+		if (flag == 0) {
+			int nOffset = 0;
+			for (auto pLabel : pLabels) {
+				int value = CToolUnits::toInt16(&pData[(startAddress + nOffset) * 2]);
+				if (value == 0) {
+					SetStatusColor(*pLabel, FALSE);
+				} else {
+					SetStatusColor(*pLabel, TRUE);
+				}
+
+				nOffset++;
+			}
+		}
+	};
+
+	m_pPLC->readData(component, startAddress, readSize, funOnReadData);
 }
 
 
@@ -588,18 +688,12 @@
 	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_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()
 
 
@@ -678,6 +772,56 @@
 
 	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)
@@ -832,46 +976,6 @@
 	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: 鍦ㄦ娣诲姞鎺т欢閫氱煡澶勭悊绋嬪簭浠ｇ爜
@@ -905,17 +1009,26 @@
 	updateDataFromUI(axisId);
 	if (RecipeManager::getInstance().saveRecipe(std::string(CT2A(m_strRecipeName)))) {
 		writeAxisDataToPLC(axisId);
-		AfxMessageBox(_T("淇濆瓨鎴愬姛锛�"));
+		cstrMessage.Format(_T("淇濆瓨杞� [%d] 鍙傛暟鎴愬姛锛�"), axisId);
+		SystemLogManager::getInstance().log(SystemLogManager::LogType::Operation, std::string(CT2A(cstrMessage)));
 	}
 	else {
-		AfxMessageBox(_T("淇濆瓨澶辫触锛�"));
+		cstrMessage.Format(_T("淇濆瓨杞� [%d] 鍙傛暟澶辫触锛�"), axisId);
+		SystemLogManager::getInstance().log(SystemLogManager::LogType::Error, std::string(CT2A(cstrMessage)));
 	}
+
+	AfxMessageBox(cstrMessage);
 }
 
 void CAxisSettingsDlg::OnTimer(UINT_PTR nIDEvent)
 {
 	if (TIMER_READ_PLC_DATA == nIDEvent) {
 		ASSERT(m_pPLC);
+
+		int nAxisId = getCurrentSelectedAxisID();
+		if (nAxisId == -1) {
+			return;
+		}
 
 		int addr1, addr2, readSize;
 		addr1 = 5120;
@@ -939,63 +1052,20 @@
 				SetDlgItemInt(IDC_EDIT_AXIS_CURR_ALARM_NUMBER, nAlarmCode);
 			}
 		};
-		m_pPLC->readData(MC::SOFT_COMPONENT::D, addr1, readSize, funOnReadData);
+		//m_pPLC->readData(MC::SOFT_COMPONENT::D, addr1, readSize, funOnReadData);
+
+		//readPLCDataToUI(nAxisId);
 	}	
 	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);
 }
-
-//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