diff --git a/App/TireHolePose/TireHolePoseApp/Version.h b/App/TireHolePose/TireHolePoseApp/Version.h index 6b61051d..ff275489 100644 --- a/App/TireHolePose/TireHolePoseApp/Version.h +++ b/App/TireHolePose/TireHolePoseApp/Version.h @@ -2,7 +2,7 @@ #define TIREHOLEPOSE_VERSION_H #define TIREHOLEPOSE_APP_NAME "轮胎孔定位" -#define TIREHOLEPOSE_VERSION_STRING "1.0.2" +#define TIREHOLEPOSE_VERSION_STRING "1.0.3" #define TIREHOLEPOSE_BUILD_STRING "1" #define TIREHOLEPOSE_FULL_VERSION_STRING "V" TIREHOLEPOSE_VERSION_STRING "_" TIREHOLEPOSE_BUILD_STRING diff --git a/App/TireHolePose/TireHolePoseApp/Version.md b/App/TireHolePose/TireHolePoseApp/Version.md index cdc3641c..8f53995e 100644 --- a/App/TireHolePose/TireHolePoseApp/Version.md +++ b/App/TireHolePose/TireHolePoseApp/Version.md @@ -1,4 +1,8 @@ -# 1.0.1 2026-07-03 +# 1.0.3 2026-08-10 +## build_1 +1. 更新算法 放宽过滤参数从轮胎直径的0.5倍到1.5倍范围 + +# 1.0.2 2026-07-03 ## build_1 1. 更新算法 diff --git a/AppAlgo/workpieceHolePositioning/Arm/aarch64/libworkpieceHolePositioning.so b/AppAlgo/workpieceHolePositioning/Arm/aarch64/libworkpieceHolePositioning.so index 01242c95..41975236 100644 Binary files a/AppAlgo/workpieceHolePositioning/Arm/aarch64/libworkpieceHolePositioning.so and b/AppAlgo/workpieceHolePositioning/Arm/aarch64/libworkpieceHolePositioning.so differ diff --git a/AppAlgo/workpieceHolePositioning/Inc/SG_baseDataType.h b/AppAlgo/workpieceHolePositioning/Inc/SG_baseDataType.h index 5cf70527..0c3155d2 100644 --- a/AppAlgo/workpieceHolePositioning/Inc/SG_baseDataType.h +++ b/AppAlgo/workpieceHolePositioning/Inc/SG_baseDataType.h @@ -52,6 +52,12 @@ typedef struct double cx, cy, r; }SWD_Circle; +typedef struct +{ + double radius; + double height; +}SWD_Cylinder; + typedef struct { double rimEdgeAngleTh; @@ -76,8 +82,7 @@ typedef struct { int lineIdx; int ptIdx; - SVzNL3DPoint point; -}SWDIndexingVzPoint; +}SWDScanPosition; typedef struct { diff --git a/AppAlgo/workpieceHolePositioning/Inc/SG_errCode.h b/AppAlgo/workpieceHolePositioning/Inc/SG_errCode.h index b4b8fe11..25af7dfc 100644 --- a/AppAlgo/workpieceHolePositioning/Inc/SG_errCode.h +++ b/AppAlgo/workpieceHolePositioning/Inc/SG_errCode.h @@ -29,6 +29,7 @@ #define SX_ERR_ZERO_OBJ_TOPLAYER -2102 #define SX_ERR_ZERO_OBJ_BTMLAYER -2103 #define SX_ERR_GET_INVALID_PALTE -2104 //ȡ +#define SX_ERR_BIN_EDGE_ERROR -2105 // #define SX_BAG_TRAY_EMPTY -2201 @@ -52,3 +53,8 @@ //ԣ춨λ #define SX_ERR_NO_HIGHEST_ROD -2701 +//ɻͣ +#define SX_ERR_NO_PLANE_FOUND -2801 +#define SX_ERR_NOSEPOINT_FAIL -2802 +#define SX_ERR_ENDINE_FAIL -2803 + diff --git a/AppAlgo/workpieceHolePositioning/Windows/x64/Debug/baseAlgorithm.dll b/AppAlgo/workpieceHolePositioning/Windows/x64/Debug/baseAlgorithm.dll index af9c0935..8f703aee 100644 Binary files a/AppAlgo/workpieceHolePositioning/Windows/x64/Debug/baseAlgorithm.dll and b/AppAlgo/workpieceHolePositioning/Windows/x64/Debug/baseAlgorithm.dll differ diff --git a/AppAlgo/workpieceHolePositioning/Windows/x64/Debug/baseAlgorithm.pdb b/AppAlgo/workpieceHolePositioning/Windows/x64/Debug/baseAlgorithm.pdb index 80c5afa5..dc6e47d7 100644 Binary files a/AppAlgo/workpieceHolePositioning/Windows/x64/Debug/baseAlgorithm.pdb and b/AppAlgo/workpieceHolePositioning/Windows/x64/Debug/baseAlgorithm.pdb differ diff --git a/AppAlgo/workpieceHolePositioning/Windows/x64/Debug/workpieceHolePositioning.dll b/AppAlgo/workpieceHolePositioning/Windows/x64/Debug/workpieceHolePositioning.dll index 64f54034..973f1049 100644 Binary files a/AppAlgo/workpieceHolePositioning/Windows/x64/Debug/workpieceHolePositioning.dll and b/AppAlgo/workpieceHolePositioning/Windows/x64/Debug/workpieceHolePositioning.dll differ diff --git a/AppAlgo/workpieceHolePositioning/Windows/x64/Debug/workpieceHolePositioning.pdb b/AppAlgo/workpieceHolePositioning/Windows/x64/Debug/workpieceHolePositioning.pdb index 58d733ec..76b2ee2b 100644 Binary files a/AppAlgo/workpieceHolePositioning/Windows/x64/Debug/workpieceHolePositioning.pdb and b/AppAlgo/workpieceHolePositioning/Windows/x64/Debug/workpieceHolePositioning.pdb differ diff --git a/AppAlgo/workpieceHolePositioning/Windows/x64/Release/baseAlgorithm.dll b/AppAlgo/workpieceHolePositioning/Windows/x64/Release/baseAlgorithm.dll index 430a8352..3c07345a 100644 Binary files a/AppAlgo/workpieceHolePositioning/Windows/x64/Release/baseAlgorithm.dll and b/AppAlgo/workpieceHolePositioning/Windows/x64/Release/baseAlgorithm.dll differ diff --git a/AppAlgo/workpieceHolePositioning/Windows/x64/Release/baseAlgorithm.pdb b/AppAlgo/workpieceHolePositioning/Windows/x64/Release/baseAlgorithm.pdb index 16455b6f..d1a01045 100644 Binary files a/AppAlgo/workpieceHolePositioning/Windows/x64/Release/baseAlgorithm.pdb and b/AppAlgo/workpieceHolePositioning/Windows/x64/Release/baseAlgorithm.pdb differ diff --git a/AppAlgo/workpieceHolePositioning/Windows/x64/Release/workpieceHolePositioning.dll b/AppAlgo/workpieceHolePositioning/Windows/x64/Release/workpieceHolePositioning.dll index 03ef8273..0b9c315a 100644 Binary files a/AppAlgo/workpieceHolePositioning/Windows/x64/Release/workpieceHolePositioning.dll and b/AppAlgo/workpieceHolePositioning/Windows/x64/Release/workpieceHolePositioning.dll differ diff --git a/AppAlgo/workpieceHolePositioning/Windows/x64/Release/workpieceHolePositioning.pdb b/AppAlgo/workpieceHolePositioning/Windows/x64/Release/workpieceHolePositioning.pdb index 1e4f66f8..3b51bc31 100644 Binary files a/AppAlgo/workpieceHolePositioning/Windows/x64/Release/workpieceHolePositioning.pdb and b/AppAlgo/workpieceHolePositioning/Windows/x64/Release/workpieceHolePositioning.pdb differ