From 57828c3476be8f8ac25b11a696e7aeb3f44be997 Mon Sep 17 00:00:00 2001 From: QuShuailong Date: Fri, 22 Jul 2022 16:48:44 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=89=93=E5=8D=B0=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/TcpServer/TcpServer.h | 2 - src/VisionController/VisionController.cpp | 107 ++++++++++++++---- src/VisionController/VisionController.h | 3 + src/VisionController/main.cpp | 1 + tpvs17/IOController/IOController.vcxproj | 26 ++--- tpvs17/IOController/IOController.vcxproj.user | 4 +- tpvs17/TcpServer/TcpServer.vcxproj | 20 ++-- tpvs17/TcpServer/TcpServer.vcxproj.user | 4 +- tpvs17/VisionController.sln | 16 +++ .../VisionController/VisionController.vcxproj | 26 ++--- .../VisionController.vcxproj.user | 6 +- 11 files changed, 149 insertions(+), 66 deletions(-) diff --git a/src/TcpServer/TcpServer.h b/src/TcpServer/TcpServer.h index 1a1adea..0511772 100644 --- a/src/TcpServer/TcpServer.h +++ b/src/TcpServer/TcpServer.h @@ -8,8 +8,6 @@ #include #include -//#include "tcpsocket.h" - #include #ifndef BUILD_STATIC diff --git a/src/VisionController/VisionController.cpp b/src/VisionController/VisionController.cpp index fe12660..5d388a8 100644 --- a/src/VisionController/VisionController.cpp +++ b/src/VisionController/VisionController.cpp @@ -5,7 +5,6 @@ VisionController::VisionController(QWidget *parent) : QMainWindow(parent) { ui.setupUi(this); - m_tcpServerPtr = nullptr; m_tcpServerPtr = new TcpServer(this); QString path = QApplication::applicationDirPath(); @@ -17,8 +16,8 @@ VisionController::VisionController(QWidget *parent) ui.LineEdit_IP->setEnabled(false); if (m_tcpServerPtr->startConnect(serverIP, serverPort)) { - //QString msg = QString("服务器：1%: 2% 启动成功").arg(serverIp).arg(port); QString showMsg = QString("【服务器：%1: %2 启动成功】").arg(serverIP).arg(serverPort); + qInfo() << showMsg; ui.textLog->appendPlainText(showMsg); ui.ButtonStart->setEnabled(false); ui.ButtonStop->setEnabled(true); @@ -26,6 +25,7 @@ VisionController::VisionController(QWidget *parent) else { QString showMsg = QString("【服务器：%1: %2 启动失败】").arg(serverIP).arg(serverPort); + qWarning() << showMsg; ui.textLog->appendPlainText(showMsg); } connect(ui.ButtonStart, SIGNAL(clicked()), this, SLOT(onButtonClicked())); @@ -36,22 +36,43 @@ VisionController::VisionController(QWidget *parent) connect(m_tcpServerPtr, &TcpServer::sgReceived, this, &VisionController::receivedData); connect(m_tcpServerPtr, &TcpServer::sgDisconnected, this, &VisionController::onDisconnected); m_ioControllerPtr = new IOController(); - unsigned int serialNum = 2; - if (!m_ioControllerPtr->controllerInitialization(serialNum)) + unsigned int comNum = 2; + if (!readComSetting(path, comNum)) + { + QString showMsg = QString("未能读取到Com配置文件"); + qWarning() << showMsg; + ui.textLog->appendPlainText(showMsg); + } + if (!m_ioControllerPtr->controllerInitialization(comNum)) { - QString showMsg = QString("串口Com%1初始化失败").arg(serialNum); + QString showMsg = QString("串口Com%1初始化失败").arg(comNum); + qWarning() << showMsg; ui.textLog->appendPlainText(showMsg); } else { - QString showMsg = QString("串口Com%1初始化成功").arg(serialNum); + QString showMsg = QString("串口Com%1初始化成功").arg(comNum); + qInfo() << showMsg; ui.textLog->appendPlainText(showMsg); } + qInfo() << "软件开启成功"; } +VisionController::~VisionController() +{ + if (m_ioControllerPtr) + { + delete m_ioControllerPtr; + //m_ioControllerPtr = nullptr; + } + if (m_tcpServerPtr) + { + delete m_tcpServerPtr; + } +} bool VisionController::readServerConfig(QString path, QString& serverIP, quint16& port) { - QString filePath = path + "\\..\\config\\tcpServer.json"; + QString filePath = path + "\\config\\tcpServer.json"; QFile jsonFile(filePath); if (!jsonFile.exists()) { @@ -82,7 +103,7 @@ bool VisionController::readServerConfig(QString path, QString& serverIP, quint16 } bool VisionController::writeServerConfig(QString path, QString serverIP, quint16 serverPort) { - QString filePath = path + "\\..\\config\\tcpServer.json"; + QString filePath = path + "\\config\\tcpServer.json"; QFile jsonFile(filePath); if (!jsonFile.open(QIODevice::WriteOnly)) { @@ -100,33 +121,49 @@ bool VisionController::writeServerConfig(QString path, QString serverIP, quint16 jsonFile.close(); return true; } -VisionController::~VisionController() + +bool VisionController::readComSetting(const QString &path, unsigned int& comNum) { - if (m_ioControllerPtr) + QString filePath = path + "\\config\\comSetting.json"; + QFile comSettingFile(filePath); + if (!comSettingFile.exists()) { - delete m_ioControllerPtr; - //m_ioControllerPtr = nullptr; + qDebug() << "文件：" << filePath << "不存在！"; + return false; } - - if (m_tcpServerPtr) + if (!comSettingFile.open(QIODevice::ReadOnly | QIODevice::Text)) { - delete m_tcpServerPtr; + qDebug() << "文件：" << filePath << "打开失败！"; + return false; + } + QByteArray dataArray = comSettingFile.readAll(); + comSettingFile.close(); + QJsonParseError jsonError; + QJsonDocument jsonDocument = QJsonDocument::fromJson(dataArray, &jsonError); + if (jsonError.error != QJsonParseError::NoError) + { + qDebug() << "文件：" << filePath << "格式错误！"; + return false; } + QJsonObject jsonObject = jsonDocument.object(); + comNum = jsonObject.value("Com").toInt(); + return true; } Q_SLOT void VisionController::onButtonClicked() { QString strObj = sender()->objectName(); + QString serverIp = ui.LineEdit_IP->text(); + quint16 port = ui.LineEdit_Port->text().toUInt(); + QString path = QApplication::applicationDirPath(); if (strObj == "ButtonStart") { - QString serverIp = ui.LineEdit_IP->text(); - quint16 port = ui.LineEdit_Port->text().toUInt(); - QString path = QApplication::applicationDirPath(); writeServerConfig(path, serverIp, port); if (m_tcpServerPtr->startConnect(serverIp, port)) { //QString msg = QString("服务器：1%: 2% 启动成功").arg(serverIp).arg(port); QString showMsg = QString("【服务器：%1: %2 启动成功】").arg(serverIp).arg(port); + qInfo() << showMsg; ui.textLog->appendPlainText(showMsg); ui.ButtonStart->setEnabled(false); ui.ButtonStop->setEnabled(true); @@ -134,6 +171,7 @@ Q_SLOT void VisionController::onButtonClicked() else { QString showMsg = QString("【服务器：%1: %2 启动失败】").arg(serverIp).arg(port); + qWarning() << showMsg; ui.textLog->appendPlainText(showMsg); } } @@ -141,6 +179,7 @@ Q_SLOT void VisionController::onButtonClicked() { if (m_tcpServerPtr != nullptr) { + qInfo() << QString("【关闭服务器：%1：%2】").arg(serverIp).arg(port); m_tcpServerPtr->onCloseConnect(); ui.ButtonStart->setEnabled(true); ui.ButtonStop->setEnabled(false); @@ -155,12 +194,14 @@ Q_SLOT void VisionController::onButtonClicked() Q_SLOT void VisionController::newConnected(QString ip, quint16 port) { QString showMsg = QString("【客户端上线：%1: %2】").arg(ip).arg(port); + qInfo() << showMsg; ui.textLog->appendPlainText(showMsg); } Q_SLOT void VisionController::receivedData(QString ip, quint16 port, const QByteArray& dataByte) { QString showMsg = QString("【客户端：%1: %2】：").arg(ip).arg(port); showMsg.append(dataByte); + qInfo() << showMsg; ui.textLog->appendPlainText(showMsg); QString msg = QString(dataByte); @@ -179,11 +220,13 @@ Q_SLOT void VisionController::receivedData(QString ip, quint16 port, const QByte if (state == 0) { QString errorMsg = QString("【端口Port%1 关闭失败！】").arg(port); + qWarning() << errorMsg; ui.textLog->appendPlainText(errorMsg); } else if (state == 1) { QString errorMsg = QString("【端口Port%1 打开失败！】").arg(port); + qWarning() << errorMsg; ui.textLog->appendPlainText(errorMsg); } } @@ -192,11 +235,13 @@ Q_SLOT void VisionController::receivedData(QString ip, quint16 port, const QByte if (state == 0) { QString successMsg = QString("【端口port%1 关闭成功！】").arg(port); + qInfo() << successMsg; ui.textLog->appendPlainText(successMsg); } else if (state == 1) { QString successMsg = QString("【端口port%1 打开成功！】").arg(port); + qInfo() << successMsg; ui.textLog->appendPlainText(successMsg); } } @@ -207,11 +252,13 @@ Q_SLOT void VisionController::receivedData(QString ip, quint16 port, const QByte if (m_ioControllerPtr->getPortState(port, portState)) { QString successMsg = QString("【端口port%1的状态为：%2】").arg(port).arg(portState); + qInfo() << QString("查询端口port%1的状态，端口port%1的状态为：%2").arg(port).arg(portState); ui.textLog->appendPlainText(successMsg); } else { QString errorMsg = QString("【端口port%1状态获取失败！】").arg(port); + qWarning() << QString("获取端口port%1状态失败！").arg(port); ui.textLog->appendPlainText(errorMsg); } } @@ -220,12 +267,28 @@ Q_SLOT void VisionController::receivedData(QString ip, quint16 port, const QByte Q_SLOT void VisionController::onDisconnected(QString ip, quint16 port) { QString msg = QString("【客户端：%1：%2断开连接！】").arg(ip).arg(port); + qInfo() << msg; ui.textLog->appendPlainText(msg); } void VisionController::closeEvent(QCloseEvent *event) { - QString serverIp = ui.LineEdit_IP->text(); - quint16 port = ui.LineEdit_Port->text().toUInt(); - QString path = QApplication::applicationDirPath(); - writeServerConfig(path, serverIp, port); + //QMessageBox msgBox; + //setWindowFlags(Qt::WindowCloseButtonHint | Qt::MSWindowsFixedSizeDialogHint); + //msgBox.setText("提示"); + //msgBox.setInformativeText("确认退出?"); + //msgBox.setStandardButtons(QMessageBox::Ok | QMessageBox::Cancel); + //msgBox.setDefaultButton(QMessageBox::Ok); + //int ret = msgBox.exec(); + //if (ret == QMessageBox::Ok) { + // //若用户点击确认，则接收这个事件,当前窗口会关闭 + // QString serverIp = ui.LineEdit_IP->text(); + // quint16 port = ui.LineEdit_Port->text().toUInt(); + // QString path = QApplication::applicationDirPath(); + // writeServerConfig(path, serverIp, port); + // event->accept(); + //} + //else { + // //若用户点击取消，则忽略这个事件，当前窗口不会关闭 + // event->ignore(); + //} } \ No newline at end of file diff --git a/src/VisionController/VisionController.h b/src/VisionController/VisionController.h index 5cc5860..a70ecd2 100644 --- a/src/VisionController/VisionController.h +++ b/src/VisionController/VisionController.h @@ -7,10 +7,12 @@ #include #include #include +#include #include "ui_VisionController.h" #include "TcpServer.h" #include "IOController.h" +#include "QLog.h" class VisionController : public QMainWindow { @@ -31,6 +33,7 @@ private: Q_SLOT void onDisconnected(QString ip, quint16 port); bool readServerConfig(QString path, QString& serverIP, quint16& port); bool writeServerConfig(QString path, QString serverIP, quint16 port); + bool readComSetting(const QString &path, unsigned int& comNum); TcpServer* m_tcpServerPtr; IOController* m_ioControllerPtr{nullptr}; //IOInterface* m_ioInterfacePtr{ nullptr }; diff --git a/src/VisionController/main.cpp b/src/VisionController/main.cpp index f0926b2..fe7fc2c 100644 --- a/src/VisionController/main.cpp +++ b/src/VisionController/main.cpp @@ -4,6 +4,7 @@ int main(int argc, char *argv[]) { QApplication a(argc, argv); + QLog::Get().installMessageHandler(); VisionController w; w.show(); return a.exec(); diff --git a/tpvs17/IOController/IOController.vcxproj b/tpvs17/IOController/IOController.vcxproj index ee9512e..d7d4891 100644 --- a/tpvs17/IOController/IOController.vcxproj +++ b/tpvs17/IOController/IOController.vcxproj @@ -52,8 +52,8 @@ true - UNICODE;_UNICODE;WIN32;WIN64;QT_DLL;QT_CORE_LIB;IOCONTROLLER_LIB;%(PreprocessorDefinitions) - .\GeneratedFiles;.;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName);$(QTDIR)\include\QtCore;%(AdditionalIncludeDirectories) + UNICODE;_UNICODE;WIN32;WIN64;IOCONTROLLER_LIB;%(PreprocessorDefinitions) + .\GeneratedFiles;.;$(QTDIR)\include;$(QTDIR)\include\QtCore;.\GeneratedFiles\$(ConfigurationName);$(SolutionDir)..\src\IOController\NewSdkInc;%(AdditionalIncludeDirectories) Disabled ProgramDatabase MultiThreadedDebugDLL @@ -61,21 +61,21 @@ Windows - $(OutDir)\$(ProjectName).dll - $(QTDIR)\lib;%(AdditionalLibraryDirectories) + $(SolutionDir)..\runner17\$(ProjectName)d.dll + $(QTDIR)\lib;$(QTDIR);$(OutDir);%(AdditionalLibraryDirectories) true - qtmaind.lib;Qt5Cored.lib;%(AdditionalDependencies) + qtmaind.lib;MvIOInterfaceBox.lib;Qt5Cored.lib;%(AdditionalDependencies) - UNICODE;_UNICODE;WIN32;WIN64;QT_DLL;QT_CORE_LIB;IOCONTROLLER_LIB;%(PreprocessorDefinitions) - .\GeneratedFiles;.;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName);$(QTDIR)\include\QtCore;%(AdditionalIncludeDirectories) + UNICODE;_UNICODE;WIN32;WIN64;IOCONTROLLER_LIB;%(PreprocessorDefinitions) + .\GeneratedFiles;.;$(QTDIR)\include;$(QTDIR)\include\QtCore;.\GeneratedFiles\$(ConfigurationName);$(SolutionDir)..\src\IOController\NewSdkInc;%(AdditionalIncludeDirectories) true - UNICODE;_UNICODE;WIN32;WIN64;QT_DLL;QT_NO_DEBUG;NDEBUG;QT_CORE_LIB;IOCONTROLLER_LIB;%(PreprocessorDefinitions) - .\GeneratedFiles;.;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName);$(QTDIR)\include\QtCore;$(SolutionDir)..\src\IOController\NewSdkInc;%(AdditionalIncludeDirectories) + UNICODE;_UNICODE;WIN32;WIN64;QT_NO_DEBUG;NDEBUG;IOCONTROLLER_LIB;%(PreprocessorDefinitions) + .\GeneratedFiles;.;$(QTDIR)\include;$(QTDIR)\include\QtCore;.\GeneratedFiles\$(ConfigurationName);$(SolutionDir)..\src\IOController\NewSdkInc;%(AdditionalIncludeDirectories) MultiThreadedDLL true @@ -85,11 +85,11 @@ $(SolutionDir)..\runner17\$(ProjectName).dll $(QTDIR)\lib;$(QTDIR);$(OutDir);%(AdditionalLibraryDirectories) false - qtmain.lib;Qt5Core.lib;MvIOInterfaceBox.lib;%(AdditionalDependencies) + qtmain.lib;MvIOInterfaceBox.lib;Qt5Core.lib;%(AdditionalDependencies) - UNICODE;_UNICODE;WIN32;WIN64;QT_DLL;QT_NO_DEBUG;NDEBUG;QT_CORE_LIB;IOCONTROLLER_LIB;%(PreprocessorDefinitions) - .\GeneratedFiles;.;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName);$(QTDIR)\include\QtCore;$(SolutionDir)..\src\IOController\NewSdkInc;%(AdditionalIncludeDirectories) + UNICODE;_UNICODE;WIN32;WIN64;QT_NO_DEBUG;NDEBUG;IOCONTROLLER_LIB;%(PreprocessorDefinitions) + .\GeneratedFiles;.;$(QTDIR)\include;$(QTDIR)\include\QtCore;.\GeneratedFiles\$(ConfigurationName);$(SolutionDir)..\src\IOController\NewSdkInc;%(AdditionalIncludeDirectories) @@ -109,7 +109,7 @@ - + \ No newline at end of file diff --git a/tpvs17/IOController/IOController.vcxproj.user b/tpvs17/IOController/IOController.vcxproj.user index 4195e6b..3134de2 100644 --- a/tpvs17/IOController/IOController.vcxproj.user +++ b/tpvs17/IOController/IOController.vcxproj.user @@ -2,11 +2,11 @@ - D:\Qt\Qt5.9.4\5.9.4\msvc2017_64 + C:\Qt\Qt5.9.4\5.9.4\msvc2017_64 PATH=$(QTDIR)\bin%3b$(PATH) - D:\Qt\Qt5.9.4\5.9.4\msvc2017_64 + C:\Qt\Qt5.9.4\5.9.4\msvc2017_64 PATH=$(QTDIR)\bin%3b$(PATH) \ No newline at end of file diff --git a/tpvs17/TcpServer/TcpServer.vcxproj b/tpvs17/TcpServer/TcpServer.vcxproj index d817062..2efd722 100644 --- a/tpvs17/TcpServer/TcpServer.vcxproj +++ b/tpvs17/TcpServer/TcpServer.vcxproj @@ -52,8 +52,8 @@ true - UNICODE;_UNICODE;WIN32;WIN64;QT_DLL;QT_CORE_LIB;QT_NETWORK_LIB;TCPSERVER_LIB;%(PreprocessorDefinitions) - .\GeneratedFiles;.;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName);$(QTDIR)\include\QtCore;$(QTDIR)\include\QtNetwork;%(AdditionalIncludeDirectories) + UNICODE;_UNICODE;WIN32;WIN64;TCPSERVER_LIB;%(PreprocessorDefinitions) + .\GeneratedFiles;.;$(QTDIR)\include;$(QTDIR)\include\QtCore;$(QTDIR)\include\QtNetwork;.\GeneratedFiles\$(ConfigurationName);%(AdditionalIncludeDirectories) Disabled ProgramDatabase MultiThreadedDebugDLL @@ -61,14 +61,14 @@ Windows - $(OutDir)\$(ProjectName).dll + $(SolutionDir)..\runner17\$(ProjectName)d.dll $(QTDIR)\lib;%(AdditionalLibraryDirectories) true qtmaind.lib;Qt5Cored.lib;Qt5Networkd.lib;%(AdditionalDependencies) - UNICODE;_UNICODE;WIN32;WIN64;QT_DLL;QT_CORE_LIB;QT_NETWORK_LIB;TCPSERVER_LIB;%(PreprocessorDefinitions) - .\GeneratedFiles;.;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName);$(QTDIR)\include\QtCore;$(QTDIR)\include\QtNetwork + UNICODE;_UNICODE;WIN32;WIN64;TCPSERVER_LIB;%(PreprocessorDefinitions) + .\GeneratedFiles;.;$(QTDIR)\include;$(QTDIR)\include\QtCore;$(QTDIR)\include\QtNetwork;.\GeneratedFiles\$(ConfigurationName);%(AdditionalIncludeDirectories) .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp Moc'ing %(Identity)... @@ -76,8 +76,8 @@ true - UNICODE;_UNICODE;WIN32;WIN64;QT_DLL;QT_NO_DEBUG;NDEBUG;QT_CORE_LIB;QT_NETWORK_LIB;TCPSERVER_LIB;%(PreprocessorDefinitions) - .\GeneratedFiles;.;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName);$(QTDIR)\include\QtCore;$(QTDIR)\include\QtNetwork;%(AdditionalIncludeDirectories) + UNICODE;_UNICODE;WIN32;WIN64;QT_NO_DEBUG;NDEBUG;TCPSERVER_LIB;%(PreprocessorDefinitions) + .\GeneratedFiles;.;$(QTDIR)\include;$(QTDIR)\include\QtCore;$(QTDIR)\include\QtNetwork;.\GeneratedFiles\$(ConfigurationName);%(AdditionalIncludeDirectories) None MultiThreadedDLL true @@ -91,8 +91,8 @@ qtmain.lib;Qt5Core.lib;Qt5Network.lib;%(AdditionalDependencies) - UNICODE;_UNICODE;WIN32;WIN64;QT_DLL;QT_NO_DEBUG;NDEBUG;QT_CORE_LIB;QT_NETWORK_LIB;TCPSERVER_LIB;%(PreprocessorDefinitions) - .\GeneratedFiles;.;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName);$(QTDIR)\include\QtCore;$(QTDIR)\include\QtNetwork + UNICODE;_UNICODE;WIN32;WIN64;QT_NO_DEBUG;NDEBUG;TCPSERVER_LIB;%(PreprocessorDefinitions) + .\GeneratedFiles;.;$(QTDIR)\include;$(QTDIR)\include\QtCore;$(QTDIR)\include\QtNetwork;.\GeneratedFiles\$(ConfigurationName);%(AdditionalIncludeDirectories) .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp Moc'ing %(Identity)... @@ -111,7 +111,7 @@ - + \ No newline at end of file diff --git a/tpvs17/TcpServer/TcpServer.vcxproj.user b/tpvs17/TcpServer/TcpServer.vcxproj.user index 4195e6b..3134de2 100644 --- a/tpvs17/TcpServer/TcpServer.vcxproj.user +++ b/tpvs17/TcpServer/TcpServer.vcxproj.user @@ -2,11 +2,11 @@ - D:\Qt\Qt5.9.4\5.9.4\msvc2017_64 + C:\Qt\Qt5.9.4\5.9.4\msvc2017_64 PATH=$(QTDIR)\bin%3b$(PATH) - D:\Qt\Qt5.9.4\5.9.4\msvc2017_64 + C:\Qt\Qt5.9.4\5.9.4\msvc2017_64 PATH=$(QTDIR)\bin%3b$(PATH) \ No newline at end of file diff --git a/tpvs17/VisionController.sln b/tpvs17/VisionController.sln index f22d4ee..44bc1c0 100644 --- a/tpvs17/VisionController.sln +++ b/tpvs17/VisionController.sln @@ -9,24 +9,40 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IOController", "IOControlle EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TcpServer", "TcpServer\TcpServer.vcxproj", "{58DB7028-F0B5-4D49-AE6C-F29CE2942198}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "QLog", "QLog\QLog.vcxproj", "{83B44262-8845-441F-AE20-515E05969932}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|x64 = Debug|x64 + Debug|x86 = Debug|x86 Release|x64 = Release|x64 + Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {B12702AD-ABFB-343A-A199-8E24837244A3}.Debug|x64.ActiveCfg = Debug|x64 {B12702AD-ABFB-343A-A199-8E24837244A3}.Debug|x64.Build.0 = Debug|x64 + {B12702AD-ABFB-343A-A199-8E24837244A3}.Debug|x86.ActiveCfg = Debug|x64 {B12702AD-ABFB-343A-A199-8E24837244A3}.Release|x64.ActiveCfg = Release|x64 {B12702AD-ABFB-343A-A199-8E24837244A3}.Release|x64.Build.0 = Release|x64 + {B12702AD-ABFB-343A-A199-8E24837244A3}.Release|x86.ActiveCfg = Release|x64 {FB680084-3EA6-4ECA-BC68-2644C45CC825}.Debug|x64.ActiveCfg = Debug|x64 {FB680084-3EA6-4ECA-BC68-2644C45CC825}.Debug|x64.Build.0 = Debug|x64 + {FB680084-3EA6-4ECA-BC68-2644C45CC825}.Debug|x86.ActiveCfg = Debug|x64 {FB680084-3EA6-4ECA-BC68-2644C45CC825}.Release|x64.ActiveCfg = Release|x64 {FB680084-3EA6-4ECA-BC68-2644C45CC825}.Release|x64.Build.0 = Release|x64 + {FB680084-3EA6-4ECA-BC68-2644C45CC825}.Release|x86.ActiveCfg = Release|x64 {58DB7028-F0B5-4D49-AE6C-F29CE2942198}.Debug|x64.ActiveCfg = Debug|x64 {58DB7028-F0B5-4D49-AE6C-F29CE2942198}.Debug|x64.Build.0 = Debug|x64 + {58DB7028-F0B5-4D49-AE6C-F29CE2942198}.Debug|x86.ActiveCfg = Debug|x64 {58DB7028-F0B5-4D49-AE6C-F29CE2942198}.Release|x64.ActiveCfg = Release|x64 {58DB7028-F0B5-4D49-AE6C-F29CE2942198}.Release|x64.Build.0 = Release|x64 + {58DB7028-F0B5-4D49-AE6C-F29CE2942198}.Release|x86.ActiveCfg = Release|x64 + {83B44262-8845-441F-AE20-515E05969932}.Debug|x64.ActiveCfg = Debug|x64 + {83B44262-8845-441F-AE20-515E05969932}.Debug|x64.Build.0 = Debug|x64 + {83B44262-8845-441F-AE20-515E05969932}.Debug|x86.ActiveCfg = Debug|x64 + {83B44262-8845-441F-AE20-515E05969932}.Release|x64.ActiveCfg = Release|x64 + {83B44262-8845-441F-AE20-515E05969932}.Release|x64.Build.0 = Release|x64 + {83B44262-8845-441F-AE20-515E05969932}.Release|x86.ActiveCfg = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/tpvs17/VisionController/VisionController.vcxproj b/tpvs17/VisionController/VisionController.vcxproj index 6b3cbe3..66c0e21 100644 --- a/tpvs17/VisionController/VisionController.vcxproj +++ b/tpvs17/VisionController/VisionController.vcxproj @@ -52,8 +52,8 @@ true - UNICODE;_UNICODE;WIN32;WIN64;QT_DLL;QT_CORE_LIB;QT_GUI_LIB;QT_NETWORK_LIB;QT_WIDGETS_LIB;%(PreprocessorDefinitions) - .\GeneratedFiles;.;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName);$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtANGLE;$(QTDIR)\include\QtNetwork;$(QTDIR)\include\QtWidgets;%(AdditionalIncludeDirectories) + UNICODE;_UNICODE;WIN32;WIN64;%(PreprocessorDefinitions) + .\GeneratedFiles;.;$(QTDIR)\include;$(QTDIR)\include\QtCore;$(QTDIR)\include\QtNetwork;$(QTDIR)\include\QtWidgets;.\GeneratedFiles\$(ConfigurationName);$(SolutionDir)..\src\TcpServer;$(SolutionDir)..\src\IOController;$(SolutionDir)..\src\IOController\NewSdkInc;$(SolutionDir)..\src\VisionController;$(SolutionDir)..\src\QLog;$(OutDir);%(AdditionalIncludeDirectories) Disabled ProgramDatabase MultiThreadedDebugDLL @@ -61,16 +61,16 @@ Windows - $(OutDir)\$(ProjectName).exe - $(QTDIR)\lib;%(AdditionalLibraryDirectories) + $(SolutionDir)..\runner17\$(ProjectName)d.exe + $(QTDIR)\lib;$(OutDir);%(AdditionalLibraryDirectories) true - qtmaind.lib;Qt5Cored.lib;Qt5Guid.lib;Qt5Networkd.lib;Qt5Widgetsd.lib;%(AdditionalDependencies) + qtmaind.lib;Qt5Cored.lib;Qt5Widgetsd.lib;Qt5Networkd.lib;IOController.lib;TcpServer.lib;QLog.lib;%(AdditionalDependencies) .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp Moc'ing %(Identity)... - .\GeneratedFiles;.;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName);$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtANGLE;$(QTDIR)\include\QtNetwork;$(QTDIR)\include\QtWidgets;%(AdditionalIncludeDirectories) - UNICODE;_UNICODE;WIN32;WIN64;QT_DLL;QT_CORE_LIB;QT_GUI_LIB;QT_NETWORK_LIB;QT_WIDGETS_LIB;%(PreprocessorDefinitions) + .\GeneratedFiles;.;$(QTDIR)\include;$(QTDIR)\include\QtCore;$(QTDIR)\include\QtNetwork;$(QTDIR)\include\QtWidgets;.\GeneratedFiles\$(ConfigurationName);$(SolutionDir)..\src\TcpServer;$(SolutionDir)..\src\IOController;$(SolutionDir)..\src\IOController\NewSdkInc;$(SolutionDir)..\src\VisionController;$(SolutionDir)..\src\QLog;$(OutDir);%(AdditionalIncludeDirectories) + UNICODE;_UNICODE;WIN32;WIN64;%(PreprocessorDefinitions) Uic'ing %(Identity)... @@ -84,8 +84,8 @@ true - UNICODE;_UNICODE;WIN32;WIN64;QT_DLL;QT_NO_DEBUG;NDEBUG;QT_CORE_LIB;QT_GUI_LIB;QT_NETWORK_LIB;QT_WIDGETS_LIB;%(PreprocessorDefinitions) - .\GeneratedFiles;.;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName);$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtANGLE;$(QTDIR)\include\QtNetwork;$(QTDIR)\include\QtWidgets;$(SolutionDir)..\src\TcpServer;$(SolutionDir)..\src\IOController;$(SolutionDir)..\src\IOController\NewSdkInc;$(SolutionDir)..\src\VisionController;$(OutDir);%(AdditionalIncludeDirectories) + UNICODE;_UNICODE;WIN32;WIN64;QT_NO_DEBUG;NDEBUG;QT_MESSAGELOGCONTEXT;%(PreprocessorDefinitions) + .\GeneratedFiles;.;$(QTDIR)\include;$(QTDIR)\include\QtCore;$(QTDIR)\include\QtNetwork;$(QTDIR)\include\QtWidgets;.\GeneratedFiles\$(ConfigurationName);$(SolutionDir)..\src\TcpServer;$(SolutionDir)..\src\IOController;$(SolutionDir)..\src\IOController\NewSdkInc;$(SolutionDir)..\src\VisionController;$(SolutionDir)..\src\QLog;$(OutDir);%(AdditionalIncludeDirectories) None MultiThreadedDLL true @@ -96,13 +96,13 @@ $(SolutionDir)..\runner17\$(ProjectName).exe $(QTDIR)\lib;$(OutDir);%(AdditionalLibraryDirectories) false - qtmain.lib;Qt5Core.lib;Qt5Gui.lib;Qt5Network.lib;Qt5Widgets.lib;IOController.lib;TcpServer.lib;%(AdditionalDependencies) + qtmain.lib;Qt5Core.lib;Qt5Widgets.lib;Qt5Network.lib;IOController.lib;TcpServer.lib;QLog.lib;%(AdditionalDependencies) .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp Moc'ing %(Identity)... - .\GeneratedFiles;.;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName);$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtANGLE;$(QTDIR)\include\QtNetwork;$(QTDIR)\include\QtWidgets;$(SolutionDir)..\src\TcpServer;$(SolutionDir)..\src\IOController;$(SolutionDir)..\src\IOController\NewSdkInc;$(SolutionDir)..\src\VisionController;%(AdditionalIncludeDirectories) - UNICODE;_UNICODE;WIN32;WIN64;QT_DLL;QT_NO_DEBUG;NDEBUG;QT_CORE_LIB;QT_GUI_LIB;QT_NETWORK_LIB;QT_WIDGETS_LIB;%(PreprocessorDefinitions) + .\GeneratedFiles;.;$(QTDIR)\include;$(QTDIR)\include\QtCore;$(QTDIR)\include\QtNetwork;$(QTDIR)\include\QtWidgets;.\GeneratedFiles\$(ConfigurationName);$(SolutionDir)..\src\TcpServer;$(SolutionDir)..\src\IOController;$(SolutionDir)..\src\IOController\NewSdkInc;$(SolutionDir)..\src\VisionController;$(SolutionDir)..\src\QLog;$(OutDir);%(AdditionalIncludeDirectories) + UNICODE;_UNICODE;WIN32;WIN64;QT_NO_DEBUG;NDEBUG;QT_MESSAGELOGCONTEXT;%(PreprocessorDefinitions) Uic'ing %(Identity)... @@ -134,7 +134,7 @@ - + \ No newline at end of file diff --git a/tpvs17/VisionController/VisionController.vcxproj.user b/tpvs17/VisionController/VisionController.vcxproj.user index 2ad395e..956d126 100644 --- a/tpvs17/VisionController/VisionController.vcxproj.user +++ b/tpvs17/VisionController/VisionController.vcxproj.user @@ -2,11 +2,13 @@ - D:\Qt\Qt5.9.4\5.9.4\msvc2017_64 + C:\Qt\Qt5.9.4\5.9.4\msvc2017_64 + $(SolutionDir)..\runner17\$(ProjectName)d.exe + WindowsLocalDebugger PATH=$(QTDIR)\bin%3b$(PATH) - D:\Qt\Qt5.9.4\5.9.4\msvc2017_64 + C:\Qt\Qt5.9.4\5.9.4\msvc2017_64 $(SolutionDir)..\runner17\$(ProjectName).exe WindowsLocalDebugger PATH=$(QTDIR)\bin%3b$(PATH)