1、添加release配置

2、分离查询模块为单独进程
3、修复添加模板和删除模板bug
valve_lucas
bobpan 5 years ago
parent 0cf588eda7
commit 460fb4120e

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

@ -1,132 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>tp_login</class>
<widget class="QDialog" name="tp_login">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>485</width>
<height>235</height>
</rect>
</property>
<property name="windowTitle">
<string>Dialog</string>
</property>
<widget class="QGroupBox" name="groupBox">
<property name="geometry">
<rect>
<x>130</x>
<y>70</y>
<width>209</width>
<height>80</height>
</rect>
</property>
<property name="title">
<string>登录</string>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
<layout class="QFormLayout" name="formLayout">
<item row="0" column="0">
<widget class="QLabel" name="label">
<property name="text">
<string>用户名:</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_2">
<property name="text">
<string>密码:</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QLineEdit" name="tp_edit_password">
<property name="styleSheet">
<string notr="true"/>
</property>
<property name="echoMode">
<enum>QLineEdit::Password</enum>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QComboBox" name="tp_combobox_user"/>
</item>
</layout>
</item>
</layout>
</widget>
<widget class="QPushButton" name="tp_button_login">
<property name="geometry">
<rect>
<x>260</x>
<y>190</y>
<width>75</width>
<height>31</height>
</rect>
</property>
<property name="styleSheet">
<string notr="true"/>
</property>
<property name="text">
<string>确认</string>
</property>
</widget>
<widget class="QLabel" name="tp_login_warning">
<property name="enabled">
<bool>true</bool>
</property>
<property name="geometry">
<rect>
<x>280</x>
<y>150</y>
<width>191</width>
<height>16</height>
</rect>
</property>
<property name="styleSheet">
<string notr="true">color: rgb(255, 0, 0);</string>
</property>
<property name="text">
<string>密码错误,请重新输入</string>
</property>
<property name="tp_prop_bool_start_to_hide_widget" stdset="0">
<bool>true</bool>
</property>
</widget>
<widget class="QToolButton" name="tp_global_dialog_pushbutton_keyboard">
<property name="geometry">
<rect>
<x>440</x>
<y>120</y>
<width>37</width>
<height>18</height>
</rect>
</property>
<property name="text">
<string>key</string>
</property>
</widget>
<widget class="QPushButton" name="tp_button_login_cancel">
<property name="geometry">
<rect>
<x>360</x>
<y>190</y>
<width>75</width>
<height>31</height>
</rect>
</property>
<property name="styleSheet">
<string notr="true"/>
</property>
<property name="text">
<string>取消</string>
</property>
</widget>
</widget>
<resources/>
<connections/>
</ui>

@ -1,529 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>tp_user_manager</class>
<widget class="QDialog" name="tp_user_manager">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>472</width>
<height>314</height>
</rect>
</property>
<property name="windowTitle">
<string>用户管理</string>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="1" column="0">
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<widget class="QLabel" name="label_4">
<property name="minimumSize">
<size>
<width>50</width>
<height>20</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>60</width>
<height>16777215</height>
</size>
</property>
<property name="text">
<string>当前用户:</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="tp_label_show_user">
<property name="text">
<string/>
</property>
</widget>
</item>
</layout>
</item>
<item row="4" column="0">
<widget class="QTabWidget" name="tp_tab_manager">
<property name="currentIndex">
<number>0</number>
</property>
<widget class="QWidget" name="tab">
<attribute name="title">
<string>用户</string>
</attribute>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<layout class="QHBoxLayout" name="horizontalLayout_4">
<item>
<spacer name="horizontalSpacer_3">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>30</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QGroupBox" name="groupBox">
<property name="minimumSize">
<size>
<width>240</width>
<height>0</height>
</size>
</property>
<property name="title">
<string>登录</string>
</property>
<layout class="QGridLayout" name="gridLayout_3">
<property name="leftMargin">
<number>3</number>
</property>
<property name="topMargin">
<number>3</number>
</property>
<property name="rightMargin">
<number>3</number>
</property>
<property name="bottomMargin">
<number>3</number>
</property>
<item row="0" column="0">
<layout class="QFormLayout" name="formLayout_2">
<item row="0" column="0">
<widget class="QLabel" name="label_5">
<property name="text">
<string>用户名:</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QComboBox" name="tp_combobox_user">
<property name="minimumSize">
<size>
<width>0</width>
<height>25</height>
</size>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_6">
<property name="text">
<string>密码:</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QLineEdit" name="tp_edit_password">
<property name="minimumSize">
<size>
<width>0</width>
<height>25</height>
</size>
</property>
<property name="styleSheet">
<string notr="true"/>
</property>
<property name="echoMode">
<enum>QLineEdit::Password</enum>
</property>
</widget>
</item>
</layout>
</item>
<item row="0" column="1">
<widget class="QLabel" name="tp_label_user_level_str">
<property name="minimumSize">
<size>
<width>30</width>
<height>0</height>
</size>
</property>
<property name="text">
<string>1</string>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_4">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>30</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_3">
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QPushButton" name="tp_button_login">
<property name="minimumSize">
<size>
<width>0</width>
<height>30</height>
</size>
</property>
<property name="styleSheet">
<string notr="true"/>
</property>
<property name="text">
<string>登录</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_9">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Preferred</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QPushButton" name="tp_button_logout_2">
<property name="minimumSize">
<size>
<width>0</width>
<height>30</height>
</size>
</property>
<property name="styleSheet">
<string notr="true"/>
</property>
<property name="text">
<string>注销</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item>
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>34</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QLabel" name="tp_login_warning">
<property name="enabled">
<bool>true</bool>
</property>
<property name="styleSheet">
<string notr="true">color: rgb(255, 0, 0);</string>
</property>
<property name="text">
<string>密码错误,请重新输入</string>
</property>
<property name="tp_prop_bool_start_to_hide_widget" stdset="0">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</widget>
<widget class="QWidget" name="tab_password">
<attribute name="title">
<string>修改密码</string>
</attribute>
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<layout class="QHBoxLayout" name="horizontalLayout_5">
<item>
<spacer name="horizontalSpacer_5">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<layout class="QFormLayout" name="formLayout">
<item row="0" column="0">
<widget class="QLabel" name="label">
<property name="text">
<string>旧密码</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_2">
<property name="text">
<string>新密码</string>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="label_3">
<property name="text">
<string>密码确认</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLineEdit" name="tp_edit_old_password">
<property name="echoMode">
<enum>QLineEdit::Password</enum>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QLineEdit" name="tp_edit_new_password">
<property name="echoMode">
<enum>QLineEdit::Password</enum>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QLineEdit" name="tp_edit_new_password_again">
<property name="echoMode">
<enum>QLineEdit::Password</enum>
</property>
</widget>
</item>
</layout>
</item>
<item>
<spacer name="horizontalSpacer_6">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_6">
<item>
<spacer name="horizontalSpacer_7">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QPushButton" name="tp_button_change_ps">
<property name="text">
<string>确定</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_8">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item>
<spacer name="verticalSpacer_2">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>43</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QLabel" name="tp_label_show_error">
<property name="styleSheet">
<string notr="true">color: rgb(255, 0, 0);</string>
</property>
<property name="text">
<string/>
</property>
</widget>
</item>
</layout>
</widget>
<widget class="QWidget" name="tab_users">
<attribute name="title">
<string>用户管理</string>
</attribute>
<layout class="QVBoxLayout" name="verticalLayout_4">
<item>
<layout class="QHBoxLayout" name="horizontalLayout_8">
<item>
<widget class="QListWidget" name="tp_listwidget_users">
<property name="toolTip">
<string>双击删除用户</string>
</property>
</widget>
</item>
<item>
<layout class="QVBoxLayout" name="verticalLayout_3">
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QLabel" name="label_7">
<property name="text">
<string>用户名:</string>
</property>
</widget>
</item>
<item>
<widget class="QLineEdit" name="tp_edit_new_user"/>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_7">
<item>
<widget class="QLabel" name="label_8">
<property name="text">
<string>权限级别:</string>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="tp_cmb_add_user_level">
<property name="editable">
<bool>false</bool>
</property>
<property name="tp_prop_stringlist_combobox_values" stdset="0">
<stringlist>
<string>4</string>
<string>5</string>
</stringlist>
</property>
<item>
<property name="text">
<string>操作员</string>
</property>
</item>
<item>
<property name="text">
<string>管理员</string>
</property>
</item>
</widget>
</item>
</layout>
</item>
<item>
<widget class="QPushButton" name="tp_button_add_user">
<property name="text">
<string>新增用户</string>
</property>
</widget>
</item>
<item>
<spacer name="verticalSpacer_3">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
</layout>
</item>
<item>
<widget class="QLabel" name="tp_label_show_warning">
<property name="text">
<string>双击列表中的用户可以删除用户; 默认密码123456</string>
</property>
</widget>
</item>
</layout>
</widget>
</widget>
</item>
</layout>
</widget>
<resources/>
<connections/>
</ui>

