Merge branch 'ywv1.2' into ywv1.2_布控feature

pans

2019-01-28 53630c440d592792dcdd86f8d5b2c59da4f3c359

 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;
@@ -88,7 +87,8 @@

   bool m_bIsMask;
   std::vector<Point> poly1;

   bool m_bSetWH;
   cv::Point2i* pointArray;

};