diff --git a/App/ScrewPosition/ScrewPositionApp/Version.h b/App/ScrewPosition/ScrewPositionApp/Version.h index c3fd7f1c..80d56aa2 100644 --- a/App/ScrewPosition/ScrewPositionApp/Version.h +++ b/App/ScrewPosition/ScrewPositionApp/Version.h @@ -3,7 +3,7 @@ #define SCREWPOSITION_APP_NAME "螺杆定位" -#define SCREWPOSITION_VERSION_STRING "1.2.2" +#define SCREWPOSITION_VERSION_STRING "1.2.3" #define SCREWPOSITION_BUILD_STRING "1" #define SCREWPOSITION_FULL_VERSION_STRING "V" SCREWPOSITION_VERSION_STRING "_" SCREWPOSITION_BUILD_STRING diff --git a/App/ScrewPosition/ScrewPositionApp/Version.md b/App/ScrewPosition/ScrewPositionApp/Version.md index 74397203..2ec9c92b 100644 --- a/App/ScrewPosition/ScrewPositionApp/Version.md +++ b/App/ScrewPosition/ScrewPositionApp/Version.md @@ -1,4 +1,7 @@ -# 1.2.1 2026-06-04 +# 1.2.3 2026-06-06 +1. 更新算法:ARM上检测结果为空 + +# 1.2.2 2026-06-04 1. 更新算法 # 1.2.1 2026-05-24 diff --git a/AppAlgo/rodAndBarDetection/Arm/aarch64/libbaseAlgorithm.so b/AppAlgo/rodAndBarDetection/Arm/aarch64/libbaseAlgorithm.so index 5ad643fc..17e83b41 100644 Binary files a/AppAlgo/rodAndBarDetection/Arm/aarch64/libbaseAlgorithm.so and b/AppAlgo/rodAndBarDetection/Arm/aarch64/libbaseAlgorithm.so differ diff --git a/AppAlgo/rodAndBarDetection/Arm/aarch64/librodAndBarDetection.so b/AppAlgo/rodAndBarDetection/Arm/aarch64/librodAndBarDetection.so index bcd5a8eb..837ec9e4 100644 Binary files a/AppAlgo/rodAndBarDetection/Arm/aarch64/librodAndBarDetection.so and b/AppAlgo/rodAndBarDetection/Arm/aarch64/librodAndBarDetection.so differ diff --git a/AppAlgo/rodAndBarDetection/Inc/rodAndBarDetection_Export.h b/AppAlgo/rodAndBarDetection/Inc/rodAndBarDetection_Export.h index 139d604b..56251a02 100644 --- a/AppAlgo/rodAndBarDetection/Inc/rodAndBarDetection_Export.h +++ b/AppAlgo/rodAndBarDetection/Inc/rodAndBarDetection_Export.h @@ -115,6 +115,6 @@ SG_APISHARED_EXPORT void sx_rebarWeldSeamPositioning( const SSG_outlierFilterParam filterParam, const SSG_treeGrowParam growParam, const SSX_rodParam rodParam, - const double weldSeanRange, //ֽķΧֵ + const SVzNLRangeD weldSeamRange, //ֽķΧСֵֵ std::vector& weldSeamInfo, int* errCode); \ No newline at end of file diff --git a/AppAlgo/rodAndBarDetection/Windows/x64/Debug/baseAlgorithm.dll b/AppAlgo/rodAndBarDetection/Windows/x64/Debug/baseAlgorithm.dll index f056fb14..f0041023 100644 Binary files a/AppAlgo/rodAndBarDetection/Windows/x64/Debug/baseAlgorithm.dll and b/AppAlgo/rodAndBarDetection/Windows/x64/Debug/baseAlgorithm.dll differ diff --git a/AppAlgo/rodAndBarDetection/Windows/x64/Debug/baseAlgorithm.lib b/AppAlgo/rodAndBarDetection/Windows/x64/Debug/baseAlgorithm.lib index 14ac784b..f95a84bd 100644 Binary files a/AppAlgo/rodAndBarDetection/Windows/x64/Debug/baseAlgorithm.lib and b/AppAlgo/rodAndBarDetection/Windows/x64/Debug/baseAlgorithm.lib differ diff --git a/AppAlgo/rodAndBarDetection/Windows/x64/Debug/baseAlgorithm.pdb b/AppAlgo/rodAndBarDetection/Windows/x64/Debug/baseAlgorithm.pdb index c9a0f3ae..c12118a0 100644 Binary files a/AppAlgo/rodAndBarDetection/Windows/x64/Debug/baseAlgorithm.pdb and b/AppAlgo/rodAndBarDetection/Windows/x64/Debug/baseAlgorithm.pdb differ diff --git a/AppAlgo/rodAndBarDetection/Windows/x64/Debug/rodAndBarDetection.dll b/AppAlgo/rodAndBarDetection/Windows/x64/Debug/rodAndBarDetection.dll index fe355da3..60befe2f 100644 Binary files a/AppAlgo/rodAndBarDetection/Windows/x64/Debug/rodAndBarDetection.dll and b/AppAlgo/rodAndBarDetection/Windows/x64/Debug/rodAndBarDetection.dll differ diff --git a/AppAlgo/rodAndBarDetection/Windows/x64/Debug/rodAndBarDetection.lib b/AppAlgo/rodAndBarDetection/Windows/x64/Debug/rodAndBarDetection.lib index 289b0fdf..08e51f7c 100644 Binary files a/AppAlgo/rodAndBarDetection/Windows/x64/Debug/rodAndBarDetection.lib and b/AppAlgo/rodAndBarDetection/Windows/x64/Debug/rodAndBarDetection.lib differ diff --git a/AppAlgo/rodAndBarDetection/Windows/x64/Debug/rodAndBarDetection.pdb b/AppAlgo/rodAndBarDetection/Windows/x64/Debug/rodAndBarDetection.pdb index 7227b3bd..c15b65fd 100644 Binary files a/AppAlgo/rodAndBarDetection/Windows/x64/Debug/rodAndBarDetection.pdb and b/AppAlgo/rodAndBarDetection/Windows/x64/Debug/rodAndBarDetection.pdb differ diff --git a/AppAlgo/rodAndBarDetection/Windows/x64/Release/baseAlgorithm.dll b/AppAlgo/rodAndBarDetection/Windows/x64/Release/baseAlgorithm.dll index a6d43f04..316f05b7 100644 Binary files a/AppAlgo/rodAndBarDetection/Windows/x64/Release/baseAlgorithm.dll and b/AppAlgo/rodAndBarDetection/Windows/x64/Release/baseAlgorithm.dll differ diff --git a/AppAlgo/rodAndBarDetection/Windows/x64/Release/baseAlgorithm.lib b/AppAlgo/rodAndBarDetection/Windows/x64/Release/baseAlgorithm.lib index 64e2a927..a2de0534 100644 Binary files a/AppAlgo/rodAndBarDetection/Windows/x64/Release/baseAlgorithm.lib and b/AppAlgo/rodAndBarDetection/Windows/x64/Release/baseAlgorithm.lib differ diff --git a/AppAlgo/rodAndBarDetection/Windows/x64/Release/baseAlgorithm.pdb b/AppAlgo/rodAndBarDetection/Windows/x64/Release/baseAlgorithm.pdb index 367ba688..3d2e8cc0 100644 Binary files a/AppAlgo/rodAndBarDetection/Windows/x64/Release/baseAlgorithm.pdb and b/AppAlgo/rodAndBarDetection/Windows/x64/Release/baseAlgorithm.pdb differ diff --git a/AppAlgo/rodAndBarDetection/Windows/x64/Release/rodAndBarDetection.dll b/AppAlgo/rodAndBarDetection/Windows/x64/Release/rodAndBarDetection.dll index 44a82e11..365f6cbe 100644 Binary files a/AppAlgo/rodAndBarDetection/Windows/x64/Release/rodAndBarDetection.dll and b/AppAlgo/rodAndBarDetection/Windows/x64/Release/rodAndBarDetection.dll differ diff --git a/AppAlgo/rodAndBarDetection/Windows/x64/Release/rodAndBarDetection.lib b/AppAlgo/rodAndBarDetection/Windows/x64/Release/rodAndBarDetection.lib index dc70572e..e280cce8 100644 Binary files a/AppAlgo/rodAndBarDetection/Windows/x64/Release/rodAndBarDetection.lib and b/AppAlgo/rodAndBarDetection/Windows/x64/Release/rodAndBarDetection.lib differ diff --git a/AppAlgo/rodAndBarDetection/Windows/x64/Release/rodAndBarDetection.pdb b/AppAlgo/rodAndBarDetection/Windows/x64/Release/rodAndBarDetection.pdb index 39f6308c..1d7fdbcc 100644 Binary files a/AppAlgo/rodAndBarDetection/Windows/x64/Release/rodAndBarDetection.pdb and b/AppAlgo/rodAndBarDetection/Windows/x64/Release/rodAndBarDetection.pdb differ diff --git a/AppAlgo/rodAndBarDetection/rodAndBarDetection_test.cpp b/AppAlgo/rodAndBarDetection/rodAndBarDetection_test.cpp index 5168afaa..1ed1e013 100644 --- a/AppAlgo/rodAndBarDetection/rodAndBarDetection_test.cpp +++ b/AppAlgo/rodAndBarDetection/rodAndBarDetection_test.cpp @@ -1151,7 +1151,7 @@ void newLocatingPlateTest(void) }; SVzNLRange fileIdx[NEW_LOCATING_PALTE_TEST_GROUP] = { - {12,13}, {1,51} + {12,13}, {1,52} }; const char* ver = wd_rodAndBarDetectionVersion(); @@ -1694,7 +1694,17 @@ void rodWeldSeamPosition_test(void) growParam.minVTypeTreeLen = 50; //mm bool isHorizonScan = true; //true:激光线平行槽道;false:激光线垂直槽道 - double weldSeanRange = 100; //焊缝距钢筋交叉点的范围(最大值) + SVzNLRangeD weldSeamRange;//焊缝距钢筋交叉点的范围 + if ((grp == 0) || (grp == 1)) + { + weldSeamRange.min = rodParam.diameter / 2; + weldSeamRange.max = 100; + } + else + { + weldSeamRange.min = 0; + weldSeamRange.max = 80; + } int errCode = 0; std::vector weldSeamInfo; sx_rebarWeldSeamPositioning( @@ -1704,7 +1714,7 @@ void rodWeldSeamPosition_test(void) filterParam, growParam, rodParam, - weldSeanRange, + weldSeamRange, weldSeamInfo, &errCode); long t2 = (long)GetTickCount64();