Binary file not shown.

@ -30,6 +30,7 @@ public:
virtual bool IAddModel(int, QString) = 0;
virtual bool IDeleteModel(int, QString) = 0;
virtual bool ISelModel(int, QString) = 0;
virtual bool ISaveModel(int, QString) = 0;
virtual void ISetModifyModel(bool) = 0;
virtual bool IStandard(int nIndex ,QString strModel)=0;
};

@ -38,11 +38,10 @@ bool WfColossus::addModel(int nIndex, QString strModel)
IDetectorTask* pTask = pSolutions->GetTask(strName);
if (pTask)
{
IDetectorTask *pNew = pSolutions->AddAndCopyTask(pTask);
PLP_DETECTOR_TASK tTsk = pNew->GetTaskInfo();
tTsk->strName = combineWithSymbol(QString::number(nIndex), strModel);
tTsk->bIsRun = false;
pNew->SetTaskInfo(tTsk);
LP_DETECTOR_TASK tTaskInfo;
tTaskInfo.bIsRun = false;
tTaskInfo.strName =combineWithSymbol(QString::number(nIndex), strModel);
IDetectorTask *pNew = pSolutions->AddAndCopyTask(pTask, tTaskInfo);
bCreate = true;
}
@ -98,7 +97,8 @@ QMap<QString, class WfModel*> WfColossus::allTask()
pInfo->bCaliState = vMap.value("model_cali").toBool();
pInfo->nCount = vMap.value("model_count").toInt();;
pInfo->nIndex = vMap.value("model_plc").toInt();;
pInfo->strCreateTime = vMap.value("model_time").toString();;
pInfo->strCreateTime = vMap.value("model_time").toString();
pInfo->strName = tInfo->strName;
lstDst.insert(tInfo->strName, pInfo);
}
return lstDst;
@ -265,10 +265,41 @@ bool WfColossus::saveTask(QMap<QString, class WfModel*> infos)
pTask->SetTaskInfo(tInfo);
}
}
//ptrSolMgr()->SaveByNames();
ptrSolMgr()->Save();
return true;
}
bool WfColossus::saveTask(class WfModel *ptr)
{
IDetectorSolution* pSolutions = ptrRunSolution();
if (!pSolutions) {
qWarning() << "running solution is null ";
return false;
}
if (!ptr)
{
qWarning() << "ptr is null ";
return false;
}
QString strName = ptr->strName;
IDetectorTask *pTask = pSolutions->GetTask(strName);
if (pTask)
{
PLP_DETECTOR_TASK tInfo = pTask->GetTaskInfo();
QVariantMap vMap = tInfo->property.toMap();
vMap.insert("model_plc", ptr->nIndex);
vMap.insert("model_count", ptr->nCount);
vMap.insert("model_time", ptr->strCreateTime);
tInfo->property = vMap;
pTask->SetTaskInfo(tInfo);
}
ptrSolMgr()->SaveByNames(QStringList()<<strName);
return true;
}
QStringList WfColossus::getStationModels(int nIndex)
{
IDetectorSolution* pSolutions = ptrRunSolution();

@ -23,7 +23,7 @@ public:
bool getBatchModel() const;
QStringList allRunningTask();
bool saveTask(QMap<QString, class WfModel*>);
bool saveTask(class WfModel *ptr);
void setModifyState(bool bFlag){ m_IsModify = bFlag; };
bool getModifyState() const{ return m_IsModify; };
void ReSetModifyState() { m_IsModify = false; };

@ -14,7 +14,7 @@ CWfCtrl::CWfCtrl(ICoreCtrl* p1, WfColossus* p3)
{
m_nOnlineMode = false;
m_pConnectChecker = new WorkChecker;
//m_pConnectChecker = new WorkChecker;
m_pCoreCtrl = p1;
m_pColossus = p3;
m_setting = new QSettings(QCoreApplication::applicationDirPath()+"\\user\\systemfile.ini", QSettings::IniFormat);
@ -26,25 +26,25 @@ CWfCtrl::CWfCtrl(ICoreCtrl* p1, WfColossus* p3)
m_nOnlineMode = systemIniFile.value("OnlineMode").toBool();
{
QString strErrorPath = QCoreApplication::applicationDirPath()+"/errorImage/";
QDiskCleanThread *pDCleanThread = new QDiskCleanThread;
pDCleanThread->setUseFlag(nCheckThreadEable);
pDCleanThread->setDays(nCheckImgFileDays);
pDCleanThread->SetImgStorageFolder(strErrorPath);
pDCleanThread->setMiniSize(nMinSpaceSize);
pDCleanThread->start();
m_pDCThreadList.append(pDCleanThread);
QString strRltImgPath = QCoreApplication::applicationDirPath() + "/DBFiles/Images/";
QDiskCleanThread *pCleanDir = new QDiskCleanThread;
pCleanDir->setModel(CleanDir);
pCleanDir->setSleepS(3600);
pCleanDir->setUseFlag(nCheckThreadEable);
pCleanDir->setDays(nCheckDirDays);
pCleanDir->SetImgStorageFolder(strRltImgPath);
pCleanDir->setMiniSize(nMinSpaceSize);
pCleanDir->start();
m_pDCThreadList.append(pCleanDir);
// QDiskCleanThread *pDCleanThread = new QDiskCleanThread;
// pDCleanThread->setUseFlag(nCheckThreadEable);
// pDCleanThread->setDays(nCheckImgFileDays);
// pDCleanThread->SetImgStorageFolder(strErrorPath);
// pDCleanThread->setMiniSize(nMinSpaceSize);
// pDCleanThread->start();
// m_pDCThreadList.append(pDCleanThread);
//
//
// QString strRltImgPath = QCoreApplication::applicationDirPath() + "/DBFiles/Images/";
// QDiskCleanThread *pCleanDir = new QDiskCleanThread;
// pCleanDir->setModel(CleanDir);
// pCleanDir->setSleepS(3600);
// pCleanDir->setUseFlag(nCheckThreadEable);
// pCleanDir->setDays(nCheckDirDays);
// pCleanDir->SetImgStorageFolder(strRltImgPath);
// pCleanDir->setMiniSize(nMinSpaceSize);
// pCleanDir->start();
// m_pDCThreadList.append(pCleanDir);
}
}
@ -206,7 +206,9 @@ bool CWfCtrl::IAddModel(int nStation, QString strModel)
if (m_pColossus) {
m_pColossus->addModel(nStation, strModel);
}
m_mpModels.insert(genModelName(nStation, strModel), new WfModel);
WfModel *pMode = new WfModel;
pMode->strName = genModelName(nStation, strModel);
m_mpModels.insert(pMode->strName, pMode);
qDebug() << "CWfCtrl::IAddModel:" << strModel;
return true;
}
@ -230,6 +232,16 @@ bool CWfCtrl::IDeleteModel(int nStation, QString strModel)
return true;
}
bool CWfCtrl::ISaveModel(int ID, QString strName)
{
IStation *pStation = IGetStationById(ID);
if (m_pColossus && pStation)
{
m_pColossus->saveTask(pStation->wfModel(strName));
}
return true;
}
bool CWfCtrl::ISelModel(int nStation, QString strModel)
{
if (strModel.isEmpty()) {

@ -35,6 +35,7 @@ public:
virtual bool IAddModel(int, QString);
virtual bool IDeleteModel(int, QString);
virtual bool ISaveModel(int, QString);
virtual bool ISelModel(int, QString);
virtual void ISetModifyModel(bool bflag);
virtual QString IGetCurrentRuningModel(int);

@ -11,6 +11,7 @@ public:
QString strCreateTime;
bool bCaliState;
int nIndex;
QString strName;
};
#endif

@ -93,7 +93,7 @@
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<OutputFile>$(OutDir)\$(ProjectName).exe</OutputFile>
<OutputFile>$(SolutionDir)..\runner17\$(TargetName)$(TargetExt)</OutputFile>
<AdditionalLibraryDirectories>$(QTDIR)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>false</GenerateDebugInformation>
<AdditionalDependencies>qtmain.lib;Qt5Core.lib;Qt5Gui.lib;Qt5Widgets.lib;%(AdditionalDependencies)</AdditionalDependencies>

@ -11,5 +11,8 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<QTDIR>D:\Qt\Qt5.9.4\5.9.4\msvc2017_64</QTDIR>
<LocalDebuggerEnvironment>PATH=$(QTDIR)\bin%3b$(PATH)</LocalDebuggerEnvironment>
<LocalDebuggerCommand>$(SolutionDir)..\runner17\$(TargetName)$(TargetExt)</LocalDebuggerCommand>
<LocalDebuggerWorkingDirectory>$(SolutionDir)..\runner17\</LocalDebuggerWorkingDirectory>
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
</PropertyGroup>
</Project>

@ -0,0 +1,7 @@
#include "Report.h"
Report::Report(QWidget *parent)
: QMainWindow(parent)
{
ui.setupUi(this);
}

@ -0,0 +1,15 @@
#pragma once
#include <QtWidgets/QMainWindow>
#include "ui_Report.h"
class Report : public QMainWindow
{
Q_OBJECT
public:
Report(QWidget *parent = Q_NULLPTR);
private:
Ui::ReportClass ui;
};

@ -0,0 +1,6 @@
<RCC>
<qresource prefix="/Report">
<file>Resources/app.png</file>
<file>Resources/app2.png</file>
</qresource>
</RCC>

@ -0,0 +1,29 @@
<UI version="4.0" >
<class>ReportClass</class>
<widget class="QMainWindow" name="ReportClass" >
<property name="objectName" >
<string notr="true">ReportClass</string>
</property>
<property name="geometry" >
<rect>
<x>0</x>
<y>0</y>
<width>600</width>
<height>400</height>
</rect>
</property>
<property name="windowTitle" >
<string>Report</string>
</property>
<widget class="QMenuBar" name="menuBar" />
<widget class="QToolBar" name="mainToolBar" />
<widget class="QWidget" name="centralWidget" />
<widget class="QStatusBar" name="statusBar" />
</widget>
<layoutDefault spacing="6" margin="11" />
<pixmapfunction></pixmapfunction>
<resources>
<include location="Report.qrc"/>
</resources>
<connections/>
</UI>

@ -0,0 +1,174 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|x64">
<Configuration>Debug</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|x64">
<Configuration>Release</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{B12702AD-ABFB-343A-A199-8E24837244A3}</ProjectGuid>
<Keyword>Qt4VSv1.0</Keyword>
<WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<PropertyGroup Condition="'$(QtMsBuild)'=='' or !Exists('$(QtMsBuild)\qt.targets')">
<QtMsBuild>$(MSBuildProjectDirectory)\QtMsBuild</QtMsBuild>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
<TargetName>$(ProjectName)d</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
</PropertyGroup>
<Target Name="QtMsBuildNotFound" BeforeTargets="CustomBuild;ClCompile" Condition="!Exists('$(QtMsBuild)\qt.targets') or !Exists('$(QtMsBuild)\qt.props')">
<Message Importance="High" Text="QtMsBuild: could not locate qt.targets, qt.props; project may not build correctly." />
</Target>
<ImportGroup Condition="Exists('$(QtMsBuild)\qt.props')">
<Import Project="$(QtMsBuild)\qt.props" />
</ImportGroup>
<ImportGroup Label="ExtensionSettings" />
<ImportGroup Label="Shared" />
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<PreprocessorDefinitions>UNICODE;_UNICODE;WIN32;WIN64;QT_DLL;QT_CORE_LIB;QT_GUI_LIB;QT_SQL_LIB;QT_WIDGETS_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>.\GeneratedFiles;.;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName);$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtANGLE;$(QTDIR)\include\QtSql;$(QTDIR)\include\QtWidgets;..\..\src\lpMain\sqliteDB;..\..\3part\libzkq\include;..\..\3part\customgui\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<Optimization>Disabled</Optimization>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<OutputFile>$(SolutionDir)..\runner17\$(TargetName)$(TargetExt)</OutputFile>
<AdditionalLibraryDirectories>$(QTDIR)\lib;..\..\3part\libzkq\lib;..\..\3part\customgui\lib_x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>qtmaind.lib;Qt5Cored.lib;Qt5Guid.lib;Qt5Sqld.lib;Qt5Widgetsd.lib;libzkqd.lib;customguid.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\QtSql;$(QTDIR)\include\QtWidgets;..\..\src\lpMain\sqliteDB;..\..\3part\libzkq\include;..\..\3part\customgui\include;%(AdditionalIncludeDirectories)</IncludePath>
<Define>UNICODE;_UNICODE;WIN32;WIN64;QT_DLL;QT_CORE_LIB;QT_GUI_LIB;QT_SQL_LIB;QT_WIDGETS_LIB;%(PreprocessorDefinitions)</Define>
</QtMoc>
<QtUic>
<ExecutionDescription>Uic'ing %(Identity)...</ExecutionDescription>
<OutputFile>.\GeneratedFiles\ui_%(Filename).h</OutputFile>
</QtUic>
<QtRcc>
<ExecutionDescription>Rcc'ing %(Identity)...</ExecutionDescription>
<OutputFile>.\GeneratedFiles\qrc_%(Filename).cpp</OutputFile>
</QtRcc>
</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;QT_GUI_LIB;QT_SQL_LIB;QT_WIDGETS_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>.\GeneratedFiles;.;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName);$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtANGLE;$(QTDIR)\include\QtSql;$(QTDIR)\include\QtWidgets;..\..\src\lpMain\sqliteDB;..\..\3part\libzkq\include;..\..\3part\customgui\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<DebugInformationFormat />
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<OutputFile>$(SolutionDir)..\runner17\$(TargetName)$(TargetExt)</OutputFile>
<AdditionalLibraryDirectories>$(QTDIR)\lib;..\..\3part\libzkq\lib;..\..\3part\customgui\lib_x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>false</GenerateDebugInformation>
<AdditionalDependencies>qtmain.lib;Qt5Core.lib;Qt5Gui.lib;Qt5Sql.lib;Qt5Widgets.lib;libzkq.lib;customgui.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\QtSql;$(QTDIR)\include\QtWidgets;..\..\src\lpMain\sqliteDB;..\..\3part\libzkq\include;..\..\3part\customgui\include;%(AdditionalIncludeDirectories)</IncludePath>
<Define>UNICODE;_UNICODE;WIN32;WIN64;QT_DLL;QT_NO_DEBUG;NDEBUG;QT_CORE_LIB;QT_GUI_LIB;QT_SQL_LIB;QT_WIDGETS_LIB;%(PreprocessorDefinitions)</Define>
</QtMoc>
<QtUic>
<ExecutionDescription>Uic'ing %(Identity)...</ExecutionDescription>
<OutputFile>.\GeneratedFiles\ui_%(Filename).h</OutputFile>
</QtUic>
<QtRcc>
<ExecutionDescription>Rcc'ing %(Identity)...</ExecutionDescription>
<OutputFile>.\GeneratedFiles\qrc_%(Filename).cpp</OutputFile>
</QtRcc>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\..\src\lpMain\sqliteDB\databasesql.cpp" />
<ClCompile Include="..\..\src\lpMain\sqliteDB\DetectDataDB.cpp" />
<ClCompile Include="..\..\src\lpMain\sqliteDB\gensql.cpp" />
<ClCompile Include="..\..\src\lpMain\sqliteDB\QSqliteGeneral.cpp" />
<ClCompile Include="..\..\src\lpMain\sqliteDB\QSqliteWheelHubWf.cpp" />
<ClCompile Include="..\..\src\lpMain\sqliteDB\stationdb.cpp" />
<ClCompile Include="main.cpp" />
<ClCompile Include="qcheckdatadlg.cpp" />
<ClCompile Include="Report.cpp" />
</ItemGroup>
<ItemGroup>
<QtMoc Include="Report.h" />
</ItemGroup>
<ItemGroup>
<QtUic Include="qcheckdatadlg.ui" />
<QtUic Include="Report.ui" />
</ItemGroup>
<ItemGroup>
<QtRcc Include="Report.qrc" />
</ItemGroup>
<ItemGroup>
<QtMoc Include="..\..\src\lpMain\sqliteDB\databasesql.h">
<IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\GeneratedFiles;.;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName);$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtANGLE;$(QTDIR)\include\QtSql;$(QTDIR)\include\QtWidgets</IncludePath>
<IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\GeneratedFiles;.;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName);$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtANGLE;$(QTDIR)\include\QtSql;$(QTDIR)\include\QtWidgets</IncludePath>
</QtMoc>
</ItemGroup>
<ItemGroup>
<QtMoc Include="..\..\src\lpMain\sqliteDB\DetectDataDB.h">
<IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\GeneratedFiles;.;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName);$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtANGLE;$(QTDIR)\include\QtSql;$(QTDIR)\include\QtWidgets</IncludePath>
<IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\GeneratedFiles;.;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName);$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtANGLE;$(QTDIR)\include\QtSql;$(QTDIR)\include\QtWidgets</IncludePath>
</QtMoc>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\src\lpMain\sqliteDB\gensql.h" />
<ClInclude Include="..\..\src\lpMain\sqliteDB\InfoFile.h" />
<ClInclude Include="..\..\src\lpMain\sqliteDB\QSqliteGeneral.h" />
<ClInclude Include="..\..\src\lpMain\sqliteDB\QSqliteWheelHubWf.h" />
<QtMoc Include="qcheckdatadlg.h">
<IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\GeneratedFiles;.;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName);$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtANGLE;$(QTDIR)\include\QtSql;$(QTDIR)\include\QtWidgets</IncludePath>
<IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\GeneratedFiles;.;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName);$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtANGLE;$(QTDIR)\include\QtSql;$(QTDIR)\include\QtWidgets</IncludePath>
</QtMoc>
<QtMoc Include="..\..\src\lpMain\sqliteDB\stationdb.h">
<IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\GeneratedFiles;.;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName);$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtANGLE;$(QTDIR)\include\QtSql;$(QTDIR)\include\QtWidgets</IncludePath>
<IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\GeneratedFiles;.;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName);$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtANGLE;$(QTDIR)\include\QtSql;$(QTDIR)\include\QtWidgets</IncludePath>
</QtMoc>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Condition="Exists('$(QtMsBuild)\qt.targets')">
<Import Project="$(QtMsBuild)\qt.targets" />
</ImportGroup>
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
<ProjectExtensions>
<VisualStudio>
<UserProperties MocDir=".\GeneratedFiles\$(ConfigurationName)" UicDir=".\GeneratedFiles" RccDir=".\GeneratedFiles" lupdateOptions="" lupdateOnBuild="0" lreleaseOptions="" Qt5Version_x0020_x64="qt5.9.4-msvc2017-x64" MocOptions="" />
</VisualStudio>
</ProjectExtensions>
</Project>

