diff --git a/3part/tadpole/include/tpBase/lpbengine.h b/3part/tadpole/include/tpBase/lpbengine.h index e64942d..87ec912 100644 Binary files a/3part/tadpole/include/tpBase/lpbengine.h and b/3part/tadpole/include/tpBase/lpbengine.h differ diff --git a/runner17/lpbengine.dll b/runner17/lpbengine.dll index 56030bb..dee7322 100644 Binary files a/runner17/lpbengine.dll and b/runner17/lpbengine.dll differ diff --git a/runner17/lpbengined.dll b/runner17/lpbengined.dll index 223739e..b7bb41e 100644 Binary files a/runner17/lpbengined.dll and b/runner17/lpbengined.dll differ diff --git a/runner17/lpdesigner.dll b/runner17/lpdesigner.dll index 751c067..e7832e4 100644 Binary files a/runner17/lpdesigner.dll and b/runner17/lpdesigner.dll differ diff --git a/runner17/lpdesignerd.dll b/runner17/lpdesignerd.dll index b099721..9fbe23e 100644 Binary files a/runner17/lpdesignerd.dll and b/runner17/lpdesignerd.dll differ diff --git a/runner17/tpAlgorithm.dll b/runner17/tpAlgorithm.dll index 574f3b9..462309e 100644 Binary files a/runner17/tpAlgorithm.dll and b/runner17/tpAlgorithm.dll differ diff --git a/runner17/tpCam_100.dll b/runner17/tpCam_100.dll index 6e9f51b..325e5cd 100644 Binary files a/runner17/tpCam_100.dll and b/runner17/tpCam_100.dll differ diff --git a/runner17/tpCam_100d.dll b/runner17/tpCam_100d.dll index f3a41b2..e806485 100644 Binary files a/runner17/tpCam_100d.dll and b/runner17/tpCam_100d.dll differ diff --git a/runner17/ui/login.ui b/runner17/ui/login.ui deleted file mode 100644 index decde6c..0000000 --- a/runner17/ui/login.ui +++ /dev/null @@ -1,132 +0,0 @@ - - - tp_login - - - - 0 - 0 - 485 - 235 - - - - Dialog - - - - - 130 - 70 - 209 - 80 - - - - 登录 - - - - - - - - 用户名： - - - - - - - 密码： - - - - - - - - - - QLineEdit::Password - - - - - - - - - - - - - - 260 - 190 - 75 - 31 - - - - - - - 确认 - - - - - true - - - - 280 - 150 - 191 - 16 - - - - color: rgb(255, 0, 0); - - - 密码错误，请重新输入 - - - true - - - - - - 440 - 120 - 37 - 18 - - - - key - - - - - - 360 - 190 - 75 - 31 - - - - - - - 取消 - - - - - - diff --git a/runner17/ui/users_manager.ui b/runner17/ui/users_manager.ui deleted file mode 100644 index 87aa915..0000000 --- a/runner17/ui/users_manager.ui +++ /dev/null @@ -1,529 +0,0 @@ - - - tp_user_manager - - - - 0 - 0 - 472 - 314 - - - - 用户管理 - - - - - - - - - 50 - 20 - - - - - 60 - 16777215 - - - - 当前用户: - - - - - - - - - - - - - - - - 0 - - - - 用户 - - - - - - - - Qt::Horizontal - - - - 30 - 20 - - - - - - - - - 240 - 0 - - - - 登录 - - - - 3 - - - 3 - - - 3 - - - 3 - - - - - - - 用户名： - - - - - - - - 0 - 25 - - - - - - - - 密码： - - - - - - - - 0 - 25 - - - - - - - QLineEdit::Password - - - - - - - - - - 30 - 0 - - - - 1 - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - - - - - - - - - Qt::Horizontal - - - - 30 - 20 - - - - - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - 0 - 30 - - - - - - - 登录 - - - - - - - Qt::Horizontal - - - QSizePolicy::Preferred - - - - 20 - 20 - - - - - - - - - 0 - 30 - - - - - - - 注销 - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - Qt::Vertical - - - - 20 - 34 - - - - - - - - true - - - color: rgb(255, 0, 0); - - - 密码错误，请重新输入 - - - true - - - - - - - - 修改密码 - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - 旧密码 - - - - - - - 新密码 - - - - - - - 密码确认 - - - - - - - QLineEdit::Password - - - - - - - QLineEdit::Password - - - - - - - QLineEdit::Password - - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - 确定 - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - Qt::Vertical - - - - 20 - 43 - - - - - - - - color: rgb(255, 0, 0); - - - - - - - - - - - 用户管理 - - - - - - - - 双击删除用户 - - - - - - - - - - - 用户名： - - - - - - - - - - - - - - 权限级别： - - - - - - - false - - - - 4 - 5 - - - - - 操作员 - - - - - 管理员 - - - - - - - - - - 新增用户 - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - - - - 双击列表中的用户可以删除用户; 默认密码123456 - - - - - - - - - - - - diff --git a/src/lpBase/lpbengine.h b/src/lpBase/lpbengine.h index e64942d..87ec912 100644 Binary files a/src/lpBase/lpbengine.h and b/src/lpBase/lpbengine.h differ diff --git a/src/lpMain/IWfCtrl.h b/src/lpMain/IWfCtrl.h index 7840087..e3cc85f 100644 --- a/src/lpMain/IWfCtrl.h +++ b/src/lpMain/IWfCtrl.h @@ -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; }; diff --git a/src/lpMain/WfColossus.cpp b/src/lpMain/WfColossus.cpp index 68f0cb5..1ec48ac 100644 --- a/src/lpMain/WfColossus.cpp +++ b/src/lpMain/WfColossus.cpp @@ -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 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 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()<); - + bool saveTask(class WfModel *ptr); void setModifyState(bool bFlag){ m_IsModify = bFlag; }; bool getModifyState() const{ return m_IsModify; }; void ReSetModifyState() { m_IsModify = false; }; diff --git a/src/lpMain/WfCtrl.cpp b/src/lpMain/WfCtrl.cpp index d68fbb7..1af3a32 100644 --- a/src/lpMain/WfCtrl.cpp +++ b/src/lpMain/WfCtrl.cpp @@ -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()) { diff --git a/src/lpMain/WfCtrl.h b/src/lpMain/WfCtrl.h index 265583e..6900aef 100644 --- a/src/lpMain/WfCtrl.h +++ b/src/lpMain/WfCtrl.h @@ -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); diff --git a/src/lpMain/WfModel.h b/src/lpMain/WfModel.h index c2d4b44..d690cde 100644 --- a/src/lpMain/WfModel.h +++ b/src/lpMain/WfModel.h @@ -11,6 +11,7 @@ public: QString strCreateTime; bool bCaliState; int nIndex; + QString strName; }; #endif diff --git a/tpvs17/Enchanter/Enchanter.vcxproj b/tpvs17/Enchanter/Enchanter.vcxproj index b1efa29..bd0876f 100644 --- a/tpvs17/Enchanter/Enchanter.vcxproj +++ b/tpvs17/Enchanter/Enchanter.vcxproj @@ -93,7 +93,7 @@ Windows - $(OutDir)\$(ProjectName).exe + $(SolutionDir)..\runner17\$(TargetName)$(TargetExt) $(QTDIR)\lib;%(AdditionalLibraryDirectories) false qtmain.lib;Qt5Core.lib;Qt5Gui.lib;Qt5Widgets.lib;%(AdditionalDependencies) diff --git a/tpvs17/Enchanter/Enchanter.vcxproj.user b/tpvs17/Enchanter/Enchanter.vcxproj.user index 1cea243..6e64592 100644 --- a/tpvs17/Enchanter/Enchanter.vcxproj.user +++ b/tpvs17/Enchanter/Enchanter.vcxproj.user @@ -11,5 +11,8 @@ D:\Qt\Qt5.9.4\5.9.4\msvc2017_64 PATH=$(QTDIR)\bin%3b$(PATH) + $(SolutionDir)..\runner17\$(TargetName)$(TargetExt) + $(SolutionDir)..\runner17\ + WindowsLocalDebugger \ No newline at end of file diff --git a/tpvs17/Report/Report.cpp b/tpvs17/Report/Report.cpp new file mode 100644 index 0000000..92cdc86 --- /dev/null +++ b/tpvs17/Report/Report.cpp @@ -0,0 +1,7 @@ +#include "Report.h" + +Report::Report(QWidget *parent) + : QMainWindow(parent) +{ + ui.setupUi(this); +} diff --git a/tpvs17/Report/Report.h b/tpvs17/Report/Report.h new file mode 100644 index 0000000..b0162fa --- /dev/null +++ b/tpvs17/Report/Report.h @@ -0,0 +1,15 @@ +#pragma once + +#include +#include "ui_Report.h" + +class Report : public QMainWindow +{ + Q_OBJECT + +public: + Report(QWidget *parent = Q_NULLPTR); + +private: + Ui::ReportClass ui; +}; diff --git a/tpvs17/Report/Report.qrc b/tpvs17/Report/Report.qrc new file mode 100644 index 0000000..0d07b69 --- /dev/null +++ b/tpvs17/Report/Report.qrc @@ -0,0 +1,6 @@ + + + Resources/app.png + Resources/app2.png + + diff --git a/tpvs17/Report/Report.ui b/tpvs17/Report/Report.ui new file mode 100644 index 0000000..8c7908b --- /dev/null +++ b/tpvs17/Report/Report.ui @@ -0,0 +1,29 @@ + + ReportClass + + + ReportClass + + + + 0 + 0 + 600 + 400 + + + + Report + + + + + + + + + + + + + diff --git a/tpvs17/Report/Report.vcxproj b/tpvs17/Report/Report.vcxproj new file mode 100644 index 0000000..4e9af59 --- /dev/null +++ b/tpvs17/Report/Report.vcxproj @@ -0,0 +1,174 @@ + + + + + Debug + x64 + + + Release + x64 + + + + {B12702AD-ABFB-343A-A199-8E24837244A3} + Qt4VSv1.0 + 10.0.17763.0 + + + + Application + v141 + + + Application + v141 + + + + $(MSBuildProjectDirectory)\QtMsBuild + + + $(SolutionDir)$(Platform)\$(Configuration)\ + $(ProjectName)d + + + $(SolutionDir)$(Platform)\$(Configuration)\ + + + + + + + + + + + + + + + + + + + true + UNICODE;_UNICODE;WIN32;WIN64;QT_DLL;QT_CORE_LIB;QT_GUI_LIB;QT_SQL_LIB;QT_WIDGETS_LIB;%(PreprocessorDefinitions) + .\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) + Disabled + ProgramDatabase + MultiThreadedDebugDLL + true + + + Windows + $(SolutionDir)..\runner17\$(TargetName)$(TargetExt) + $(QTDIR)\lib;..\..\3part\libzkq\lib;..\..\3part\customgui\lib_x64;%(AdditionalLibraryDirectories) + true + qtmaind.lib;Qt5Cored.lib;Qt5Guid.lib;Qt5Sqld.lib;Qt5Widgetsd.lib;libzkqd.lib;customguid.lib;%(AdditionalDependencies) + + + .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp + Moc'ing %(Identity)... + .\GeneratedFiles;.;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName);$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtANGLE;$(QTDIR)\include\QtSql;$(QTDIR)\include\QtWidgets;..\..\src\lpMain\sqliteDB;..\..\3part\libzkq\include;..\..\3part\customgui\include;%(AdditionalIncludeDirectories) + UNICODE;_UNICODE;WIN32;WIN64;QT_DLL;QT_CORE_LIB;QT_GUI_LIB;QT_SQL_LIB;QT_WIDGETS_LIB;%(PreprocessorDefinitions) + + + Uic'ing %(Identity)... + .\GeneratedFiles\ui_%(Filename).h + + + Rcc'ing %(Identity)... + .\GeneratedFiles\qrc_%(Filename).cpp + + + + + true + UNICODE;_UNICODE;WIN32;WIN64;QT_DLL;QT_NO_DEBUG;NDEBUG;QT_CORE_LIB;QT_GUI_LIB;QT_SQL_LIB;QT_WIDGETS_LIB;%(PreprocessorDefinitions) + .\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) + + MultiThreadedDLL + true + + + Windows + $(SolutionDir)..\runner17\$(TargetName)$(TargetExt) + $(QTDIR)\lib;..\..\3part\libzkq\lib;..\..\3part\customgui\lib_x64;%(AdditionalLibraryDirectories) + false + qtmain.lib;Qt5Core.lib;Qt5Gui.lib;Qt5Sql.lib;Qt5Widgets.lib;libzkq.lib;customgui.lib;%(AdditionalDependencies) + + + .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp + Moc'ing %(Identity)... + .\GeneratedFiles;.;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName);$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtANGLE;$(QTDIR)\include\QtSql;$(QTDIR)\include\QtWidgets;..\..\src\lpMain\sqliteDB;..\..\3part\libzkq\include;..\..\3part\customgui\include;%(AdditionalIncludeDirectories) + UNICODE;_UNICODE;WIN32;WIN64;QT_DLL;QT_NO_DEBUG;NDEBUG;QT_CORE_LIB;QT_GUI_LIB;QT_SQL_LIB;QT_WIDGETS_LIB;%(PreprocessorDefinitions) + + + Uic'ing %(Identity)... + .\GeneratedFiles\ui_%(Filename).h + + + Rcc'ing %(Identity)... + .\GeneratedFiles\qrc_%(Filename).cpp + + + + + + + + + + + + + + + + + + + + + + + + + + .\GeneratedFiles;.;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName);$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtANGLE;$(QTDIR)\include\QtSql;$(QTDIR)\include\QtWidgets + .\GeneratedFiles;.;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName);$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtANGLE;$(QTDIR)\include\QtSql;$(QTDIR)\include\QtWidgets + + + + + .\GeneratedFiles;.;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName);$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtANGLE;$(QTDIR)\include\QtSql;$(QTDIR)\include\QtWidgets + .\GeneratedFiles;.;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName);$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtANGLE;$(QTDIR)\include\QtSql;$(QTDIR)\include\QtWidgets + + + + + + + + + .\GeneratedFiles;.;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName);$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtANGLE;$(QTDIR)\include\QtSql;$(QTDIR)\include\QtWidgets + .\GeneratedFiles;.;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName);$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtANGLE;$(QTDIR)\include\QtSql;$(QTDIR)\include\QtWidgets + + + .\GeneratedFiles;.;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName);$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtANGLE;$(QTDIR)\include\QtSql;$(QTDIR)\include\QtWidgets + .\GeneratedFiles;.;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName);$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtANGLE;$(QTDIR)\include\QtSql;$(QTDIR)\include\QtWidgets + + + + + + + + + + + + + + \ No newline at end of file diff --git a/tpvs17/Report/Report.vcxproj.filters b/tpvs17/Report/Report.vcxproj.filters new file mode 100644 index 0000000..28ccb2c --- /dev/null +++ b/tpvs17/Report/Report.vcxproj.filters @@ -0,0 +1,108 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hh;hpp;hxx;hm;inl;inc;xsd + + + {D9D6E242-F8AF-46E4-B9FD-80ECBC20BA3E} + qrc;* + false + + + {99349809-55BA-4b9d-BF79-8FDBB0286EB3} + ui + + + {D9D6E242-F8AF-46E4-B9FD-80ECBC20BA3E} + qrc;* + false + + + {71ED8ED8-ACB9-4CE9-BBE1-E00B30144E11} + moc;h;cpp + False + + + {254918ee-db1e-4bc7-a132-e121174a9976} + + + + + Source Files + + + Source Files + + + db + + + db + + + db + + + db + + + db + + + db + + + Source Files + + + + + Header Files + + + db + + + db + + + db + + + Header Files + + + + + Form Files + + + Form Files + + + + + Resource Files + + + + + db + + + db + + + db + + + db + + + \ No newline at end of file diff --git a/tpvs17/Report/Report.vcxproj.user b/tpvs17/Report/Report.vcxproj.user new file mode 100644 index 0000000..6e64592 --- /dev/null +++ b/tpvs17/Report/Report.vcxproj.user @@ -0,0 +1,18 @@ + + + + + D:\Qt\Qt5.9.4\5.9.4\msvc2017_64 + $(SolutionDir)..\runner17\$(TargetName)$(TargetExt) + $(SolutionDir)..\runner17\ + WindowsLocalDebugger + PATH=$(QTDIR)\bin%3b$(PATH) + + + D:\Qt\Qt5.9.4\5.9.4\msvc2017_64 + PATH=$(QTDIR)\bin%3b$(PATH) + $(SolutionDir)..\runner17\$(TargetName)$(TargetExt) + $(SolutionDir)..\runner17\ + WindowsLocalDebugger + + \ No newline at end of file diff --git a/tpvs17/Report/Resources/app.png b/tpvs17/Report/Resources/app.png new file mode 100644 index 0000000..b2bc426 Binary files /dev/null and b/tpvs17/Report/Resources/app.png differ diff --git a/tpvs17/Report/Resources/app2.png b/tpvs17/Report/Resources/app2.png new file mode 100644 index 0000000..d47d80d Binary files /dev/null and b/tpvs17/Report/Resources/app2.png differ diff --git a/tpvs17/Report/main.cpp b/tpvs17/Report/main.cpp new file mode 100644 index 0000000..1eb8ac2 --- /dev/null +++ b/tpvs17/Report/main.cpp @@ -0,0 +1,29 @@ +#include "Report.h" +#include +#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; +} diff --git a/src/lpMain/sqliteDB/qcheckdatadlg.cpp b/tpvs17/Report/qcheckdatadlg.cpp similarity index 100% rename from src/lpMain/sqliteDB/qcheckdatadlg.cpp rename to tpvs17/Report/qcheckdatadlg.cpp diff --git a/src/lpMain/sqliteDB/qcheckdatadlg.h b/tpvs17/Report/qcheckdatadlg.h similarity index 100% rename from src/lpMain/sqliteDB/qcheckdatadlg.h rename to tpvs17/Report/qcheckdatadlg.h diff --git a/src/lpMain/sqliteDB/qcheckdatadlg.ui b/tpvs17/Report/qcheckdatadlg.ui similarity index 100% rename from src/lpMain/sqliteDB/qcheckdatadlg.ui rename to tpvs17/Report/qcheckdatadlg.ui diff --git a/tpvs17/lpCoreCtrl/lpCoreCtrl.vcxproj b/tpvs17/lpCoreCtrl/lpCoreCtrl.vcxproj index a95df4b..d86f017 100644 --- a/tpvs17/lpCoreCtrl/lpCoreCtrl.vcxproj +++ b/tpvs17/lpCoreCtrl/lpCoreCtrl.vcxproj @@ -109,7 +109,7 @@ Windows $(SolutionDir)..\runner17\$(TargetName)$(TargetExt) - $(QTDIR)\lib;$(OutDir);..\..\..\lpOpenssl\openssl-1.0.2n\vs13\lib\x64;%(AdditionalLibraryDirectories) + $(QTDIR)\lib;$(OutDir);..\..\..\lpOpenssl\openssl-1.0.2n\vs13\lib\x64;..\..\3part\tadpole\x64\lib;..\..\3part\libzkq\lib;%(AdditionalLibraryDirectories) true qtmaind.lib;Qt5Cored.lib;Qt5Guid.lib;Qt5Networkd.lib;Qt5SerialPortd.lib;Qt5Sqld.lib;tpBased.lib;libzkqd.lib;libeay32.lib;%(AdditionalDependencies) @@ -117,7 +117,7 @@ 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) - .\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) + .\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) ProgramDatabase MultiThreadedDLL true @@ -125,7 +125,7 @@ Windows $(SolutionDir)..\runner17\$(TargetName)$(TargetExt) - $(QTDIR)\lib;$(OutDir);..\..\..\lpOpenssl\openssl-1.0.2n\vs13\lib\x64;%(AdditionalLibraryDirectories) + $(QTDIR)\lib;$(OutDir);..\..\..\lpOpenssl\openssl-1.0.2n\vs13\lib\x64;..\..\3part\tadpole\x64\lib;..\..\3part\libzkq\lib;%(AdditionalLibraryDirectories) true qtmain.lib;Qt5Core.lib;Qt5Gui.lib;Qt5Network.lib;Qt5SerialPort.lib;Qt5Sql.lib;tpBase.lib;libzkq.lib;libeay32.lib;%(AdditionalDependencies) diff --git a/tpvs17/lpMain/CMainWin.cpp b/tpvs17/lpMain/CMainWin.cpp index ecd6800..c9c0859 100644 --- a/tpvs17/lpMain/CMainWin.cpp +++ b/tpvs17/lpMain/CMainWin.cpp @@ -8,10 +8,9 @@ #include #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) {//ϵͳ diff --git a/tpvs17/lpMain/CMainWin.h b/tpvs17/lpMain/CMainWin.h index 4e86ecd..56f1e6e 100644 --- a/tpvs17/lpMain/CMainWin.h +++ b/tpvs17/lpMain/CMainWin.h @@ -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 diff --git a/tpvs17/lpMain/QAddModeUI.cpp b/tpvs17/lpMain/QAddModeUI.cpp new file mode 100644 index 0000000..44afa2f --- /dev/null +++ b/tpvs17/lpMain/QAddModeUI.cpp @@ -0,0 +1,35 @@ +#include "QAddModeUI.h" +#include + +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 validator = QSharedPointer(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; +} \ No newline at end of file diff --git a/tpvs17/lpMain/QAddModeUI.h b/tpvs17/lpMain/QAddModeUI.h new file mode 100644 index 0000000..d46c432 --- /dev/null +++ b/tpvs17/lpMain/QAddModeUI.h @@ -0,0 +1,20 @@ +#ifndef _H_QADDMODEUI_H_ +#define _H_QADDMODEUI_H_ + +#include +#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 diff --git a/tpvs17/lpMain/QAddModeUI.ui b/tpvs17/lpMain/QAddModeUI.ui new file mode 100644 index 0000000..f0b6ed4 --- /dev/null +++ b/tpvs17/lpMain/QAddModeUI.ui @@ -0,0 +1,67 @@ + + + QAddModeUI + + + + 0 + 0 + 220 + 89 + + + + 添加型号 + + + + + + + 11 + + + + 确认 + + + + + + + + 11 + + + + 取消 + + + + + + + + 11 + + + + + + + + + 11 + + + + 请输入型号名： + + + + + + + + + diff --git a/tpvs17/lpMain/QModelMangerUI.cpp b/tpvs17/lpMain/QModelMangerUI.cpp index dc5cc0d..fea158b 100644 --- a/tpvs17/lpMain/QModelMangerUI.cpp +++ b/tpvs17/lpMain/QModelMangerUI.cpp @@ -5,6 +5,7 @@ #include #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 validator = QSharedPointer(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("ģͺвַܰոַ320֮!")); - } + 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; diff --git a/tpvs17/lpMain/QModelMangerUI.ui b/tpvs17/lpMain/QModelMangerUI.ui index 1083302..63425a6 100644 --- a/tpvs17/lpMain/QModelMangerUI.ui +++ b/tpvs17/lpMain/QModelMangerUI.ui @@ -81,29 +81,6 @@ 3 - - - - - 微软雅黑 - 10 - - - - 模型号： - - - - - - - - 0 - 25 - - - - diff --git a/tpvs17/lpMain/QPLCIndexUI.cpp b/tpvs17/lpMain/QPLCIndexUI.cpp index 973ef80..31b4447 100644 --- a/tpvs17/lpMain/QPLCIndexUI.cpp +++ b/tpvs17/lpMain/QPLCIndexUI.cpp @@ -14,7 +14,7 @@ QPLCIndexUI::~QPLCIndexUI() void QPLCIndexUI::setModelName(QString strName) { - + setWindowTitle(strName); } void QPLCIndexUI::setModelIndex(int val) diff --git a/tpvs17/lpMain/lpMain.vcxproj b/tpvs17/lpMain/lpMain.vcxproj index c836e7e..465f999 100644 --- a/tpvs17/lpMain/lpMain.vcxproj +++ b/tpvs17/lpMain/lpMain.vcxproj @@ -86,21 +86,21 @@ true 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) - .\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) + .\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) MultiThreadedDLL true Windows - $(OutDir)\$(ProjectName).dll - $(QTDIR)\lib;%(AdditionalLibraryDirectories) + $(SolutionDir)..\runner17\$(TargetName)$(TargetExt) + $(QTDIR)\lib;..\..\3part\opencv3.4.1\x64\vc15\lib;..\..\3part\lpSyslog\lib;..\..\3part\customgui\lib_x64;..\..\3part\libzkq\lib;%(AdditionalLibraryDirectories) false - qtmain.lib;Qt5Core.lib;Qt5Gui.lib;Qt5Widgets.lib;Qt5SerialBus.lib;Qt5SerialPort.lib;Qt5Sql.lib;%(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) 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) - .\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) + .\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) .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp Moc'ing %(Identity)... @@ -127,7 +127,6 @@ - @@ -138,6 +137,7 @@ + @@ -150,14 +150,18 @@ - + + + .\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 + .\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 + .\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 .\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 @@ -186,10 +190,6 @@ .\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 .\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 - - .\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 - .\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 - .\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 diff --git a/tpvs17/lpMain/lpMain.vcxproj.filters b/tpvs17/lpMain/lpMain.vcxproj.filters index 227fd3c..eec8316 100644 --- a/tpvs17/lpMain/lpMain.vcxproj.filters +++ b/tpvs17/lpMain/lpMain.vcxproj.filters @@ -109,9 +109,6 @@ lpMain - - lpMain\db - Source Files @@ -130,6 +127,9 @@ Source Files + + Source Files + @@ -183,9 +183,6 @@ lpMain - - lpMain\db - Header Files @@ -207,14 +204,14 @@ Header Files + + Header Files + Form Files - - lpMain\db - Form Files @@ -227,6 +224,9 @@ Form Files + + Form Files + diff --git a/tpvs17/lpMain/lpMain.vcxproj.user b/tpvs17/lpMain/lpMain.vcxproj.user index 60c58f5..931055a 100644 --- a/tpvs17/lpMain/lpMain.vcxproj.user +++ b/tpvs17/lpMain/lpMain.vcxproj.user @@ -10,6 +10,9 @@ D:\Qt\Qt5.9.4\5.9.4\msvc2017_64 + $(SolutionDir)..\runner17\Enchanter.exe + $(SolutionDir)..\runner17\ + WindowsLocalDebugger PATH=$(QTDIR)\bin%3b$(PATH) \ No newline at end of file