From abd9036f024a77d22b47a108bc88b27b9732e3c5 Mon Sep 17 00:00:00 2001
From: zhangjixing <775834166@qq.com>
Date: 星期二, 15 一月 2019 17:27:27 +0800
Subject: [PATCH] 

---
 QiaoJiaSystem/StructureApp/FaceRpcElement.cpp |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/QiaoJiaSystem/StructureApp/FaceRpcElement.cpp b/QiaoJiaSystem/StructureApp/FaceRpcElement.cpp
index 1e5553a..5399c59 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;
             }
@@ -186,6 +187,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