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/PerimeterElement.h | 19 +++++++++++++------
1 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/QiaoJiaSystem/StructureApp/PerimeterElement.h b/QiaoJiaSystem/StructureApp/PerimeterElement.h
index b7a4dfd..7f90643 100644
--- a/QiaoJiaSystem/StructureApp/PerimeterElement.h
+++ b/QiaoJiaSystem/StructureApp/PerimeterElement.h
@@ -8,13 +8,16 @@
#include "TrackingTrigger.h"
#include <QJsonArray>
#include <RapidStructureApp/TriggerElement.h>
+#include <basic/util/app/AppPreference.hpp>
#include <basic/util/fastdfs/FastFds.hpp>
#include "DBStruct.h"
#include <basic/db/Elasticsearch/EsDBTool.h>
+#include "IntAreaCalcUtil.h"
+#include "SaveVideoRpc.h"
class PerimeterElement : public basic::PipeElement
{
public:
- PerimeterElement(){}
+ PerimeterElement():m_rpcClient("RtspAnalysServer", "127.0.0.1",appPref.getIntData("RpcServerPort"),"tcp"){}
PerimeterElement(const SdkRule& rule);
public:
~PerimeterElement();
@@ -51,7 +54,7 @@
void setImage(const cv::Mat &value) const;
private:
-
+ //PerimeterElement(const SdkRule& rule);
virtual void threadInitial()override;
@@ -61,11 +64,10 @@
std::string uploadImgToFdfs(cv::Mat& image);
- bool saveInfoToEs(const std::string& imgUrl,const std::string& time);
+ bool saveInfoToEs(const std::string& imgUrl,const std::string& time,const std::string& imgKey);
void setMask(std::string mask);
bool isInWeek(const std::vector<LActRuleWeekRecord>& ruleWeek);
cv::Rect CutMask();
- bool isAnd();
private:
cv::Mat image;
//cv::Mat mask;
@@ -82,10 +84,15 @@
EsDBTool* pManagerEsDB;
- int npts;
- vector<cv::Rect> m_recVec;
+ int npts;
+ std::vector<cv::Rect> m_recVec;
bool m_bIsMask;
+ std::vector<Point> poly1;
+ bool m_bSetWH;
+ cv::Point2i* pointArray;
+ SaveVideoRpcClient_t m_rpcClient;
+
};
#endif // PAELEMENT_H
--
Gitblit v1.8.0