@ -0,0 +1,108 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="Source Files">
<UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
<Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
</Filter>
<Filter Include="Header Files">
<UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
<Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
</Filter>
<Filter Include="Resource Files">
<UniqueIdentifier>{D9D6E242-F8AF-46E4-B9FD-80ECBC20BA3E}</UniqueIdentifier>
<Extensions>qrc;*</Extensions>
<ParseFiles>false</ParseFiles>
</Filter>
<Filter Include="Form Files">
<UniqueIdentifier>{99349809-55BA-4b9d-BF79-8FDBB0286EB3}</UniqueIdentifier>
<Extensions>ui</Extensions>
</Filter>
<Filter Include="Resource Files">
<UniqueIdentifier>{D9D6E242-F8AF-46E4-B9FD-80ECBC20BA3E}</UniqueIdentifier>
<Extensions>qrc;*</Extensions>
<ParseFiles>false</ParseFiles>
</Filter>
<Filter Include="Generated Files">
<UniqueIdentifier>{71ED8ED8-ACB9-4CE9-BBE1-E00B30144E11}</UniqueIdentifier>
<Extensions>moc;h;cpp</Extensions>
<SourceControlFiles>False</SourceControlFiles>
</Filter>
<Filter Include="db">
<UniqueIdentifier>{254918ee-db1e-4bc7-a132-e121174a9976}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="main.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="Report.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\src\lpMain\sqliteDB\databasesql.cpp">
<Filter>db</Filter>
</ClCompile>
<ClCompile Include="..\..\src\lpMain\sqliteDB\DetectDataDB.cpp">
<Filter>db</Filter>
</ClCompile>
<ClCompile Include="..\..\src\lpMain\sqliteDB\gensql.cpp">
<Filter>db</Filter>
</ClCompile>
<ClCompile Include="..\..\src\lpMain\sqliteDB\QSqliteGeneral.cpp">
<Filter>db</Filter>
</ClCompile>
<ClCompile Include="..\..\src\lpMain\sqliteDB\QSqliteWheelHubWf.cpp">
<Filter>db</Filter>
</ClCompile>
<ClCompile Include="..\..\src\lpMain\sqliteDB\stationdb.cpp">
<Filter>db</Filter>
</ClCompile>
<ClCompile Include="qcheckdatadlg.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<QtMoc Include="Report.h">
<Filter>Header Files</Filter>
</QtMoc>
<QtMoc Include="..\..\src\lpMain\sqliteDB\databasesql.h">
<Filter>db</Filter>
</QtMoc>
<QtMoc Include="..\..\src\lpMain\sqliteDB\DetectDataDB.h">
<Filter>db</Filter>
</QtMoc>
<QtMoc Include="..\..\src\lpMain\sqliteDB\stationdb.h">
<Filter>db</Filter>
</QtMoc>
<QtMoc Include="qcheckdatadlg.h">
<Filter>Header Files</Filter>
</QtMoc>
</ItemGroup>
<ItemGroup>
<QtUic Include="Report.ui">
<Filter>Form Files</Filter>
</QtUic>
<QtUic Include="qcheckdatadlg.ui">
<Filter>Form Files</Filter>
</QtUic>
</ItemGroup>
<ItemGroup>
<QtRcc Include="Report.qrc">
<Filter>Resource Files</Filter>
</QtRcc>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\src\lpMain\sqliteDB\gensql.h">
<Filter>db</Filter>
</ClInclude>
<ClInclude Include="..\..\src\lpMain\sqliteDB\InfoFile.h">
<Filter>db</Filter>
</ClInclude>
<ClInclude Include="..\..\src\lpMain\sqliteDB\QSqliteGeneral.h">
<Filter>db</Filter>
</ClInclude>
<ClInclude Include="..\..\src\lpMain\sqliteDB\QSqliteWheelHubWf.h">
<Filter>db</Filter>
</ClInclude>
</ItemGroup>
</Project>

