From 1e751a5eb3c23d932b5de94456b5a8741f28c7cc Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期六, 16 八月 2025 17:37:49 +0800
Subject: [PATCH] 1. 修复离线测试设置错误的扫描个数，应该设置的是需要扫描的个数（非相机个数）
---
EdgeInspector_App/Grabber/SapLineGrab.cpp | 29 +++++++++++++++--------------
1 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/EdgeInspector_App/Grabber/SapLineGrab.cpp b/EdgeInspector_App/Grabber/SapLineGrab.cpp
index 1ae10c9..c47bbdb 100644
--- a/EdgeInspector_App/Grabber/SapLineGrab.cpp
+++ b/EdgeInspector_App/Grabber/SapLineGrab.cpp
@@ -1,4 +1,4 @@
-
+锘�
#include "StdAfx.h"
#include "SapLineGrab.h"
@@ -79,7 +79,7 @@
return INITX64_FAIL_CREATEBUFFER;
if(ActivateObjects() == FALSE)
- return INITX64_FAIL_CREATEXFER;// ??? 货肺款 define 急攫 鞘夸
+ return INITX64_FAIL_CREATEXFER;// ??? 璐ц偤娆� define 鎬ユ敨 闉樺じ
m_pXfer->Connect();
m_pXfer->SetAutoConnect(TRUE);
@@ -143,7 +143,7 @@
////////////////////////////////////////////////////////////////////////////////////////////////////////////
- // Process侩 滚欺 积己
+ // Process渚� 婊氭 绉繁
// 1. Memory Virtual Alloc
@@ -231,18 +231,19 @@
if(m_bGrabLive == TRUE)
m_nSetBufferIdx = 0;
- if (m_nEndFrameIdx > g_pStatus->GetGrabFrameCount(m_nScanIndex))
+ int nCameraIdx = m_Param.nCameraIdx;
+ if (m_nEndFrameIdx > g_pStatus->GetGrabFrameCount(nCameraIdx, m_nScanIndex))
{
GrabScanStop();
- g_pStatus->SetGrabEnd(m_nScanIndex);
- g_pLog->DisplayMessage(_T("%d Over Grab Count : Stop Grab[%d][%d] - %d"), m_Param.nBoardIdx, m_nScanIndex, m_nEndFrameIdx,g_pStatus->GetGrabFrameCount(m_nScanIndex));
+ g_pStatus->SetGrabEnd(nCameraIdx, m_nScanIndex);
+ g_pLog->DisplayMessage(_T("%d Over Grab Count : Stop Grab[%d][%d] - %d"), m_Param.nBoardIdx, m_nScanIndex, m_nEndFrameIdx,g_pStatus->GetGrabFrameCount(nCameraIdx, m_nScanIndex));
return;
}
if (m_nSetBufferIdx > m_pFrameBuffer->GetFrameCount())
{
GrabScanStop();
- g_pStatus->SetGrabEnd(m_nScanIndex);
+ g_pStatus->SetGrabEnd(nCameraIdx, m_nScanIndex);
g_pLog->DisplayMessage(_T("%d Over Grab Buffer Stop Grab[%d][%d] - %d"), m_Param.nBoardIdx, m_nScanIndex, m_nEndFrameIdx,m_pFrameBuffer->GetFrameCount());
return;
}
@@ -251,7 +252,7 @@
if(pBuffer == NULL)
{
GrabScanStop();
- g_pStatus->SetGrabEnd(m_nScanIndex);
+ g_pStatus->SetGrabEnd(nCameraIdx, m_nScanIndex);
g_pLog->DisplayMessage(_T("%d Over Grab Buffer Stop Grab[%d][%d] - %d"), m_Param.nBoardIdx, m_nScanIndex, m_nEndFrameIdx,m_pFrameBuffer->GetFrameCount());
return;
}
@@ -286,7 +287,7 @@
LPBYTE CSapLineGrab::GetGrabFrameHeader(int nFrameNo, BOOL* bRet)
{
- // 捞固瘤甫 嘛篮 利捞 绝绰 版快绰 滚欺甫 府畔茄促.
+ // 鎹炲浐鐦ょ敨 鍢涚 鍒╂崬 缁濈话 鐗堝揩缁� 婊氭鐢� 搴滅晹鑼勪績.
LPBYTE pBuff= NULL;
if(nFrameNo > m_nSetBufferIdx) return NULL;
@@ -310,7 +311,7 @@
else
lpBuffer = NULL;
}
- else // 捞固瘤甫 嘛篮 版快绰 Frame No甫 犬牢窍咯 滚欺甫 府畔茄促.
+ else // 鎹炲浐鐦ょ敨 鍢涚 鐗堝揩缁� Frame No鐢� 鐘墷绐嶅挴 婊氭鐢� 搴滅晹鑼勪績.
{
if (bRet)
*bRet = TRUE;
@@ -452,7 +453,7 @@
if (bGrabbing == FALSE)
{
- // Snap 疙飞捞 吭栏唱 Callback 窃荐啊 龋免登瘤 臼篮 版快 Abort() 龋免 -> Callback 窃荐啊 龋免登瘤 臼栏搁 Freeze()肺绰 Snap 辆丰啊 救等促.
+ // Snap 鐤欓鎹� 鍚爮鍞� Callback 绐冭崘鍟� 榫嬪厤鐧荤槫 鑷肩 鐗堝揩 Abort() 榫嬪厤 -> Callback 绐冭崘鍟� 榫嬪厤鐧荤槫 鑷兼爮鎼� Freeze()鑲虹话 Snap 杈嗕赴鍟� 鏁戠瓑淇�.
g_pLog->DisplayMessage(_T("Stop Acq Case 1-1 Not Grabbing"));
if(m_bSnapStart == TRUE && m_bXferCall == FALSE)
{
@@ -467,7 +468,7 @@
}
else
{
- // Callback 窃荐啊 龋免等 版快绰 Freeze() 龋免
+ // Callback 绐冭崘鍟� 榫嬪厤绛� 鐗堝揩缁� Freeze() 榫嬪厤
//g_pLog->DisplayMessage(TRUE, "Stop Acq Case 2-1");
if(m_bXferCall)
{
@@ -625,7 +626,7 @@
}
/*
- // 矫累 橇饭烙 锅龋客 场 橇饭烙 锅龋.
+ // 鐭疮 姗囬キ鐑� 閿呴緥瀹� 鍦� 姗囬キ鐑� 閿呴緥.
int nStartFrameNo = nYStart / nBufSizeY;
int nEndFrameNo = (nYStart + nYSize) / nBufSizeY;
LPBYTE lpHeadAddr = GetFrameHeader(iScan,nStartFrameNo);
@@ -641,7 +642,7 @@
memcpy(lpIn + i * nXSize, lpStart + nLine * nBufSizeX, nXSize);
if (nStartFrameNo <= nEndFrameNo && (nYStart + i + 1) % nBufSizeY == 0)
{
- // 捞固瘤甫 蝶郴具窍绰 康开捞 MemFrameNo 版拌俊 吧媚乐绰 版快 贸府.
+ // 鎹炲浐鐦ょ敨 铦堕兇鍏风獚缁� 搴峰紑鎹� MemFrameNo 鐗堟媽淇� 鍚у獨涔愮话 鐗堝揩 璐稿簻.
lpHeadAddr = GetFrameHeader(iScan,++nStartFrameNo);
lpStart = lpHeadAddr + nXStart;
nLine = 0;
--
Gitblit v1.9.3