diff --git a/App/ScrewPosition/ScrewPositionApp/Version.h b/App/ScrewPosition/ScrewPositionApp/Version.h index 6c2e90bb..afbf8a13 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.1.6" +#define SCREWPOSITION_VERSION_STRING "1.1.7" #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 e0037510..b48d05a6 100644 --- a/App/ScrewPosition/ScrewPositionApp/Version.md +++ b/App/ScrewPosition/ScrewPositionApp/Version.md @@ -1,3 +1,7 @@ +# 1.1.7 2026-05-08 +## build_1 +1. 更新算法:工具盘姿态优化 + # 1.1.6 2026-04-25 ## build_1 1. 双相机 diff --git a/AppAlgo/rodAndBarDetection/Arm/aarch64/libbaseAlgorithm.so b/AppAlgo/rodAndBarDetection/Arm/aarch64/libbaseAlgorithm.so index b4494e23..39f579a7 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 4790fcc2..68df6ba9 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/SG_baseDataType.h b/AppAlgo/rodAndBarDetection/Inc/SG_baseDataType.h index 456aabac..e619576e 100644 --- a/AppAlgo/rodAndBarDetection/Inc/SG_baseDataType.h +++ b/AppAlgo/rodAndBarDetection/Inc/SG_baseDataType.h @@ -39,6 +39,13 @@ typedef struct SWD3DPoint point; }SWDIndexing3DPoint; +typedef struct +{ + int lineIdx; + int ptIdx; + SVzNL3DPoint point; +}SWD3DPointPostion; + typedef struct { int lineIdx; diff --git a/AppAlgo/rodAndBarDetection/Inc/SG_errCode.h b/AppAlgo/rodAndBarDetection/Inc/SG_errCode.h index fcc99920..1165b0d8 100644 --- a/AppAlgo/rodAndBarDetection/Inc/SG_errCode.h +++ b/AppAlgo/rodAndBarDetection/Inc/SG_errCode.h @@ -47,3 +47,6 @@ //칤λ #define SX_ERR_UNKNOWN_PLATE_DIR -2601 +//ԣ춨λ +#define SX_ERR_NO_HIGHEST_ROD -2701 + diff --git a/AppAlgo/rodAndBarDetection/Inc/rodAndBarDetection_Export.h b/AppAlgo/rodAndBarDetection/Inc/rodAndBarDetection_Export.h index 3ec68bdc..1cf9f5b8 100644 --- a/AppAlgo/rodAndBarDetection/Inc/rodAndBarDetection_Export.h +++ b/AppAlgo/rodAndBarDetection/Inc/rodAndBarDetection_Export.h @@ -36,12 +36,24 @@ typedef struct SVzNL3DPoint endPt; }SSX_rodPositionInfo; +typedef enum +{ + KeWD_WELD_UNKNOWN = 0, + KeWD_WELD_POINT, // + KeWD_WELD_SEAM, // + KeWD_WELD_SEAM_GAP, //죬з϶ +}EWD_weldType; typedef struct { + EWD_weldType weldType; SVzNL3DPoint startPt; SVzNL3DPoint endPt; SVzNL3DPoint center; + SVzNL3DPoint axialDir; SVzNL3DPoint normalDir; // + std::vector< SVzNL3DPoint> centerPts; + std::vector< SVzNL3DPoint> edgePts_0; + std::vector< SVzNL3DPoint> edgePts_1; }SSX_weldSeamInfo; //汾 @@ -97,5 +109,6 @@ SG_APISHARED_EXPORT void sx_rebarWeldSeamPositioning( const SSG_outlierFilterParam filterParam, const SSG_treeGrowParam growParam, const SSX_rodParam rodParam, + const double weldSeanRange, //ֽķΧֵ 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 fcd53328..b3438e27 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 4966ca62..64aac627 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 73e29041..2e28f563 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 b7849e6d..54d4586b 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 5c15543a..dd77f0b0 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 96fae4b0..ab5ca042 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 a78003f8..f85da5f9 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 0a90c88c..08279904 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 816c75ad..e7f36e02 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 de533d1b..5bc5aa28 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 ad462491..da7af9d0 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 ae6ccde8..fc162c47 100644 Binary files a/AppAlgo/rodAndBarDetection/Windows/x64/Release/rodAndBarDetection.pdb and b/AppAlgo/rodAndBarDetection/Windows/x64/Release/rodAndBarDetection.pdb differ diff --git a/GrabBagPrj/AppList.md b/GrabBagPrj/AppList.md index aa944945..ebb3c071 100644 --- a/GrabBagPrj/AppList.md +++ b/GrabBagPrj/AppList.md @@ -15,7 +15,7 @@ | 9 | 颗粒尺寸检测 | ParticleSize | 1.0.0.0 | | 10 | 双目标记检测 | BinocularMarkServer | 1.0.0.4 | | 11 | 铁路隧道槽道测量 | TunnelChannel | 1.0.0.3 | -| 12 | 螺杆定位 | ScrewPosition | 1.1.6.1 | +| 12 | 螺杆定位 | ScrewPosition | 1.1.7.1 | | 13 | 包裹拆线位置定位 | BagThreadPosition | 1.0.0.4 | | 14 | 工件孔定位 | WorkpieceHole | 1.1.5.1 | | 16 | 坑孔定位 | HolePitPosition | 无 |