1. 监听按钮按下抬起事件

LAPTOP-T815PCOQ\25526

2024-11-27 2cd3e98d5d0bdf341d772b7e75869cd6f2b39280

 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,23 +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) {
      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()
{
   // 获取所有轴的轴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();
@@ -224,88 +258,61 @@
   }
}

void CAxisSettingsDlg::refreshAxisDetails()
void CAxisSettingsDlg::refreshAxisDetails(int nAxisId)
{
   // 获取当前选中的轴ID
   int axisId = getCurrentSelectedAxisID();
   // 获取轴数据
   RecipeManager& recipeManager = RecipeManager::getInstance();
   auto axisDetails = recipeManager.getAxis(nAxisId);

   // 获取轴信息
   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()));         // 轴NO
   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
   int axisId = getCurrentSelectedAxisID();

   // 获取定位点数据
   auto positions = AxisManager::getInstance().getPositions(axisId, pageNumber, pageSize);
   auto positions = recipeManager.getPositions(nAxisId, pageNumber, pageSize);

   // 刷新 UI
   for (int i = 0; i < pageSize; ++i) {
      // 动态构造控件名称
      CString descriptionName;
      CString positionName;
      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);

      // 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);
      UINT descriptionCtrlId = FindIDByName(descriptionCtrlName);
      UINT positionCtrlId = FindIDByName(positionCtrlName);

      // 获取控件指针
      UINT unDescription = FindIDByName(descriptionName);
      UINT unPosition = FindIDByName(positionName);
      CWnd* pDescriptionCtrl = GetDlgItem(descriptionCtrlId);
      CWnd* pPositionCtrl = GetDlgItem(positionCtrlId);

      TRACE("CAxisSettingsDlg::refreshPositionDetails %unDescription[%d], unPosition[%d]\n", unDescription, unPosition);
      if (unDescription == 0 || unPosition == 0) {
         continue;
      }
      if (i < positions.size()) {
         CString description = CString(positions[i].first.c_str());
         CString value;
         value.Format(_T("%.3f"), positions[i].second);

      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);
         if (pDescriptionCtrl) pDescriptionCtrl->SetWindowText(description);
         if (pPositionCtrl) pPositionCtrl->SetWindowText(value);
      }
      else {
         // 无数据，清空控件内容
         if (pDescription) pDescription->SetWindowText(_T(""));
         if (pPosition) pPosition->SetWindowText(_T(""));
         if (pDescriptionCtrl) pDescriptionCtrl->SetWindowText(_T(""));
         if (pPositionCtrl) pPositionCtrl->SetWindowText(_T(""));
      }
   }
}
@@ -327,9 +334,244 @@
   }

   m_comboAxisNO.SetCurSel(newIndex);
   refreshAxisDetails();
   refreshPositionDetails(1);
   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);
      }
   });
}


BEGIN_MESSAGE_MAP(CAxisSettingsDlg, CDialogEx)
   ON_BN_CLICKED(IDC_BUTTON_AXIS_LAST, &CAxisSettingsDlg::OnBnClickedButtonAxisLast)
@@ -345,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()
@@ -364,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 };
@@ -376,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);
@@ -434,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);
@@ -453,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);
   }
}

@@ -483,151 +795,129 @@
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 {
      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)
@@ -658,6 +948,14 @@
         }
      };
      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+
   }
   else if (nIDEvent == TIMER_JOG_SUB && m_bJogSubPressed) {
      TRACE("持续发送 JOG-\n");
      handleAxisOperation(AxisOperationType::JOG_SUB, true); // 持续发送 JOG-
   }

   CDialogEx::OnTimer(nIDEvent);