From 02c39baf5375f1588e9c20dc06d89a0605077672 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期一, 10 二月 2025 10:41:44 +0800
Subject: [PATCH] Merge branch 'liuyang' into clh
---
SourceCode/Bond/BoounionPLC/BoounionPLCDlg.cpp | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/SourceCode/Bond/BoounionPLC/BoounionPLCDlg.cpp b/SourceCode/Bond/BoounionPLC/BoounionPLCDlg.cpp
index b5276ea..d859bee 100644
--- a/SourceCode/Bond/BoounionPLC/BoounionPLCDlg.cpp
+++ b/SourceCode/Bond/BoounionPLC/BoounionPLCDlg.cpp
@@ -10,6 +10,7 @@
#include "PlcView.h"
#include "Log.h"
#include "InputDialog.h"
+#include "AddPLCInfo.h"
#include "AxisManager.h"
#include "IOManager.h"
@@ -505,24 +506,25 @@
{
int id = (int)lParam;
if (id == IDC_BUTTON_ADD) {
- CInputDialog inputDialog(_T("新建设备"), _T("请输入设备名称："));
- if (inputDialog.DoModal() != IDOK) {
- AfxMessageBox(_T("取消验证！"));
+ CAddPLCInfo dlgAddPLCInfo;
+ if (dlgAddPLCInfo.DoModal() != IDOK) {
return 0;
}
- CString strName;
- strName = inputDialog.GetInputText();
- if (!strName.IsEmpty()) {
- theApp.m_model.addPlc((LPTSTR)(LPCTSTR)strName, "192.168.1.188", 1001);
+ CString strPLCName = dlgAddPLCInfo.GetPLCName();
+ CString strIP = dlgAddPLCInfo.GetIP();
+ CString strPort = dlgAddPLCInfo.GetPort();
+
+ if (!strPLCName.IsEmpty() && !strIP.IsEmpty() && !strPort.IsEmpty()) {
+ theApp.m_model.addPlc((LPTSTR)(LPCTSTR)strPLCName, (LPTSTR)(LPCTSTR)strIP, std::stoi((LPTSTR)(LPCTSTR)strPort));
// 新建轴文件
AxisManager axisManager;
- axisManager.SaveAxis((LPTSTR)(LPCTSTR)strName);
+ axisManager.SaveAxis((LPTSTR)(LPCTSTR)strPLCName);
// 新建IO文件
IOManager ioManager;
- ioManager.SaveToFile((LPTSTR)(LPCTSTR)strName);
+ ioManager.SaveToFile((LPTSTR)(LPCTSTR)strPLCName);
}
}
else if (id == IDC_BUTTON_DELETE) {
--
Gitblit v1.9.3