From dd5adf6383819915967b2a76b18ca6e4d88d60cd Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期三, 30 一月 2019 09:59:31 +0800
Subject: [PATCH] 添加布控等级。对比暂未添加本字段。

---
 QiaoJiaSystem/StructureApp/PerimeterElement.h |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/QiaoJiaSystem/StructureApp/PerimeterElement.h b/QiaoJiaSystem/StructureApp/PerimeterElement.h
index 3e6e35e..4a1d3fe 100644
--- a/QiaoJiaSystem/StructureApp/PerimeterElement.h
+++ b/QiaoJiaSystem/StructureApp/PerimeterElement.h
@@ -66,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;
@@ -83,12 +82,13 @@
     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;
 
 };
 

--
Gitblit v1.8.0