From f676f7af18163b4532b6b982bbe1dc57b32e96dd Mon Sep 17 00:00:00 2001
From: zhangjixing <775834166@qq.com>
Date: 星期四, 24 一月 2019 15:38:22 +0800
Subject: [PATCH]
---
QiaoJiaSystem/StructureApp/PerimeterElement.h | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/QiaoJiaSystem/StructureApp/PerimeterElement.h b/QiaoJiaSystem/StructureApp/PerimeterElement.h
index b7a4dfd..24f32f7 100644
--- a/QiaoJiaSystem/StructureApp/PerimeterElement.h
+++ b/QiaoJiaSystem/StructureApp/PerimeterElement.h
@@ -11,6 +11,7 @@
#include <basic/util/fastdfs/FastFds.hpp>
#include "DBStruct.h"
#include <basic/db/Elasticsearch/EsDBTool.h>
+#include "IntAreaCalcUtil.h"
class PerimeterElement : public basic::PipeElement
{
public:
@@ -65,7 +66,6 @@
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 +82,13 @@
EsDBTool* pManagerEsDB;
- int npts;
- vector<cv::Rect> m_recVec;
+ int npts;
+ std::vector<cv::Rect> m_recVec;
bool m_bIsMask;
+ std::vector<Point> poly1;
+ cv::Point2i* pointArray;
+
};
#endif // PAELEMENT_H
--
Gitblit v1.8.0