diff --git a/App/WheelMeasure/WheelMeasureApp/Version.h b/App/WheelMeasure/WheelMeasureApp/Version.h index def79ae2..a8fe569a 100644 --- a/App/WheelMeasure/WheelMeasureApp/Version.h +++ b/App/WheelMeasure/WheelMeasureApp/Version.h @@ -3,8 +3,8 @@ #define WHEELMEASURE_VERSION_STRING "1.0.1" -#define WHEELMEASURE_BUILD_STRING "4" -#define WHEELMEASURE_FULL_VERSION_STRING "V1.0.1.4" +#define WHEELMEASURE_BUILD_STRING "5" +#define WHEELMEASURE_FULL_VERSION_STRING "V" WHEELMEASURE_VERSION_STRING "_" WHEELMEASURE_BUILD_STRING // 获取版本信息的便捷函数 inline const char* GetWheelMeasureVersion() { diff --git a/App/WheelMeasure/WheelMeasureApp/Version.md b/App/WheelMeasure/WheelMeasureApp/Version.md index 7b0fb58e..e597aa37 100644 --- a/App/WheelMeasure/WheelMeasureApp/Version.md +++ b/App/WheelMeasure/WheelMeasureApp/Version.md @@ -1,4 +1,7 @@ # 1.0.1 +## build_5 2026-01-17 +1. 更新算法 1.3.0 + ## build_4 1. 增加debug功能,在检测前存储点云 diff --git a/App/WheelMeasure/WheelMeasureApp/dialogcameralevel.ui b/App/WheelMeasure/WheelMeasureApp/dialogcameralevel.ui index 9a72e571..c62508ce 100644 --- a/App/WheelMeasure/WheelMeasureApp/dialogcameralevel.ui +++ b/App/WheelMeasure/WheelMeasureApp/dialogcameralevel.ui @@ -7,7 +7,7 @@ 0 0 659 - 400 + 453 @@ -65,7 +65,7 @@ 170 - 350 + 400 101 38 @@ -86,7 +86,7 @@ 380 - 350 + 400 111 38 @@ -109,7 +109,7 @@ 130 110 511 - 221 + 271 @@ -135,7 +135,7 @@ padding: 5px; 20 60 - 621 + 634 41 diff --git a/App/WheelMeasure/WheelMeasureConfig/Inc/IVrWheelMeasureConfig.h b/App/WheelMeasure/WheelMeasureConfig/Inc/IVrWheelMeasureConfig.h index 5e02c4fa..991c79c4 100644 --- a/App/WheelMeasure/WheelMeasureConfig/Inc/IVrWheelMeasureConfig.h +++ b/App/WheelMeasure/WheelMeasureConfig/Inc/IVrWheelMeasureConfig.h @@ -72,7 +72,7 @@ struct WheelCornerParam double minEndingGap = 20.0; // y方向,最短结束间隙 double minEndingGap_z = 20.0; // z方向,最短结束间隙 double scale = 50.0; // 计算方向角的窗口比例 - double cornerTh = 60.0; // 空角阈值,大于此阈值为有效空点 + double cornerTh = 45.0; // 空角阈值,大于此阈值为有效空点 double jumpCornerTh_1 = 10.0; // 判断空角是否为跳变的阈值 double jumpCornerTh_2 = 60.0; // 判断空角是否为跳变的阈值 }; diff --git a/AppAlgo/wheelArchHeigthMeasure/Inc/SG_baseDataType.h b/AppAlgo/wheelArchHeigthMeasure/Inc/SG_baseDataType.h index 7dd295d1..6630ea81 100644 --- a/AppAlgo/wheelArchHeigthMeasure/Inc/SG_baseDataType.h +++ b/AppAlgo/wheelArchHeigthMeasure/Inc/SG_baseDataType.h @@ -265,6 +265,18 @@ typedef struct int angleChkScalePos; //ڼangleCheckٶ }SSG_featureTree; +typedef struct +{ + int treeState; + int treeType; + int sLineIdx; + int eLineIdx; + double tree_value; + SSG_ROIRectD roi; + std::vector< SSG_basicFeatureGap> treeNodes; + int angleChkScalePos; //ڼangleCheckٶ +}SSG_gapFeatureTree; + typedef struct { int treeState; @@ -531,4 +543,5 @@ typedef struct int clusterIdx; int ptSize; SVzNL3DRangeD roi3D; + SVzNLRect roi2D; }SWD_clustersInfo; diff --git a/AppAlgo/wheelArchHeigthMeasure/Windows/x64/Debug/baseAlgorithm.dll b/AppAlgo/wheelArchHeigthMeasure/Windows/x64/Debug/baseAlgorithm.dll index 554b2e60..51ec9995 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 69493611..2dd5e466 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 d65ecf06..c5773bdb 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 6f88551d..fe7d6754 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 ba323d36..818d8d15 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 367770d3..a1f35417 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 b6b06a52..8458365c 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 7e64b4b3..e9cc296b 100644 Binary files a/AppAlgo/wheelArchHeigthMeasure/Windows/x64/Release/wheelArchHeigthMeasure.pdb and b/AppAlgo/wheelArchHeigthMeasure/Windows/x64/Release/wheelArchHeigthMeasure.pdb differ