@ -0,0 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<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>
<LocalDebuggerCommand>$(SolutionDir)..\runner17\$(TargetName)$(TargetExt)</LocalDebuggerCommand>
<LocalDebuggerWorkingDirectory>$(SolutionDir)..\runner17\</LocalDebuggerWorkingDirectory>
<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>
<LocalDebuggerEnvironment>PATH=$(QTDIR)\bin%3b$(PATH)</LocalDebuggerEnvironment>
<LocalDebuggerCommand>$(SolutionDir)..\runner17\$(TargetName)$(TargetExt)</LocalDebuggerCommand>
<LocalDebuggerWorkingDirectory>$(SolutionDir)..\runner17\</LocalDebuggerWorkingDirectory>
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
</PropertyGroup>
</Project>

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 48 KiB

@ -0,0 +1,29 @@
#include "Report.h"
#include <QtWidgets/QApplication>
#include "stationdb.h"
#include "qcheckdatadlg.h"
#pragma execution_character_set("utf-8")
int main(int argc, char *argv[])
{
QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
QApplication a(argc, argv);
QString strPath = QCoreApplication::applicationDirPath();
QString DBFilePath = strPath + "\\DBFiles";
StationDB* m_db = new StationDB(DBFilePath + "\\AntMan.db");
m_db->InitDatabase();
QCheckDataDlg dlg;
dlg.setWindowIcon(QIcon(":/Report/Resources/app2.png"));
dlg.setWindowFlags(Qt::Dialog | Qt::WindowCloseButtonHint);
dlg.setDbPtr(m_db);
QStringList strList;
strList<< "¹¤Î»1" << "¹¤Î»2";
dlg.setStationNames(strList);
dlg.show();
int ret = a.exec();
delete m_db;
m_db = nullptr;
return ret;
}

