From 17ae0cd78c16f55d38dc3f9ad6b27688f445aee3 Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期三, 03 四月 2019 09:57:19 +0800
Subject: [PATCH] Merge branch 'yangwu1.3' into 1.3nsq
---
QiaoJiaSystem/StructureApp/YoloRpcElement.cpp | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/QiaoJiaSystem/StructureApp/YoloRpcElement.cpp b/QiaoJiaSystem/StructureApp/YoloRpcElement.cpp
index 31a2e2f..e3ccd11 100644
--- a/QiaoJiaSystem/StructureApp/YoloRpcElement.cpp
+++ b/QiaoJiaSystem/StructureApp/YoloRpcElement.cpp
@@ -101,11 +101,13 @@
scoredRect.rect = cv::Rect(x, y, w, h);
scoredRect.score = scoredRect.rect.area() > 0 ? obj.prob : 0;
scoredRect.properties["time"] = getProperty("time");
+ scoredRect.properties["imgKey"]=getProperty("imgKey");
if (trackingTrigger->triggerOnce(scoredRect))
{
trackingTrigger->getLastRect().properties["id"] = to_string(scoredRect.id);
trackingTrigger->getLastRect().properties["type"] = cocoData[obj.type];
trackingTrigger->getLastRect().properties["time"] = getProperty("time");
+ trackingTrigger->getLastRect().properties["imgKey"]=getProperty("imgKey");
// DBG("time)"<<getProperty("time"));
triggerScoredRects.push_back(trackingTrigger->getLastRect());
}
--
Gitblit v1.8.0