From edb7c9ae9cd72601bcb58d3e1a3d9bf9250f0100 Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期二, 29 一月 2019 09:44:54 +0800
Subject: [PATCH] 添加布控等级。对比暂未添加本字段。
---
QiaoJiaSystem/StructureApp/PerimeterElement.cpp | 63 ++++++++++++++-----------------
1 files changed, 29 insertions(+), 34 deletions(-)
diff --git a/QiaoJiaSystem/StructureApp/PerimeterElement.cpp b/QiaoJiaSystem/StructureApp/PerimeterElement.cpp
index bdb066f..432adf7 100644
--- a/QiaoJiaSystem/StructureApp/PerimeterElement.cpp
+++ b/QiaoJiaSystem/StructureApp/PerimeterElement.cpp
@@ -14,12 +14,13 @@
#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(rule.nTriggerDelay*8,0),
+ m_triggerElement(rule.nTriggerDelay * 8, 0),
pManagerEsDB(nullptr),
m_bIsMask(true),
m_bSetWH(false),
@@ -71,43 +72,37 @@
// DBG("picDate="<<picDate);
}
- if (m_sdkRule.nSdkType == PerimeterSdk)
- {
+ 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 (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++;
- }
+ 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)
- {
+ } else if (mPolygon.containsPoint(center, Qt::OddEvenFill) || !m_bIsMask) {
m_recVec.push_back(obj.rect);
num++;
}
-
}
@@ -116,17 +111,17 @@
switch (m_sdkRule.nSdkType) {
case PerimeterSdk:
//state = num > 0 ;
- state =( num !=mRealNum);
- // DBG("num="<<num<< "time="<< picDate);
+ state = (num != mRealNum);
+ // DBG("num="<<num<< "time="<< picDate);
break;
case CrowdSdk:
- state = num > m_sdkRule.nAlarmNumLowerLimit && num !=mRealNum;
+ state = num > m_sdkRule.nAlarmNumLowerLimit && num != mRealNum;
break;
case PerHubSdk:
- state = num > m_sdkRule.nAlarmNumLowerLimit && num < m_sdkRule.nAlarmNumUpperLimit && num !=mRealNum;
+ state = num > m_sdkRule.nAlarmNumLowerLimit && num < m_sdkRule.nAlarmNumUpperLimit && num != mRealNum;
// if(m_sdkRule.nAlarmNumLowerLimit>=0)
@@ -251,7 +246,7 @@
void PerimeterElement::setMask(std::string mask) {
QJsonArray arrayAreas = getJsonArrayFromQString(QString::fromStdString(mask));
if (arrayAreas.isEmpty() && m_sdkRule.nSdkType != PerimeterSdk) {
- m_bIsMask=false;
+ m_bIsMask = false;
return;//do not detect
}
int size = arrayAreas.size();
@@ -316,7 +311,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);
--
Gitblit v1.8.0