From a9e9e90b0c0a8fa7f0b78b29101a3dc13a021a5d Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期五, 04 一月 2019 11:01:50 +0800
Subject: [PATCH] Merge branch 'master' into Develop
---
QiaoJiaSystem/StructureApp/AppPipeController.cpp | 14 +-------------
1 files changed, 1 insertions(+), 13 deletions(-)
diff --git a/QiaoJiaSystem/StructureApp/AppPipeController.cpp b/QiaoJiaSystem/StructureApp/AppPipeController.cpp
index afb6584..c411932 100644
--- a/QiaoJiaSystem/StructureApp/AppPipeController.cpp
+++ b/QiaoJiaSystem/StructureApp/AppPipeController.cpp
@@ -249,18 +249,6 @@
ImageShowElement::showImage(to_string(this->m_index), *imageDrawElement.getImage());
}
});
- newRecordVideoElement.registerConnector([&] {
- if (faceRpcElement.getTriggerState() ||//TODO
- yoloRpcElement.getTrigger() ||
- leftJudgment.getTriggerState() ||
- rightJudgment.getTriggerState() ||
- perimeterElement.getTriggerState() ||
- crowdElement.getTriggerState()
- ) {
-
- }
-
- });
registerElement(videoCaptureElement);
if (m_json["yolo.enable"].asString() == "1") {
@@ -272,7 +260,7 @@
}
registerElement(imageDrawElement);
registerElement(newRecordVideoElement);
- videoCaptureElement.setOutPutInterval(5);
+ videoCaptureElement.setOutPutInterval(3);
faceExtractElement.setProperty("index", to_string(m_index));
//#todo setProperty
// faceExtractElement.setProperty("index", to_string(m_index));
--
Gitblit v1.8.0