diff --git a/runner17/Release/Qt5Xlsx.dll b/runner17/Release/Qt5Xlsx.dll new file mode 100644 index 0000000..71e3c6d Binary files /dev/null and b/runner17/Release/Qt5Xlsx.dll differ diff --git a/runner17/Release/smokeBox.exe b/runner17/Release/smokeBox.exe index dca1a93..f02a722 100644 Binary files a/runner17/Release/smokeBox.exe and b/runner17/Release/smokeBox.exe differ diff --git a/src/CategoryMatcher.cpp b/src/CategoryMatcher.cpp index b13bcd3..c45e365 100644 --- a/src/CategoryMatcher.cpp +++ b/src/CategoryMatcher.cpp @@ -99,6 +99,7 @@ bool CategoryMatcher::smokeMatch(const QString& typeNo, const ILImagePtr ilImgPt ILMatchResultsPtr matchResultsPtr; QList keys = templateObj.uniqueKeys(); int templateLevel = keys.length(); + qDebug() << "templateLevel = "<< templateLevel; templateLevelAndvecMatchRltPtr.first = templateLevel; for each (int level in keys) { @@ -126,7 +127,16 @@ bool CategoryMatcher::smokeMatch(const QString& typeNo, const ILImagePtr ilImgPt qDebug() << outStr; continue; } + m_ilmatchPtr->DetailLevel = 0.5; m_ilmatchPtr->Learn(ilTemplatePtr, nullptr); + // 如果模板的特征点特别多,匹配时间会相当长,需要降低细节 + ILPointsPtr featurePoints = m_ilmatchPtr->GetPatFeature(); + if (featurePoints->Count()>3000) + { + m_ilmatchPtr->DetailLevel = 0.05; + m_ilmatchPtr->Learn(ilTemplatePtr, nullptr); + } + LPVErrorCode err = m_ilmatchPtr->Match(ilImgPtr, nullptr, &matchResultsPtr); if (err != LPVErrorCode::LPVNoError) { continue; // match failed diff --git a/tpvs17/SmokeBoxIdentification/SmokeBoxIdentification.vcxproj.user b/tpvs17/SmokeBoxIdentification/SmokeBoxIdentification.vcxproj.user index 95f2585..7a20d55 100644 --- a/tpvs17/SmokeBoxIdentification/SmokeBoxIdentification.vcxproj.user +++ b/tpvs17/SmokeBoxIdentification/SmokeBoxIdentification.vcxproj.user @@ -2,13 +2,13 @@ - D:\software\Qt\Qt5.9.4\5.9.4\msvc2017_64 + C:\Qt\Qt5.9.4\5.9.4\msvc2017_64 $(OutDir)smokeBoxd.exe WindowsLocalDebugger PATH=$(QTDIR)\bin%3b$(PATH) - D:\software\Qt\Qt5.9.4\5.9.4\msvc2017_64 + C:\Qt\Qt5.9.4\5.9.4\msvc2017_64 $(OutDir)smokeBox.exe WindowsLocalDebugger PATH=$(QTDIR)\bin%3b$(PATH) diff --git a/tpvs17/SmokeBoxIdentification/SmokeBoxIdentification.vcxproj.user.bak b/tpvs17/SmokeBoxIdentification/SmokeBoxIdentification.vcxproj.user.bak index 7a20d55..95f2585 100644 --- a/tpvs17/SmokeBoxIdentification/SmokeBoxIdentification.vcxproj.user.bak +++ b/tpvs17/SmokeBoxIdentification/SmokeBoxIdentification.vcxproj.user.bak @@ -2,13 +2,13 @@ - C:\Qt\Qt5.9.4\5.9.4\msvc2017_64 + D:\software\Qt\Qt5.9.4\5.9.4\msvc2017_64 $(OutDir)smokeBoxd.exe WindowsLocalDebugger PATH=$(QTDIR)\bin%3b$(PATH) - C:\Qt\Qt5.9.4\5.9.4\msvc2017_64 + D:\software\Qt\Qt5.9.4\5.9.4\msvc2017_64 $(OutDir)smokeBox.exe WindowsLocalDebugger PATH=$(QTDIR)\bin%3b$(PATH) diff --git a/tpvs17/SmokeBoxIdentification/x64/Release/ADModule.obj b/tpvs17/SmokeBoxIdentification/x64/Release/ADModule.obj index c5979e7..9c66642 100644 Binary files a/tpvs17/SmokeBoxIdentification/x64/Release/ADModule.obj and b/tpvs17/SmokeBoxIdentification/x64/Release/ADModule.obj differ diff --git a/tpvs17/SmokeBoxIdentification/x64/Release/CameraControl.obj b/tpvs17/SmokeBoxIdentification/x64/Release/CameraControl.obj index 3c9dc33..ea67ba4 100644 Binary files a/tpvs17/SmokeBoxIdentification/x64/Release/CameraControl.obj and b/tpvs17/SmokeBoxIdentification/x64/Release/CameraControl.obj differ diff --git a/tpvs17/SmokeBoxIdentification/x64/Release/CategoryMatcher.obj b/tpvs17/SmokeBoxIdentification/x64/Release/CategoryMatcher.obj index 5a24bff..a91208f 100644 Binary files a/tpvs17/SmokeBoxIdentification/x64/Release/CategoryMatcher.obj and b/tpvs17/SmokeBoxIdentification/x64/Release/CategoryMatcher.obj differ diff --git a/tpvs17/SmokeBoxIdentification/x64/Release/CodeScanStation.obj b/tpvs17/SmokeBoxIdentification/x64/Release/CodeScanStation.obj index 5a9c633..9222e92 100644 Binary files a/tpvs17/SmokeBoxIdentification/x64/Release/CodeScanStation.obj and b/tpvs17/SmokeBoxIdentification/x64/Release/CodeScanStation.obj differ diff --git a/tpvs17/SmokeBoxIdentification/x64/Release/HikCamera.obj b/tpvs17/SmokeBoxIdentification/x64/Release/HikCamera.obj index 450cb03..09ab21d 100644 Binary files a/tpvs17/SmokeBoxIdentification/x64/Release/HikCamera.obj and b/tpvs17/SmokeBoxIdentification/x64/Release/HikCamera.obj differ diff --git a/tpvs17/SmokeBoxIdentification/x64/Release/NetControl.obj b/tpvs17/SmokeBoxIdentification/x64/Release/NetControl.obj index 43a25af..77fc7c5 100644 Binary files a/tpvs17/SmokeBoxIdentification/x64/Release/NetControl.obj and b/tpvs17/SmokeBoxIdentification/x64/Release/NetControl.obj differ diff --git a/tpvs17/SmokeBoxIdentification/x64/Release/QNumTemplateBuild.obj b/tpvs17/SmokeBoxIdentification/x64/Release/QNumTemplateBuild.obj index 176fe06..615adcf 100644 Binary files a/tpvs17/SmokeBoxIdentification/x64/Release/QNumTemplateBuild.obj and b/tpvs17/SmokeBoxIdentification/x64/Release/QNumTemplateBuild.obj differ diff --git a/tpvs17/SmokeBoxIdentification/x64/Release/SmokeBox.B12702AD.tlog/CL.command.1.tlog b/tpvs17/SmokeBoxIdentification/x64/Release/SmokeBox.B12702AD.tlog/CL.command.1.tlog index 9a1ee69..214ff5a 100644 Binary files a/tpvs17/SmokeBoxIdentification/x64/Release/SmokeBox.B12702AD.tlog/CL.command.1.tlog and b/tpvs17/SmokeBoxIdentification/x64/Release/SmokeBox.B12702AD.tlog/CL.command.1.tlog differ diff --git a/tpvs17/SmokeBoxIdentification/x64/Release/SmokeBox.B12702AD.tlog/CL.read.1.tlog b/tpvs17/SmokeBoxIdentification/x64/Release/SmokeBox.B12702AD.tlog/CL.read.1.tlog index fc9a65b..ebc57aa 100644 Binary files a/tpvs17/SmokeBoxIdentification/x64/Release/SmokeBox.B12702AD.tlog/CL.read.1.tlog and b/tpvs17/SmokeBoxIdentification/x64/Release/SmokeBox.B12702AD.tlog/CL.read.1.tlog differ diff --git a/tpvs17/SmokeBoxIdentification/x64/Release/SmokeBox.B12702AD.tlog/link.command.1.tlog b/tpvs17/SmokeBoxIdentification/x64/Release/SmokeBox.B12702AD.tlog/link.command.1.tlog index e617e74..1b2eb98 100644 Binary files a/tpvs17/SmokeBoxIdentification/x64/Release/SmokeBox.B12702AD.tlog/link.command.1.tlog and b/tpvs17/SmokeBoxIdentification/x64/Release/SmokeBox.B12702AD.tlog/link.command.1.tlog differ diff --git a/tpvs17/SmokeBoxIdentification/x64/Release/SmokeBox.B12702AD.tlog/link.read.1.tlog b/tpvs17/SmokeBoxIdentification/x64/Release/SmokeBox.B12702AD.tlog/link.read.1.tlog index 6fb26da..afb05e0 100644 Binary files a/tpvs17/SmokeBoxIdentification/x64/Release/SmokeBox.B12702AD.tlog/link.read.1.tlog and b/tpvs17/SmokeBoxIdentification/x64/Release/SmokeBox.B12702AD.tlog/link.read.1.tlog differ diff --git a/tpvs17/SmokeBoxIdentification/x64/Release/SmokeBoxIdentification.log b/tpvs17/SmokeBoxIdentification/x64/Release/SmokeBoxIdentification.log index d579fd0..153fdb4 100644 --- a/tpvs17/SmokeBoxIdentification/x64/Release/SmokeBoxIdentification.log +++ b/tpvs17/SmokeBoxIdentification/x64/Release/SmokeBoxIdentification.log @@ -5,13 +5,13 @@ Moc'ing ..\..\src\Camera.h... Moc'ing ..\..\src\CameraControl.h... Moc'ing ..\..\src\CategoryMatcher.h... + RCC: Warning: No resources in 'E:\Code\smokeboxidentification\tpvs17\SmokeBoxIdentification\SmokeBoxIdentification.qrc'. Moc'ing ..\..\src\CodeScanStation.h... Moc'ing ..\..\src\QNumTemplateBuild.h... Moc'ing ..\..\src\SmokeBoxIdentification.h... Moc'ing ..\..\src\NetControl.h... Moc'ing ..\..\src\lpSerialStation.h... Moc'ing ..\..\src\HikCamera.h... - RCC: Warning: No resources in 'E:\Code\smokeboxidentification\tpvs17\SmokeBoxIdentification\SmokeBoxIdentification.qrc'. ADModule.cpp e:\code\smokeboxidentification\src\numstatisticalgo\datapreprocessing.h(17): warning C4005: 鈥淭YPE_TEMPLATE_PATH鈥: 瀹忛噸瀹氫箟 e:\code\smokeboxidentification\src\common\commondefine.h(25): note: 鍙傝鈥淭YPE_TEMPLATE_PATH鈥濈殑鍓嶄竴涓畾涔 diff --git a/tpvs17/SmokeBoxIdentification/x64/Release/SmokeBoxIdentification.obj b/tpvs17/SmokeBoxIdentification/x64/Release/SmokeBoxIdentification.obj index 8413016..6517b77 100644 Binary files a/tpvs17/SmokeBoxIdentification/x64/Release/SmokeBoxIdentification.obj and b/tpvs17/SmokeBoxIdentification/x64/Release/SmokeBoxIdentification.obj differ diff --git a/tpvs17/SmokeBoxIdentification/x64/Release/log.obj b/tpvs17/SmokeBoxIdentification/x64/Release/log.obj index b957b6d..2b096bb 100644 Binary files a/tpvs17/SmokeBoxIdentification/x64/Release/log.obj and b/tpvs17/SmokeBoxIdentification/x64/Release/log.obj differ diff --git a/tpvs17/SmokeBoxIdentification/x64/Release/lpSerialStation.obj b/tpvs17/SmokeBoxIdentification/x64/Release/lpSerialStation.obj index a8a981d..41d64b6 100644 Binary files a/tpvs17/SmokeBoxIdentification/x64/Release/lpSerialStation.obj and b/tpvs17/SmokeBoxIdentification/x64/Release/lpSerialStation.obj differ diff --git a/tpvs17/SmokeBoxIdentification/x64/Release/lpvCore.tlh b/tpvs17/SmokeBoxIdentification/x64/Release/lpvCore.tlh index b158aeb..f208196 100644 --- a/tpvs17/SmokeBoxIdentification/x64/Release/lpvCore.tlh +++ b/tpvs17/SmokeBoxIdentification/x64/Release/lpvCore.tlh @@ -3,7 +3,7 @@ // e:\code\smokeboxidentification\tpvs17\smokeboxidentification\x64\release\lpvCore.tlh // // C++ source equivalent of Win32 type library c34b3e9e-6dea-4aa9-b500-0266f90dc15f -// compiler-generated file created 11/22/23 at 21:55:41 - DO NOT EDIT! +// compiler-generated file created 11/23/23 at 20:42:00 - DO NOT EDIT! #pragma once #pragma pack(push, 8) diff --git a/tpvs17/SmokeBoxIdentification/x64/Release/lpvCore.tli b/tpvs17/SmokeBoxIdentification/x64/Release/lpvCore.tli index e72fa04..2fe815a 100644 --- a/tpvs17/SmokeBoxIdentification/x64/Release/lpvCore.tli +++ b/tpvs17/SmokeBoxIdentification/x64/Release/lpvCore.tli @@ -3,7 +3,7 @@ // e:\code\smokeboxidentification\tpvs17\smokeboxidentification\x64\release\lpvCore.tli // // Wrapper implementations for Win32 type library c34b3e9e-6dea-4aa9-b500-0266f90dc15f -// compiler-generated file created 11/22/23 at 21:55:41 - DO NOT EDIT! +// compiler-generated file created 11/23/23 at 20:42:00 - DO NOT EDIT! #pragma once diff --git a/tpvs17/SmokeBoxIdentification/x64/Release/lpvGeom.tlh b/tpvs17/SmokeBoxIdentification/x64/Release/lpvGeom.tlh index 73639b9..6d70b8d 100644 --- a/tpvs17/SmokeBoxIdentification/x64/Release/lpvGeom.tlh +++ b/tpvs17/SmokeBoxIdentification/x64/Release/lpvGeom.tlh @@ -3,7 +3,7 @@ // e:\code\smokeboxidentification\tpvs17\smokeboxidentification\x64\release\lpvGeom.tlh // // C++ source equivalent of Win32 type library 8955aafb-4602-4d6a-a888-69d1437c4d2b -// compiler-generated file created 11/22/23 at 21:55:41 - DO NOT EDIT! +// compiler-generated file created 11/23/23 at 20:42:00 - DO NOT EDIT! // // Cross-referenced type libraries: diff --git a/tpvs17/SmokeBoxIdentification/x64/Release/lpvGeom.tli b/tpvs17/SmokeBoxIdentification/x64/Release/lpvGeom.tli index bce2ed4..06daeb8 100644 --- a/tpvs17/SmokeBoxIdentification/x64/Release/lpvGeom.tli +++ b/tpvs17/SmokeBoxIdentification/x64/Release/lpvGeom.tli @@ -3,7 +3,7 @@ // e:\code\smokeboxidentification\tpvs17\smokeboxidentification\x64\release\lpvGeom.tli // // Wrapper implementations for Win32 type library 8955aafb-4602-4d6a-a888-69d1437c4d2b -// compiler-generated file created 11/22/23 at 21:55:41 - DO NOT EDIT! +// compiler-generated file created 11/23/23 at 20:42:00 - DO NOT EDIT! #pragma once diff --git a/tpvs17/SmokeBoxIdentification/x64/Release/lpvGeomX.tlh b/tpvs17/SmokeBoxIdentification/x64/Release/lpvGeomX.tlh index 32f8dc3..10d140c 100644 --- a/tpvs17/SmokeBoxIdentification/x64/Release/lpvGeomX.tlh +++ b/tpvs17/SmokeBoxIdentification/x64/Release/lpvGeomX.tlh @@ -3,7 +3,7 @@ // e:\code\smokeboxidentification\tpvs17\smokeboxidentification\x64\release\lpvGeomX.tlh // // C++ source equivalent of Win32 type library 02517f91-b197-4cd5-a1b5-92d1da6ca9ce -// compiler-generated file created 11/22/23 at 21:55:41 - DO NOT EDIT! +// compiler-generated file created 11/23/23 at 20:42:00 - DO NOT EDIT! // // Cross-referenced type libraries: diff --git a/tpvs17/SmokeBoxIdentification/x64/Release/lpvGeomX.tli b/tpvs17/SmokeBoxIdentification/x64/Release/lpvGeomX.tli index 14a358a..72532ba 100644 --- a/tpvs17/SmokeBoxIdentification/x64/Release/lpvGeomX.tli +++ b/tpvs17/SmokeBoxIdentification/x64/Release/lpvGeomX.tli @@ -3,7 +3,7 @@ // e:\code\smokeboxidentification\tpvs17\smokeboxidentification\x64\release\lpvGeomX.tli // // Wrapper implementations for Win32 type library 02517f91-b197-4cd5-a1b5-92d1da6ca9ce -// compiler-generated file created 11/22/23 at 21:55:41 - DO NOT EDIT! +// compiler-generated file created 11/23/23 at 20:42:00 - DO NOT EDIT! #pragma once diff --git a/tpvs17/SmokeBoxIdentification/x64/Release/lpvPat.tlh b/tpvs17/SmokeBoxIdentification/x64/Release/lpvPat.tlh index 254aa27..aba6976 100644 --- a/tpvs17/SmokeBoxIdentification/x64/Release/lpvPat.tlh +++ b/tpvs17/SmokeBoxIdentification/x64/Release/lpvPat.tlh @@ -3,7 +3,7 @@ // e:\code\smokeboxidentification\tpvs17\smokeboxidentification\x64\release\lpvPat.tlh // // C++ source equivalent of Win32 type library 799860e5-cec7-4d65-9c62-a93320c0f60a -// compiler-generated file created 11/22/23 at 21:55:41 - DO NOT EDIT! +// compiler-generated file created 11/23/23 at 20:42:00 - DO NOT EDIT! // // Cross-referenced type libraries: diff --git a/tpvs17/SmokeBoxIdentification/x64/Release/lpvPat.tli b/tpvs17/SmokeBoxIdentification/x64/Release/lpvPat.tli index 785252d..377960f 100644 --- a/tpvs17/SmokeBoxIdentification/x64/Release/lpvPat.tli +++ b/tpvs17/SmokeBoxIdentification/x64/Release/lpvPat.tli @@ -3,7 +3,7 @@ // e:\code\smokeboxidentification\tpvs17\smokeboxidentification\x64\release\lpvPat.tli // // Wrapper implementations for Win32 type library 799860e5-cec7-4d65-9c62-a93320c0f60a -// compiler-generated file created 11/22/23 at 21:55:41 - DO NOT EDIT! +// compiler-generated file created 11/23/23 at 20:42:00 - DO NOT EDIT! #pragma once diff --git a/tpvs17/SmokeBoxIdentification/x64/Release/main.obj b/tpvs17/SmokeBoxIdentification/x64/Release/main.obj index e7f29b1..2fd57cf 100644 Binary files a/tpvs17/SmokeBoxIdentification/x64/Release/main.obj and b/tpvs17/SmokeBoxIdentification/x64/Release/main.obj differ diff --git a/tpvs17/SmokeBoxIdentification/x64/Release/moc_ADModule.obj b/tpvs17/SmokeBoxIdentification/x64/Release/moc_ADModule.obj index aa59083..b35f2cc 100644 Binary files a/tpvs17/SmokeBoxIdentification/x64/Release/moc_ADModule.obj and b/tpvs17/SmokeBoxIdentification/x64/Release/moc_ADModule.obj differ diff --git a/tpvs17/SmokeBoxIdentification/x64/Release/moc_Camera.obj b/tpvs17/SmokeBoxIdentification/x64/Release/moc_Camera.obj index c4cca14..9e8bc9e 100644 Binary files a/tpvs17/SmokeBoxIdentification/x64/Release/moc_Camera.obj and b/tpvs17/SmokeBoxIdentification/x64/Release/moc_Camera.obj differ diff --git a/tpvs17/SmokeBoxIdentification/x64/Release/moc_CameraControl.obj b/tpvs17/SmokeBoxIdentification/x64/Release/moc_CameraControl.obj index 975cbbc..8d777ce 100644 Binary files a/tpvs17/SmokeBoxIdentification/x64/Release/moc_CameraControl.obj and b/tpvs17/SmokeBoxIdentification/x64/Release/moc_CameraControl.obj differ diff --git a/tpvs17/SmokeBoxIdentification/x64/Release/moc_CategoryMatcher.obj b/tpvs17/SmokeBoxIdentification/x64/Release/moc_CategoryMatcher.obj index 2d8409e..a8582a6 100644 Binary files a/tpvs17/SmokeBoxIdentification/x64/Release/moc_CategoryMatcher.obj and b/tpvs17/SmokeBoxIdentification/x64/Release/moc_CategoryMatcher.obj differ diff --git a/tpvs17/SmokeBoxIdentification/x64/Release/moc_CodeScanStation.obj b/tpvs17/SmokeBoxIdentification/x64/Release/moc_CodeScanStation.obj index 13df793..70d7ab6 100644 Binary files a/tpvs17/SmokeBoxIdentification/x64/Release/moc_CodeScanStation.obj and b/tpvs17/SmokeBoxIdentification/x64/Release/moc_CodeScanStation.obj differ diff --git a/tpvs17/SmokeBoxIdentification/x64/Release/moc_HikCamera.obj b/tpvs17/SmokeBoxIdentification/x64/Release/moc_HikCamera.obj index 2246430..a44cfc3 100644 Binary files a/tpvs17/SmokeBoxIdentification/x64/Release/moc_HikCamera.obj and b/tpvs17/SmokeBoxIdentification/x64/Release/moc_HikCamera.obj differ diff --git a/tpvs17/SmokeBoxIdentification/x64/Release/moc_NetControl.obj b/tpvs17/SmokeBoxIdentification/x64/Release/moc_NetControl.obj index 221bfba..256b66f 100644 Binary files a/tpvs17/SmokeBoxIdentification/x64/Release/moc_NetControl.obj and b/tpvs17/SmokeBoxIdentification/x64/Release/moc_NetControl.obj differ diff --git a/tpvs17/SmokeBoxIdentification/x64/Release/moc_QNumTemplateBuild.obj b/tpvs17/SmokeBoxIdentification/x64/Release/moc_QNumTemplateBuild.obj index dd4b001..10ac21f 100644 Binary files a/tpvs17/SmokeBoxIdentification/x64/Release/moc_QNumTemplateBuild.obj and b/tpvs17/SmokeBoxIdentification/x64/Release/moc_QNumTemplateBuild.obj differ diff --git a/tpvs17/SmokeBoxIdentification/x64/Release/moc_SmokeBoxIdentification.obj b/tpvs17/SmokeBoxIdentification/x64/Release/moc_SmokeBoxIdentification.obj index e53562d..b866dae 100644 Binary files a/tpvs17/SmokeBoxIdentification/x64/Release/moc_SmokeBoxIdentification.obj and b/tpvs17/SmokeBoxIdentification/x64/Release/moc_SmokeBoxIdentification.obj differ diff --git a/tpvs17/SmokeBoxIdentification/x64/Release/moc_lpSerialStation.obj b/tpvs17/SmokeBoxIdentification/x64/Release/moc_lpSerialStation.obj index 4283575..69251d2 100644 Binary files a/tpvs17/SmokeBoxIdentification/x64/Release/moc_lpSerialStation.obj and b/tpvs17/SmokeBoxIdentification/x64/Release/moc_lpSerialStation.obj differ diff --git a/tpvs17/SmokeBoxIdentification/x64/Release/qrc_SmokeBoxIdentification.obj b/tpvs17/SmokeBoxIdentification/x64/Release/qrc_SmokeBoxIdentification.obj index 4383893..717b390 100644 Binary files a/tpvs17/SmokeBoxIdentification/x64/Release/qrc_SmokeBoxIdentification.obj and b/tpvs17/SmokeBoxIdentification/x64/Release/qrc_SmokeBoxIdentification.obj differ diff --git a/tpvs17/SmokeBoxIdentification/x64/Release/qt_work.log b/tpvs17/SmokeBoxIdentification/x64/Release/qt_work.log index c363b28..a8daeac 100644 Binary files a/tpvs17/SmokeBoxIdentification/x64/Release/qt_work.log and b/tpvs17/SmokeBoxIdentification/x64/Release/qt_work.log differ diff --git a/tpvs17/SmokeBoxIdentification/x64/Release/smokeBox.Build.CppClean.log b/tpvs17/SmokeBoxIdentification/x64/Release/smokeBox.Build.CppClean.log index 01c68df..1c02552 100644 --- a/tpvs17/SmokeBoxIdentification/x64/Release/smokeBox.Build.CppClean.log +++ b/tpvs17/SmokeBoxIdentification/x64/Release/smokeBox.Build.CppClean.log @@ -1,3 +1,14 @@ +e:\code\smokeboxidentification\tpvs17\smokeboxidentification\x64\release\smokeboxidentification.obj +e:\code\smokeboxidentification\tpvs17\smokeboxidentification\x64\release\qnumtemplatebuild.obj +e:\code\smokeboxidentification\tpvs17\smokeboxidentification\x64\release\netcontrol.obj +e:\code\smokeboxidentification\tpvs17\smokeboxidentification\x64\release\main.obj +e:\code\smokeboxidentification\tpvs17\smokeboxidentification\x64\release\lpserialstation.obj +e:\code\smokeboxidentification\tpvs17\smokeboxidentification\x64\release\hikcamera.obj +e:\code\smokeboxidentification\tpvs17\smokeboxidentification\x64\release\log.obj +e:\code\smokeboxidentification\tpvs17\smokeboxidentification\x64\release\codescanstation.obj +e:\code\smokeboxidentification\tpvs17\smokeboxidentification\x64\release\categorymatcher.obj +e:\code\smokeboxidentification\tpvs17\smokeboxidentification\x64\release\cameracontrol.obj +e:\code\smokeboxidentification\tpvs17\smokeboxidentification\x64\release\admodule.obj e:\code\smokeboxidentification\tpvs17\smokeboxidentification\x64\release\moc_hikcamera.obj e:\code\smokeboxidentification\tpvs17\smokeboxidentification\x64\release\moc_lpserialstation.obj e:\code\smokeboxidentification\tpvs17\smokeboxidentification\x64\release\moc_netcontrol.obj @@ -9,19 +20,17 @@ e:\code\smokeboxidentification\tpvs17\smokeboxidentification\x64\release\moc_cam e:\code\smokeboxidentification\tpvs17\smokeboxidentification\x64\release\moc_camera.obj e:\code\smokeboxidentification\tpvs17\smokeboxidentification\x64\release\moc_admodule.obj e:\code\smokeboxidentification\tpvs17\smokeboxidentification\x64\release\qrc_smokeboxidentification.obj -e:\code\smokeboxidentification\tpvs17\smokeboxidentification\x64\release\smokeboxidentification.obj -e:\code\smokeboxidentification\tpvs17\smokeboxidentification\x64\release\qnumtemplatebuild.obj -e:\code\smokeboxidentification\tpvs17\smokeboxidentification\x64\release\main.obj -e:\code\smokeboxidentification\tpvs17\smokeboxidentification\x64\release\admodule.obj -e:\code\smokeboxidentification\tpvs17\smokeboxidentification\x64\release\lpserialstation.obj -e:\code\smokeboxidentification\tpvs17\smokeboxidentification\x64\release\log.obj -e:\code\smokeboxidentification\tpvs17\smokeboxidentification\x64\release\netcontrol.obj -e:\code\smokeboxidentification\tpvs17\smokeboxidentification\x64\release\hikcamera.obj -e:\code\smokeboxidentification\tpvs17\smokeboxidentification\x64\release\codescanstation.obj -e:\code\smokeboxidentification\tpvs17\smokeboxidentification\x64\release\categorymatcher.obj -e:\code\smokeboxidentification\tpvs17\smokeboxidentification\x64\release\cameracontrol.obj e:\code\smokeboxidentification\runner17\release\smokebox.exe +e:\code\smokeboxidentification\tpvs17\smokeboxidentification\.\generatedfiles\release\moc_admodule.cpp +e:\code\smokeboxidentification\tpvs17\smokeboxidentification\.\generatedfiles\release\moc_camera.cpp +e:\code\smokeboxidentification\tpvs17\smokeboxidentification\.\generatedfiles\release\moc_cameracontrol.cpp +e:\code\smokeboxidentification\tpvs17\smokeboxidentification\.\generatedfiles\release\moc_categorymatcher.cpp +e:\code\smokeboxidentification\tpvs17\smokeboxidentification\.\generatedfiles\release\moc_codescanstation.cpp +e:\code\smokeboxidentification\tpvs17\smokeboxidentification\.\generatedfiles\release\moc_qnumtemplatebuild.cpp e:\code\smokeboxidentification\tpvs17\smokeboxidentification\.\generatedfiles\release\moc_smokeboxidentification.cpp +e:\code\smokeboxidentification\tpvs17\smokeboxidentification\.\generatedfiles\release\moc_netcontrol.cpp +e:\code\smokeboxidentification\tpvs17\smokeboxidentification\.\generatedfiles\release\moc_lpserialstation.cpp +e:\code\smokeboxidentification\tpvs17\smokeboxidentification\.\generatedfiles\release\moc_hikcamera.cpp e:\code\smokeboxidentification\tpvs17\smokeboxidentification\.\generatedfiles\qrc_smokeboxidentification.cpp e:\code\smokeboxidentification\tpvs17\smokeboxidentification\generatedfiles\ui_qnumtemplatebuild.h e:\code\smokeboxidentification\tpvs17\smokeboxidentification\generatedfiles\ui_smokeboxidentification.h diff --git a/tpvs17/lpSerial/lp_serial.vcxproj.user b/tpvs17/lpSerial/lp_serial.vcxproj.user index 71d520d..3134de2 100644 --- a/tpvs17/lpSerial/lp_serial.vcxproj.user +++ b/tpvs17/lpSerial/lp_serial.vcxproj.user @@ -2,11 +2,11 @@ - D:\software\Qt\Qt5.9.4\5.9.4\msvc2017_64 + C:\Qt\Qt5.9.4\5.9.4\msvc2017_64 PATH=$(QTDIR)\bin%3b$(PATH) - D:\software\Qt\Qt5.9.4\5.9.4\msvc2017_64 + C:\Qt\Qt5.9.4\5.9.4\msvc2017_64 PATH=$(QTDIR)\bin%3b$(PATH) \ No newline at end of file diff --git a/tpvs17/lpSerial/lp_serial.vcxproj.user.bak b/tpvs17/lpSerial/lp_serial.vcxproj.user.bak index 3134de2..71d520d 100644 --- a/tpvs17/lpSerial/lp_serial.vcxproj.user.bak +++ b/tpvs17/lpSerial/lp_serial.vcxproj.user.bak @@ -2,11 +2,11 @@ - C:\Qt\Qt5.9.4\5.9.4\msvc2017_64 + D:\software\Qt\Qt5.9.4\5.9.4\msvc2017_64 PATH=$(QTDIR)\bin%3b$(PATH) - C:\Qt\Qt5.9.4\5.9.4\msvc2017_64 + D:\software\Qt\Qt5.9.4\5.9.4\msvc2017_64 PATH=$(QTDIR)\bin%3b$(PATH) \ No newline at end of file diff --git a/tpvs17/lpSerial/x64/Release/lpSerial.tlog/lpSerial.write.1u.tlog b/tpvs17/lpSerial/x64/Release/lpSerial.tlog/lpSerial.write.1u.tlog index 8c3ca3a..1fc0f59 100644 Binary files a/tpvs17/lpSerial/x64/Release/lpSerial.tlog/lpSerial.write.1u.tlog and b/tpvs17/lpSerial/x64/Release/lpSerial.tlog/lpSerial.write.1u.tlog differ diff --git a/tpvs17/numStatisticAlgo/numStatisticAlgo.vcxproj.user b/tpvs17/numStatisticAlgo/numStatisticAlgo.vcxproj.user index 98185ff..4213426 100644 --- a/tpvs17/numStatisticAlgo/numStatisticAlgo.vcxproj.user +++ b/tpvs17/numStatisticAlgo/numStatisticAlgo.vcxproj.user @@ -4,12 +4,12 @@ file:$(ProjectGuid),block -qmljsdebugger=$(QmlDebugSettings) - D:\software\Qt\Qt5.9.4\5.9.4\msvc2017_64 + C:\Qt\Qt5.9.4\5.9.4\msvc2017_64 WindowsLocalDebugger PATH=$(QTDIR)\bin%3b$(PATH) - D:\software\Qt\Qt5.9.4\5.9.4\msvc2017_64 + C:\Qt\Qt5.9.4\5.9.4\msvc2017_64 WindowsLocalDebugger PATH=$(QTDIR)\bin%3b$(PATH) diff --git a/tpvs17/numStatisticAlgo/numStatisticAlgo.vcxproj.user.bak b/tpvs17/numStatisticAlgo/numStatisticAlgo.vcxproj.user.bak index 4213426..98185ff 100644 --- a/tpvs17/numStatisticAlgo/numStatisticAlgo.vcxproj.user.bak +++ b/tpvs17/numStatisticAlgo/numStatisticAlgo.vcxproj.user.bak @@ -4,12 +4,12 @@ file:$(ProjectGuid),block -qmljsdebugger=$(QmlDebugSettings) - C:\Qt\Qt5.9.4\5.9.4\msvc2017_64 + D:\software\Qt\Qt5.9.4\5.9.4\msvc2017_64 WindowsLocalDebugger PATH=$(QTDIR)\bin%3b$(PATH) - C:\Qt\Qt5.9.4\5.9.4\msvc2017_64 + D:\software\Qt\Qt5.9.4\5.9.4\msvc2017_64 WindowsLocalDebugger PATH=$(QTDIR)\bin%3b$(PATH)