From b67e16869a5bfbbde3896a4e5a13f1301f1b978d Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期五, 13 十二月 2024 14:55:55 +0800
Subject: [PATCH] 1.调整保存警告到数据库的位置； 2.CAlarmMonitor组件不再保存已完成的警告的数据；

---
 SourceCode/Bond/BondEq/View/AxisSettingsDlg.cpp |  422 +++++++++++++++++++++++++++++++++++++++-------------
 1 files changed, 314 insertions(+), 108 deletions(-)

diff --git a/SourceCode/Bond/BondEq/View/AxisSettingsDlg.cpp b/SourceCode/Bond/BondEq/View/AxisSettingsDlg.cpp
index bbddb7b..d8add62 100644
--- a/SourceCode/Bond/BondEq/View/AxisSettingsDlg.cpp
+++ b/SourceCode/Bond/BondEq/View/AxisSettingsDlg.cpp
@@ -5,9 +5,14 @@
 #include "BondEq.h"
 #include "afxdialogex.h"
 #include "AxisSettingsDlg.h"
+#include "AxisDetailSettingsDlg.h"
 #include "ToolUnits.h"
 #include <cctype>
 #include <algorithm>
+
+#define COLOR_GREEN_ON    RGB(0, 255, 0)  // 姝ｅ父鐘舵�佺豢鑹�
+#define COLOR_GREEN_OFF   RGB(0, 180, 0)  // 鍋忕豢鐘舵��
+#define COLOR_RED         RGB(255, 0, 0)  // 閿欒鐘舵�佺孩鑹�
 
 #define TIMER_INIT					1
 #define TIMER_READ_PLC_DATA			2
@@ -40,13 +45,20 @@
 	m_bBusy = FALSE;
 	m_bErr = FALSE;
 
-	for (int i = 0; i < 9; i++) {
+	for (int i = 0; i < BTN_MAX; i++) {
 		m_pBlBtns[i] = new CBlButton();
 	}
 
-	for (int i = 0; i < 6; i++) {
+	for (int i = 0; i < EDIT_MAX; i++) {
+		m_pRegexEdit[i] = new CRegexEdit();
+	}
+
+	for (int i = 0; i < LABEL_MAX; i++) {
 		m_pBlLabels[i] = new CBLLabel();
 	}
+	
+	m_nBtnsFlashState6 = 0;
+	m_nBtnsFlashState8 = 0;
 }
 
 CAxisSettingsDlg::~CAxisSettingsDlg()
@@ -59,11 +71,15 @@
 	}
 	m_mapFonts.clear();
 
-	for (int i = 0; i < 9; i++) {
+	for (int i = 0; i < BTN_MAX; i++) {
 		delete m_pBlBtns[i];
 	}
 
-	for (int i = 0; i < 6; i++) {
+	for (int i = 0; i < EDIT_MAX; i++) {
+		delete m_pRegexEdit[i];
+	}
+
+	for (int i = 0; i < LABEL_MAX; i++) {
 		delete m_pBlLabels[i];
 	}
 }
@@ -86,11 +102,6 @@
 	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);
 }
 
 UINT CAxisSettingsDlg::FindIDByName(const CString& strControlID)
@@ -218,9 +229,40 @@
 	label.UpdateWindow();            // 绔嬪嵆鍒锋柊
 }
 
