From 726f0553fa435809d10c8a33abe46473ee975db1 Mon Sep 17 00:00:00 2001
From: LAPTOP-T815PCOQ\25526 <mr.liuyang@126.com>
Date: 星期二, 10 十二月 2024 16:37:00 +0800
Subject: [PATCH] 1. 完善axis细部设定人机交互(数据填充和文件保存)
---
SourceCode/Bond/BondEq/BondEqDlg.cpp | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/SourceCode/Bond/BondEq/BondEqDlg.cpp b/SourceCode/Bond/BondEq/BondEqDlg.cpp
index 3584094..3f3103b 100644
--- a/SourceCode/Bond/BondEq/BondEqDlg.cpp
+++ b/SourceCode/Bond/BondEq/BondEqDlg.cpp
@@ -573,6 +573,7 @@
return 0;
}
+ /*
CString inputText = inputDialog.GetInputText();
std::string strPass = UserManager::getInstance().getCurrentPass();
if (inputText.Compare(strPass.c_str()) != 0) {
@@ -580,14 +581,17 @@
logManager.log(SystemLogManager::LogType::Info, _T("验证时,密码错误!"));
return 0;
}
+ */
}
if (id == IDC_BUTTON_RUN) {
+ theApp.m_model.getBonder().start();
m_pTopToolbar->GetBtn(IDC_BUTTON_RUN)->EnableWindow(FALSE);
m_pTopToolbar->GetBtn(IDC_BUTTON_STOP)->EnableWindow(TRUE);
logManager.log(SystemLogManager::LogType::Operation, _T("运行..."));
}
else if (id == IDC_BUTTON_STOP) {
+ theApp.m_model.getBonder().stop();
m_pTopToolbar->GetBtn(IDC_BUTTON_RUN)->EnableWindow(TRUE);
m_pTopToolbar->GetBtn(IDC_BUTTON_STOP)->EnableWindow(FALSE);
logManager.log(SystemLogManager::LogType::Operation, _T("停止..."));
@@ -760,8 +764,9 @@
CComponentPLCDlg* CBondEqDlg::CreateComponentPLCDlg(CComponent* pComponent)
{
CComponentPLCDlg* pDlg = new CComponentPLCDlg(m_pMainContainer);
- pDlg->Create(IDD_COMPONENT_PLC, m_pMainContainer);
pDlg->SetContext(pComponent);
+ pDlg->Create(IDD_COMPONENT_PLC, m_pMainContainer);
+
CString strIcon0, strIcon1, strIcon2, strIcon3;
strIcon0.Format(_T("%s\\Res\\small_close0.ico"), (LPTSTR)(LPCTSTR)theApp.m_strAppDir);
--
Gitblit v1.9.3