Merge remote-tracking branch 'origin/ywv1.2' into ywv1.2

zhangjixing

2019-01-15 fa7e820c7715eb9294c9bae62c6f75fd3bda4f0d

 QiaoJiaSystem/StructureApp/PerimeterElement.h

@@ -65,6 +65,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;
@@ -83,6 +84,8 @@

   int npts;
   vector<cv::Rect> m_recVec;

   bool m_bIsMask;
};

#endif // PAELEMENT_H