更新opencv的库到320
This commit is contained in:
parent
a07ccc6373
commit
3b77699ac4
@ -127,11 +127,11 @@ INCLUDEPATH += ../SDK/bagPosition/Inc
|
|||||||
|
|
||||||
win32:CONFIG(release, debug|release): {
|
win32:CONFIG(release, debug|release): {
|
||||||
LIBS += -L$$PWD/../SDK/bagPosition/Windows/x64/Release -lbagPositioning -lbaseAlgorithm
|
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): {
|
else:win32:CONFIG(debug, debug|release): {
|
||||||
LIBS += -L$$PWD/../SDK/bagPosition/Windows/x64/Debug -lbagPositioning -lbaseAlgorithm
|
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: {
|
else:unix:!macx: {
|
||||||
LIBS += -L$$PWD/../SDK/bagPosition/Arm/aarch64 -lbagPositioning -lbaseAlgorithm
|
LIBS += -L$$PWD/../SDK/bagPosition/Arm/aarch64 -lbagPositioning -lbaseAlgorithm
|
||||||
|
|||||||
@ -157,14 +157,12 @@ int LaserDataLoader::SaveLaserScanData(const std::string& fileName,
|
|||||||
sw << "MaxTimeStamp:" << maxTimeStamp << "_" << clockPerSecond << std::endl;
|
sw << "MaxTimeStamp:" << maxTimeStamp << "_" << clockPerSecond << std::endl;
|
||||||
|
|
||||||
// 写入每条扫描线数据
|
// 写入每条扫描线数据
|
||||||
int lineIndex = 0;
|
|
||||||
for (const auto& linePair : laserLines) {
|
for (const auto& linePair : laserLines) {
|
||||||
if (lineIndex >= lineNum) break;
|
|
||||||
|
|
||||||
EVzResultDataType dataType = linePair.first;
|
EVzResultDataType dataType = linePair.first;
|
||||||
const SVzLaserLineData& lineData = linePair.second;
|
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) {
|
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;
|
sw << "{ " << points2D[i].sRight.x << "," << points2D[i].sRight.y << " }" << std::endl;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
lineIndex++;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
sw.close();
|
sw.close();
|
||||||
|
|||||||
BIN
SDK/OpenCV320/Windows/vc14/Release/opencv_ffmpeg320_64.dll
Normal file
BIN
SDK/OpenCV320/Windows/vc14/Release/opencv_ffmpeg320_64.dll
Normal file
Binary file not shown.
BIN
SDK/OpenCV320/Windows/vc14/Release/opencv_world320.dll
Normal file
BIN
SDK/OpenCV320/Windows/vc14/Release/opencv_world320.dll
Normal file
Binary file not shown.
BIN
SDK/OpenCV320/Windows/vc14/Release/opencv_world320d.dll
Normal file
BIN
SDK/OpenCV320/Windows/vc14/Release/opencv_world320d.dll
Normal file
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading…
x
Reference in New Issue
Block a user