From f76e6f73d57015a04272f05a48c27bfd42b14015 Mon Sep 17 00:00:00 2001
From: miyanhui <dennismi1024@gmail.com>
Date: 星期三, 13 二月 2019 17:33:27 +0800
Subject: [PATCH] Merge branch 'ywv1.2' of http://192.168.1.226:10010/r/development/c++ into ywv1.2
---
QiaoJiaSystem/StructureApp/PerimeterElement.h | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/QiaoJiaSystem/StructureApp/PerimeterElement.h b/QiaoJiaSystem/StructureApp/PerimeterElement.h
index 3e6e35e..d0056b9 100644
--- a/QiaoJiaSystem/StructureApp/PerimeterElement.h
+++ b/QiaoJiaSystem/StructureApp/PerimeterElement.h
@@ -62,11 +62,10 @@
std::string uploadImgToFdfs(cv::Mat& image);
- bool saveInfoToEs(const std::string& imgUrl,const std::string& time);
+ bool saveInfoToEs(const std::string& imgUrl,const std::string& time,const std::string& imgKey);
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