From 9bbbe29c81aa9cd183e840232f2bd973937d1ef4 Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期二, 15 一月 2019 17:17:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ywv1.2' into ywv1.2
---
QiaoJiaSystem/StructureApp/YoloRpcElement.cpp | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/QiaoJiaSystem/StructureApp/YoloRpcElement.cpp b/QiaoJiaSystem/StructureApp/YoloRpcElement.cpp
index b16012d..a56a7e7 100644
--- a/QiaoJiaSystem/StructureApp/YoloRpcElement.cpp
+++ b/QiaoJiaSystem/StructureApp/YoloRpcElement.cpp
@@ -54,7 +54,7 @@
std::vector<ScoredRect> YoloRpcElement::getLastScoreRects() const {
- return triggerScoredRects;
+ return trackingTrigger->getLastScoreRects();
}
cv::Mat YoloRpcElement::getImage() const
@@ -64,6 +64,7 @@
void YoloRpcElement::threadFunc()
{
+ // ClockTimer ct("YoloRpcElement::threadFunc");
triggerScoredRects.clear();
try {
auto server = rpcClient.getServer();
@@ -103,19 +104,21 @@
int h = (obj.rcObj.bottom - obj.rcObj.top) * image.rows;
scoredRect.rect = cv::Rect(x, y, w, h);
scoredRect.score = scoredRect.rect.area() > 0 ? obj.prob : 0;
+ scoredRect.properties["time"] = getProperty("time");
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");
+ // DBG("time)"<<getProperty("time"));
triggerScoredRects.push_back(trackingTrigger->getLastRect());
}
}
trackingTrigger->triggerLine();
- if(trackingTrigger->getLastScoreRects().size()>20)
- {
- DBG("");
- }
+// if(trackingTrigger->getLastScoreRects().size()>20)
+// {
+// DBG("");
+// }
fireConnectors();
}
--
Gitblit v1.8.0