diff --git a/App/HoleDetection/HoleDetectionApp/resource/logo.ico b/App/HoleDetection/HoleDetectionApp/resource/logo.ico index e18b2a4..46f7e3c 100644 Binary files a/App/HoleDetection/HoleDetectionApp/resource/logo.ico and b/App/HoleDetection/HoleDetectionApp/resource/logo.ico differ diff --git a/App/HoleDetection/HoleDetectionApp/resource/logo.png b/App/HoleDetection/HoleDetectionApp/resource/logo.png index 199acf6..cdc33b6 100644 Binary files a/App/HoleDetection/HoleDetectionApp/resource/logo.png and b/App/HoleDetection/HoleDetectionApp/resource/logo.png differ diff --git a/App/HolePitPosition/HolePitPositionApp/resource/logo.ico b/App/HolePitPosition/HolePitPositionApp/resource/logo.ico index e18b2a4..46f7e3c 100644 Binary files a/App/HolePitPosition/HolePitPositionApp/resource/logo.ico and b/App/HolePitPosition/HolePitPositionApp/resource/logo.ico differ diff --git a/App/HolePitPosition/HolePitPositionApp/resource/logo.png b/App/HolePitPosition/HolePitPositionApp/resource/logo.png index 199acf6..cdc33b6 100644 Binary files a/App/HolePitPosition/HolePitPositionApp/resource/logo.png and b/App/HolePitPosition/HolePitPositionApp/resource/logo.png differ diff --git a/App/WorkpieceHole/WorkpieceHoleApp/resource/logo.ico b/App/WorkpieceHole/WorkpieceHoleApp/resource/logo.ico index e18b2a4..46f7e3c 100644 Binary files a/App/WorkpieceHole/WorkpieceHoleApp/resource/logo.ico and b/App/WorkpieceHole/WorkpieceHoleApp/resource/logo.ico differ diff --git a/App/WorkpieceHole/WorkpieceHoleApp/resource/logo.png b/App/WorkpieceHole/WorkpieceHoleApp/resource/logo.png index 199acf6..cdc33b6 100644 Binary files a/App/WorkpieceHole/WorkpieceHoleApp/resource/logo.png and b/App/WorkpieceHole/WorkpieceHoleApp/resource/logo.png differ diff --git a/AppUtils/AppCommon/Src/BasePresenter.cpp b/AppUtils/AppCommon/Src/BasePresenter.cpp index 92c4c08..5d5fe4a 100644 --- a/AppUtils/AppCommon/Src/BasePresenter.cpp +++ b/AppUtils/AppCommon/Src/BasePresenter.cpp @@ -579,26 +579,8 @@ void BasePresenter::StopAlgoDetectThread() void BasePresenter::ClearDetectionDataCache() { std::lock_guard lock(m_detectionDataMutex); - - // 释放每个 SVzLaserLineData 中动态分配的 p3DPoint 和 p2DPoint - // (_StaticDetectionCallback 中通过 new[] 分配,此处必须 delete[]) - for (auto& pair : m_detectionDataCache) { - EVzResultDataType dataType = pair.first; - SVzLaserLineData& lineData = pair.second; - - if (dataType == keResultDataType_Position) { - delete[] static_cast(lineData.p3DPoint); - delete[] static_cast(lineData.p2DPoint); - } else if (dataType == keResultDataType_PointXYZRGBA) { - delete[] static_cast(lineData.p3DPoint); - delete[] static_cast(lineData.p2DPoint); - } - - lineData.p3DPoint = nullptr; - lineData.p2DPoint = nullptr; - } - - m_detectionDataCache.clear(); + // 释放加载的数据 + m_dataLoader.FreeLaserScanData(m_detectionDataCache); LOG_DEBUG("[BasePresenter] 检测数据缓存已清空\n"); }