@ -109,7 +109,7 @@
<Link>
<SubSystem>Windows</SubSystem>
<OutputFile>$(SolutionDir)..\runner17\$(TargetName)$(TargetExt)</OutputFile>
<AdditionalLibraryDirectories>$(QTDIR)\lib;$(OutDir);..\..\..\lpOpenssl\openssl-1.0.2n\vs13\lib\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>$(QTDIR)\lib;$(OutDir);..\..\..\lpOpenssl\openssl-1.0.2n\vs13\lib\x64;..\..\3part\tadpole\x64\lib;..\..\3part\libzkq\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>qtmaind.lib;Qt5Cored.lib;Qt5Guid.lib;Qt5Networkd.lib;Qt5SerialPortd.lib;Qt5Sqld.lib;tpBased.lib;libzkqd.lib;libeay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
@ -117,7 +117,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<PreprocessorDefinitions>UNICODE;_UNICODE;WIN32;WIN64;QT_NO_DEBUG;NDEBUG;QT_CORE_LIB;QT_GUI_LIB;QT_NETWORK_LIB;QT_SERIALPORT_LIB;QT_SQL_LIB;TPCORECTRL_LIB;TPCORECTRL_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>.\GeneratedFiles;.;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName);$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtNetwork;$(QTDIR)\include\QtSerialPort;$(QTDIR)\include\QtSql;..\..\include;..\..\src\tpBase;..\..\src\tpCoreCtrl;..\..\src\tpCamera;..\..\src\tpCommunicate;..\..\src\tpImgProc;..\..\3dpart\modbus\include;..\..\..\spider\libZK;..\..\src\crypto;..\..\..\lpOpenssl\openssl-1.0.2n\vs13\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>.\GeneratedFiles;.;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName);$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtNetwork;$(QTDIR)\include\QtSerialPort;$(QTDIR)\include\QtSql;..\..\src\lpCoreCtrl;..\..\src\lpCoreCtrl\tpCamera;..\..\src\lpCoreCtrl\tpImgProc;..\..\3part\libzkq\include;..\..\..\lpOpenssl\openssl-1.0.2n\vs13\include;..\..\src\lpBase;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
@ -125,7 +125,7 @@
<Link>
<SubSystem>Windows</SubSystem>
<OutputFile>$(SolutionDir)..\runner17\$(TargetName)$(TargetExt)</OutputFile>
<AdditionalLibraryDirectories>$(QTDIR)\lib;$(OutDir);..\..\..\lpOpenssl\openssl-1.0.2n\vs13\lib\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>$(QTDIR)\lib;$(OutDir);..\..\..\lpOpenssl\openssl-1.0.2n\vs13\lib\x64;..\..\3part\tadpole\x64\lib;..\..\3part\libzkq\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>qtmain.lib;Qt5Core.lib;Qt5Gui.lib;Qt5Network.lib;Qt5SerialPort.lib;Qt5Sql.lib;tpBase.lib;libzkq.lib;libeay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>