+void CAxisSettingsDlg::SetLabelColorBasedOnState(CBLLabel& label, BOOL bState, COLORREF colorTrue, COLORREF colorFalse) {
+	SetLabelColor(label, bState ? colorTrue : colorFalse);
+}
+
+void CAxisSettingsDlg::UpdateLabels() {
+	SetLabelColorBasedOnState(*m_pBlLabels[LABEL_FLS], m_bFLS, COLOR_GREEN_ON, COLOR_GREEN_OFF);
+	SetLabelColorBasedOnState(*m_pBlLabels[LABEL_DOG], m_bDOG, COLOR_GREEN_ON, COLOR_GREEN_OFF);
+	SetLabelColorBasedOnState(*m_pBlLabels[LABEL_RLS], m_bRLS, COLOR_GREEN_ON, COLOR_GREEN_OFF);
+	SetLabelColorBasedOnState(*m_pBlLabels[LABEL_READY], m_bReady, COLOR_GREEN_ON, COLOR_GREEN_OFF);
+	SetLabelColorBasedOnState(*m_pBlLabels[LABEL_BUSY], m_bBusy, COLOR_GREEN_ON, COLOR_GREEN_OFF);
+	SetLabelColorBasedOnState(*m_pBlLabels[LABEL_ERR], m_bErr, COLOR_RED, COLOR_GREEN_OFF);
+}
+
+void CAxisSettingsDlg::UpdateRegexEdit(CRegexEdit* pRegexEdit, const ValueRange& range, const CString& title)
+{
+	auto formatDouble = [](double value) -> CString {
+		CString str;
+		str.Format(_T("%.3f"), value);
+		return str;
+	};
+
+	pRegexEdit->SetWindowText(formatDouble(range.currentValue));
+	pRegexEdit->SetRegexType(RegexType::Decimal);
+	pRegexEdit->SetValueRange(range.minValue, range.maxValue);
+	pRegexEdit->SetInvalidInputCallback([title, range]() {
+		CString strError;
+		strError.Format(_T("%s鐨勫�煎繀椤诲湪 %.3f 鍜� %.3f 涔嬮棿锛�"), title, range.minValue, range.maxValue);
+		AfxMessageBox(strError);
+	});
+}
+
 void CAxisSettingsDlg::updatePageButtonStates()
 {
-	for (int i = 0; i < 5; ++i) {
+	for (int i = 0; i < AXIS_PAGE_SIZE; ++i) {
 		BOOL bSelect = (i + 1 == m_currentPage);
 		m_pBlBtns[i]->SetFaceColor(bSelect ?
 			BTN_PAGE_FACE_SELECT_COLOR: BTN_PAGE_FACE_NORMAL_COLOR);
@@ -257,6 +299,7 @@
 	RecipeManager& recipeManager = RecipeManager::getInstance();
 	if (m_strRecipeName.IsEmpty() || !recipeManager.loadRecipe(std::string(CT2A(m_strRecipeName)))) {
 		AfxMessageBox(_T("鍔犺浇閰嶆柟澶辫触锛�"));
+		recipeManager.saveRecipe(std::string(CT2A(m_strRecipeName)));
 		return;
 	}
 
@@ -292,21 +335,22 @@
 	};
 
 	// 鏇存柊鎺т欢鏄剧ず
-	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));	// 鍑忛�熸椂闂�
+	m_staticAxisNO.SetWindowText(CString(axisDetails.number.c_str()));					// 杞寸紪鍙�
+	m_staticAxisDescription.SetWindowText(CString(axisDetails.description.c_str()));	// 杞存弿杩�
+	m_staticStartAddress.SetWindowText(CString(axisDetails.startAddress.c_str()));		// 璧峰鍦板潃
+
+	UpdateRegexEdit(m_pRegexEdit[EDIT_MICROMENTUM], axisDetails.jogDistance, _T("寰姩閲�"));
+	UpdateRegexEdit(m_pRegexEdit[EDIT_MANUAL_SPEED], axisDetails.manualSpeed, _T("鎵嬪姩閫熷害"));
+	UpdateRegexEdit(m_pRegexEdit[EDIT_AUTO_SPEED], axisDetails.autoSpeed, _T("鑷姩閫熷害"));
+	UpdateRegexEdit(m_pRegexEdit[EDIT_ACCE_TIME], axisDetails.accelerationTime, _T("鍔犻�熸椂闂�"));
+	UpdateRegexEdit(m_pRegexEdit[EDIT_DECE_TIME], axisDetails.decelerationTime, _T("鍑忛�熸椂闂�"));
 }
 
 void CAxisSettingsDlg::refreshPositionDetails(int nAxisId, int pageNumber)
 {
 	RecipeManager& recipeManager = RecipeManager::getInstance();
 	// 姣忛〉鏄剧ず鐨勫畾浣嶇偣鏁伴噺
-	const int pageSize = 5;
+	const int pageSize = AXIS_PAGE_SIZE;
 
 	// 鑾峰彇瀹氫綅鐐规暟鎹�
 	auto positions = recipeManager.getPositions(nAxisId, pageNumber, pageSize);
@@ -333,12 +377,28 @@
 			// 鏄剧ず瀹氫綅鐐圭殑褰撳墠浣嶇疆
 			CString value;
 			value.Format(_T("%.3f"), position.range.currentValue);
-			if (pPositionCtrl) pPositionCtrl->SetWindowText(value);
+			if (pPositionCtrl) {
+				pPositionCtrl->SetWindowText(value);
+				pPositionCtrl->EnableWindow(position.isEnable);
+
+				if (position.isEnable) {
+					CString strError;
+					strError.Format(_T("瀹氫綅鐐�%d"), i + 1);
+					UpdateRegexEdit((CRegexEdit*)pPositionCtrl, position.range, strError);
+				}
+			}
 		}
 		else {
 			// 娓呯┖鎺т欢鍐呭
-			if (pDescriptionCtrl) pDescriptionCtrl->SetWindowText(_T(""));
-			if (pPositionCtrl) pPositionCtrl->SetWindowText(_T(""));
+			if (pDescriptionCtrl) {
+				pDescriptionCtrl->SetWindowText(_T("")); 
+				pDescriptionCtrl->EnableWindow(FALSE);
+			}
+
+			if (pPositionCtrl) {
+				pPositionCtrl->SetWindowText(_T("")); 
+				pPositionCtrl->EnableWindow(FALSE);
+			}
 		}
 	}
 }
