From f53e1204bd4a21f74cb5872030f1eadf231eedc7 Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期六, 05 一月 2019 19:48:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ywv1.2' into ywv1.2
---
QiaoJiaSystem/StructureApp/AppPipeController.cpp | 23 +++++------------------
1 files changed, 5 insertions(+), 18 deletions(-)
diff --git a/QiaoJiaSystem/StructureApp/AppPipeController.cpp b/QiaoJiaSystem/StructureApp/AppPipeController.cpp
index afb6584..2d89d86 100644
--- a/QiaoJiaSystem/StructureApp/AppPipeController.cpp
+++ b/QiaoJiaSystem/StructureApp/AppPipeController.cpp
@@ -161,12 +161,13 @@
std::string strNewTime;
strNewTime = AppUtil::getTimeUSecString();
-// cv::putText(imageTemp, strNewTime, cv::Point(408, 540), cv::HersheyFonts::FONT_HERSHEY_PLAIN, 5,
-// cv::Scalar(255, 255, 0), 2);
+ cv::putText(imageTemp, strNewTime, cv::Point(408, 540), cv::HersheyFonts::FONT_HERSHEY_PLAIN, 5,
+ cv::Scalar(255, 255, 0), 2);
if (m_camId.size() > 0) {
if (bRecordVideoEnable) {
+ DBG("strNewTime="<<strNewTime<<" camId="<<m_camId);
newRecordVideoElement.pushImgBuf(strNewTime, imageTemp);
newRecordVideoElement.setSdkTrigger(faceRpcElement.getTriggerState() ||//TODO
yoloRpcElement.getTrigger() ||
@@ -174,9 +175,7 @@
rightJudgment.getTriggerState() ||
perimeterElement.getTriggerState() ||
crowdElement.getTriggerState());
- if (!newRecordVideoElement.isBusy()) {
- newRecordVideoElement.submit();
- }
+ // newRecordVideoElement.submit();
}
@@ -249,18 +248,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 +259,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