From 9f08028f23d9e5cbfa159bec1e07d63b141a6809 Mon Sep 17 00:00:00 2001
From: zhangjixing <775834166@qq.com>
Date: 星期五, 18 一月 2019 10:17:00 +0800
Subject: [PATCH]
---
QiaoJiaSystem/StructureApp/YoloRpcElement.cpp | 29 ++++++++++++++---------------
1 files changed, 14 insertions(+), 15 deletions(-)
diff --git a/QiaoJiaSystem/StructureApp/YoloRpcElement.cpp b/QiaoJiaSystem/StructureApp/YoloRpcElement.cpp
index b16012d..31a2e2f 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();
@@ -78,17 +79,13 @@
{
ERR(e.what())
}
- int size=objs.size();
- if(size>30)
- {
+// int size=objs.size();
+// if(size>30)
+// {
-// cv::imshow("image", image);
-
-// cv::waitKey();
-
- DBG("size="<<size);
- return;
- }
+// DBG("size="<<size);
+// return;
+// }
for (auto &obj: objs)
{
@@ -103,19 +100,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