@@ -407,26 +467,26 @@
 
 void CAxisSettingsDlg::updateDataFromUI(int nAxisId)
 {
-	const int pageSize = 5; // 姣忛〉鏄剧ず 5 涓畾浣嶇偣
+	const int pageSize = AXIS_PAGE_SIZE; // 姣忛〉鏄剧ず 5 涓畾浣嶇偣
 
 	RecipeManager& recipeManager = RecipeManager::getInstance();
 	auto axisData = recipeManager.getAxis(nAxisId);
 
 	// 鑾峰彇鐣岄潰涓婄殑淇敼鍙傛暟
 	CString text;
-	m_editManualSpeed.GetWindowText(text);
+	m_pRegexEdit[EDIT_MANUAL_SPEED]->GetWindowText(text);
 	axisData.manualSpeed.currentValue = _ttof(text);
 
-	m_editAutoSpeed.GetWindowText(text);
+	m_pRegexEdit[EDIT_AUTO_SPEED]->GetWindowText(text);
 	axisData.autoSpeed.currentValue = _ttof(text);
 
-	m_editAccelerationTime.GetWindowText(text);
+	m_pRegexEdit[EDIT_ACCE_TIME]->GetWindowText(text);
 	axisData.accelerationTime.currentValue = _ttof(text);
 
-	m_editDecelerationTime.GetWindowText(text);
+	m_pRegexEdit[EDIT_DECE_TIME]->GetWindowText(text);
 	axisData.decelerationTime.currentValue = _ttof(text);
 
-	m_editJogDistance.GetWindowText(text);
+	m_pRegexEdit[EDIT_MICROMENTUM]->GetWindowText(text);
 	axisData.jogDistance.currentValue = _ttof(text);
 
 	// 鏇存柊瀹氫綅鐐规暟鎹�
@@ -435,7 +495,7 @@
 
 		if (index < axisData.positions.size()) {
 			// 鏋勫缓鎺т欢鍚嶇О
-			CString descriptionName, positionName, minValueName, maxValueName;
+			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);
 
@@ -444,7 +504,7 @@
 			CEdit* pPositionEdit = (CEdit*)GetDlgItem(FindIDByName(positionName));
 
 			if (pDescriptionEdit && pPositionEdit) {
-				CString description, positionValue, minValue, maxValue;
+				CString description, positionValue;
 
 				// 鑾峰彇鎺т欢涓殑鏂囨湰
 				pDescriptionEdit->GetWindowText(description);
@@ -622,7 +682,7 @@
 
 	// 鍐欏叆瀹氫綅鐐规暟鎹�
 	int positionStartAddress = startAddress + 100;
-	for (size_t i = 0; i < axisData.positions.size(); ++i) {
+	for (int i = 0; i < axisData.positions.size(); ++i) {
 		const auto& position = axisData.positions[i];
 		unsigned int positionAddress = positionStartAddress + (i * 2);
 
@@ -709,7 +769,7 @@
 {
 	// 浠� RecipeManager 鑾峰彇杞存暟鎹�
 	RecipeManager& recipeManager = RecipeManager::getInstance();
-	auto axisData = recipeManager.getAxis(nAxisId);
+	AxisInfo axisData = recipeManager.getAxis(nAxisId);
 
 	MC::SOFT_COMPONENT component;
 	int startAddress, endAddress, readSize;
@@ -719,7 +779,7 @@
 	endAddress = startAddress + 300;
 	readSize = (endAddress - startAddress + 1) * 2;
 
-	auto funOnReadData = [&, startAddress, readSize](IMcChannel* pChannel, int addr, char* pData, unsigned int nDataSize, int flag) -> void {
+	auto funOnReadData = [this, nAxisId, 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;
@@ -736,6 +796,31 @@
 			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);
+
+			// 璁板綍鎸夐挳鍒锋柊鐘舵��
+			// 6,7,8,9涓哄師鐐瑰拰25涓偣浣嶇姸鎬佸拰瀹屾垚鐘舵��
+			// ZR 06.0 鍜� 08.0
+			// 鍥炲師鐐硅繍鍔ㄤ腑锛孼R06.0鍦�0鍜�1涓垏鎹紝鍥炲師鐐瑰畬鎴愶紝 08.0涓�1
+			// 瀹氫綅1
+			// ZR 06.1 鍜� 08.1
+			// ...
+			int b = 6 * 2;
+			m_nBtnsFlashState6 = ((BYTE)pData[b] | (BYTE)pData[b + 1] << 8);
+			m_nBtnsFlashState6 |= ((BYTE)pData[b + 2] << 16 | (BYTE)pData[b + 3] << 24);
+			m_nBtnsFlashState8 = ((BYTE)pData[b + 4] | (BYTE)pData[b + 5] << 8);
+			m_nBtnsFlashState8 |= ((BYTE)pData[b + 6] << 16 | (BYTE)pData[b + 7] << 24);
+
+			// 璇诲彇瀹氫綅鐐规暟鎹�
+			AxisInfo axisInfo = RecipeManager::getInstance().getAxis(nAxisId);
+			for (int i = 0; i < axisInfo.positions.size(); ++i) {
+				if (axisInfo.positions[i].isEnable == FALSE) {
+					unsigned int positionAddress = 100 + (i * 2);
+					//axisInfo.positions[i].range.minValue = CToolUnits::toInt32(&pData[positionAddress * 2]) * 0.001;
+					axisInfo.positions[i].range.currentValue = CToolUnits::toInt32(&pData[positionAddress * 2]) * 0.001;
+					//axisInfo.positions[i].range.maxValue = CToolUnits::toInt32(&pData[positionAddress * 2]) * 0.001;
+				}
+			}
+			RecipeManager::getInstance().updateAxis(axisInfo);
 
 			PostMessage(ID_MSG_UPDATA_DATA_TO_UI);
 		}
@@ -759,15 +844,17 @@
 	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_CLICKED(IDC_BUTTON_AXIS_SEV, &CAxisSettingsDlg::OnBnClickedButtonAxisSev)
 	ON_CBN_SELCHANGE(IDC_COMBO_AXIS_NAME, &CAxisSettingsDlg::OnSelchangeComboAxisName)
 	ON_BN_CLICKED(IDC_BUTTON_AXIS_SAVE, &CAxisSettingsDlg::OnBnClickedButtonAxisSave)
+	ON_BN_CLICKED(IDC_BUTTON_AXIS_UPDATE_UI, &CAxisSettingsDlg::OnBnClickedButtonAxisUpdateUi)
+	ON_BN_CLICKED(IDC_BUTTON_AXIS_DETAIL_SETTINGS, &CAxisSettingsDlg::OnBnClickedButtonAxisDetailSettings)
 	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()
 
 
@@ -784,7 +871,7 @@
 	SetWindowText(strTitle);
 
 	// 闅愯棌鍏夋爣
-	//HideEditCursor(IDC_EDIT_AXIS_CURR_POS);
+	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);
@@ -792,20 +879,13 @@
 	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);
-	}
-
 	// 璁剧疆娴嬭瘯鐘舵��
-	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);
+	m_pBlLabels[LABEL_FLS]->SubclassDlgItem(IDC_STATIC_AXIS_TEST_FLS, this);
+	m_pBlLabels[LABEL_DOG]->SubclassDlgItem(IDC_STATIC_AXIS_TEST_DOG, this);
+	m_pBlLabels[LABEL_RLS]->SubclassDlgItem(IDC_STATIC_AXIS_TEST_RLS, this);
+	m_pBlLabels[LABEL_READY]->SubclassDlgItem(IDC_STATIC_AXIS_TEST_READY, this);
+	m_pBlLabels[LABEL_BUSY]->SubclassDlgItem(IDC_STATIC_AXIS_TEST_BUSY, this);
+	m_pBlLabels[LABEL_ERR]->SubclassDlgItem(IDC_STATIC_AXIS_TEST_ERR, this);
 
 	for (auto pLabel : m_pBlLabels) {
 		pLabel->SetBkColor(RGB(0, 180, 0));
@@ -815,40 +895,70 @@
 		pLabel->SetDynamicFont(TRUE);
 	}
 	
+	// 鍒濆鍖栫紪杈戞
+	m_pRegexEdit[EDIT_MANUAL_SPEED]->SubclassDlgItem(IDC_EDIT_AXIS_MODITFY_MANUAL_SPEED, this);
+	m_pRegexEdit[EDIT_AUTO_SPEED]->SubclassDlgItem(IDC_EDIT_AXIS_MODITFY_AUTO_SPEED, this);
+	m_pRegexEdit[EDIT_ACCE_TIME]->SubclassDlgItem(IDC_EDIT_AXIS_MODITFY_ACCE_TIME, this);
+	m_pRegexEdit[EDIT_DECE_TIME]->SubclassDlgItem(IDC_EDIT_AXIS_MODITFY_DECE_TIME, this);
+	m_pRegexEdit[EDIT_MICROMENTUM]->SubclassDlgItem(IDC_EDIT_AXIS_MODITFY_MICROMENTUM, this);
+	m_pRegexEdit[EDIT_ANCHOR_POINT1]->SubclassDlgItem(IDC_EDIT_AXIS_ANCHOR_POINT1, this);
+	m_pRegexEdit[EDIT_ANCHOR_POINT2]->SubclassDlgItem(IDC_EDIT_AXIS_ANCHOR_POINT2, this);
+	m_pRegexEdit[EDIT_ANCHOR_POINT3]->SubclassDlgItem(IDC_EDIT_AXIS_ANCHOR_POINT3, this);
+	m_pRegexEdit[EDIT_ANCHOR_POINT4]->SubclassDlgItem(IDC_EDIT_AXIS_ANCHOR_POINT4, this);
+	m_pRegexEdit[EDIT_ANCHOR_POINT5]->SubclassDlgItem(IDC_EDIT_AXIS_ANCHOR_POINT5, this);
+
 	// 鎸夐挳鍒濆鍖�
-	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_pBlBtns[BTN_PAGE1]->SubclassDlgItem(IDC_BUTTON_AXIS_ANCHOR_POINT_GROUP1, this);
+	m_pBlBtns[BTN_PAGE2]->SubclassDlgItem(IDC_BUTTON_AXIS_ANCHOR_POINT_GROUP2, this);
+	m_pBlBtns[BTN_PAGE3]->SubclassDlgItem(IDC_BUTTON_AXIS_ANCHOR_POINT_GROUP3, this);
+	m_pBlBtns[BTN_PAGE4]->SubclassDlgItem(IDC_BUTTON_AXIS_ANCHOR_POINT_GROUP4, this);
+	m_pBlBtns[BTN_PAGE5]->SubclassDlgItem(IDC_BUTTON_AXIS_ANCHOR_POINT_GROUP5, this);
+	m_pBlBtns[BTN_JOG_ADD]->SubclassDlgItem(IDC_BUTTON_AXIS_TEST_JOG_ADD, this);
+	m_pBlBtns[BTN_JOG_ADD]->SetFrameColor(BS_NORMAL, BTN_JOG_FRAME_NORMAL);
+	m_pBlBtns[BTN_JOG_ADD]->SetFrameColor(BS_HOVER, BTN_JOG_FRAME_HOVER);
+	m_pBlBtns[BTN_JOG_ADD]->SetFrameColor(BS_PRESS, BTN_JOG_FRAME_PRESS);
+	m_pBlBtns[BTN_JOG_ADD]->SetBkgndColor(BS_NORMAL, BTN_JOG_BKGND_NORMAL);
+	m_pBlBtns[BTN_JOG_ADD]->SetBkgndColor(BS_HOVER, BTN_JOG_BKGND_HOVER);
+	m_pBlBtns[BTN_JOG_ADD]->SetBkgndColor(BS_PRESS, BTN_JOG_BKGND_PRESS);
+	m_pBlBtns[BTN_JOG_SUB]->SubclassDlgItem(IDC_BUTTON_AXIS_TEST_JOG_SUB, this);
+	m_pBlBtns[BTN_JOG_SUB]->SetFrameColor(BS_NORMAL, BTN_JOG_FRAME_NORMAL);
+	m_pBlBtns[BTN_JOG_SUB]->SetFrameColor(BS_HOVER, BTN_JOG_FRAME_HOVER);
+	m_pBlBtns[BTN_JOG_SUB]->SetFrameColor(BS_PRESS, BTN_JOG_FRAME_PRESS);
+	m_pBlBtns[BTN_JOG_SUB]->SetBkgndColor(BS_NORMAL, BTN_JOG_BKGND_NORMAL);
+	m_pBlBtns[BTN_JOG_SUB]->SetBkgndColor(BS_HOVER, BTN_JOG_BKGND_HOVER);
+	m_pBlBtns[BTN_JOG_SUB]->SetBkgndColor(BS_PRESS, BTN_JOG_BKGND_PRESS);
+	m_pBlBtns[BTN_JOG_SEV]->SubclassDlgItem(IDC_BUTTON_AXIS_SEV, this);
+	m_pBlBtns[BTN_JOG_SEV]->SetFrameColor(BS_NORMAL, BTN_SEV_FRAME_NORMAL);
+	m_pBlBtns[BTN_JOG_SEV]->SetFrameColor(BS_HOVER, BTN_SEV_FRAME_HOVER);
+	m_pBlBtns[BTN_JOG_SEV]->SetFrameColor(BS_PRESS, BTN_SEV_FRAME_PRESS);
+	m_pBlBtns[BTN_JOG_SEV]->SetBkgndColor(BS_NORMAL, BTN_SEV_BKGND_NORMAL);
+	m_pBlBtns[BTN_JOG_SEV]->SetBkgndColor(BS_HOVER, BTN_SEV_BKGND_HOVER);
+	m_pBlBtns[BTN_JOG_SEV]->SetBkgndColor(BS_PRESS, BTN_SEV_BKGND_PRESS);
+	m_pBlBtns[BTN_JOG_STOP]->SubclassDlgItem(IDC_BUTTON_AXIS_TEST_STOP, this);
+	m_pBlBtns[BTN_JOG_STOP]->SetFrameColor(BS_NORMAL, BTN_STOP_FRAME_NORMAL);
+	m_pBlBtns[BTN_JOG_STOP]->SetFrameColor(BS_HOVER, BTN_STOP_FRAME_HOVER);
+	m_pBlBtns[BTN_JOG_STOP]->SetFrameColor(BS_PRESS, BTN_STOP_FRAME_PRESS);
+	m_pBlBtns[BTN_JOG_STOP]->SetBkgndColor(BS_NORMAL, BTN_STOP_BKGND_NORMAL);
+	m_pBlBtns[BTN_JOG_STOP]->SetBkgndColor(BS_HOVER, BTN_STOP_BKGND_HOVER);
+	m_pBlBtns[BTN_JOG_STOP]->SetBkgndColor(BS_PRESS, BTN_STOP_BKGND_PRESS);
+	m_pBlBtns[BTN_JOG_OPR]->SubclassDlgItem(IDC_BUTTON_AXIS_TEST_OPR, this);
+	m_pBlBtns[BTN_JOG_OPR]->SetFrameColor(BS_NORMAL, BTN_OPR_FRAME_NORMAL);
+	m_pBlBtns[BTN_JOG_OPR]->SetFrameColor(BS_HOVER, BTN_OPR_FRAME_HOVER);
+	m_pBlBtns[BTN_JOG_OPR]->SetFrameColor(BS_PRESS, BTN_OPR_FRAME_PRESS);
+	m_pBlBtns[BTN_JOG_OPR]->SetBkgndColor(BS_NORMAL, BTN_OPR_BKGND_NORMAL);
+	m_pBlBtns[BTN_JOG_OPR]->SetBkgndColor(BS_HOVER, BTN_OPR_BKGND_HOVER);
+	m_pBlBtns[BTN_JOG_OPR]->SetBkgndColor(BS_PRESS, BTN_OPR_BKGND_PRESS);
+	static UINT btnPointIds[] = { IDC_BUTTON_AXIS_ANCHOR_POINT1, IDC_BUTTON_AXIS_ANCHOR_POINT2,
+		IDC_BUTTON_AXIS_ANCHOR_POINT3, IDC_BUTTON_AXIS_ANCHOR_POINT4, IDC_BUTTON_AXIS_ANCHOR_POINT5};
+	for (int i = 0; i < 5; i++) {
+		m_pBlBtns[BTN_POINT1 + i]->SubclassDlgItem(btnPointIds[i], this);
+		m_pBlBtns[BTN_POINT1 + i]->SetFrameColor(BS_NORMAL, BTN_POINT_FRAME_NORMAL);
+		m_pBlBtns[BTN_POINT1 + i]->SetFrameColor(BS_HOVER, BTN_POINT_FRAME_HOVER);
+		m_pBlBtns[BTN_POINT1 + i]->SetFrameColor(BS_PRESS, BTN_POINT_FRAME_PRESS);
+		m_pBlBtns[BTN_POINT1 + i]->SetBkgndColor(BS_NORMAL, BTN_POINT_BKGND_NORMAL);
+		m_pBlBtns[BTN_POINT1 + i]->SetBkgndColor(BS_HOVER, BTN_POINT_BKGND_HOVER);
+		m_pBlBtns[BTN_POINT1 + i]->SetBkgndColor(BS_PRESS, BTN_POINT_BKGND_PRESS);
+	}
 
 	// 鍒濆鍖栧綋鍓嶉〉闈负绗竴椤�
 	m_currentPage = 1;
@@ -911,6 +1021,11 @@
 	CWnd* pWnd = CWnd::FromHandle(pMsg->hwnd);
 
 	if (pWnd) {
+		if (pMsg->message == WM_KEYDOWN && pMsg->wParam == VK_RETURN) {
+			// 闃绘鍥炶溅閿粯璁ゅ鐞嗭紝闃叉瀵硅瘽妗嗗叧闂�
+			return TRUE;
+		}
+
 		// 鍒ゆ柇榧犳爣鏄惁杩涘叆鎸囧畾鎺т欢鍖哄煙
 		if (pWnd->GetSafeHwnd() == GetDlgItem(IDC_EDIT_AXIS_ANCHOR_POINT_DESCRIP1)->m_hWnd ||
 			pWnd->GetSafeHwnd() == GetDlgItem(IDC_EDIT_AXIS_ANCHOR_POINT_DESCRIP2)->m_hWnd ||
@@ -955,7 +1070,7 @@
 				return CDialogEx::PreTranslateMessage(pMsg);
 			}
 
-			PositionRange& position = recipeManager.getPositionByIndex(getCurrentSelectedAxisID(), m_currentPage, 5, currentIndex);
+			PositionRange& position = recipeManager.getPositionByIndex(getCurrentSelectedAxisID(), m_currentPage, AXIS_PAGE_SIZE, currentIndex);
 			if (pMsg->message == WM_LBUTTONDOWN || pMsg->message == WM_LBUTTONDBLCLK) {
 				// 澶勭悊榧犳爣鐐瑰嚮浜嬩欢
 				// 璁剧疆榧犳爣涓虹澶村厜鏍�
@@ -1138,6 +1253,7 @@
 	handleAxisOperation(AxisOperationType::POSITION_1, true);
 	Sleep(200);
 	handleAxisOperation(AxisOperationType::POSITION_1, false);
+	m_pBlBtns[BTN_POINT1]->Flash(500);
 }
 
 void CAxisSettingsDlg::OnBnClickedButtonAxisAnchorPoint2()
@@ -1186,6 +1302,12 @@
 	handleAxisOperation(AxisOperationType::STOP, true);
 	Sleep(200);
 	handleAxisOperation(AxisOperationType::STOP, false);
+	m_pBlBtns[BTN_JOG_OPR]->StopFlash();
+	m_pBlBtns[BTN_POINT1]->StopFlash();
+	m_pBlBtns[BTN_POINT2]->StopFlash();
+	m_pBlBtns[BTN_POINT3]->StopFlash();
+	m_pBlBtns[BTN_POINT3]->StopFlash();
+	m_pBlBtns[BTN_POINT4]->StopFlash();
 }
 
 void CAxisSettingsDlg::OnBnClickedButtonAxisSev()
@@ -1227,6 +1349,7 @@
 	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)));
 	}
