From b10d8e00b83032d802adab3222def7e6d280d928 Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期一, 28 一月 2019 20:33:33 +0800
Subject: [PATCH] 添加布控等级。对比暂未添加本字段。
---
QiaoJiaSystem/StructureApp/PerimeterElement.cpp | 121 +++++++++++++++++++++++++++++++---------
1 files changed, 94 insertions(+), 27 deletions(-)
diff --git a/QiaoJiaSystem/StructureApp/PerimeterElement.cpp b/QiaoJiaSystem/StructureApp/PerimeterElement.cpp
index 27d4716..ca48b0f 100644
--- a/QiaoJiaSystem/StructureApp/PerimeterElement.cpp
+++ b/QiaoJiaSystem/StructureApp/PerimeterElement.cpp
@@ -13,14 +13,16 @@
#include <uuid/uuid.h>
#include <jsoncpp/json/json.h>
+#define ALARM_PERCENT (10) //10%
+
PerimeterElement::PerimeterElement(const SdkRule &rule) :
m_sdkRule(rule),
PipeElement(true),
trackingTrigger(nullptr),
mRealNum(0),
- m_triggerElement(0, rule.nTriggerDelay * 1000 * 1000),
+ m_triggerElement(rule.nTriggerDelay * 8, 0),
pManagerEsDB(nullptr),
- npts(0) {
+ m_bIsMask(true) {
pManagerEsDB = new EsDBTool(appPref.getStringData("ipAdd"), appPref.getIntData("ipPort"));
}
@@ -40,6 +42,7 @@
void PerimeterElement::threadFunc() {
+ //ClockTimer ct("PerimeterElement::threadFunc");
if (!isInWeek(m_sdkRule.weekRuleVec))
return;
int num = 0;
@@ -55,17 +58,42 @@
QRect rect(obj.rect.x, obj.rect.y, obj.rect.width, obj.rect.height);
QPoint center = rect.center();
- if (mPolygon.containsPoint(center, Qt::OddEvenFill)) {
- m_recVec.push_back(obj.rect);
- if (picDate.empty()) {
- picDate = obj.properties["time"];
- // DBG("picDate="<<picDate);
+ if (picDate.empty()) {
+ picDate = obj.properties["time"];
+ // DBG("picDate="<<picDate);
+
+ }
+ if (m_sdkRule.nSdkType == PerimeterSdk) {
+
+ if (m_bIsMask) {
+ std::vector<Point> poly2;
+ std::vector<Point> interPoly;
+ poly2.push_back(Point(rect.x(), rect.y()));
+ poly2.push_back(Point(rect.x() + rect.width(), rect.y()));
+ poly2.push_back(Point(rect.x() + rect.width(), rect.y() + rect.height()));
+ poly2.push_back(Point(rect.x(), rect.y() + rect.height()));
+ IntAreaCalcUtil::PolygonClip(poly1, poly2, interPoly);
+ float inter = IntAreaCalcUtil::intAreaCalc(interPoly);
+ float total1 = IntAreaCalcUtil::intAreaCalc(poly1);
+ float total2 = IntAreaCalcUtil::intAreaCalc(poly2);
+ int per1 = (int) (inter / total1 * 100);
+ int per2 = (int) (inter / total2 * 100);
+ int per = std::max(per1, per2);
+
+ if (ALARM_PERCENT <= per) {
+ //DBG("per 1="<<per1<<" per2="<<per2<<" per="<<per);
+ m_recVec.push_back(obj.rect);
+ num++;
+ }
}
+
+ } else if (mPolygon.containsPoint(center, Qt::OddEvenFill) || !m_bIsMask) {
+ m_recVec.push_back(obj.rect);
+
+
num++;
-
-
}
@@ -73,7 +101,9 @@
switch (m_sdkRule.nSdkType) {
case PerimeterSdk:
- state = num > 0 && num != mRealNum;
+ //state = num > 0 ;
+ state = (num != mRealNum);
+ // DBG("num="<<num<< "time="<< picDate);
break;
@@ -83,9 +113,11 @@
break;
case PerHubSdk:
state = num > m_sdkRule.nAlarmNumLowerLimit && num < m_sdkRule.nAlarmNumUpperLimit && num != mRealNum;
-// if(m_sdkRule.nAlarmNumLowerLimit>0)
+
+
+// if(m_sdkRule.nAlarmNumLowerLimit>=0)
// {
-// if( m_sdkRule.nAlarmNumUpperLimit>m_sdkRule.nAlarmNumLowerLimit+1)
+// if( m_sdkRule.nAlarmNumUp2019-01-16 09:49:57perLimit>m_sdkRule.nAlarmNumLowerLimit+1)
// {
// m_triggerElement.setState(num>m_sdkRule.nAlarmNumLowerLimit && num<m_sdkRule.nAlarmNumUpperLimit);
@@ -113,21 +145,46 @@
default:
break;
}
+
m_triggerElement.setState(state);
-
- // DBG("imgUrl="<<imgUrl);
- if (state) {
- auto t_image = image(CutMask()).clone();
- std::string imgUrl = uploadImgToFdfs(t_image);
- saveInfoToEs(imgUrl, picDate);
+ m_triggerElement.triggerOnce();
+ if (m_triggerElement.getTriggerState()) {
+ if (num > 0) {
+ cv::Mat t_image = image(CutMask()).clone();
+ if (t_image.empty()) {
+ DBG("t_image empty");
+ return;
+ }
+ std::string imgUrl = uploadImgToFdfs(t_image);
+ saveInfoToEs(imgUrl, picDate);
+ }
DBG("num=" << num << " lastnum=" << mRealNum);
-
+ mRealNum = num;
}
+// if (m_triggerElement.getTriggerState() && num!=mRealNum)
+// {
- m_triggerElement.triggerOnce();
+// cv::Mat t_image = image(CutMask()).clone();
+// if(t_image.empty())
+// {
+// DBG("t_image empty");
+// return;
+// }
+// std::string imgUrl = uploadImgToFdfs(t_image);
+// saveInfoToEs(imgUrl, picDate);
+// DBG("num=" << num << " lastnum=" << mRealNum);
+// mRealNum = num;
+// }
- mRealNum = num;
+
+
+// if(!state)
+// {
+// mRealNum = num;
+// }
+
+
// DBG("m_sdkRule.nSdkType="<<m_sdkRule.nSdkType<<" num="<<num);
fireConnectors();
}
@@ -164,7 +221,8 @@
void PerimeterElement::setMask(std::string mask) {
QJsonArray arrayAreas = getJsonArrayFromQString(QString::fromStdString(mask));
- if (arrayAreas.isEmpty()) {
+ if (arrayAreas.isEmpty() && m_sdkRule.nSdkType != PerimeterSdk) {
+ m_bIsMask = false;
return;//do not detect
}
int size = arrayAreas.size();
@@ -175,8 +233,12 @@
QJsonObject obj = jsonValue.toObject();
int x = obj.value("x").toDouble() * 4;
int y = obj.value("y").toDouble() * 4;
+ if (m_sdkRule.nSdkType == PerimeterSdk) {
+ poly1.push_back(Point(x, y));
+ } else {
+ mPolygon << (QPoint(x, y));
+ }
- mPolygon << (QPoint(x, y));
}
}
@@ -210,7 +272,7 @@
CvUtil::cvMat2Buffer(image, buffer);
std::string strImgUrlTmp = "";
fdfsClient->fastFds->uploadFile(buffer, strImgUrlTmp, "jpg");
- strImgUrl.append(fdfsClient->fastFds->getIp() + "/" + strImgUrlTmp);
+ // strImgUrl.append(fdfsClient->fastFds->getIp() + "/" + strImgUrlTmp);
strImgUrl.clear();
strImgUrl = strImgUrlTmp;
// strImgUrl.append("/").append(strImgUrlTmp);
@@ -243,13 +305,14 @@
t_json["personPicUrl"] = "";// 浜哄憳 鍦板簱鍥剧墖
t_json["ChannlId"] = getProperty("ch_id"); // 閫氶亾id
t_json["likeDate"] = AppUtil::getTimeSecString(); // 姣斿鏃堕棿
- t_json["picAddress"] = getProperty("str_addr");// 鎶撴媿鍦板潃
+ t_json["picAddress"] = m_sdkRule.strAddr.toStdString();// 鎶撴媿鍦板潃
+ DBG("picAddress=" << m_sdkRule.strAddr.toStdString());
t_json["picMaxUrl"] = "wait todo"; // 澶у浘璺緞
// t_json["Age"] ="wait todo";
t_json["picDate"] = time; // 鎶撴媿鏃堕棿锛屽繀椤绘湁
- // DBG("picDate="<<time);
+ DBG("picDate=" << time);
t_json["picLocalUrl"] = "wait todo"; // 鏈湴璺緞
t_json["isDelete"] = "1";//榛樿1 ,0鏃犳晥 1鏈夋晥
@@ -267,7 +330,7 @@
t_json["personIsHub"] = m_triggerElement.getTriggerState() ? "1" : "4"; //1: 鎶ヨ 2: 鍙枒 3: 瀹夊叏 4: 鏈煡
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"] = "wait todo"; // ji qun id
+ t_json["cluster_id"] = appPref.getStringData("clusterID");; // ji qun id
bool retface = false;
if (pManagerEsDB)
@@ -341,3 +404,7 @@
// DBG("RECT x="<<rect.x<<"y"<<rect.y<<"w"<<rect.width<<"h"<<rect.height);
return rect;
}
+
+bool PerimeterElement::isAnd() {
+
+}
--
Gitblit v1.8.0