From f76e6f73d57015a04272f05a48c27bfd42b14015 Mon Sep 17 00:00:00 2001
From: miyanhui <dennismi1024@gmail.com>
Date: 星期三, 13 二月 2019 17:33:27 +0800
Subject: [PATCH] Merge branch 'ywv1.2' of http://192.168.1.226:10010/r/development/c++ into ywv1.2
---
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