From adb08adc83dfe9dc5d6170c2322952d77a93c510 Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期三, 03 四月 2019 09:54:33 +0800
Subject: [PATCH] Merge branch 'yw.1.2' into yangwu1.3
---
QiaoJiaSystem/StructureApp/AppPipeController.cpp | 55 ++++++++++++++++++++++++-------------------------------
1 files changed, 24 insertions(+), 31 deletions(-)
diff --git a/QiaoJiaSystem/StructureApp/AppPipeController.cpp b/QiaoJiaSystem/StructureApp/AppPipeController.cpp
index dfc92ab..45c7773 100644
--- a/QiaoJiaSystem/StructureApp/AppPipeController.cpp
+++ b/QiaoJiaSystem/StructureApp/AppPipeController.cpp
@@ -33,8 +33,7 @@
// recordVideoElement(-1, ""),
bRecordVideoEnable(false),
- m_bSetWH(false)
-{
+ m_bSetWH(false) {
init();
@@ -90,9 +89,7 @@
rightJudgment(ruleMap[KeepRightSdk]),
bRecordVideoEnable(RecordVideoEnable),
m_sdkRuleMap(ruleMap),
- m_bSetWH(false)
-
- {
+ m_bSetWH(false) {
DBG("camId" << camId);
init();
initPerimeter();
@@ -229,6 +226,7 @@
"perStaticElement: "<<perStaticElement.getTriggerState());
}*/
}
+
void AppPipeController::init() {
unsigned char ip_old[15] = {0};
@@ -266,22 +264,20 @@
}
cv::Mat imageTemp;
- m_hiredisTool.getKeyImage(imgKey,imageTemp);
- if(!m_bSetWH)
- {
- INFO("SetWidth:"<<imageTemp.cols<<" Height:"<<imageTemp.rows);
- appPref.setIntData(m_camId+"width",imageTemp.cols);
- appPref.setIntData(m_camId+"height",imageTemp.rows);
- m_bSetWH=true;
+ m_hiredisTool.getKeyImage(imgKey, imageTemp);
+ if (!m_bSetWH) {
+ INFO("SetWidth:" << imageTemp.cols << " Height:" << imageTemp.rows);
+ appPref.setIntData(m_camId + "width", imageTemp.cols);
+ appPref.setIntData(m_camId + "height", imageTemp.rows);
+ m_bSetWH = true;
}
m_hiredisTool.delKey(imgKey);
- if(imageTemp.empty())
- {
- ERR("No Image Data In: "<<m_camId<<" ImgKey:"<<imgKey);
+ if (imageTemp.empty()) {
+ ERR("No Image Data In: " << m_camId << " ImgKey:" << imgKey);
return;
}
- std::string strNewTime = AppUtil::getTimeUSecString();
+ std::string strNewTime = AppUtil::getTimeUSecString();
ImageName_s_t imgSt = ImageName_s_t::fromString(imgKey);
@@ -289,8 +285,8 @@
if (!faceRpcElement.isBusy()) {
//#todo
faceRpcElement.setProperty("time", strNewTime);
- faceRpcElement.setProperty("imgKey",imgKey);
- INFO("Write To FaceRPC ES time:"<<strNewTime<< " ImgKey: "<<imgKey);
+ faceRpcElement.setProperty("imgKey", imgKey);
+ INFO("Write To FaceRPC ES time:" << strNewTime << " ImgKey: " << imgKey);
faceRpcElement.setImage(imageTemp);
faceRpcElement.submit();
}
@@ -298,8 +294,8 @@
if (!yoloRpcElement.isBusy()) {
//#todo
yoloRpcElement.setProperty("time", strNewTime);
- yoloRpcElement.setProperty("imgKey",imgKey);
- INFO("Write To YoloES time:"<<strNewTime<< " ImgKey: "<<imgKey);
+ yoloRpcElement.setProperty("imgKey", imgKey);
+ INFO("Write To YoloES time:" << strNewTime << " ImgKey: " << imgKey);
yoloRpcElement.setImage(imageTemp);
yoloRpcElement.submit();
}
@@ -385,7 +381,7 @@
imageDrawElement.registerConnector([&] {
if (appPref.getIntData("show.image") == 1) {
- ImageShowElement::showImage(to_string(this->m_index), *imageDrawElement.getImage());
+ ImageShowElement::showImage(to_string(this->m_index), *imageDrawElement.getImage());
}
});
@@ -398,8 +394,7 @@
registerElement(faceRpcElement);
registerElement(faceExtractElement);
}
- if(appPref.getIntData("show.image") == 1)
- {
+ if (appPref.getIntData("show.image") == 1) {
imageDrawElement.registerConnector([&] {
ImageShowElement::showImage(to_string(this->m_index), *imageDrawElement.getImage());
@@ -409,7 +404,7 @@
registerElement(imageDrawElement);
}
- // registerElement(newRecordVideoElement);
+ // registerElement(newRecordVideoElement);
//videoCaptureElement.setOutPutInterval(3);
faceExtractElement.setProperty("index", to_string(m_index));
registerElement(yoloRpcElement);
@@ -543,14 +538,12 @@
leftJudgment.init(rule.strAreas, rule.strLine);
rightJudgment.init(rule.strExAreas, rule.strExLine);
yoloRpcElement.registerConnector([&] {
- if(!leftJudgment.isBusy())
- {
- leftJudgment.setYoloObjects(yoloRpcElement.getLastScoreRects());
- leftJudgment.setImage(yoloRpcElement.getImage());
- leftJudgment.submit();
+ if (!leftJudgment.isBusy()) {
+ leftJudgment.setYoloObjects(yoloRpcElement.getLastScoreRects());
+ leftJudgment.setImage(yoloRpcElement.getImage());
+ leftJudgment.submit();
}
- if(!rightJudgment.isBusy())
- {
+ if (!rightJudgment.isBusy()) {
rightJudgment.setYoloObjects(yoloRpcElement.getLastScoreRects());
rightJudgment.setImage(yoloRpcElement.getImage());
--
Gitblit v1.8.0