From 2cf69b4bbe56fc379c7f433037e043d0dba42493 Mon Sep 17 00:00:00 2001
From: miyanhui <dennismi1024@gmail.com>
Date: 星期五, 15 二月 2019 15:58:59 +0800
Subject: [PATCH] Merge branch 'ywv1.2' of http://192.168.1.226:10010/r/development/c++ into ywv1.2
---
QiaoJiaSystem/StructureApp/PerimeterElement.h | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/QiaoJiaSystem/StructureApp/PerimeterElement.h b/QiaoJiaSystem/StructureApp/PerimeterElement.h
index 3e6e35e..b9d28a2 100644
--- a/QiaoJiaSystem/StructureApp/PerimeterElement.h
+++ b/QiaoJiaSystem/StructureApp/PerimeterElement.h
@@ -12,10 +12,11 @@
#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",10009,"tcp"){}
PerimeterElement(const SdkRule& rule);
public:
~PerimeterElement();
@@ -52,7 +53,7 @@
void setImage(const cv::Mat &value) const;
private:
-
+ //PerimeterElement(const SdkRule& rule);
virtual void threadInitial()override;
@@ -62,11 +63,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;
@@ -83,12 +83,14 @@
EsDBTool* pManagerEsDB;
- int npts;
+ 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;
};
--
Gitblit v1.8.0