From f676f7af18163b4532b6b982bbe1dc57b32e96dd Mon Sep 17 00:00:00 2001
From: zhangjixing <775834166@qq.com>
Date: 星期四, 24 一月 2019 15:38:22 +0800
Subject: [PATCH]
---
QiaoJiaSystem/StructureApp/PerimeterElement.cpp | 63 +++++++++++++++++++++++--------
1 files changed, 46 insertions(+), 17 deletions(-)
diff --git a/QiaoJiaSystem/StructureApp/PerimeterElement.cpp b/QiaoJiaSystem/StructureApp/PerimeterElement.cpp
index b605b07..c081c6b 100644
--- a/QiaoJiaSystem/StructureApp/PerimeterElement.cpp
+++ b/QiaoJiaSystem/StructureApp/PerimeterElement.cpp
@@ -21,7 +21,8 @@
mRealNum(0),
m_triggerElement(rule.nTriggerDelay*8,0),
pManagerEsDB(nullptr),
- m_bIsMask(true)
+ m_bIsMask(true),
+ pointArray(nullptr)
{
pManagerEsDB = new EsDBTool(appPref.getStringData("ipAdd"), appPref.getIntData("ipPort"));
@@ -31,6 +32,11 @@
if (pManagerEsDB) {
delete pManagerEsDB;
pManagerEsDB = nullptr;
+ }
+ if(pointArray)
+ {
+// delete[] pointArray[0];
+ delete[] pointArray;
}
}
@@ -157,13 +163,29 @@
if (m_triggerElement.getTriggerState() )
{
if(num > 0) {
- cv::Mat t_image = image(CutMask()).clone();
- if(t_image.empty())
+
+
+
+ if(pointArray!=nullptr)
{
- DBG("t_image empty");
- return;
+ const cv::Point2i* ppt[1] = { pointArray };
+
+ int npt[]={npts};
+
+ cv::polylines(image, ppt,npt, 1, true,cv::Scalar(255,255,0));
}
- std::string imgUrl = uploadImgToFdfs(t_image);
+
+ for(auto rect:m_recVec)
+ {
+ cv::rectangle(image, rect, cv::Scalar(0, 0, 255), 2);
+ }
+// cv::Mat t_image = image(CutMask()).clone();
+// if(t_image.empty())
+// {
+// DBG("t_image empty");
+// return;
+// }
+ std::string imgUrl = uploadImgToFdfs(image);
saveInfoToEs(imgUrl, picDate);
}
DBG("num=" << num << " lastnum=" << mRealNum);
@@ -235,12 +257,22 @@
}
int size = arrayAreas.size();
npts = size;
+// pointArray=new cv::Point2i*[1];
+// pointArray[0]=new cv::Point2i[size];
+
+ pointArray=new cv::Point2i[npts];
+
+
for (int i = 0; i < size; ++i) {
QJsonValue jsonValue = arrayAreas[i];
QJsonObject obj = jsonValue.toObject();
int x = obj.value("x").toDouble() * 4;
int y = obj.value("y").toDouble() * 4;
+
+ pointArray[i]={x,y};
+
+
if(m_sdkRule.nSdkType == PerimeterSdk)
{
poly1.push_back(Point(x,y));
@@ -312,31 +344,31 @@
// DBG("to_string(m_sdkRule.nSdkType)="<<to_string(m_sdkRule.nSdkType));
// t_json["Gender"] = obj.score;
- t_json["picName"] = "wait todo";// 鎶撴媿鐓х墖鍚嶇О
- t_json["content"] = "wait todo";// 鍐呭鎻忚堪
+ t_json["picName"] = "";// 鎶撴媿鐓х墖鍚嶇О
+ t_json["content"] = "";// 鍐呭鎻忚堪
t_json["personPicUrl"] = "";// 浜哄憳 鍦板簱鍥剧墖
t_json["ChannlId"] = getProperty("ch_id"); // 閫氶亾id
t_json["likeDate"] = AppUtil::getTimeSecString(); // 姣斿鏃堕棿
t_json["picAddress"] = m_sdkRule.strAddr.toStdString();// 鎶撴媿鍦板潃
DBG("picAddress="<<m_sdkRule.strAddr.toStdString());
- t_json["picMaxUrl"] = "wait todo"; // 澶у浘璺緞
+ t_json["picMaxUrl"] = ""; // 澶у浘璺緞
// t_json["Age"] ="wait todo";
t_json["picDate"] = time; // 鎶撴媿鏃堕棿锛屽繀椤绘湁
DBG("picDate="<<time);
- t_json["picLocalUrl"] = "wait todo"; // 鏈湴璺緞
+ t_json["picLocalUrl"] = ""; // 鏈湴璺緞
t_json["isDelete"] = "1";//榛樿1 ,0鏃犳晥 1鏈夋晥
- t_json["likePer"] = "0"; // 鐩镐技鍊�
+ t_json["likePer"] = 1.0; // 鐩镐技鍊�
- t_json["BaseName"] = "wait todo";// 鍦板簱鍚嶇О
+ t_json["BaseName"] = "";// 鍦板簱鍚嶇О
t_json["videoNum"] = m_sdkRule.strCamId.toStdString();//Video璁惧缂栧彿
t_json["picSmUrl"] = imgUrl; // 鎶撴媿鍥剧墖
t_json["indeviceid"] = appPref.getStringData("fxDevID");;// 璁惧id
- t_json["idcard"] = "wait todo";
- t_json["personId"] = "wait todo";
+ t_json["idcard"] = "";
+ t_json["personId"] = "";
t_json["indevicename"] = appPref.getStringData("fxDevNAME");// 璁惧鍚嶇О
t_json["FaceFeature"] = "base64";
t_json["personIsHub"] = m_triggerElement.getTriggerState() ? "1" : "4"; //1: 鎶ヨ 2: 鍙枒 3: 瀹夊叏 4: 鏈煡
@@ -416,7 +448,4 @@
// DBG("RECT x="<<rect.x<<"y"<<rect.y<<"w"<<rect.width<<"h"<<rect.height);
return rect;
}
-bool PerimeterElement::isAnd()
-{
-}
--
Gitblit v1.8.0