@@ -1236,6 +1359,36 @@
 	}
 
 	AfxMessageBox(cstrMessage);
+}
+
+void CAxisSettingsDlg::OnBnClickedButtonAxisUpdateUi()
+{
+	// TODO: 鍦ㄦ娣诲姞鎺т欢閫氱煡澶勭悊绋嬪簭浠ｇ爜
+	int axisId = getCurrentSelectedAxisID();
+	if (axisId == -1) {
+		AfxMessageBox(_T("璇烽�夋嫨涓�涓湁鏁堢殑杞寸紪鍙凤紒"));
+		return;
+	}
+
+	refreshAxisDetails(axisId);
+	refreshPositionDetails(axisId, m_currentPage);
+}
+
+void CAxisSettingsDlg::OnBnClickedButtonAxisDetailSettings()
+{
+	// TODO: 鍦ㄦ娣诲姞鎺т欢閫氱煡澶勭悊绋嬪簭浠ｇ爜
+	int nAxisId = getCurrentSelectedAxisID();
+	if (nAxisId == -1) {
+		AfxMessageBox(_T("璇烽�夋嫨涓�涓湁鏁堢殑杞寸紪鍙凤紒"));
+		return;
+	}
+
+	CAxisDetailSettingsDlg dlg(m_strRecipeName, nAxisId, this);
+	dlg.SetPLC(m_pPLC);
+	dlg.DoModal();
+
+	refreshAxisDetails(nAxisId);
+	refreshPositionDetails(nAxisId, m_currentPage);
 }
 
 LRESULT CAxisSettingsDlg::OnUpdateDataToUI(WPARAM wParam, LPARAM lParam)
