Merge branch 'clh' into liuyang

mrDarker

6 天以前 829fe6c6bc33d53fda9c31fd45a37e1df87befff

 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();
}