|
|
|
|
@ -466,10 +466,22 @@ void ARIDLL_OutputPipeTarget(Arith_EOController* pArith, ARIDLL_OUTPUT* pstOutpu
|
|
|
|
|
pipeBox.w = pTarget->snSize.w;
|
|
|
|
|
pipeBox.h = pTarget->snSize.h;
|
|
|
|
|
|
|
|
|
|
if(SIoUB_Expand(pipeBox,trackBox, 10) > 0.1 && !pPipe->bTrackingPipe)
|
|
|
|
|
//if(SIoUB_Expand(pipeBox,trackBox, 10) > 0.1 && !pPipe->bTrackingPipe)
|
|
|
|
|
//{
|
|
|
|
|
// continue;
|
|
|
|
|
//}
|
|
|
|
|
//
|
|
|
|
|
if (!pPipe->bTrackingPipe &&
|
|
|
|
|
(pstOutput->nStatus == GLB_STATUS_TRACK || pstOutput->nStatus == GLB_STATUS_MOTRACK))
|
|
|
|
|
|
|
|
|
|
{
|
|
|
|
|
if (ABS(pipeBox.x - trackBox.x) < 256 && ABS(pipeBox.y - trackBox.y) < 256)
|
|
|
|
|
{
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// 告警目标输出
|
|
|
|
|
ARIDLL_OBJINFO* pt_detObj = &pstOutput->stAlarmObjs[pstOutput->nAlarmObjCnts];
|
|
|
|
|
|
|
|
|
|
@ -493,6 +505,12 @@ void ARIDLL_OutputPipeTarget(Arith_EOController* pArith, ARIDLL_OUTPUT* pstOutpu
|
|
|
|
|
obj.nOutputID = pPipe->nAlarmBatchID_1;
|
|
|
|
|
obj.unClsType = pPipe->unClsType;
|
|
|
|
|
|
|
|
|
|
obj.fSNR = pTarget->fSNR;
|
|
|
|
|
obj.nObjGray = pTarget->pxObjGray;
|
|
|
|
|
obj.fBkgGray = pTarget->fBGMean;
|
|
|
|
|
obj.fBkgStd = pTarget->fBGStd;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// 若有外部引导批号,则上报该批号
|
|
|
|
|
if (pPipe->nGuideBatchID > 0)
|
|
|
|
|
@ -674,11 +692,11 @@ void ARIDLL_OutputPipeTarget(Arith_EOController* pArith, ARIDLL_OUTPUT* pstOutpu
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// 跟踪状态不送显示
|
|
|
|
|
if (pstOutput->nTrackObjCnts > 0)
|
|
|
|
|
{
|
|
|
|
|
memset(pstOutput->stAlarmObjs, 0, ST_OBJ_NUM * sizeof(ARIDLL_OBJINFO));
|
|
|
|
|
pstOutput->nAlarmObjCnts = 0;
|
|
|
|
|
}
|
|
|
|
|
//if (pstOutput->nTrackObjCnts > 0)
|
|
|
|
|
//{
|
|
|
|
|
// memset(pstOutput->stAlarmObjs, 0, ST_OBJ_NUM * sizeof(ARIDLL_OBJINFO));
|
|
|
|
|
// pstOutput->nAlarmObjCnts = 0;
|
|
|
|
|
//}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
LOG_DEBUG_OUTPUT("stAlarmObjs[0]:nX:{},nY:{}; stTrackers[0]:nX:{},nY:{}", pstOutput->stAlarmObjs[0].nX, pstOutput->stAlarmObjs[0].nY, pstOutput->stTrackers[0].nX, pstOutput->stTrackers[0].nY);
|
|
|
|
|
|