From 6dc80508b1c0f431007f8a8c947c152ec00c3d15 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期一, 08 九月 2025 09:24:05 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang
---
SourceCode/Bond/BondEq/CComponentPLCDlg.cpp | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/SourceCode/Bond/BondEq/CComponentPLCDlg.cpp b/SourceCode/Bond/BondEq/CComponentPLCDlg.cpp
index d380353..5ce1ae9 100644
--- a/SourceCode/Bond/BondEq/CComponentPLCDlg.cpp
+++ b/SourceCode/Bond/BondEq/CComponentPLCDlg.cpp
@@ -152,9 +152,14 @@
void CComponentPLCDlg::OnBnClickedButtonAxisSetting()
{
+ std::string strName = RecipeManager::getInstance().getCurrentRecipeName();
+ if (strName.empty()) {
+ AfxMessageBox("鏈�夋嫨閰嶆柟锛�", MB_ICONERROR);
+ }
+
CAxisSettingsDlg axisDlg;
axisDlg.SetPLC((CPLC*)m_pContext);
- axisDlg.SetRecipeName(_T("Default"));
+ axisDlg.SetRecipeName(strName.c_str());
axisDlg.DoModal();
}
--
Gitblit v1.9.3