diff --git a/3part/tadpole/include/tpBase/baseStruct.h b/3part/tadpole/include/tpBase/baseStruct.h index ab7894a..c4408e4 100644 --- a/3part/tadpole/include/tpBase/baseStruct.h +++ b/3part/tadpole/include/tpBase/baseStruct.h @@ -4,6 +4,7 @@ #include "baseDefine.h" #include "baseConstant.h" #include "iAlgorithm.h" +#include "QDateTime" typedef struct tagTP_CORE_SETTING{ int threadsCount; diff --git a/runner17/algorithmLib/caliCenter.dll b/runner17/algorithmLib/caliCenter.dll index c14ae40..181fda3 100644 Binary files a/runner17/algorithmLib/caliCenter.dll and b/runner17/algorithmLib/caliCenter.dll differ diff --git a/runner17/algorithmLib/caliValve.dll b/runner17/algorithmLib/caliValve.dll index 7682762..6c43583 100644 Binary files a/runner17/algorithmLib/caliValve.dll and b/runner17/algorithmLib/caliValve.dll differ diff --git a/runner17/algorithmLib/valveDetector.dll b/runner17/algorithmLib/valveDetector.dll index 20bd2b7..8b6380e 100644 Binary files a/runner17/algorithmLib/valveDetector.dll and b/runner17/algorithmLib/valveDetector.dll differ diff --git a/runner17/lpbengined.dll b/runner17/lpbengined.dll index d817af9..a41575a 100644 Binary files a/runner17/lpbengined.dll and b/runner17/lpbengined.dll differ diff --git a/runner17/lpbengined.ilk b/runner17/lpbengined.ilk deleted file mode 100644 index c50fb4d..0000000 Binary files a/runner17/lpbengined.ilk and /dev/null differ diff --git a/runner17/lpdesignerd.dll b/runner17/lpdesignerd.dll index 62e36e1..94c8999 100644 Binary files a/runner17/lpdesignerd.dll and b/runner17/lpdesignerd.dll differ diff --git a/runner17/lpdesignerd.ilk b/runner17/lpdesignerd.ilk deleted file mode 100644 index ee4541d..0000000 Binary files a/runner17/lpdesignerd.ilk and /dev/null differ diff --git a/runner17/tpCam_100d.dll b/runner17/tpCam_100d.dll index cb851a2..de5f172 100644 Binary files a/runner17/tpCam_100d.dll and b/runner17/tpCam_100d.dll differ diff --git a/runner17/tpCam_100d.ilk b/runner17/tpCam_100d.ilk deleted file mode 100644 index c6530e3..0000000 Binary files a/runner17/tpCam_100d.ilk and /dev/null differ diff --git a/runner17/tpCam_120d.dll b/runner17/tpCam_120d.dll index bbc7d30..9e4841f 100644 Binary files a/runner17/tpCam_120d.dll and b/runner17/tpCam_120d.dll differ diff --git a/runner17/tpCam_120d.ilk b/runner17/tpCam_120d.ilk deleted file mode 100644 index c6416da..0000000 Binary files a/runner17/tpCam_120d.ilk and /dev/null differ diff --git a/runner17/tpCam_140d.dll b/runner17/tpCam_140d.dll index 8ff97d5..db9be14 100644 Binary files a/runner17/tpCam_140d.dll and b/runner17/tpCam_140d.dll differ diff --git a/runner17/tpCam_160d.dll b/runner17/tpCam_160d.dll index 4ffb7cd..43ff798 100644 Binary files a/runner17/tpCam_160d.dll and b/runner17/tpCam_160d.dll differ diff --git a/runner17/tpCam_160d.ilk b/runner17/tpCam_160d.ilk deleted file mode 100644 index ec073c8..0000000 Binary files a/runner17/tpCam_160d.ilk and /dev/null differ diff --git a/src/lpCamera/lpCamVirtual/CameraVirtualFolder.cpp b/src/lpCamera/lpCamVirtual/CameraVirtualFolder.cpp index 4b27957..bc3e882 100644 --- a/src/lpCamera/lpCamVirtual/CameraVirtualFolder.cpp +++ b/src/lpCamera/lpCamVirtual/CameraVirtualFolder.cpp @@ -180,6 +180,8 @@ void CCameraVirtualFolder::ISnapCamera() m_nImageWidth = img.width(); m_nImageHeight = img.height(); m_nImageSize = img.byteCount(); + m_pCamOpt->height = m_nImageHeight; + m_pCamOpt->width = m_nImageWidth; m_nBitsPerPixel = img.depth(); m_nColorFormat = TP_FUNCS::FromQImageFormat(img); m_pCb->IPushCameraData(this); diff --git a/src/lpMain/Station.cpp b/src/lpMain/Station.cpp index 49ddab1..eeb90fe 100644 --- a/src/lpMain/Station.cpp +++ b/src/lpMain/Station.cpp @@ -9,6 +9,7 @@ #include "WfModel.h" #include #include "lpSysLog.h" +#include "QDateTime" #pragma execution_character_set("utf-8") diff --git a/src/lpbdesigner/DsgRoiDlg.cpp b/src/lpbdesigner/DsgRoiDlg.cpp index e493b98..9a8afb3 100644 --- a/src/lpbdesigner/DsgRoiDlg.cpp +++ b/src/lpbdesigner/DsgRoiDlg.cpp @@ -84,6 +84,11 @@ CDsgRoiDlg::~CDsgRoiDlg() delete m_pRoiScene; m_pRoiScene = nullptr; } + if (ui) + { + delete ui; + ui = nullptr; + } } bool CDsgRoiDlg::Initialize(IDetectorEngine* pDE, IDetectorAlgorithm* pAlgo, IDetectorTask* pTask) @@ -107,7 +112,6 @@ bool CDsgRoiDlg::Initialize(IDetectorEngine* pDE, IDetectorAlgorithm* pAlgo, IDe bool CDsgRoiDlg::InitGraphView() { ui->pushButton_5->setText(QObject::tr("显示定位线")); - ui->graphicsView->setUserData(0, (QObjectUserData*)1); ui->graphicsView->setScene(m_pRoiScene); ui->graphicsView->setRenderHint(QPainter::Antialiasing); @@ -174,7 +178,6 @@ void CDsgRoiDlg::OnShowColorDlg() return ; QString strRGB = QString("(%1,%2,%3)").arg(QString::number(color.red()), QString::number(color.green()), QString::number(color.blue())); ui->lineEdit_3->setText(strRGB); - ui->lineEdit_3->setUserData(0, (QObjectUserData*)color.rgb()); QString strStyle = QString("background-color:rgba(%1,%2,%3,255);").arg(color.red()).arg(color.green()).arg(color.blue()); ui->lineEdit_3->setStyleSheet(strStyle); SystemStateInfo::rgb = color.rgb(); @@ -245,7 +248,6 @@ LP_DETECTOR_ROI_DATA CDsgRoiDlg::ShowRoiDlg(LP_DETECTOR_ROI_DATA roiData) QColor color(SystemStateInfo::rgb); QString strRGB = QString("(%1,%2,%3)").arg(QString::number(color.red()), QString::number(color.green()), QString::number(color.blue())); ui->lineEdit_3->setText(strRGB); - ui->lineEdit_3->setUserData(0, (QObjectUserData*)color.rgb()); QString strStyle = QString("background-color:rgba(%1,%2,%3,255);").arg(color.red()).arg(color.green()).arg(color.blue()); ui->lineEdit_3->setStyleSheet(strStyle); diff --git a/tpvs17/Enchanter/Enchanter.vcxproj b/tpvs17/Enchanter/Enchanter.vcxproj index c1d8174..ad3e449 100644 --- a/tpvs17/Enchanter/Enchanter.vcxproj +++ b/tpvs17/Enchanter/Enchanter.vcxproj @@ -53,7 +53,7 @@ true - UNICODE;_UNICODE;WIN32;WIN64;QT_DLL;QT_CORE_LIB;QT_GUI_LIB;QT_WIDGETS_LIB;%(PreprocessorDefinitions) + UNICODE;_UNICODE;WIN32;WIN64;QT_CORE_LIB;QT_GUI_LIB;QT_WIDGETS_LIB;%(PreprocessorDefinitions) .\GeneratedFiles;.;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName);$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtANGLE;$(QTDIR)\include\QtWidgets;%(AdditionalIncludeDirectories) Disabled ProgramDatabase @@ -71,7 +71,7 @@ .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp Moc'ing %(Identity)... .\GeneratedFiles;.;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName);$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtANGLE;$(QTDIR)\include\QtWidgets;%(AdditionalIncludeDirectories) - UNICODE;_UNICODE;WIN32;WIN64;QT_DLL;QT_CORE_LIB;QT_GUI_LIB;QT_WIDGETS_LIB;%(PreprocessorDefinitions) + UNICODE;_UNICODE;WIN32;WIN64;QT_CORE_LIB;QT_GUI_LIB;QT_WIDGETS_LIB;%(PreprocessorDefinitions) Uic'ing %(Identity)... @@ -85,7 +85,7 @@ true - UNICODE;_UNICODE;WIN32;WIN64;QT_DLL;QT_NO_DEBUG;NDEBUG;QT_CORE_LIB;QT_GUI_LIB;QT_WIDGETS_LIB;%(PreprocessorDefinitions) + UNICODE;_UNICODE;WIN32;WIN64;QT_NO_DEBUG;NDEBUG;QT_CORE_LIB;QT_GUI_LIB;QT_WIDGETS_LIB;%(PreprocessorDefinitions) .\GeneratedFiles;.;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName);$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtANGLE;$(QTDIR)\include\QtWidgets;%(AdditionalIncludeDirectories) MultiThreadedDLL @@ -102,7 +102,7 @@ .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp Moc'ing %(Identity)... .\GeneratedFiles;.;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName);$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtANGLE;$(QTDIR)\include\QtWidgets;%(AdditionalIncludeDirectories) - UNICODE;_UNICODE;WIN32;WIN64;QT_DLL;QT_NO_DEBUG;NDEBUG;QT_CORE_LIB;QT_GUI_LIB;QT_WIDGETS_LIB;%(PreprocessorDefinitions) + UNICODE;_UNICODE;WIN32;WIN64;QT_NO_DEBUG;NDEBUG;QT_CORE_LIB;QT_GUI_LIB;QT_WIDGETS_LIB;%(PreprocessorDefinitions) Uic'ing %(Identity)... diff --git a/tpvs17/Enchanter/Enchanter.vcxproj.user b/tpvs17/Enchanter/Enchanter.vcxproj.user deleted file mode 100644 index 6e64592..0000000 --- a/tpvs17/Enchanter/Enchanter.vcxproj.user +++ /dev/null @@ -1,18 +0,0 @@ - - - - - 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/QUserInfo/QUserInfo.vcxproj.user b/tpvs17/QUserInfo/QUserInfo.vcxproj.user deleted file mode 100644 index 4473bc9..0000000 --- a/tpvs17/QUserInfo/QUserInfo.vcxproj.user +++ /dev/null @@ -1,18 +0,0 @@ - - - - - D:\Qt\Qt5.9.4\5.9.4\msvc2017_64 - $(SolutionDir)..\runner17\tpShelld.exe - $(SolutionDir)..\runner17\ - WindowsLocalDebugger - PATH=$(QTDIR)\bin%3b$(PATH) - - - D:\Qt\Qt5.9.4\5.9.4\msvc2017_64 - $(OutDir)..\..\..\runner13\tpShell.exe - $(OutDir)..\..\..\runner13\ - WindowsLocalDebugger - PATH=$(QTDIR)\bin%3b$(PATH) - - \ No newline at end of file diff --git a/tpvs17/Report/Report.vcxproj b/tpvs17/Report/Report.vcxproj index 4e9af59..5f39c45 100644 --- a/tpvs17/Report/Report.vcxproj +++ b/tpvs17/Report/Report.vcxproj @@ -53,7 +53,7 @@ true - UNICODE;_UNICODE;WIN32;WIN64;QT_DLL;QT_CORE_LIB;QT_GUI_LIB;QT_SQL_LIB;QT_WIDGETS_LIB;%(PreprocessorDefinitions) + UNICODE;_UNICODE;WIN32;WIN64;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 @@ -71,7 +71,7 @@ .\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) + UNICODE;_UNICODE;WIN32;WIN64;QT_CORE_LIB;QT_GUI_LIB;QT_SQL_LIB;QT_WIDGETS_LIB;%(PreprocessorDefinitions) Uic'ing %(Identity)... @@ -85,7 +85,7 @@ true - UNICODE;_UNICODE;WIN32;WIN64;QT_DLL;QT_NO_DEBUG;NDEBUG;QT_CORE_LIB;QT_GUI_LIB;QT_SQL_LIB;QT_WIDGETS_LIB;%(PreprocessorDefinitions) + UNICODE;_UNICODE;WIN32;WIN64;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 @@ -102,7 +102,7 @@ .\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) + UNICODE;_UNICODE;WIN32;WIN64;QT_NO_DEBUG;NDEBUG;QT_CORE_LIB;QT_GUI_LIB;QT_SQL_LIB;QT_WIDGETS_LIB;%(PreprocessorDefinitions) Uic'ing %(Identity)... diff --git a/tpvs17/Report/Report.vcxproj.user b/tpvs17/Report/Report.vcxproj.user deleted file mode 100644 index 6974a71..0000000 --- a/tpvs17/Report/Report.vcxproj.user +++ /dev/null @@ -1,18 +0,0 @@ - - - - - C:\Qt\Qt5.9.4\5.9.4\msvc2017_64 - $(SolutionDir)..\runner17\$(TargetName)$(TargetExt) - $(SolutionDir)..\runner17\ - WindowsLocalDebugger - PATH=$(QTDIR)\bin%3b$(PATH) - - - C:\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/algorithm/algorithm.vcxproj.user b/tpvs17/algorithm/algorithm.vcxproj.user deleted file mode 100644 index dfd94c1..0000000 --- a/tpvs17/algorithm/algorithm.vcxproj.user +++ /dev/null @@ -1,12 +0,0 @@ - - - - - D:\Qt\Qt5.9.4\5.9.4\msvc2017_64 - PATH=$(QTDIR)\bin%3b$(PATH) - - - D:\Qt\Qt5.9.4\5.9.4\msvc2017_64 - PATH=$(QTDIR)\bin%3b$(PATH) - - \ No newline at end of file diff --git a/tpvs17/caliCenter/caliCenter.vcxproj.user b/tpvs17/caliCenter/caliCenter.vcxproj.user deleted file mode 100644 index dfd94c1..0000000 --- a/tpvs17/caliCenter/caliCenter.vcxproj.user +++ /dev/null @@ -1,12 +0,0 @@ - - - - - D:\Qt\Qt5.9.4\5.9.4\msvc2017_64 - PATH=$(QTDIR)\bin%3b$(PATH) - - - D:\Qt\Qt5.9.4\5.9.4\msvc2017_64 - PATH=$(QTDIR)\bin%3b$(PATH) - - \ No newline at end of file diff --git a/tpvs17/caliValve/caliValve.vcxproj.user b/tpvs17/caliValve/caliValve.vcxproj.user deleted file mode 100644 index dfd94c1..0000000 --- a/tpvs17/caliValve/caliValve.vcxproj.user +++ /dev/null @@ -1,12 +0,0 @@ - - - - - D:\Qt\Qt5.9.4\5.9.4\msvc2017_64 - PATH=$(QTDIR)\bin%3b$(PATH) - - - D:\Qt\Qt5.9.4\5.9.4\msvc2017_64 - PATH=$(QTDIR)\bin%3b$(PATH) - - \ No newline at end of file diff --git a/tpvs17/lpCoreCtrl/lpCoreCtrl.vcxproj.user b/tpvs17/lpCoreCtrl/lpCoreCtrl.vcxproj.user deleted file mode 100644 index 4195e6b..0000000 --- a/tpvs17/lpCoreCtrl/lpCoreCtrl.vcxproj.user +++ /dev/null @@ -1,12 +0,0 @@ - - - - - D:\Qt\Qt5.9.4\5.9.4\msvc2017_64 - PATH=$(QTDIR)\bin%3b$(PATH) - - - D:\Qt\Qt5.9.4\5.9.4\msvc2017_64 - PATH=$(QTDIR)\bin%3b$(PATH) - - \ No newline at end of file diff --git a/tpvs17/lpMain/CMainWin.cpp b/tpvs17/lpMain/CMainWin.cpp index 3a4fd63..acd546e 100644 --- a/tpvs17/lpMain/CMainWin.cpp +++ b/tpvs17/lpMain/CMainWin.cpp @@ -19,9 +19,9 @@ CMainWin::CMainWin(QWidget *parent) : QMainWindow(parent) { {//加载语言设置 - QSettings languageSetting(lpSysConfig::instance()->getCfgPath(), QSettings::IniFormat); - QString strLanguage = languageSetting.value("language/select", "Chinese").toString(); - SetLanguage(strLanguage); + //QSettings languageSetting(lpSysConfig::instance()->(), QSettings::IniFormat); + //QString strLanguage = languageSetting.value("language/select", "Chinese").toString(); + //SetLanguage(strLanguage); } setWindowIcon(QIcon(":/leaper/Resource/app.png")); onInitCoreCtrl(); @@ -829,8 +829,8 @@ void CMainWin::SetTranslator(const QString strPath) } Q_SLOT void CMainWin::onLanguageChange(QString strLanguage) { - QSettings languageSetting(lpSysConfig::instance()->getCfgPath(), QSettings::IniFormat); - languageSetting.value("language/select", "Chinese").toString(); +// QSettings languageSetting(lpSysConfig::instance()->getCfgPath(), QSettings::IniFormat); +// languageSetting.value("language/select", "Chinese").toString(); SetLanguage(strLanguage); } diff --git a/tpvs17/lpMain/lpMain.vcxproj b/tpvs17/lpMain/lpMain.vcxproj index c74227c..63fb1f4 100644 --- a/tpvs17/lpMain/lpMain.vcxproj +++ b/tpvs17/lpMain/lpMain.vcxproj @@ -54,7 +54,7 @@ true UNICODE;_UNICODE;WIN32;WIN64;LPMAIN_LIB;%(PreprocessorDefinitions) - .\GeneratedFiles;.;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName);..\..\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;..\..\src\userCtrl;..\..\src\lpMain\CoreCtrl;..\..\3part\tadpole\include\tpBase;..\..\src\lpMain\view;%(AdditionalIncludeDirectories) + .\GeneratedFiles;.;$(QTDIR)\include;$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtWidgets;$(QTDIR)\include\QtSql;.\GeneratedFiles\$(ConfigurationName);..\..\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;..\..\src\userCtrl;..\..\src\lpMain\CoreCtrl;..\..\3part\tadpole\include\tpBase;..\..\src\lpMain\view;%(AdditionalIncludeDirectories) Disabled ProgramDatabase MultiThreadedDebugDLL @@ -65,11 +65,11 @@ $(SolutionDir)..\runner17\$(TargetName)$(TargetExt) $(QTDIR)\lib;..\..\3part\opencv3.4.1\x64\vc15\lib;..\..\3part\lpSyslog\lib;..\..\3part\libzkq\lib;%(AdditionalLibraryDirectories) true - qtmaind.lib;opencv_world341d.lib;lpSyslogd.lib;libzkqd.lib;%(AdditionalDependencies) + qtmaind.lib;Qt5Cored.lib;Qt5Guid.lib;Qt5Widgetsd.lib;Qt5Sqld.lib;opencv_world341d.lib;lpSyslogd.lib;libzkqd.lib;%(AdditionalDependencies) UNICODE;_UNICODE;WIN32;WIN64;LPMAIN_LIB;%(PreprocessorDefinitions) - .\GeneratedFiles;.;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName);..\..\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;..\..\src\userCtrl;..\..\src\lpMain\CoreCtrl;..\..\3part\tadpole\include\tpBase;..\..\src\lpMain\view;%(AdditionalIncludeDirectories) + .\GeneratedFiles;.;$(QTDIR)\include;$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtWidgets;$(QTDIR)\include\QtSql;.\GeneratedFiles\$(ConfigurationName);..\..\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;..\..\src\userCtrl;..\..\src\lpMain\CoreCtrl;..\..\3part\tadpole\include\tpBase;..\..\src\lpMain\view;%(AdditionalIncludeDirectories) .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp Moc'ing %(Identity)... @@ -143,7 +143,10 @@ + + + @@ -157,13 +160,28 @@ + + + + + .\GeneratedFiles;.;$(QTDIR)\include;$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtWidgets;$(QTDIR)\include\QtSql;.\GeneratedFiles\$(ConfigurationName);.\..\..\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;.\..\..\src\userCtrl;.\..\..\src\lpMain\CoreCtrl;.\..\..\3part\tadpole\include\tpBase;.\..\..\src\lpMain\view + .\GeneratedFiles;.;$(QTDIR)\include;$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtWidgets;$(QTDIR)\include\QtSql;.\GeneratedFiles\$(ConfigurationName);.\..\..\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;.\..\..\src\userCtrl;.\..\..\src\lpMain\CoreCtrl;.\..\..\3part\tadpole\include\tpBase;.\..\..\src\lpMain\view + + + .\GeneratedFiles;.;$(QTDIR)\include;$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtWidgets;$(QTDIR)\include\QtSql;.\GeneratedFiles\$(ConfigurationName);.\..\..\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;.\..\..\src\userCtrl;.\..\..\src\lpMain\CoreCtrl;.\..\..\3part\tadpole\include\tpBase;.\..\..\src\lpMain\view + .\GeneratedFiles;.;$(QTDIR)\include;$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtWidgets;$(QTDIR)\include\QtSql;.\GeneratedFiles\$(ConfigurationName);.\..\..\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;.\..\..\src\userCtrl;.\..\..\src\lpMain\CoreCtrl;.\..\..\3part\tadpole\include\tpBase;.\..\..\src\lpMain\view + + + .\GeneratedFiles;.;$(QTDIR)\include;$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtWidgets;$(QTDIR)\include\QtSql;.\GeneratedFiles\$(ConfigurationName);.\..\..\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;.\..\..\src\userCtrl;.\..\..\src\lpMain\CoreCtrl;.\..\..\3part\tadpole\include\tpBase;.\..\..\src\lpMain\view + .\GeneratedFiles;.;$(QTDIR)\include;$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtWidgets;$(QTDIR)\include\QtSql;.\GeneratedFiles\$(ConfigurationName);.\..\..\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;.\..\..\src\userCtrl;.\..\..\src\lpMain\CoreCtrl;.\..\..\3part\tadpole\include\tpBase;.\..\..\src\lpMain\view + @@ -268,7 +286,7 @@ - + \ No newline at end of file diff --git a/tpvs17/lpMain/lpMain.vcxproj.filters b/tpvs17/lpMain/lpMain.vcxproj.filters index 3178daf..2934b0a 100644 --- a/tpvs17/lpMain/lpMain.vcxproj.filters +++ b/tpvs17/lpMain/lpMain.vcxproj.filters @@ -150,16 +150,16 @@ view - + Source Files - + Source Files Source Files - + Source Files @@ -254,16 +254,16 @@ view - + Header Files - + Header Files Header Files - + Header Files @@ -289,16 +289,16 @@ Form Files - + Form Files - + Form Files Form Files - + Form Files diff --git a/tpvs17/valveDetector/valveDetector.vcxproj.user b/tpvs17/valveDetector/valveDetector.vcxproj.user deleted file mode 100644 index 1533ea2..0000000 --- a/tpvs17/valveDetector/valveDetector.vcxproj.user +++ /dev/null @@ -1,20 +0,0 @@ - - - - - D:\Qt\Qt5.4.2\5.4\msvc2013 - PATH=$(QTDIR)\bin%3b$(PATH) - - - D:\Qt\Qt5.4.2\5.4\msvc2013 - PATH=$(QTDIR)\bin%3b$(PATH) - - - D:\Qt\Qt5.9.4\5.9.4\msvc2017_64 - PATH=$(QTDIR)\bin%3b$(PATH) - - - D:\Qt\Qt5.9.4\5.9.4\msvc2017_64 - PATH=$(QTDIR)\bin%3b$(PATH) - - \ No newline at end of file