diff --git a/App/ScrewPosition/ScrewPositionApp/Presenter/Src/DetectPresenter.cpp b/App/ScrewPosition/ScrewPositionApp/Presenter/Src/DetectPresenter.cpp index 82dc809f..4c330106 100644 --- a/App/ScrewPosition/ScrewPositionApp/Presenter/Src/DetectPresenter.cpp +++ b/App/ScrewPosition/ScrewPositionApp/Presenter/Src/DetectPresenter.cpp @@ -587,7 +587,7 @@ int DetectPresenter::DetectScrew( detectionResult.success = true; detectionResult.errorCode = 0; - detectionResult.message = QStringLiteral("\u68c0\u6d4b\u6210\u529f"); + detectionResult.message = QStringLiteral("螺杆检测成功"); const CTHomogeneousMatrix handEyeMatrix = BuildHandEyeMatrix(clibMatrix); const CTEulerOrder order = static_cast(extrinsic.eulerOrder); @@ -615,7 +615,7 @@ int DetectPresenter::DetectScrew( const CTVec3D robotAxialDir = NormalizeVector(eyeInHandTransform.transformVector(eyeAxialDir)); // 接近点:Eye 系沿螺杆轴偏移 offset,再经 T 变换到 Robot 系;姿态与目标点共用。 - const double offset = extrinsic.approachOffset; + const double offset = -extrinsic.approachOffset; const CTVec3D eyeApproach(eyeCenter.x + eyeAxialDir.x * offset, eyeCenter.y + eyeAxialDir.y * offset, eyeCenter.z + eyeAxialDir.z * offset); diff --git a/App/ScrewPosition/ScrewPositionApp/Version.h b/App/ScrewPosition/ScrewPositionApp/Version.h index afbf8a13..f0f65eb0 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.7" +#define SCREWPOSITION_VERSION_STRING "1.1.8" #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 b48d05a6..c15f5a22 100644 --- a/App/ScrewPosition/ScrewPositionApp/Version.md +++ b/App/ScrewPosition/ScrewPositionApp/Version.md @@ -1,3 +1,7 @@ +# 1.1.8 2026-05-10 +## build_1 +1. 更新算法:螺杆检测 + # 1.1.7 2026-05-08 ## build_1 1. 更新算法:工具盘姿态优化 diff --git a/AppAlgo/rodAndBarDetection/Arm/aarch64/libbaseAlgorithm.so b/AppAlgo/rodAndBarDetection/Arm/aarch64/libbaseAlgorithm.so index 39f579a7..46b45303 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 68df6ba9..24ca147d 100644 Binary files a/AppAlgo/rodAndBarDetection/Arm/aarch64/librodAndBarDetection.so and b/AppAlgo/rodAndBarDetection/Arm/aarch64/librodAndBarDetection.so differ diff --git a/AppAlgo/rodAndBarDetection/Windows/x64/Debug/baseAlgorithm.dll b/AppAlgo/rodAndBarDetection/Windows/x64/Debug/baseAlgorithm.dll index b3438e27..f401c839 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 64aac627..51bacf92 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 2e28f563..bc0712e6 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 54d4586b..36859907 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.pdb b/AppAlgo/rodAndBarDetection/Windows/x64/Debug/rodAndBarDetection.pdb index ab5ca042..6af59e93 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 f85da5f9..1daa48fb 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 08279904..ae4fd837 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 e7f36e02..8aaf6dab 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 5bc5aa28..dac4c1bc 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.pdb b/AppAlgo/rodAndBarDetection/Windows/x64/Release/rodAndBarDetection.pdb index fc162c47..0929f0e6 100644 Binary files a/AppAlgo/rodAndBarDetection/Windows/x64/Release/rodAndBarDetection.pdb and b/AppAlgo/rodAndBarDetection/Windows/x64/Release/rodAndBarDetection.pdb differ diff --git a/Device/Device.pro b/Device/Device.pro index b98bef26..f1d5f863 100644 --- a/Device/Device.pro +++ b/Device/Device.pro @@ -12,3 +12,4 @@ SUBDIRS += \ GalaxyDevice/GalaxyDevice.pro \ HikDevice/HikDevice.pro \ GlLineLaserDevice/GlLineLaserDevice.pro +# RsLidarDevice/RsLidarDevice.pro diff --git a/GrabBagPrj/AppList.md b/GrabBagPrj/AppList.md index ebb3c071..b7a86108 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.7.1 | +| 12 | 螺杆定位 | ScrewPosition | 1.1.8.1 | | 13 | 包裹拆线位置定位 | BagThreadPosition | 1.0.0.4 | | 14 | 工件孔定位 | WorkpieceHole | 1.1.5.1 | | 16 | 坑孔定位 | HolePitPosition | 无 | diff --git a/GrabBagPrj/GrabBagPrj.pro b/GrabBagPrj/GrabBagPrj.pro index f79c265b..76857a3d 100644 --- a/GrabBagPrj/GrabBagPrj.pro +++ b/GrabBagPrj/GrabBagPrj.pro @@ -29,4 +29,4 @@ App.depends = Utils VrNets Module Device AppUtils Tools.depends = Module Utils Robot # Test 测试 -# SUBDIRS += ../Test/Test.pro +SUBDIRS += ../Test/Test.pro diff --git a/Test/Test.pro b/Test/Test.pro index 70845ddc..01f69e7f 100644 --- a/Test/Test.pro +++ b/Test/Test.pro @@ -3,4 +3,4 @@ TEMPLATE = subdirs # 撕裂项目 # SUBDIRS += tcpclient/tcpclient_test.pro # SUBDIRS += tcpserver/tcpserver_test.pro -SUBDIRS += TeskAlgo/TeskAlgo.pro \ No newline at end of file +# SUBDIRS += RsLidarTest/RsLidarTest.pro \ No newline at end of file