@@ -1248,47 +1401,100 @@
 	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));
+	// 鏇存柊Labels鐘舵��
+	UpdateLabels();
+
+	// 鏇存柊涓嶅彲鍐欑殑瀹氫綅鐐规暟鎹�
+	RecipeManager& recipeManager = RecipeManager::getInstance();
+	for (int i = 0; i < AXIS_PAGE_SIZE; ++i) {
+		PositionRange position = recipeManager.getPositionByIndex(getCurrentSelectedAxisID(), m_currentPage, AXIS_PAGE_SIZE, 0);
+		if (position.isEnable) {
+			continue;
+		}
+
+		CString positionName;
+		positionName.Format(_T("IDC_EDIT_AXIS_ANCHOR_POINT%d"), i + 1);
+
+		CEdit* pPositionEdit = (CEdit*)GetDlgItem(FindIDByName(positionName));
+		if (pPositionEdit) {
+			CString positionValue;
+			positionValue.Format(_T("%.3f"), position.range.currentValue);
+			pPositionEdit->GetWindowText(positionValue);
+		}
 	}
-	else {
-		SetLabelColor(*m_pBlLabels[0], RGB(0, 180, 0));
+	
+	// OPR鎸夐挳鏄惁瑕侀棯鐑佹垨鍋滄闂儊
+	// 06.0鍜�08.0
+	if (m_nBtnsFlashState6 & 0x01) {
+		// 06.0
+		if (!m_pBlBtns[BTN_JOG_OPR]->IsFlash()) {
+			m_pBlBtns[BTN_JOG_OPR]->Flash(500);
+		}
+	}
+	else if (m_nBtnsFlashState8 & 0x01) {
+		if (m_pBlBtns[BTN_JOG_OPR]->IsFlash()) {
+			m_pBlBtns[BTN_JOG_OPR]->StopFlash();
+		}
 	}
 
-	if (m_bDOG) {
-		SetLabelColor(*m_pBlLabels[1], RGB(0, 255, 0));
-	}
-	else {
-		SetLabelColor(*m_pBlLabels[1], RGB(0, 180, 0));
+	int v = 0x02;
+	if (m_currentPage > 1) {
+		v = v << (5 * (m_currentPage - 1));
 	}
 
-	if (m_bRLS) {
-		SetLabelColor(*m_pBlLabels[2], RGB(0, 255, 0));
+	if (m_nBtnsFlashState6 & v) {
+		if (!m_pBlBtns[BTN_POINT1]->IsFlash()) {
+			m_pBlBtns[BTN_POINT1]->Flash(500);
+		}
 	}
-	else {
-		SetLabelColor(*m_pBlLabels[2], RGB(0, 180, 0));
+	else if (m_nBtnsFlashState8 & v) {
+		if (m_pBlBtns[BTN_POINT1]->IsFlash()) {
+			m_pBlBtns[BTN_POINT1]->StopFlash();
+		}
 	}
 
-	if (m_bReady) {
-		SetLabelColor(*m_pBlLabels[3], RGB(0, 255, 0));
+	if (m_nBtnsFlashState6 & (v << 1)) {
+		if (!m_pBlBtns[BTN_POINT2]->IsFlash()) {
+			m_pBlBtns[BTN_POINT2]->Flash(500);
+		}
 	}
-	else {
-		SetLabelColor(*m_pBlLabels[3], RGB(0, 180, 0));
+	else if (m_nBtnsFlashState8 & (v << 1)) {
+		if (m_pBlBtns[BTN_POINT2]->IsFlash()) {
+			m_pBlBtns[BTN_POINT2]->StopFlash();
+		}
 	}
 
-	if (m_bBusy) {
-		SetLabelColor(*m_pBlLabels[4], RGB(0, 255, 0));
+	if (m_nBtnsFlashState6 & (v << 2)) {
+		if (!m_pBlBtns[BTN_POINT3]->IsFlash()) {
+			m_pBlBtns[BTN_POINT3]->Flash(500);
+		}
 	}
-	else {
-		SetLabelColor(*m_pBlLabels[4], RGB(0, 180, 0));
+	else if (m_nBtnsFlashState8 & (v << 2)) {
+		if (m_pBlBtns[BTN_POINT3]->IsFlash()) {
+			m_pBlBtns[BTN_POINT3]->StopFlash();
+		}
 	}
 
-	if (m_bErr) {
-		SetLabelColor(*m_pBlLabels[5], RGB(255, 0, 0));
+	if (m_nBtnsFlashState6 & (v << 3)) {
+		if (!m_pBlBtns[BTN_POINT4]->IsFlash()) {
+			m_pBlBtns[BTN_POINT4]->Flash(500);
+		}
 	}
-	else {
-		SetLabelColor(*m_pBlLabels[5], RGB(0, 180, 0));
+	else if (m_nBtnsFlashState8 & (v << 3)) {
+		if (m_pBlBtns[BTN_POINT4]->IsFlash()) {
+			m_pBlBtns[BTN_POINT4]->StopFlash();
+		}
+	}
+
+	if (m_nBtnsFlashState6 & (v << 4)) {
+		if (!m_pBlBtns[BTN_POINT5]->IsFlash()) {
+			m_pBlBtns[BTN_POINT5]->Flash(500);
+		}
+	}
+	else if (m_nBtnsFlashState8 & (v << 4)) {
+		if (m_pBlBtns[BTN_POINT5]->IsFlash()) {
+			m_pBlBtns[BTN_POINT5]->StopFlash();
+		}
 	}
 
 	return 0;

--
Gitblit v1.9.3