From c6e24163c3c852b4ac3e45d100b9253b3db0e182 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期五, 15 八月 2025 16:59:00 +0800
Subject: [PATCH] 1. 保存数据优化，提取公共区域，方便后期修改和扩展
---
EdgeInspector_App/Grabber/SapControl.cpp | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/EdgeInspector_App/Grabber/SapControl.cpp b/EdgeInspector_App/Grabber/SapControl.cpp
index 28c2ec7..bb613e8 100644
--- a/EdgeInspector_App/Grabber/SapControl.cpp
+++ b/EdgeInspector_App/Grabber/SapControl.cpp
@@ -761,18 +761,19 @@
pX64->m_nEndFrameIdx++; //Count
pX64->m_nSetBufferIdx++; //index
- if (pX64->m_nEndFrameIdx > g_pStatus->GetGrabFrameCount(pX64->m_nScanIndex))
+ int nCameraIdx = pX64->m_Param.nCameraIdx;
+ if (pX64->m_nEndFrameIdx > g_pStatus->GetGrabFrameCount(nCameraIdx, pX64->m_nScanIndex))
{
pX64->GrabScanStop();
- g_pStatus->SetGrabEnd(pX64->m_nScanIndex);
- g_pLog->DisplayMessage(_T("%d Over Grab Count : Stop Grab[%d][%d] - %d"), pX64->m_Param.nBoardIdx, pX64->m_nScanIndex, pX64->m_nEndFrameIdx,g_pStatus->GetGrabFrameCount(pX64->m_nScanIndex));
+ g_pStatus->SetGrabEnd(nCameraIdx, pX64->m_nScanIndex);
+ g_pLog->DisplayMessage(_T("%d Over Grab Count : Stop Grab[%d][%d] - %d"), pX64->m_Param.nBoardIdx, pX64->m_nScanIndex, pX64->m_nEndFrameIdx,g_pStatus->GetGrabFrameCount(nCameraIdx, pX64->m_nScanIndex));
return TRUE;
}
if (pX64->m_nSetBufferIdx > pX64->m_pFrameBuffer->GetFrameCount())
{
pX64->GrabScanStop();
- g_pStatus->SetGrabEnd(pX64->m_nScanIndex);
+ g_pStatus->SetGrabEnd(nCameraIdx, pX64->m_nScanIndex);
g_pLog->DisplayMessage(_T("%d Over Grab Buffer Stop Grab[%d][%d] - %d"), pX64->m_Param.nBoardIdx, pX64->m_nScanIndex, pX64->m_nEndFrameIdx,pX64->m_pFrameBuffer->GetFrameCount());
return TRUE;
}
@@ -781,7 +782,7 @@
if(pBuffer == NULL)
{
pX64->GrabScanStop();
- g_pStatus->SetGrabEnd(pX64->m_nScanIndex);
+ g_pStatus->SetGrabEnd(nCameraIdx, pX64->m_nScanIndex);
g_pLog->DisplayMessage(_T("%d Over Grab Buffer Stop Grab[%d][%d] - %d"), pX64->m_Param.nBoardIdx, pX64->m_nScanIndex, pX64->m_nEndFrameIdx,pX64->m_pFrameBuffer->GetFrameCount());
return TRUE;
}
--
Gitblit v1.9.3