From 049e00dc49439d82f72d5f7c1b6cae6b9023686e Mon Sep 17 00:00:00 2001
From: chenshijun <csj_sky@126.com>
Date: 星期二, 16 四月 2019 18:34:37 +0800
Subject: [PATCH] 解决修改参数和推流画面跳跃问题
---
QiaoJiaSystem/StructureApp/VptRpcElement.cpp | 44 +++++++++++++++++++++++---------------------
1 files changed, 23 insertions(+), 21 deletions(-)
diff --git a/QiaoJiaSystem/StructureApp/VptRpcElement.cpp b/QiaoJiaSystem/StructureApp/VptRpcElement.cpp
index 8607438..3168bf2 100644
--- a/QiaoJiaSystem/StructureApp/VptRpcElement.cpp
+++ b/QiaoJiaSystem/StructureApp/VptRpcElement.cpp
@@ -10,6 +10,7 @@
appPref.getStringData("vpt.ip"),
appPref.getIntData("vpt.port"), "tcp"),
m_sharedMemory(nullptr), m_trackingTrigger(nullptr) {
+ init();
}
@@ -63,9 +64,9 @@
}
for (auto &obj: m_objs) {
- //#todo 浜�/浜洪獞杞�/杞�
- if (obj.sdkDetectType != 0)
- continue;
+// //#todo 浜�/浜洪獞杞�/杞�
+// if (obj.sdkDetectType != 0)
+// continue;
ScoredRect scoredRect;
@@ -80,24 +81,25 @@
m_trackingTrigger->getLastRect().properties["time"] = getProperty("time");
m_trackingTrigger->getLastRect().properties["imgKey"] = getProperty("imgKey");
m_triggerScoredRects.push_back(m_trackingTrigger->getLastRect());
- switch (obj.sdkDetectType) {
- case 0 :
- m_HPScoredRects.push_back(m_trackingTrigger->getLastRect());
- break;
- case 1:
- case 2 :
- m_HCPScoredRects.push_back(m_trackingTrigger->getLastRect());
- break;
- case 4 :
- case 5 :
- case 6 :
- case 8 :
- m_CarScoredRects.push_back(m_trackingTrigger->getLastRect());
- break;
- }
+
}
}
m_trackingTrigger->triggerLine();
+ auto res_ = m_trackingTrigger->getLastScoreRects();
+ for (auto &obj: res_) {
+ if(obj.properties["type"] == "person") {
+ m_HPScoredRects.push_back(obj);
+ DBG("person:" << obj.score);
+ }else if((obj.properties["type"] == "bike") ||
+ (obj.properties["type"] == "motor")){
+ m_HCPScoredRects.push_back(obj);
+ DBG("bike or moto:" << obj.score);
+ }else{
+ m_CarScoredRects.push_back(obj);
+ DBG("car:" << obj.score);
+ }
+ }
+
fireConnectors();
}
@@ -113,9 +115,9 @@
try {
auto server = m_rpcClient.getServer();
- m_HpResStr = server->getStr(0); // 妫�娴嬬绫� case 0
- m_HcpResStr = server->getStr(1); // 妫�娴嬬绫� case 1
- m_TypeStr = server->getStr(2)[0]; // 妫�娴嬬绫� case 2
+ m_HpResStr = server->getStr(0); // 琛屼汉浜屾灞炴�� case 0
+ m_HcpResStr = server->getStr(1); // 浜洪獞杞︿簩娆″睘鎬� case 1
+ m_TypeStr = server->getStr(2)[0]; // VPT妫�娴嬬绫� case 2
m_colorLabelStr = server->getStr(3)[0]; // 杞︾墝棰滆壊 case 3
}
catch (std::exception &e) {
--
Gitblit v1.8.0