From 5bf0020b189b2bc8c64737c2af4ea77c3e8f5612 Mon Sep 17 00:00:00 2001
From: xuxiuxi <554325746@qq.com>
Date: 星期五, 08 三月 2019 22:24:27 +0800
Subject: [PATCH] Merge branch 'yw.1.2.fixbug' of http://192.168.1.226:10010/r/development/c++ into yw.1.2.fixbug
---
QiaoJiaSystem/StructureApp/FaceRpcElement.h | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/QiaoJiaSystem/StructureApp/FaceRpcElement.h b/QiaoJiaSystem/StructureApp/FaceRpcElement.h
index 4804da4..64002da 100644
--- a/QiaoJiaSystem/StructureApp/FaceRpcElement.h
+++ b/QiaoJiaSystem/StructureApp/FaceRpcElement.h
@@ -7,12 +7,14 @@
#include <opencv2/opencv.hpp>
#include <RapidStructureApp/TriggerElement.h>
#include "TrackingTrigger.h"
-
+#include "DBStruct.h"
+#include <QtGui/QPolygon>
+#include <QJsonArray>
class QSharedMemory;
class FaceRpcElement : public basic::PipeElement {
public:
- FaceRpcElement(string);
+ FaceRpcElement(string,const SdkRule& rule);
~FaceRpcElement();
@@ -33,9 +35,12 @@
cv::Mat getImage() const;
+
private:
virtual void threadFunc() override;
-
+ void setMask(std::string mask);
+ QJsonArray getJsonArrayFromQString(const QString& strJson);
+ bool isInWeek(const std::vector<LActRuleWeekRecord>& ruleWeek);
private:
IceRpcClient<FaceDetect::FaceDetectServerPrx> rpcClient;
cv::Mat image;
@@ -45,8 +50,11 @@
::FaceDetect::Faces triggerFaces;
std::vector<cv::Mat> triggerMats;
std::vector<ScoredRect> triggerScoredRects;
-
+ QPolygon mPolygon;
TriggerElement m_triggerElement;
+ SdkRule m_sdkRule;
+ bool m_bIsMask;
+ bool m_bSetWH;
};
#endif // FACERPCELEMENT_H
--
Gitblit v1.8.0