增加打印日志功能

develop-qsl
QuShuailong 4 years ago
parent 490083b884
commit 57828c3476

@ -8,8 +8,6 @@
#include <QTcpServer>
#include <QTcpSocket>
//#include "tcpsocket.h"
#include <QtCore/qglobal.h>
#ifndef BUILD_STATIC

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

@ -7,10 +7,12 @@
#include <QJsonArray>
#include <QJsonObject>
#include <QJsonDocument>
#include<QMessageBox>
#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 };

@ -4,6 +4,7 @@
int main(int argc, char *argv[])
{
QApplication a(argc, argv);
QLog::Get().installMessageHandler();
VisionController w;
w.show();
return a.exec();

@ -52,8 +52,8 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<PreprocessorDefinitions>UNICODE;_UNICODE;WIN32;WIN64;QT_DLL;QT_CORE_LIB;IOCONTROLLER_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>.\GeneratedFiles;.;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName);$(QTDIR)\include\QtCore;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>UNICODE;_UNICODE;WIN32;WIN64;IOCONTROLLER_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>.\GeneratedFiles;.;$(QTDIR)\include;$(QTDIR)\include\QtCore;.\GeneratedFiles\$(ConfigurationName);$(SolutionDir)..\src\IOController\NewSdkInc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<Optimization>Disabled</Optimization>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@ -61,21 +61,21 @@
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<OutputFile>$(OutDir)\$(ProjectName).dll</OutputFile>
<AdditionalLibraryDirectories>$(QTDIR)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<OutputFile>$(SolutionDir)..\runner17\$(ProjectName)d.dll</OutputFile>
<AdditionalLibraryDirectories>$(QTDIR)\lib;$(QTDIR);$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>qtmaind.lib;Qt5Cored.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>qtmaind.lib;MvIOInterfaceBox.lib;Qt5Cored.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<QtMoc>
<Define>UNICODE;_UNICODE;WIN32;WIN64;QT_DLL;QT_CORE_LIB;IOCONTROLLER_LIB;%(PreprocessorDefinitions)</Define>
<IncludePath>.\GeneratedFiles;.;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName);$(QTDIR)\include\QtCore;%(AdditionalIncludeDirectories)</IncludePath>
<Define>UNICODE;_UNICODE;WIN32;WIN64;IOCONTROLLER_LIB;%(PreprocessorDefinitions)</Define>
<IncludePath>.\GeneratedFiles;.;$(QTDIR)\include;$(QTDIR)\include\QtCore;.\GeneratedFiles\$(ConfigurationName);$(SolutionDir)..\src\IOController\NewSdkInc;%(AdditionalIncludeDirectories)</IncludePath>
</QtMoc>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<PreprocessorDefinitions>UNICODE;_UNICODE;WIN32;WIN64;QT_DLL;QT_NO_DEBUG;NDEBUG;QT_CORE_LIB;IOCONTROLLER_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>.\GeneratedFiles;.;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName);$(QTDIR)\include\QtCore;$(SolutionDir)..\src\IOController\NewSdkInc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>UNICODE;_UNICODE;WIN32;WIN64;QT_NO_DEBUG;NDEBUG;IOCONTROLLER_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>.\GeneratedFiles;.;$(QTDIR)\include;$(QTDIR)\include\QtCore;.\GeneratedFiles\$(ConfigurationName);$(SolutionDir)..\src\IOController\NewSdkInc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<DebugInformationFormat />
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
@ -85,11 +85,11 @@
<OutputFile>$(SolutionDir)..\runner17\$(ProjectName).dll</OutputFile>
<AdditionalLibraryDirectories>$(QTDIR)\lib;$(QTDIR);$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>false</GenerateDebugInformation>
<AdditionalDependencies>qtmain.lib;Qt5Core.lib;MvIOInterfaceBox.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>qtmain.lib;MvIOInterfaceBox.lib;Qt5Core.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<QtMoc>
<Define>UNICODE;_UNICODE;WIN32;WIN64;QT_DLL;QT_NO_DEBUG;NDEBUG;QT_CORE_LIB;IOCONTROLLER_LIB;%(PreprocessorDefinitions)</Define>
<IncludePath>.\GeneratedFiles;.;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName);$(QTDIR)\include\QtCore;$(SolutionDir)..\src\IOController\NewSdkInc;%(AdditionalIncludeDirectories)</IncludePath>
<Define>UNICODE;_UNICODE;WIN32;WIN64;QT_NO_DEBUG;NDEBUG;IOCONTROLLER_LIB;%(PreprocessorDefinitions)</Define>
<IncludePath>.\GeneratedFiles;.;$(QTDIR)\include;$(QTDIR)\include\QtCore;.\GeneratedFiles\$(ConfigurationName);$(SolutionDir)..\src\IOController\NewSdkInc;%(AdditionalIncludeDirectories)</IncludePath>
</QtMoc>
</ItemDefinitionGroup>
<ItemGroup>
@ -109,7 +109,7 @@
</ImportGroup>
<ProjectExtensions>
<VisualStudio>
<UserProperties MocDir=".\GeneratedFiles\$(ConfigurationName)" UicDir=".\GeneratedFiles" RccDir=".\GeneratedFiles" lupdateOptions="" lupdateOnBuild="0" lreleaseOptions="" Qt5Version_x0020_x64="5.9.4_msvc2017_64" MocOptions="" />
<UserProperties MocDir=".\GeneratedFiles\$(ConfigurationName)" UicDir=".\GeneratedFiles" RccDir=".\GeneratedFiles" lupdateOptions="" lupdateOnBuild="0" lreleaseOptions="" Qt5Version_x0020_x64="msvc2017_qt-5.9.4-x64" MocOptions="" />
</VisualStudio>
</ProjectExtensions>
</Project>

