更新算法,工具盘检测随机数导致结果不同

This commit is contained in:
杰仔 2026-06-08 00:27:39 +08:00
parent 126e4c7aa6
commit cb6590bc9e
18 changed files with 19 additions and 6 deletions

View File

@ -3,7 +3,7 @@
#define SCREWPOSITION_APP_NAME "螺杆定位" #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_BUILD_STRING "1"
#define SCREWPOSITION_FULL_VERSION_STRING "V" SCREWPOSITION_VERSION_STRING "_" SCREWPOSITION_BUILD_STRING #define SCREWPOSITION_FULL_VERSION_STRING "V" SCREWPOSITION_VERSION_STRING "_" SCREWPOSITION_BUILD_STRING

View File

@ -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. 更新算法
# 1.2.1 2026-05-24 # 1.2.1 2026-05-24

View File

@ -115,6 +115,6 @@ SG_APISHARED_EXPORT void sx_rebarWeldSeamPositioning(
const SSG_outlierFilterParam filterParam, const SSG_outlierFilterParam filterParam,
const SSG_treeGrowParam growParam, const SSG_treeGrowParam growParam,
const SSX_rodParam rodParam, const SSX_rodParam rodParam,
const double weldSeanRange, //焊缝距钢筋交叉点的范围(最大值) const SVzNLRangeD weldSeamRange, //焊缝距钢筋交叉点的范围(最小值和最大值)
std::vector<SSX_weldSeamInfo>& weldSeamInfo, std::vector<SSX_weldSeamInfo>& weldSeamInfo,
int* errCode); int* errCode);

View File

@ -1151,7 +1151,7 @@ void newLocatingPlateTest(void)
}; };
SVzNLRange fileIdx[NEW_LOCATING_PALTE_TEST_GROUP] = { SVzNLRange fileIdx[NEW_LOCATING_PALTE_TEST_GROUP] = {
{12,13}, {1,51} {12,13}, {1,52}
}; };
const char* ver = wd_rodAndBarDetectionVersion(); const char* ver = wd_rodAndBarDetectionVersion();
@ -1694,7 +1694,17 @@ void rodWeldSeamPosition_test(void)
growParam.minVTypeTreeLen = 50; //mm growParam.minVTypeTreeLen = 50; //mm
bool isHorizonScan = true; //true:激光线平行槽道false:激光线垂直槽道 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; int errCode = 0;
std::vector<SSX_weldSeamInfo> weldSeamInfo; std::vector<SSX_weldSeamInfo> weldSeamInfo;
sx_rebarWeldSeamPositioning( sx_rebarWeldSeamPositioning(
@ -1704,7 +1714,7 @@ void rodWeldSeamPosition_test(void)
filterParam, filterParam,
growParam, growParam,
rodParam, rodParam,
weldSeanRange, weldSeamRange,
weldSeamInfo, weldSeamInfo,
&errCode); &errCode);
long t2 = (long)GetTickCount64(); long t2 = (long)GetTickCount64();