From 4d1c2ee860222138fc7932225ea6d91e7483646a Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期一, 22 四月 2019 11:18:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.3nsq' into 1.3nsq
---
QiaoJiaSystem/StructureApp/AppPipeController.cpp | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/QiaoJiaSystem/StructureApp/AppPipeController.cpp b/QiaoJiaSystem/StructureApp/AppPipeController.cpp
index fcddc04..14bfad1 100644
--- a/QiaoJiaSystem/StructureApp/AppPipeController.cpp
+++ b/QiaoJiaSystem/StructureApp/AppPipeController.cpp
@@ -95,7 +95,7 @@
perHubElement(ruleMap[PerHubSdk]),
leftJudgment(ruleMap[KeepRightSdk]),
rightJudgment(ruleMap[KeepRightSdk]),
- bRecordVideoEnable(RecordVideoEnable),
+// bRecordVideoEnable(RecordVideoEnable),
m_sdkRuleMap(ruleMap),
m_bSetWH(false) {
DBG("camId" << camId);
@@ -292,7 +292,7 @@
//#todo
faceRpcElement.setProperty("time", strNewTime);
faceRpcElement.setProperty("imgKey", imgKey);
- INFO("Write To FaceRPC ES time:" << strNewTime << " ImgKey: " << imgKey);
+// INFO("Write To FaceRPC ES time:" << strNewTime << " ImgKey: " << imgKey);
faceRpcElement.setImage(imageTemp);
faceRpcElement.submit();
}
@@ -302,7 +302,7 @@
//#todo
yoloRpcElement.setProperty("time", strNewTime);
yoloRpcElement.setProperty("imgKey", imgKey);
- INFO("Write To YoloES time:" << strNewTime << " ImgKey: " << imgKey);
+// INFO("Write To YoloES time:" << strNewTime << " ImgKey: " << imgKey);
yoloRpcElement.setImage(imageTemp);
yoloRpcElement.submit();
}
@@ -530,7 +530,7 @@
#else
vptRpcElement.registerConnector([&] {
if (!perimeterElement.isBusy()) {
- perimeterElement.setYoloObjects(vptRpcElement.getLastHpRects());
+ perimeterElement.setYoloObjects(vptRpcElement.getLastScoreRects());
perimeterElement.setImage(vptRpcElement.getImage());
perimeterElement.submit();
}
--
Gitblit v1.8.0