@ -2,11 +2,11 @@
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<QTDIR>D:\Qt\Qt5.9.4\5.9.4\msvc2017_64</QTDIR>
<QTDIR>C:\Qt\Qt5.9.4\5.9.4\msvc2017_64</QTDIR>
<LocalDebuggerEnvironment>PATH=$(QTDIR)\bin%3b$(PATH)</LocalDebuggerEnvironment>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<QTDIR>D:\Qt\Qt5.9.4\5.9.4\msvc2017_64</QTDIR>
<QTDIR>C:\Qt\Qt5.9.4\5.9.4\msvc2017_64</QTDIR>
<LocalDebuggerEnvironment>PATH=$(QTDIR)\bin%3b$(PATH)</LocalDebuggerEnvironment>
</PropertyGroup>
</Project>

@ -52,8 +52,8 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<PreprocessorDefinitions>UNICODE;_UNICODE;WIN32;WIN64;QT_DLL;QT_CORE_LIB;QT_NETWORK_LIB;TCPSERVER_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>.\GeneratedFiles;.;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName);$(QTDIR)\include\QtCore;$(QTDIR)\include\QtNetwork;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>UNICODE;_UNICODE;WIN32;WIN64;TCPSERVER_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>.\GeneratedFiles;.;$(QTDIR)\include;$(QTDIR)\include\QtCore;$(QTDIR)\include\QtNetwork;.\GeneratedFiles\$(ConfigurationName);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<Optimization>Disabled</Optimization>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@ -61,14 +61,14 @@
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<OutputFile>$(OutDir)\$(ProjectName).dll</OutputFile>
<OutputFile>$(SolutionDir)..\runner17\$(ProjectName)d.dll</OutputFile>
<AdditionalLibraryDirectories>$(QTDIR)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>qtmaind.lib;Qt5Cored.lib;Qt5Networkd.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<QtMoc>
<Define>UNICODE;_UNICODE;WIN32;WIN64;QT_DLL;QT_CORE_LIB;QT_NETWORK_LIB;TCPSERVER_LIB;%(PreprocessorDefinitions)</Define>
<IncludePath>.\GeneratedFiles;.;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName);$(QTDIR)\include\QtCore;$(QTDIR)\include\QtNetwork</IncludePath>
<Define>UNICODE;_UNICODE;WIN32;WIN64;TCPSERVER_LIB;%(PreprocessorDefinitions)</Define>
<IncludePath>.\GeneratedFiles;.;$(QTDIR)\include;$(QTDIR)\include\QtCore;$(QTDIR)\include\QtNetwork;.\GeneratedFiles\$(ConfigurationName);%(AdditionalIncludeDirectories)</IncludePath>
<OutputFile>.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</OutputFile>
<ExecutionDescription>Moc'ing %(Identity)...</ExecutionDescription>
</QtMoc>
@ -76,8 +76,8 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<PreprocessorDefinitions>UNICODE;_UNICODE;WIN32;WIN64;QT_DLL;QT_NO_DEBUG;NDEBUG;QT_CORE_LIB;QT_NETWORK_LIB;TCPSERVER_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>.\GeneratedFiles;.;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName);$(QTDIR)\include\QtCore;$(QTDIR)\include\QtNetwork;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>UNICODE;_UNICODE;WIN32;WIN64;QT_NO_DEBUG;NDEBUG;TCPSERVER_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>.\GeneratedFiles;.;$(QTDIR)\include;$(QTDIR)\include\QtCore;$(QTDIR)\include\QtNetwork;.\GeneratedFiles\$(ConfigurationName);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<DebugInformationFormat>None</DebugInformationFormat>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
@ -91,8 +91,8 @@
<AdditionalDependencies>qtmain.lib;Qt5Core.lib;Qt5Network.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<QtMoc>
<Define>UNICODE;_UNICODE;WIN32;WIN64;QT_DLL;QT_NO_DEBUG;NDEBUG;QT_CORE_LIB;QT_NETWORK_LIB;TCPSERVER_LIB;%(PreprocessorDefinitions)</Define>
<IncludePath>.\GeneratedFiles;.;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName);$(QTDIR)\include\QtCore;$(QTDIR)\include\QtNetwork</IncludePath>
<Define>UNICODE;_UNICODE;WIN32;WIN64;QT_NO_DEBUG;NDEBUG;TCPSERVER_LIB;%(PreprocessorDefinitions)</Define>
<IncludePath>.\GeneratedFiles;.;$(QTDIR)\include;$(QTDIR)\include\QtCore;$(QTDIR)\include\QtNetwork;.\GeneratedFiles\$(ConfigurationName);%(AdditionalIncludeDirectories)</IncludePath>
<OutputFile>.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</OutputFile>
<ExecutionDescription>Moc'ing %(Identity)...</ExecutionDescription>
</QtMoc>
@ -111,7 +111,7 @@
</ImportGroup>
<ProjectExtensions>
<VisualStudio>
<UserProperties MocDir=".\GeneratedFiles\$(ConfigurationName)" UicDir=".\GeneratedFiles" RccDir=".\GeneratedFiles" lupdateOptions="" lupdateOnBuild="0" lreleaseOptions="" Qt5Version_x0020_x64="5.9.4_msvc2017_64" MocOptions="" />
<UserProperties MocDir=".\GeneratedFiles\$(ConfigurationName)" UicDir=".\GeneratedFiles" RccDir=".\GeneratedFiles" lupdateOptions="" lupdateOnBuild="0" lreleaseOptions="" Qt5Version_x0020_x64="msvc2017_qt-5.9.4-x64" MocOptions="" />
</VisualStudio>
</ProjectExtensions>
</Project>

