From fa7e820c7715eb9294c9bae62c6f75fd3bda4f0d Mon Sep 17 00:00:00 2001
From: zhangjixing <775834166@qq.com>
Date: 星期二, 15 一月 2019 17:28:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ywv1.2' into ywv1.2
---
QiaoJiaSystem/StructureApp/FaceRpcElement.cpp | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/QiaoJiaSystem/StructureApp/FaceRpcElement.cpp b/QiaoJiaSystem/StructureApp/FaceRpcElement.cpp
index 1e5553a..3a4c807 100644
--- a/QiaoJiaSystem/StructureApp/FaceRpcElement.cpp
+++ b/QiaoJiaSystem/StructureApp/FaceRpcElement.cpp
@@ -38,7 +38,8 @@
// rpcClient("faceServer","",10002,"tcp"),
sharedMemory(nullptr),
trackingTrigger(nullptr),
- m_sdkRule(rule)
+ m_sdkRule(rule),
+ m_bIsMask(true)
{
sharedMemory = new QSharedMemory(QString(shareMemoryName.c_str()));
if (!sharedMemory->create(4608 * 2592 * 4)) {
@@ -106,7 +107,7 @@
int h = face.rcFace.bottom - face.rcFace.top;
QRect re(x,y,w,h);
QPoint center = re.center();
- if(!mPolygon.containsPoint(center,Qt::OddEvenFill))
+ if(m_bIsMask && !mPolygon.containsPoint(center,Qt::OddEvenFill))
{
return;
}
@@ -122,6 +123,7 @@
trackingTrigger->getLastRect().properties["smile"] = to_string(property.smile_level);
trackingTrigger->getLastRect().properties["race"] = to_string(property.race);
trackingTrigger->getLastRect().properties["time"] = getProperty("time");
+ trackingTrigger->getLastRect().properties["detectscore"] = scoredRect.score;
triggerFaces.push_back(face);
triggerMats.push_back(image(
@@ -186,6 +188,7 @@
QJsonArray arrayAreas = getJsonArrayFromQString(QString::fromStdString(mask));
if(arrayAreas.isEmpty())
{
+ m_bIsMask=false;
return;//do not detect
}
for(int i = 0;i < arrayAreas.size();++i)
--
Gitblit v1.8.0