From 114e9783e9b7ad0e12fe24415fe34d75ee4b4af7 Mon Sep 17 00:00:00 2001
From: chenshijun <csj_sky@126.com>
Date: 星期四, 24 一月 2019 13:42:28 +0800
Subject: [PATCH] test
---
QiaoJiaSystem/StructureApp/PerimeterElement.h | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/QiaoJiaSystem/StructureApp/PerimeterElement.h b/QiaoJiaSystem/StructureApp/PerimeterElement.h
index 685677e..3e6e35e 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,6 +66,7 @@
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,7 +84,12 @@
int npts;
- vector<cv::Rect> m_recVec;
+ std::vector<cv::Rect> m_recVec;
+
+ bool m_bIsMask;
+ std::vector<Point> poly1;
+
+
};
#endif // PAELEMENT_H
--
Gitblit v1.8.0