@ -8,10 +8,9 @@
#include <QLibrary>
#include "quserinfo_global.h"
#include "Serialport_global.h"
#include "qcheckdatadlg.h"
#include "QAboutUI.h"
#include "QProcess"
#define LEAPER_LOGO ":/leaper/app.png"
#define LEAPER_LOGO ":/leaper/Resource/app.png"
#define DELETE_POINTER(p) if (p) {delete p; p = NULL;}
#pragma execution_character_set("utf-8")
CMainWin::CMainWin(QWidget *parent)
@ -513,25 +512,21 @@ Q_SLOT void CMainWin::onActionClicked()
m_testWid.show();
}
else if ("actionHelp" == strObj) {//帮助
QAboutUI dlg(this);
dlg.setWindowFlags(Qt::Dialog | Qt::WindowCloseButtonHint);
dlg.setWindowModality(Qt::ApplicationModal);
dlg.setAttribute(Qt::WA_ShowModal, true);
dlg.show();
m_aboutWid.setWindowIcon(QIcon(LEAPER_LOGO));
m_aboutWid.setWindowFlags(Qt::Dialog | Qt::WindowCloseButtonHint);
m_aboutWid.setWindowModality(Qt::ApplicationModal);
m_aboutWid.setAttribute(Qt::WA_ShowModal, true);
m_aboutWid.show();
}
else if ("action_Check" == strObj) {//历史记录查询
QCheckDataDlg dlg(this);
dlg.setWindowFlags(Qt::Dialog | Qt::WindowCloseButtonHint);
dlg.setDbPtr(m_db);
QStringList strList = m_pWfCtrl->IGetStationKeys();
QStringList pList;
for (int nIndex = 0; nIndex < strList.size(); nIndex++)
{
IStation *pStation = m_pWfCtrl->IGetStationByKey(strList.at(nIndex));
pList.append(pStation->stationShowName());
}
dlg.setStationNames(pList);
dlg.exec();
QProcess process;
process.setWorkingDirectory(QCoreApplication::applicationDirPath());
#ifdef _DEBUG
QString strTaskName = "Reportd.exe";
#else
QString strTaskName = "Report.exe";
#endif
process.startDetached(strTaskName);
}
else if ("action" == strObj) {//系统参数设置

@ -17,6 +17,7 @@
#include "QTestModeWid.h"
#include "iCoreCtrl.h"
#include "QModelMangerUI.h"
#include "QAboutUI.h"
struct StationInfo
{
@ -130,6 +131,7 @@ private:
QTestModeWid m_testWid;
QModelMangerUI m_mangeWid;
QAboutUI m_aboutWid;
};
#endif

@ -0,0 +1,35 @@
#include "QAddModeUI.h"
#include <QRegExp>
QAddModeUI::QAddModeUI(QWidget *parent)
: QDialog(parent)
{
ui.setupUi(this);
connect(ui.pushButton, SIGNAL(clicked()), this, SLOT(onButtonClicked()));
connect(ui.pushButton_2, SIGNAL(clicked()), this, SLOT(onButtonClicked()));
QRegExp regx("[a-zA-Z0-9]+$");
QSharedPointer<QValidator> validator = QSharedPointer<QValidator>(new QRegExpValidator(regx));
ui.lineEdit->setValidator(validator.data());
}
QAddModeUI::~QAddModeUI()
{
}
Q_SLOT void QAddModeUI::onButtonClicked()
{
QString strObj = sender()->objectName();
if (strObj == "pushButton")
{
QDialog::accept();
}
else if (strObj == "pushButton_2") {
QDialog::reject();
}
}
QString QAddModeUI::getInputName() {
QString strName = ui.lineEdit->text();
return strName;
}

@ -0,0 +1,20 @@
#ifndef _H_QADDMODEUI_H_
#define _H_QADDMODEUI_H_
#include <QDialog>
#include "ui_QAddModeUI.h"
class QAddModeUI : public QDialog
{
Q_OBJECT
public:
QAddModeUI(QWidget *parent = Q_NULLPTR);
~QAddModeUI();
Q_SLOT void onButtonClicked();
QString getInputName();
private:
Ui::QAddModeUI ui;
};
#endif

@ -0,0 +1,67 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>QAddModeUI</class>
<widget class="QDialog" name="QAddModeUI">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>220</width>
<height>89</height>
</rect>
</property>
<property name="windowTitle">
<string>添加型号</string>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="2" column="0">
<widget class="QPushButton" name="pushButton">
<property name="font">
<font>
<pointsize>11</pointsize>
</font>
</property>
<property name="text">
<string>确认</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QPushButton" name="pushButton_2">
<property name="font">
<font>
<pointsize>11</pointsize>
</font>
</property>
<property name="text">
<string>取消</string>
</property>
</widget>
</item>
<item row="1" column="0" colspan="2">
<widget class="QLineEdit" name="lineEdit">
<property name="font">
<font>
<pointsize>11</pointsize>
</font>
</property>
</widget>
</item>
<item row="0" column="0" colspan="2">
<widget class="QLabel" name="label">
<property name="font">
<font>
<pointsize>11</pointsize>
</font>
</property>
<property name="text">
<string>请输入型号名:</string>
</property>
</widget>
</item>
</layout>
</widget>
<layoutdefault spacing="6" margin="11"/>
<resources/>
<connections/>
</ui>

@ -5,6 +5,7 @@
#include <QTimer>
#include "QPLCIndexUI.h"
#include "WfModel.h"
#include "QAddModeUI.h"
#pragma execution_character_set("utf-8")
QModelMangerUI::QModelMangerUI(QWidget *parent)
@ -15,14 +16,9 @@ QModelMangerUI::QModelMangerUI(QWidget *parent)
connect(ui.wf_model_add_button, SIGNAL(clicked()), this, SLOT(onButtonClicked()));
connect(ui.wf_model_mod_button, SIGNAL(clicked()), this, SLOT(onButtonClicked()));
connect(ui.wf_model_delete_button, SIGNAL(clicked()), this, SLOT(onButtonClicked()));
QRegExp regx("[a-zA-Z0-9]+$");
QSharedPointer<QValidator> validator = QSharedPointer<QValidator>(new QRegExpValidator(regx));
ui.wf_model_input_edit->setValidator(validator.data());
connect(ui.wf_chkbox_read_mode_from_plc, SIGNAL(stateChanged(int)), this, SLOT(onCheckBoxChange(int)));
}
QModelMangerUI::~QModelMangerUI()
{
}
@ -44,22 +40,28 @@ Q_SLOT void QModelMangerUI::onButtonClicked()
}
}
else if ("wf_model_add_button" == strObj) {
QString strModel = ui.wf_model_input_edit->text();
if (!strModel.isEmpty() && !strModel.contains(_WF_UNIQUE_SPLIT) && !strModel.contains("##")
&& strModel.size() >= 3 && strModel.size() <= 20 && !strModel.contains(" ")) {
int nIndex = currentTab();
bool bFlag = m_pCtrl->IAddModel(nIndex, strModel);
QAddModeUI adddlg(this);
adddlg.setWindowIcon(QIcon(":/leaper/Resource/app.png"));
adddlg.setWindowFlags(Qt::Dialog | Qt::WindowCloseButtonHint);
if (adddlg.exec() == QDialog::Accepted)
{
QString strName = adddlg.getInputName();
int nStaionID = currentTab();
bool bFlag = m_pCtrl->IAddModel(nStaionID, strName);
if (bFlag) {
ui.mLblModelState->setText(tr("add %1 successful!").arg(strModel));
ui.wf_model_input_edit->setText("");
ui.mLblModelState->setText(tr("add %1 successful!").arg(strName));
if (m_pCtrl)
m_pCtrl->ISaveModel(nStaionID, strName);
}
else {
ui.mLblModelState->setText(tr("add %1 failed!").arg(strModel));
QMessageBox msgWarning(QMessageBox::Warning, QObject::tr("错误警告"), strName + QObject::tr(" 添加失败,可能名字重复"), QMessageBox::Yes);
msgWarning.setWindowIcon(QIcon(":/leaper/Resource/app.png"));
msgWarning.setButtonText(QMessageBox::Yes, QObject::tr("确认"));
msgWarning.exec();
}
}
else {
ui.mLblModelState->setText(QObject::tr("模型号中不能包括中文字符、空格字符个数在3与20之间!"));
}
QTimer::singleShot(5000, [&]() {
ui.mLblModelState->setText("");
});
@ -70,19 +72,19 @@ Q_SLOT void QModelMangerUI::onButtonClicked()
else if ("wf_model_delete_button" == strObj) {
IStation *pStation = getStation();
if (pStation) {
QString strModel = pStation->currentRunningModel();
QString strModel = pStation->currentSelectModel();
if (!strModel.isEmpty()) {
QString strName = m_pCtrl->IGetCurrentRuningModel(currentTab());
if (strModel == strName)
{
QMessageBox msgWarning(QMessageBox::Warning, QObject::tr("错误警告"), strModel + QObject::tr(" 正在使用,不能被删除"), QMessageBox::Yes);
msgWarning.setWindowIcon(QIcon(":/leaper/app.png"));
msgWarning.setWindowIcon(QIcon(":/leaper/Resource/app.png"));
msgWarning.setButtonText(QMessageBox::Yes, QObject::tr("确认"));
msgWarning.exec();
return ;
}
QMessageBox msgBox(QMessageBox::Warning, QObject::tr("型号删除"), QObject::tr("删除") + strModel + "?", QMessageBox::Yes | QMessageBox::No);
msgBox.setWindowIcon(QIcon(":/leaper/app.png"));
msgBox.setWindowIcon(QIcon(":/leaper/Resource/app.png"));
if (QMessageBox::Yes == msgBox.exec()) {
bool b = m_pCtrl->IDeleteModel(currentTab(), strModel);
if (!b) {
@ -96,10 +98,12 @@ Q_SLOT void QModelMangerUI::onButtonClicked()
}
}
}
int QModelMangerUI::lastNum(QString str)
{
return str.right(1).toInt();
}
Q_SLOT bool QModelMangerUI::OnCellDoubleClicked(const QModelIndex &index)
{
QString strListName = sender()->objectName();
@ -116,12 +120,16 @@ Q_SLOT bool QModelMangerUI::OnCellDoubleClicked(const QModelIndex &index)
return false;
}
QPLCIndexUI dlg(this);
dlg.setWindowFlags(Qt::Dialog | Qt::WindowCloseButtonHint);
dlg.setModelName(strName);
dlg.setModelIndex(pModel->nIndex);
if (dlg.exec() == QDialog::Accepted)
{
int nIndex = dlg.getModelIndex();
pModel->nIndex = nIndex;
if (m_pCtrl)
m_pCtrl->ISaveModel(stationID, strModel);
}
}
return true;
@ -168,10 +176,13 @@ void QModelMangerUI::showEvent(QShowEvent *event)
void QModelMangerUI::closeEvent(QCloseEvent *event)
{
// qDebug() << "start save solution";
// if (m_pColossus && m_pWfCtrl) {
// m_pColossus->saveTask(m_pCtrl->IGetModelInfos());
// }
// qDebug() << "finish save solution";
}
void QModelMangerUI::onInitModelList(IWfCtrl *pCtrl)
{
m_pCtrl = pCtrl;

@ -81,29 +81,6 @@
<property name="bottomMargin">
<number>3</number>
</property>
<item>
<widget class="QLabel" name="label">
<property name="font">
<font>
<family>微软雅黑</family>
<pointsize>10</pointsize>
</font>
</property>
<property name="text">
<string>模型号:</string>
</property>
</widget>
</item>
<item>
<widget class="QLineEdit" name="wf_model_input_edit">
<property name="minimumSize">
<size>
<width>0</width>
<height>25</height>
</size>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="wf_model_add_button">
<property name="minimumSize">

@ -14,7 +14,7 @@ QPLCIndexUI::~QPLCIndexUI()
void QPLCIndexUI::setModelName(QString strName)
{
setWindowTitle(strName);
}
void QPLCIndexUI::setModelIndex(int val)

@ -86,21 +86,21 @@
<ClCompile>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<PreprocessorDefinitions>UNICODE;_UNICODE;WIN32;WIN64;QT_DLL;QT_NO_DEBUG;NDEBUG;QT_CORE_LIB;QT_GUI_LIB;LPMAIN_LIB;QT_WIDGETS_LIB;QT_SERIALBUS_LIB;QT_SERIALPORT_LIB;QT_SQL_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>.\GeneratedFiles;.;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName);$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtANGLE;$(QTDIR)\include\QtWidgets;$(QTDIR)\include\QtSerialBus;$(QTDIR)\include\QtSerialPort;$(QTDIR)\include\QtSql;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>.\GeneratedFiles;.;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName);$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtANGLE;$(QTDIR)\include\QtWidgets;$(QTDIR)\include\QtSerialBus;$(QTDIR)\include\QtSerialPort;$(QTDIR)\include\QtSql;..\..\3part\SerialPortTool\include;..\..\src\lpMain;..\..\src\lpMain\algela;..\..\src\lpMain\QDiskCleanThread;..\..\src\lpMain\sqliteDB;..\..\src\lpMain\UI;..\..\3part\opencv3.4.1\include;..\..\3part\opencv3.4.1\include\opencv;..\..\3part\opencv3.4.1\include\opencv2;..\..\3part\libzkq\include;..\..\3part\lpSyslog\inc;..\..\3part\customgui\include;..\..\src\userCtrl;..\..\src\lpMain\CoreCtrl;..\..\src\lpBase;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<DebugInformationFormat />
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<OutputFile>$(OutDir)\$(ProjectName).dll</OutputFile>
<AdditionalLibraryDirectories>$(QTDIR)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<OutputFile>$(SolutionDir)..\runner17\$(TargetName)$(TargetExt)</OutputFile>
<AdditionalLibraryDirectories>$(QTDIR)\lib;..\..\3part\opencv3.4.1\x64\vc15\lib;..\..\3part\lpSyslog\lib;..\..\3part\customgui\lib_x64;..\..\3part\libzkq\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>false</GenerateDebugInformation>
<AdditionalDependencies>qtmain.lib;Qt5Core.lib;Qt5Gui.lib;Qt5Widgets.lib;Qt5SerialBus.lib;Qt5SerialPort.lib;Qt5Sql.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>qtmain.lib;Qt5Core.lib;Qt5Gui.lib;Qt5Widgets.lib;Qt5SerialBus.lib;Qt5SerialPort.lib;Qt5Sql.lib;customgui.lib;opencv_world341.lib;lpSyslog.lib;libzkq.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<QtMoc>
<Define>UNICODE;_UNICODE;WIN32;WIN64;QT_DLL;QT_NO_DEBUG;NDEBUG;QT_CORE_LIB;QT_GUI_LIB;LPMAIN_LIB;QT_WIDGETS_LIB;QT_SERIALBUS_LIB;QT_SERIALPORT_LIB;QT_SQL_LIB;%(PreprocessorDefinitions)</Define>
<IncludePath>.\GeneratedFiles;.;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName);$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtANGLE;$(QTDIR)\include\QtWidgets;$(QTDIR)\include\QtSerialBus;$(QTDIR)\include\QtSerialPort;$(QTDIR)\include\QtSql;%(AdditionalIncludeDirectories)</IncludePath>
<IncludePath>.\GeneratedFiles;.;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName);$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtANGLE;$(QTDIR)\include\QtWidgets;$(QTDIR)\include\QtSerialBus;$(QTDIR)\include\QtSerialPort;$(QTDIR)\include\QtSql;..\..\3part\SerialPortTool\include;..\..\src\lpMain;..\..\src\lpMain\algela;..\..\src\lpMain\QDiskCleanThread;..\..\src\lpMain\sqliteDB;..\..\src\lpMain\UI;..\..\3part\opencv3.4.1\include;..\..\3part\opencv3.4.1\include\opencv;..\..\3part\opencv3.4.1\include\opencv2;..\..\3part\libzkq\include;..\..\3part\lpSyslog\inc;..\..\3part\customgui\include;..\..\src\userCtrl;..\..\src\lpMain\CoreCtrl;..\..\src\lpBase;%(AdditionalIncludeDirectories)</IncludePath>
<OutputFile>.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</OutputFile>
<ExecutionDescription>Moc'ing %(Identity)...</ExecutionDescription>
</QtMoc>
@ -127,7 +127,6 @@
<ClCompile Include="..\..\src\lpMain\sqliteDB\databasesql.cpp" />
<ClCompile Include="..\..\src\lpMain\sqliteDB\DetectDataDB.cpp" />
<ClCompile Include="..\..\src\lpMain\sqliteDB\gensql.cpp" />
<ClCompile Include="..\..\src\lpMain\sqliteDB\qcheckdatadlg.cpp" />
<ClCompile Include="..\..\src\lpMain\sqliteDB\QSqliteGeneral.cpp" />
<ClCompile Include="..\..\src\lpMain\sqliteDB\QSqliteWheelHubWf.cpp" />
<ClCompile Include="..\..\src\lpMain\sqliteDB\stationdb.cpp" />
@ -138,6 +137,7 @@
<ClCompile Include="CMainWin.cpp" />
<ClCompile Include="lpMain.cpp" />
<ClCompile Include="QAboutUI.cpp" />
<ClCompile Include="QAddModeUI.cpp" />
<ClCompile Include="QModelMangerUI.cpp" />
<ClCompile Include="QPLCIndexUI.cpp" />
<ClCompile Include="QTestModeWid.cpp" />
@ -150,14 +150,18 @@
</QtMoc>
</ItemGroup>
<ItemGroup>
<QtUic Include="..\..\src\lpMain\sqliteDB\qcheckdatadlg.ui" />
<QtUic Include="CMainWin.ui" />
<QtUic Include="QAboutUI.ui" />
<QtUic Include="QAddModeUI.ui" />
<QtUic Include="QModelMangerUI.ui" />
<QtUic Include="QPLCIndexUI.ui" />
<QtUic Include="QTestModeWid.ui" />
</ItemGroup>
<ItemGroup>
<QtMoc Include="QAddModeUI.h">
<IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\GeneratedFiles;.;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName);$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtANGLE;$(QTDIR)\include\QtWidgets;$(QTDIR)\include\QtSerialBus;$(QTDIR)\include\QtSerialPort;$(QTDIR)\include\QtSql;.\..\..\3part\SerialPortTool\include;.\..\..\src\lpMain;.\..\..\src\lpMain\algela;.\..\..\src\lpMain\QDiskCleanThread;.\..\..\src\lpMain\sqliteDB;.\..\..\src\lpMain\UI;.\..\..\3part\opencv3.4.1\include;.\..\..\3part\opencv3.4.1\include\opencv;.\..\..\3part\opencv3.4.1\include\opencv2;.\..\..\3part\libzkq\include;.\..\..\3part\lpSyslog\inc;.\..\..\3part\customgui\include;.\..\..\src\userCtrl;.\..\..\src\lpMain\CoreCtrl;.\..\..\src\lpBase</IncludePath>
<IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\GeneratedFiles;.;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName);$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtANGLE;$(QTDIR)\include\QtWidgets;$(QTDIR)\include\QtSerialBus;$(QTDIR)\include\QtSerialPort;$(QTDIR)\include\QtSql</IncludePath>
</QtMoc>
<QtMoc Include="QAboutUI.h">
<IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\GeneratedFiles;.;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName);$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtANGLE;$(QTDIR)\include\QtWidgets;$(QTDIR)\include\QtSerialBus;$(QTDIR)\include\QtSerialPort;$(QTDIR)\include\QtSql;.\..\..\3part\SerialPortTool\include;.\..\..\src\lpMain;.\..\..\src\lpMain\algela;.\..\..\src\lpMain\QDiskCleanThread;.\..\..\src\lpMain\sqliteDB;.\..\..\src\lpMain\UI;.\..\..\3part\opencv3.4.1\include;.\..\..\3part\opencv3.4.1\include\opencv;.\..\..\3part\opencv3.4.1\include\opencv2;.\..\..\3part\libzkq\include;.\..\..\3part\lpSyslog\inc;.\..\..\3part\customgui\include;.\..\..\src\userCtrl;.\..\..\src\lpMain\CoreCtrl;.\..\..\src\lpBase</IncludePath>
<IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\GeneratedFiles;.;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName);$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtANGLE;$(QTDIR)\include\QtWidgets;$(QTDIR)\include\QtSerialBus;$(QTDIR)\include\QtSerialPort;$(QTDIR)\include\QtSql</IncludePath>
@ -186,10 +190,6 @@
<IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\GeneratedFiles;.;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName);$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtANGLE;$(QTDIR)\include\QtWidgets;$(QTDIR)\include\QtSerialBus;$(QTDIR)\include\QtSerialPort;$(QTDIR)\include\QtSql;.\..\..\3part\SerialPortTool\include;.\..\..\src\lpMain;.\..\..\src\lpMain\algela;.\..\..\src\lpMain\QDiskCleanThread;.\..\..\src\lpMain\sqliteDB;.\..\..\src\lpMain\UI;.\..\..\3part\opencv3.4.1\include;.\..\..\3part\opencv3.4.1\include\opencv;.\..\..\3part\opencv3.4.1\include\opencv2;.\..\..\3part\libzkq\include;.\..\..\3part\lpSyslog\inc;.\..\..\3part\customgui\include;.\..\..\src\userCtrl;.\..\..\src\lpMain\CoreCtrl;.\..\..\src\lpBase</IncludePath>
<IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\GeneratedFiles;.;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName);$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtANGLE;$(QTDIR)\include\QtWidgets;$(QTDIR)\include\QtSerialBus;$(QTDIR)\include\QtSerialPort;$(QTDIR)\include\QtSql</IncludePath>
</QtMoc>
<QtMoc Include="..\..\src\lpMain\sqliteDB\qcheckdatadlg.h">
<IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\GeneratedFiles;.;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName);$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtANGLE;$(QTDIR)\include\QtWidgets;$(QTDIR)\include\QtSerialBus;$(QTDIR)\include\QtSerialPort;$(QTDIR)\include\QtSql;.\..\..\3part\SerialPortTool\include;.\..\..\src\lpMain;.\..\..\src\lpMain\algela;.\..\..\src\lpMain\QDiskCleanThread;.\..\..\src\lpMain\sqliteDB;.\..\..\src\lpMain\UI;.\..\..\3part\opencv3.4.1\include;.\..\..\3part\opencv3.4.1\include\opencv;.\..\..\3part\opencv3.4.1\include\opencv2;.\..\..\3part\libzkq\include;.\..\..\3part\lpSyslog\inc;.\..\..\3part\customgui\include;.\..\..\src\userCtrl;.\..\..\src\lpMain\CoreCtrl;.\..\..\src\lpBase</IncludePath>
<IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\GeneratedFiles;.;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName);$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtANGLE;$(QTDIR)\include\QtWidgets;$(QTDIR)\include\QtSerialBus;$(QTDIR)\include\QtSerialPort;$(QTDIR)\include\QtSql</IncludePath>
</QtMoc>
<ClInclude Include="..\..\src\lpMain\WfModel.h" />
<QtMoc Include="..\..\src\lpMain\Station.h">
<IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\GeneratedFiles;.;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName);$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtANGLE;$(QTDIR)\include\QtWidgets;$(QTDIR)\include\QtSerialBus;$(QTDIR)\include\QtSerialPort;$(QTDIR)\include\QtSql;.\..\..\3part\SerialPortTool\include;.\..\..\src\lpMain;.\..\..\src\lpMain\algela;.\..\..\src\lpMain\QDiskCleanThread;.\..\..\src\lpMain\sqliteDB;.\..\..\src\lpMain\UI;.\..\..\3part\opencv3.4.1\include;.\..\..\3part\opencv3.4.1\include\opencv;.\..\..\3part\opencv3.4.1\include\opencv2;.\..\..\3part\libzkq\include;.\..\..\3part\lpSyslog\inc;.\..\..\3part\customgui\include;.\..\..\src\userCtrl;.\..\..\src\lpMain\CoreCtrl;.\..\..\src\lpBase</IncludePath>

