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.cpp | 46 ++++++++++++++++++++++++++--------------------
1 files changed, 26 insertions(+), 20 deletions(-)
diff --git a/QiaoJiaSystem/StructureApp/PerimeterElement.cpp b/QiaoJiaSystem/StructureApp/PerimeterElement.cpp
index c081c6b..0523472 100644
--- a/QiaoJiaSystem/StructureApp/PerimeterElement.cpp
+++ b/QiaoJiaSystem/StructureApp/PerimeterElement.cpp
@@ -22,6 +22,7 @@
m_triggerElement(rule.nTriggerDelay*8,0),
pManagerEsDB(nullptr),
m_bIsMask(true),
+ m_bSetWH(false),
pointArray(nullptr)
{
@@ -42,7 +43,7 @@
void PerimeterElement::threadInitial() {
- setMask(m_sdkRule.strAreas.toStdString());
+// setMask(m_sdkRule.strAreas.toStdString());
}
@@ -53,10 +54,11 @@
return;
int num = 0;
std::string picDate;
+ std::string imgKey;
bool state = false;
m_recVec.clear();
- // DBG("Objs="<<mObjs.size()<<" fSensitivity="<<m_sdkRule.fSensitivity<<" nThreshold"<<m_sdkRule.nThreshold);
+// DBG("Objs="<<mObjs.size()<<" fSensitivity="<<m_sdkRule.fSensitivity<<" nThreshold"<<m_sdkRule.nThreshold);
for (auto obj:mObjs) {
@@ -69,6 +71,10 @@
picDate = obj.properties["time"];
// DBG("picDate="<<picDate);
+ }
+ if(imgKey.empty())
+ {
+ imgKey =obj.properties["imgKey"];
}
if (m_sdkRule.nSdkType == PerimeterSdk)
{
@@ -110,6 +116,7 @@
}
+
switch (m_sdkRule.nSdkType) {
case PerimeterSdk:
@@ -163,9 +170,6 @@
if (m_triggerElement.getTriggerState() )
{
if(num > 0) {
-
-
-
if(pointArray!=nullptr)
{
const cv::Point2i* ppt[1] = { pointArray };
@@ -186,7 +190,7 @@
// return;
// }
std::string imgUrl = uploadImgToFdfs(image);
- saveInfoToEs(imgUrl, picDate);
+ saveInfoToEs(imgUrl, picDate,imgKey);
}
DBG("num=" << num << " lastnum=" << mRealNum);
mRealNum = num;
@@ -257,22 +261,16 @@
}
int size = arrayAreas.size();
npts = size;
-// pointArray=new cv::Point2i*[1];
-// pointArray[0]=new cv::Point2i[size];
-
- pointArray=new cv::Point2i[npts];
-
-
+ float sizeW=(float)appPref.getIntData(m_sdkRule.strCamId.toStdString()+"width")/480;
+ float sizeH=(float)appPref.getIntData(m_sdkRule.strCamId.toStdString()+"height")/270;
+ 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;
-
+ int x = obj.value("x").toDouble() *sizeW;
+ int y = obj.value("y").toDouble() *sizeH;
pointArray[i]={x,y};
-
-
if(m_sdkRule.nSdkType == PerimeterSdk)
{
poly1.push_back(Point(x,y));
@@ -281,7 +279,8 @@
{
mPolygon << (QPoint(x, y));
}
-
+ DBG("width="<<sizeW);
+ DBG("height="<<sizeH);
}
@@ -302,6 +301,12 @@
// image = cv::Mat(value.rows, value.cols, CV_8UC3, sharedMemory->data());
// }
value.copyTo(image);
+ if(!m_bSetWH)
+ {
+ setMask(m_sdkRule.strAreas.toStdString());
+ m_bSetWH=true;
+ }
+
}
bool PerimeterElement::getTriggerState() const {
@@ -325,7 +330,7 @@
return strImgUrl;
}
-bool PerimeterElement::saveInfoToEs(const std::string &imgUrl, const std::string &time) {
+bool PerimeterElement::saveInfoToEs(const std::string &imgUrl, const std::string &time,const std::string& imgKey) {
string str_uuid;
uuid_t t_uuid;
@@ -375,7 +380,8 @@
t_json["videoIp"] = m_sdkRule.strAddr.toStdString(); // 璁惧ip
t_json["ack_alarm"] = m_triggerElement.getTriggerState() ? "0" : ""; // que ren shi fou bao jing
t_json["cluster_id"] = appPref.getStringData("clusterID");; // ji qun id
-
+ t_json["imgKey"] = imgKey;
+ INFO("SaveImgKeyToES: "<<imgKey);
bool retface = false;
if (pManagerEsDB)
retface = pManagerEsDB->insertData("personaction", "perVideoAction", t_json.toStyledString(), str_uuid);
--
Gitblit v1.8.0