diff --git a/App/RodAndBarPosition/Doc/vision_modbus_client.mthings b/App/RodAndBarPosition/Doc/vision_modbus_client.mthings index 41635f1e..8d177c42 100644 --- a/App/RodAndBarPosition/Doc/vision_modbus_client.mthings +++ b/App/RodAndBarPosition/Doc/vision_modbus_client.mthings @@ -4,6 +4,9 @@ + + + diff --git a/App/RodAndBarPosition/RodAndBarPositionApp/Presenter/Src/RodAndBarPositionPresenter.cpp b/App/RodAndBarPosition/RodAndBarPositionApp/Presenter/Src/RodAndBarPositionPresenter.cpp index 9583e8e5..77284ae0 100644 --- a/App/RodAndBarPosition/RodAndBarPositionApp/Presenter/Src/RodAndBarPositionPresenter.cpp +++ b/App/RodAndBarPosition/RodAndBarPositionApp/Presenter/Src/RodAndBarPositionPresenter.cpp @@ -101,6 +101,9 @@ int RodAndBarPositionPresenter::InitApp() // 获取配置结果 ConfigResult configResult = m_pConfigManager->GetConfigResult(); + // 在相机采集前同步调试参数,启用基类的异步点云保存。 + SetDebugParam(configResult.debugParam); + // 调用基类InitCamera进行相机初始化(bRGB=false, bSwing=true) InitCamera(configResult.cameraList, false, true); @@ -128,6 +131,9 @@ int RodAndBarPositionPresenter::InitAlgoParams() // 从 ConfigManager 获取配置结果 ConfigResult configResult = m_pConfigManager->GetConfigResult(); + // 重新加载算法配置时同步点云保存开关和输出路径。 + SetDebugParam(configResult.debugParam); + // 从 config.xml 加载手眼标定矩阵列表(支持多相机) for (const auto& handEyeMatrix : configResult.handEyeCalibMatrixList) { CalibMatrix calibMatrix; diff --git a/App/RodAndBarPosition/RodAndBarPositionApp/RodAndBarPositionApp.pro b/App/RodAndBarPosition/RodAndBarPositionApp/RodAndBarPositionApp.pro index 02bd94ea..332855ed 100644 --- a/App/RodAndBarPosition/RodAndBarPositionApp/RodAndBarPositionApp.pro +++ b/App/RodAndBarPosition/RodAndBarPositionApp/RodAndBarPositionApp.pro @@ -168,3 +168,6 @@ unix { LIBS += -lrt } !isEmpty(target.path): INSTALLS += target + +DISTFILES += \ + Version.md diff --git a/App/RodAndBarPosition/RodAndBarPositionApp/Version.h b/App/RodAndBarPosition/RodAndBarPositionApp/Version.h index 9b44cdab..69ba56ea 100644 --- a/App/RodAndBarPosition/RodAndBarPositionApp/Version.h +++ b/App/RodAndBarPosition/RodAndBarPositionApp/Version.h @@ -5,7 +5,7 @@ // 应用名称 #define RODANDBARPOSITION_APP_NAME "棒材定位" -#define RODANDBARPOSITION_VERSION_STRING "1.1.6" +#define RODANDBARPOSITION_VERSION_STRING "1.1.8" #define RODANDBARPOSITION_BUILD_STRING "1" #define RODANDBARPOSITION_FULL_VERSION_STRING "V" RODANDBARPOSITION_VERSION_STRING "_" RODANDBARPOSITION_BUILD_STRING diff --git a/App/RodAndBarPosition/RodAndBarPositionApp/Version.md b/App/RodAndBarPosition/RodAndBarPositionApp/Version.md index ae042c31..651fdda1 100644 --- a/App/RodAndBarPosition/RodAndBarPositionApp/Version.md +++ b/App/RodAndBarPosition/RodAndBarPositionApp/Version.md @@ -1,3 +1,16 @@ +# 1.1.8 +## build_1 2026-10-06 +1. 更新算法:修复无棒材时的崩溃 + + +# 1.1.7 +## build_2 2026-10-05 +1. ARM增加crash 点云存储路径不对 + +## build_1 2026-10-04 +1. 增加crash 数据存储 +2. 奔溃的信息存储 + # 1.1.6 ## build_1 2026-08-23 1. 更新算法:增加框的检测 diff --git a/App/RodAndBarPosition/RodAndBarPositionConfig/config/config.xml b/App/RodAndBarPosition/RodAndBarPositionConfig/config/config.xml index 5d7fa254..05d61a9c 100644 --- a/App/RodAndBarPosition/RodAndBarPositionConfig/config/config.xml +++ b/App/RodAndBarPosition/RodAndBarPositionConfig/config/config.xml @@ -43,7 +43,7 @@ - + diff --git a/AppAlgo/rodAndBarDetection/Arm/aarch64/libbaseAlgorithm.so b/AppAlgo/rodAndBarDetection/Arm/aarch64/libbaseAlgorithm.so index 35f87bfd..1bd4631b 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 2dad0319..a517a7bc 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 eb03fc5d..7c638a34 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 cb6b7ae2..72176a75 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 3cf21b7a..f11ed767 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 12d7ce22..530c0eba 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 46c31daf..0ba8bacd 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 7d7ac10d..1d912013 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 dde44efd..d5ddfd7a 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 60c1a62e..d40b4a87 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 ec6e8f25..39d29729 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 28f55eca..3c07fc37 100644 Binary files a/AppAlgo/rodAndBarDetection/Windows/x64/Release/rodAndBarDetection.pdb and b/AppAlgo/rodAndBarDetection/Windows/x64/Release/rodAndBarDetection.pdb differ