@ -109,9 +109,6 @@
<ClCompile Include="..\..\src\lpMain\Station.cpp">
<Filter>lpMain</Filter>
</ClCompile>
<ClCompile Include="..\..\src\lpMain\sqliteDB\qcheckdatadlg.cpp">
<Filter>lpMain\db</Filter>
</ClCompile>
<ClCompile Include="QTestModeWid.cpp">
<Filter>Source Files</Filter>
</ClCompile>
@ -130,6 +127,9 @@
<ClCompile Include="QAboutUI.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="QAddModeUI.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<QtMoc Include="IMainWidget.h">
@ -183,9 +183,6 @@
<QtMoc Include="..\..\src\lpMain\Station.h">
<Filter>lpMain</Filter>
</QtMoc>
<QtMoc Include="..\..\src\lpMain\sqliteDB\qcheckdatadlg.h">
<Filter>lpMain\db</Filter>
</QtMoc>
<QtMoc Include="QTestModeWid.h">
<Filter>Header Files</Filter>
</QtMoc>
@ -207,14 +204,14 @@
<QtMoc Include="QAboutUI.h">
<Filter>Header Files</Filter>
</QtMoc>
<QtMoc Include="QAddModeUI.h">
<Filter>Header Files</Filter>
</QtMoc>
</ItemGroup>
<ItemGroup>
<QtUic Include="CMainWin.ui">
<Filter>Form Files</Filter>
</QtUic>
<QtUic Include="..\..\src\lpMain\sqliteDB\qcheckdatadlg.ui">
<Filter>lpMain\db</Filter>
</QtUic>
<QtUic Include="QTestModeWid.ui">
<Filter>Form Files</Filter>
</QtUic>
@ -227,6 +224,9 @@
<QtUic Include="QAboutUI.ui">
<Filter>Form Files</Filter>
</QtUic>
<QtUic Include="QAddModeUI.ui">
<Filter>Form Files</Filter>
</QtUic>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\src\lpMain\CoreCtrl\CDllCoreCtrl.h">

@ -10,6 +10,9 @@
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<QTDIR>D:\Qt\Qt5.9.4\5.9.4\msvc2017_64</QTDIR>
<LocalDebuggerCommand>$(SolutionDir)..\runner17\Enchanter.exe</LocalDebuggerCommand>
<LocalDebuggerWorkingDirectory>$(SolutionDir)..\runner17\</LocalDebuggerWorkingDirectory>
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
<LocalDebuggerEnvironment>PATH=$(QTDIR)\bin%3b$(PATH)</LocalDebuggerEnvironment>
</PropertyGroup>
</Project>
Loading…
Cancel
Save