diff --git a/App/WheelMeasure/WheelMeasureApp/Presenter/Src/WheelMeasurePresenter.cpp b/App/WheelMeasure/WheelMeasureApp/Presenter/Src/WheelMeasurePresenter.cpp index 97b52eb..4c8780e 100644 --- a/App/WheelMeasure/WheelMeasureApp/Presenter/Src/WheelMeasurePresenter.cpp +++ b/App/WheelMeasure/WheelMeasureApp/Presenter/Src/WheelMeasurePresenter.cpp @@ -643,7 +643,7 @@ void WheelMeasurePresenter::processScanData(std::vectorplaneCalib, adjustedPlaneHeight); + wd_horizonCamera_lineDataR(scanLines[i], calibParam->planeCalib, -1); } } } else { diff --git a/App/WheelMeasure/WheelMeasureApp/Version.h b/App/WheelMeasure/WheelMeasureApp/Version.h index 4709cc7..3b1b2ee 100644 --- a/App/WheelMeasure/WheelMeasureApp/Version.h +++ b/App/WheelMeasure/WheelMeasureApp/Version.h @@ -3,7 +3,7 @@ #define WHEELMEASURE_APP_NAME "轮眉高度测量" -#define WHEELMEASURE_VERSION_STRING "1.0.2" +#define WHEELMEASURE_VERSION_STRING "1.1.1" #define WHEELMEASURE_BUILD_STRING "1" #define WHEELMEASURE_FULL_VERSION_STRING "V" WHEELMEASURE_VERSION_STRING "_" WHEELMEASURE_BUILD_STRING diff --git a/App/WheelMeasure/WheelMeasureApp/Version.md b/App/WheelMeasure/WheelMeasureApp/Version.md index d838e20..9059eb3 100644 --- a/App/WheelMeasure/WheelMeasureApp/Version.md +++ b/App/WheelMeasure/WheelMeasureApp/Version.md @@ -1,3 +1,11 @@ +# 1.1.1 +## build_1 2026-04-09 +1. 更新算法1.3.3 + +# 1.1.0 +## build_1 2026-04-09 +1. wd_horizonCamera_lineDataR 参数固定-1 ,移除补偿 + # 1.0.2 ## build_1 2026-04-01 1. 更新算法 1.3.2 diff --git a/App/WheelMeasure/WheelMeasureApp/dialogcameralevel.ui b/App/WheelMeasure/WheelMeasureApp/dialogcameralevel.ui index b9378f7..c3dceaa 100644 --- a/App/WheelMeasure/WheelMeasureApp/dialogcameralevel.ui +++ b/App/WheelMeasure/WheelMeasureApp/dialogcameralevel.ui @@ -182,6 +182,12 @@ background-color: rgb(47, 48, 52); + + true + + + false + 100 @@ -203,6 +209,12 @@ background-color: rgb(47, 48, 52); + + true + + + false + 100 @@ -234,6 +246,12 @@ background-color: rgb(47, 48, 52); + + true + + + false + 14 @@ -249,6 +267,12 @@ background-color: rgb(47, 48, 52); + + true + + + false + 60 diff --git a/App/WheelMeasure/WheelMeasureConfig/Inc/IVrWheelMeasureConfig.h b/App/WheelMeasure/WheelMeasureConfig/Inc/IVrWheelMeasureConfig.h index 7e03faf..11640f0 100644 --- a/App/WheelMeasure/WheelMeasureConfig/Inc/IVrWheelMeasureConfig.h +++ b/App/WheelMeasure/WheelMeasureConfig/Inc/IVrWheelMeasureConfig.h @@ -109,8 +109,8 @@ struct WheelOutlierFilterParam */ struct WheelTreeGrowParam { - double yDeviation_max = 10.0; // 生长时允许的最大Y偏差 - double zDeviation_max = 10.0; // 生长时允许的最大Z偏差 + double yDeviation_max = 20.0; // 生长时允许的最大Y偏差 + double zDeviation_max = 20.0; // 生长时允许的最大Z偏差 int maxLineSkipNum = 10; // 生长时允许的最大跳线数 double maxSkipDistance = 10.0; // 当maxLineSkipNum为-1时使用 double minLTypeTreeLen = 100.0; // 最少的L型节点数目 diff --git a/AppAlgo/wheelArchHeigthMeasure/Arm/aarch64/libwheelArchHeigthMeasure.so b/AppAlgo/wheelArchHeigthMeasure/Arm/aarch64/libwheelArchHeigthMeasure.so index e262cd1..8631ebe 100644 Binary files a/AppAlgo/wheelArchHeigthMeasure/Arm/aarch64/libwheelArchHeigthMeasure.so and b/AppAlgo/wheelArchHeigthMeasure/Arm/aarch64/libwheelArchHeigthMeasure.so differ diff --git a/AppAlgo/wheelArchHeigthMeasure/Windows/x64/Debug/baseAlgorithm.dll b/AppAlgo/wheelArchHeigthMeasure/Windows/x64/Debug/baseAlgorithm.dll index 469c355..b7b28cd 100644 Binary files a/AppAlgo/wheelArchHeigthMeasure/Windows/x64/Debug/baseAlgorithm.dll and b/AppAlgo/wheelArchHeigthMeasure/Windows/x64/Debug/baseAlgorithm.dll differ diff --git a/AppAlgo/wheelArchHeigthMeasure/Windows/x64/Debug/baseAlgorithm.pdb b/AppAlgo/wheelArchHeigthMeasure/Windows/x64/Debug/baseAlgorithm.pdb index ca2f2f7..1c8049d 100644 Binary files a/AppAlgo/wheelArchHeigthMeasure/Windows/x64/Debug/baseAlgorithm.pdb and b/AppAlgo/wheelArchHeigthMeasure/Windows/x64/Debug/baseAlgorithm.pdb differ diff --git a/AppAlgo/wheelArchHeigthMeasure/Windows/x64/Debug/wheelArchHeigthMeasure.dll b/AppAlgo/wheelArchHeigthMeasure/Windows/x64/Debug/wheelArchHeigthMeasure.dll index ff93b46..cd29d53 100644 Binary files a/AppAlgo/wheelArchHeigthMeasure/Windows/x64/Debug/wheelArchHeigthMeasure.dll and b/AppAlgo/wheelArchHeigthMeasure/Windows/x64/Debug/wheelArchHeigthMeasure.dll differ diff --git a/AppAlgo/wheelArchHeigthMeasure/Windows/x64/Debug/wheelArchHeigthMeasure.pdb b/AppAlgo/wheelArchHeigthMeasure/Windows/x64/Debug/wheelArchHeigthMeasure.pdb index 89c8993..eed3486 100644 Binary files a/AppAlgo/wheelArchHeigthMeasure/Windows/x64/Debug/wheelArchHeigthMeasure.pdb and b/AppAlgo/wheelArchHeigthMeasure/Windows/x64/Debug/wheelArchHeigthMeasure.pdb differ diff --git a/AppAlgo/wheelArchHeigthMeasure/Windows/x64/Release/baseAlgorithm.dll b/AppAlgo/wheelArchHeigthMeasure/Windows/x64/Release/baseAlgorithm.dll index 21b6137..5664d69 100644 Binary files a/AppAlgo/wheelArchHeigthMeasure/Windows/x64/Release/baseAlgorithm.dll and b/AppAlgo/wheelArchHeigthMeasure/Windows/x64/Release/baseAlgorithm.dll differ diff --git a/AppAlgo/wheelArchHeigthMeasure/Windows/x64/Release/baseAlgorithm.pdb b/AppAlgo/wheelArchHeigthMeasure/Windows/x64/Release/baseAlgorithm.pdb index 3357db0..5af9396 100644 Binary files a/AppAlgo/wheelArchHeigthMeasure/Windows/x64/Release/baseAlgorithm.pdb and b/AppAlgo/wheelArchHeigthMeasure/Windows/x64/Release/baseAlgorithm.pdb differ diff --git a/AppAlgo/wheelArchHeigthMeasure/Windows/x64/Release/wheelArchHeigthMeasure.dll b/AppAlgo/wheelArchHeigthMeasure/Windows/x64/Release/wheelArchHeigthMeasure.dll index d40efbf..c9dd1ee 100644 Binary files a/AppAlgo/wheelArchHeigthMeasure/Windows/x64/Release/wheelArchHeigthMeasure.dll and b/AppAlgo/wheelArchHeigthMeasure/Windows/x64/Release/wheelArchHeigthMeasure.dll differ diff --git a/AppAlgo/wheelArchHeigthMeasure/Windows/x64/Release/wheelArchHeigthMeasure.pdb b/AppAlgo/wheelArchHeigthMeasure/Windows/x64/Release/wheelArchHeigthMeasure.pdb index 3abdb6d..7c67de7 100644 Binary files a/AppAlgo/wheelArchHeigthMeasure/Windows/x64/Release/wheelArchHeigthMeasure.pdb and b/AppAlgo/wheelArchHeigthMeasure/Windows/x64/Release/wheelArchHeigthMeasure.pdb differ diff --git a/AppAlgo/wheelArchHeigthMeasure/wheelArchHeigthMeasure_test.cpp b/AppAlgo/wheelArchHeigthMeasure/wheelArchHeigthMeasure_test.cpp index 6ed16b4..f1f911f 100644 --- a/AppAlgo/wheelArchHeigthMeasure/wheelArchHeigthMeasure_test.cpp +++ b/AppAlgo/wheelArchHeigthMeasure/wheelArchHeigthMeasure_test.cpp @@ -2639,7 +2639,7 @@ void _outputScanDataFile_removeZeros(char* fileName, SVzNL3DLaserLine * scanData #define TEST_COMPUTE_WHEEL_ARCH 1 #define TEST_COMPUTE_CALIB_PARA 0 -#define TEST_GROUP 2 +#define TEST_GROUP 6 int main() { #if TEST_CONVERT_TO_GRID @@ -2718,10 +2718,14 @@ int main() const char* dataPath[TEST_GROUP] = { "F:/ShangGu/项目/冠钦_轮眉高度测量/测试数据/现场数据/", //0 "F:/ShangGu/项目/冠钦_轮眉高度测量/测试数据/部署现场数据/", //1 + "F:/ShangGu/项目/冠钦_轮眉高度测量/测试数据/部署现场数据2/11/", //2 + "F:/ShangGu/项目/冠钦_轮眉高度测量/测试数据/部署现场数据2/13/", //3 + "F:/ShangGu/项目/冠钦_轮眉高度测量/测试数据/部署现场数据2/15/", //4 + "F:/ShangGu/项目/冠钦_轮眉高度测量/测试数据/部署现场数据2/17/", //5 }; SVzNLRange fileIdx[TEST_GROUP] = { - {1,2}, {1,4} + {1,2}, {1,4}, {1,7}, {1,7}, {1,7},{1,7} }; SSG_planeCalibPara poseCalibPara; @@ -2745,14 +2749,14 @@ int main() char _scan_file[256]; int endGroup = TEST_GROUP - 1; - for (int grp = 1; grp <= endGroup; grp++) + for (int grp = 2; grp <= endGroup; grp++) { char calibFile[250]; sprintf_s(calibFile, "%sground_calib_para.txt", dataPath[grp]); poseCalibPara = _readCalibPara(calibFile); for (int fidx = fileIdx[grp].nMin; fidx <= fileIdx[grp].nMax; fidx++) { - //fidx = 4; + //fidx = 6; sprintf_s(_scan_file, "%sLaserData_%d.txt", dataPath[grp], fidx); std::vector> scanData; vzReadLaserScanPointFromFile_XYZ_vector(_scan_file, scanData); @@ -2784,9 +2788,9 @@ int main() SSG_treeGrowParam growParam; growParam.maxLineSkipNum = 10; - growParam.yDeviation_max = 10.0; + growParam.yDeviation_max = 20.0; growParam.maxSkipDistance = 10.0; - growParam.zDeviation_max = 10.0;// + growParam.zDeviation_max = 20.0;// growParam.minLTypeTreeLen = 100; //mm growParam.minVTypeTreeLen = 100; //mm