@ -2,11 +2,11 @@
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<QTDIR>D:\Qt\Qt5.9.4\5.9.4\msvc2017_64</QTDIR>
<QTDIR>C:\Qt\Qt5.9.4\5.9.4\msvc2017_64</QTDIR>
<LocalDebuggerEnvironment>PATH=$(QTDIR)\bin%3b$(PATH)</LocalDebuggerEnvironment>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<QTDIR>D:\Qt\Qt5.9.4\5.9.4\msvc2017_64</QTDIR>
<QTDIR>C:\Qt\Qt5.9.4\5.9.4\msvc2017_64</QTDIR>
<LocalDebuggerEnvironment>PATH=$(QTDIR)\bin%3b$(PATH)</LocalDebuggerEnvironment>
</PropertyGroup>
</Project>

@ -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

@ -52,8 +52,8 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<PreprocessorDefinitions>UNICODE;_UNICODE;WIN32;WIN64;QT_DLL;QT_CORE_LIB;QT_GUI_LIB;QT_NETWORK_LIB;QT_WIDGETS_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>.\GeneratedFiles;.;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName);$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtANGLE;$(QTDIR)\include\QtNetwork;$(QTDIR)\include\QtWidgets;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>UNICODE;_UNICODE;WIN32;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>.\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)</AdditionalIncludeDirectories>
<Optimization>Disabled</Optimization>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@ -61,16 +61,16 @@
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<OutputFile>$(OutDir)\$(ProjectName).exe</OutputFile>
<AdditionalLibraryDirectories>$(QTDIR)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<OutputFile>$(SolutionDir)..\runner17\$(ProjectName)d.exe</OutputFile>
<AdditionalLibraryDirectories>$(QTDIR)\lib;$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>qtmaind.lib;Qt5Cored.lib;Qt5Guid.lib;Qt5Networkd.lib;Qt5Widgetsd.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>qtmaind.lib;Qt5Cored.lib;Qt5Widgetsd.lib;Qt5Networkd.lib;IOController.lib;TcpServer.lib;QLog.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<QtMoc>
<OutputFile>.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</OutputFile>
<ExecutionDescription>Moc'ing %(Identity)...</ExecutionDescription>
<IncludePath>.\GeneratedFiles;.;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName);$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtANGLE;$(QTDIR)\include\QtNetwork;$(QTDIR)\include\QtWidgets;%(AdditionalIncludeDirectories)</IncludePath>
<Define>UNICODE;_UNICODE;WIN32;WIN64;QT_DLL;QT_CORE_LIB;QT_GUI_LIB;QT_NETWORK_LIB;QT_WIDGETS_LIB;%(PreprocessorDefinitions)</Define>
<IncludePath>.\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)</IncludePath>
<Define>UNICODE;_UNICODE;WIN32;WIN64;%(PreprocessorDefinitions)</Define>
</QtMoc>
<QtUic>
<ExecutionDescription>Uic'ing %(Identity)...</ExecutionDescription>
@ -84,8 +84,8 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<PreprocessorDefinitions>UNICODE;_UNICODE;WIN32;WIN64;QT_DLL;QT_NO_DEBUG;NDEBUG;QT_CORE_LIB;QT_GUI_LIB;QT_NETWORK_LIB;QT_WIDGETS_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>.\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)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>UNICODE;_UNICODE;WIN32;WIN64;QT_NO_DEBUG;NDEBUG;QT_MESSAGELOGCONTEXT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>.\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)</AdditionalIncludeDirectories>
<DebugInformationFormat>None</DebugInformationFormat>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
@ -96,13 +96,13 @@
<OutputFile>$(SolutionDir)..\runner17\$(ProjectName).exe</OutputFile>
<AdditionalLibraryDirectories>$(QTDIR)\lib;$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>false</GenerateDebugInformation>
<AdditionalDependencies>qtmain.lib;Qt5Core.lib;Qt5Gui.lib;Qt5Network.lib;Qt5Widgets.lib;IOController.lib;TcpServer.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>qtmain.lib;Qt5Core.lib;Qt5Widgets.lib;Qt5Network.lib;IOController.lib;TcpServer.lib;QLog.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<QtMoc>
<OutputFile>.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</OutputFile>
<ExecutionDescription>Moc'ing %(Identity)...</ExecutionDescription>
<IncludePath>.\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)</IncludePath>
<Define>UNICODE;_UNICODE;WIN32;WIN64;QT_DLL;QT_NO_DEBUG;NDEBUG;QT_CORE_LIB;QT_GUI_LIB;QT_NETWORK_LIB;QT_WIDGETS_LIB;%(PreprocessorDefinitions)</Define>
<IncludePath>.\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)</IncludePath>
<Define>UNICODE;_UNICODE;WIN32;WIN64;QT_NO_DEBUG;NDEBUG;QT_MESSAGELOGCONTEXT;%(PreprocessorDefinitions)</Define>
</QtMoc>
<QtUic>
<ExecutionDescription>Uic'ing %(Identity)...</ExecutionDescription>
@ -134,7 +134,7 @@
</ImportGroup>
<ProjectExtensions>
<VisualStudio>
<UserProperties MocDir=".\GeneratedFiles\$(ConfigurationName)" UicDir=".\GeneratedFiles" RccDir=".\GeneratedFiles" lupdateOptions="" lupdateOnBuild="0" lreleaseOptions="" Qt5Version_x0020_x64="5.9.4_msvc2017_64" MocOptions="" />
<UserProperties MocDir=".\GeneratedFiles\$(ConfigurationName)" UicDir=".\GeneratedFiles" RccDir=".\GeneratedFiles" lupdateOptions="" lupdateOnBuild="0" lreleaseOptions="" Qt5Version_x0020_x64="msvc2017_qt-5.9.4-x64" MocOptions="" />
</VisualStudio>
</ProjectExtensions>
</Project>

@ -2,11 +2,13 @@
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<QTDIR>D:\Qt\Qt5.9.4\5.9.4\msvc2017_64</QTDIR>
<QTDIR>C:\Qt\Qt5.9.4\5.9.4\msvc2017_64</QTDIR>
<LocalDebuggerCommand>$(SolutionDir)..\runner17\$(ProjectName)d.exe</LocalDebuggerCommand>
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
<LocalDebuggerEnvironment>PATH=$(QTDIR)\bin%3b$(PATH)</LocalDebuggerEnvironment>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<QTDIR>D:\Qt\Qt5.9.4\5.9.4\msvc2017_64</QTDIR>
<QTDIR>C:\Qt\Qt5.9.4\5.9.4\msvc2017_64</QTDIR>
<LocalDebuggerCommand>$(SolutionDir)..\runner17\$(ProjectName).exe</LocalDebuggerCommand>
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
<LocalDebuggerEnvironment>PATH=$(QTDIR)\bin%3b$(PATH)</LocalDebuggerEnvironment>

Loading…
Cancel
Save