diff --git a/GrabBagApp/GrabBagApp.pro b/GrabBagApp/GrabBagApp.pro index bb7e99d..d808d87 100644 --- a/GrabBagApp/GrabBagApp.pro +++ b/GrabBagApp/GrabBagApp.pro @@ -127,11 +127,11 @@ INCLUDEPATH += ../SDK/bagPosition/Inc win32:CONFIG(release, debug|release): { LIBS += -L$$PWD/../SDK/bagPosition/Windows/x64/Release -lbagPositioning -lbaseAlgorithm - LIBS += -L$$PWD/../SDK/OpenCV480/Windows/x64/Release -lopencv_world480 + LIBS += -L$$PWD/../SDK/OpenCV320/Windows/vc14/Release -lopencv_world320 } else:win32:CONFIG(debug, debug|release): { LIBS += -L$$PWD/../SDK/bagPosition/Windows/x64/Debug -lbagPositioning -lbaseAlgorithm - LIBS += -L$$PWD/../SDK/OpenCV480/Windows/x64/Debug -lopencv_world480d + LIBS += -L$$PWD/../SDK/OpenCV320/Windows/vc14/Release -lopencv_world320 } else:unix:!macx: { LIBS += -L$$PWD/../SDK/bagPosition/Arm/aarch64 -lbagPositioning -lbaseAlgorithm diff --git a/GrabBagApp/Utils/Src/LaserDataLoader.cpp b/GrabBagApp/Utils/Src/LaserDataLoader.cpp index 9f6d937..79d9f0c 100644 --- a/GrabBagApp/Utils/Src/LaserDataLoader.cpp +++ b/GrabBagApp/Utils/Src/LaserDataLoader.cpp @@ -157,14 +157,12 @@ int LaserDataLoader::SaveLaserScanData(const std::string& fileName, sw << "MaxTimeStamp:" << maxTimeStamp << "_" << clockPerSecond << std::endl; // 写入每条扫描线数据 - int lineIndex = 0; for (const auto& linePair : laserLines) { - if (lineIndex >= lineNum) break; EVzResultDataType dataType = linePair.first; const SVzLaserLineData& lineData = linePair.second; - sw << "Line_" << lineIndex << "_" << lineData.llTimeStamp << "_" << lineData.nPointCount << std::endl; + sw << "Line_" << lineData.llFrameIdx << "_" << lineData.llTimeStamp << "_" << lineData.nPointCount << std::endl; // 根据数据类型写入点云数据 if (dataType == keResultDataType_Position && lineData.p3DPoint) { @@ -201,8 +199,6 @@ int LaserDataLoader::SaveLaserScanData(const std::string& fileName, sw << "{ " << points2D[i].sRight.x << "," << points2D[i].sRight.y << " }" << std::endl; } } - - lineIndex++; } sw.close(); diff --git a/SDK/OpenCV320/Windows/vc14/Release/opencv_ffmpeg320_64.dll b/SDK/OpenCV320/Windows/vc14/Release/opencv_ffmpeg320_64.dll new file mode 100644 index 0000000..8a26deb Binary files /dev/null and b/SDK/OpenCV320/Windows/vc14/Release/opencv_ffmpeg320_64.dll differ diff --git a/SDK/OpenCV320/Windows/vc14/Release/opencv_world320.dll b/SDK/OpenCV320/Windows/vc14/Release/opencv_world320.dll new file mode 100644 index 0000000..61626b3 Binary files /dev/null and b/SDK/OpenCV320/Windows/vc14/Release/opencv_world320.dll differ diff --git a/SDK/OpenCV320/Windows/vc14/Release/opencv_world320d.dll b/SDK/OpenCV320/Windows/vc14/Release/opencv_world320d.dll new file mode 100644 index 0000000..8fde8aa Binary files /dev/null and b/SDK/OpenCV320/Windows/vc14/Release/opencv_world320d.dll differ diff --git a/SDK/bagPosition/Windows/x64/Debug/bagPositioning.dll b/SDK/bagPosition/Windows/x64/Debug/bagPositioning.dll deleted file mode 100644 index 8d69699..0000000 Binary files a/SDK/bagPosition/Windows/x64/Debug/bagPositioning.dll and /dev/null differ diff --git a/SDK/bagPosition/Windows/x64/Debug/bagPositioning.pdb b/SDK/bagPosition/Windows/x64/Debug/bagPositioning.pdb deleted file mode 100644 index 8cdb2ee..0000000 Binary files a/SDK/bagPosition/Windows/x64/Debug/bagPositioning.pdb and /dev/null differ diff --git a/SDK/bagPosition/Windows/x64/Debug/baseAlgorithm.dll b/SDK/bagPosition/Windows/x64/Debug/baseAlgorithm.dll deleted file mode 100644 index 7b55985..0000000 Binary files a/SDK/bagPosition/Windows/x64/Debug/baseAlgorithm.dll and /dev/null differ diff --git a/SDK/bagPosition/Windows/x64/Debug/baseAlgorithm.pdb b/SDK/bagPosition/Windows/x64/Debug/baseAlgorithm.pdb deleted file mode 100644 index 1b7120d..0000000 Binary files a/SDK/bagPosition/Windows/x64/Debug/baseAlgorithm.pdb and /dev/null differ diff --git a/SDK/bagPosition/Windows/x64/Release/bagPositioning.dll b/SDK/bagPosition/Windows/x64/Release/bagPositioning.dll index 5a58d9f..b070ac7 100644 Binary files a/SDK/bagPosition/Windows/x64/Release/bagPositioning.dll and b/SDK/bagPosition/Windows/x64/Release/bagPositioning.dll differ diff --git a/SDK/bagPosition/Windows/x64/Release/bagPositioning.pdb b/SDK/bagPosition/Windows/x64/Release/bagPositioning.pdb index 1661f80..c2390df 100644 Binary files a/SDK/bagPosition/Windows/x64/Release/bagPositioning.pdb and b/SDK/bagPosition/Windows/x64/Release/bagPositioning.pdb differ diff --git a/SDK/bagPosition/Windows/x64/Release/baseAlgorithm.dll b/SDK/bagPosition/Windows/x64/Release/baseAlgorithm.dll index f9af407..033e59b 100644 Binary files a/SDK/bagPosition/Windows/x64/Release/baseAlgorithm.dll and b/SDK/bagPosition/Windows/x64/Release/baseAlgorithm.dll differ diff --git a/SDK/bagPosition/Windows/x64/Release/baseAlgorithm.pdb b/SDK/bagPosition/Windows/x64/Release/baseAlgorithm.pdb index e4d3e11..0056c4f 100644 Binary files a/SDK/bagPosition/Windows/x64/Release/baseAlgorithm.pdb and b/SDK/bagPosition/Windows/x64/Release/baseAlgorithm.pdb differ