From c06ac5deb150c99b53d1ff460a88cf2543698788 Mon Sep 17 00:00:00 2001
From: chenshijun <csj_sky@126.com>
Date: 星期一, 15 四月 2019 15:26:51 +0800
Subject: [PATCH] vpt调试基本ok
---
QiaoJiaSystem/StructureApp/PerimeterElement.cpp | 179 ++++++++++++++++++++++++++++++-----------------------------
1 files changed, 92 insertions(+), 87 deletions(-)
diff --git a/QiaoJiaSystem/StructureApp/PerimeterElement.cpp b/QiaoJiaSystem/StructureApp/PerimeterElement.cpp
index c637c6d..5345549 100644
--- a/QiaoJiaSystem/StructureApp/PerimeterElement.cpp
+++ b/QiaoJiaSystem/StructureApp/PerimeterElement.cpp
@@ -14,19 +14,19 @@
#include <jsoncpp/json/json.h>
#define ALARM_PERCENT (25) //25%
+
PerimeterElement::PerimeterElement(const SdkRule &rule) :
m_sdkRule(rule),
PipeElement(true),
trackingTrigger(nullptr),
mRealNum(0),
//姣忕鍑犲紶,灏变箻浠ュ嚑
- m_triggerElement(rule.nTriggerDelay*3,0),
+ m_triggerElement(rule.nTriggerDelay * 3, 0),
pManagerEsDB(nullptr),
m_bIsMask(true),
m_bSetWH(false),
pointArray(nullptr),
- m_rpcClient("RtspAnalysServer", "127.0.0.1",appPref.getIntData("RpcVTIMPort"),"tcp")
-{
+ m_rpcClient("RtspAnalysServer", "127.0.0.1", appPref.getIntData("RpcVTIMPort"), "tcp") {
pManagerEsDB = new EsDBTool(appPref.getStringData("ipAdd"), appPref.getIntData("ipPort"));
}
@@ -36,8 +36,7 @@
delete pManagerEsDB;
pManagerEsDB = nullptr;
}
- if(pointArray)
- {
+ if (pointArray) {
// delete[] pointArray[0];
delete[] pointArray;
}
@@ -60,11 +59,17 @@
bool state = false;
m_recVec.clear();
+ //todo debug
+ m_scoreVec.clear();
+ m_objTypeVec.clear();
+
// DBG("Objs="<<mObjs.size()<<" fSensitivity="<<m_sdkRule.fSensitivity<<" nThreshold"<<m_sdkRule.nThreshold);
- for (auto obj:mObjs) {
+ for (auto &obj:mObjs) {
if (obj.score < m_sdkRule.fSensitivity)continue;
+ DBG("objArea:" << obj.rect.width * obj.rect.height);
+ DBG("alarmObjType:" << obj.properties["type"]);
QRect rect(obj.rect.x, obj.rect.y, obj.rect.width, obj.rect.height);
QPoint center = rect.center();
@@ -74,66 +79,64 @@
// DBG("picDate="<<picDate);
}
- if(imgKey.empty())
- {
- imgKey =obj.properties["imgKey"];
+ if (imgKey.empty()) {
+ imgKey = obj.properties["imgKey"];
}
- if (m_sdkRule.nSdkType == PerimeterSdk)
- {
-
- if(m_bIsMask)
+ if (m_sdkRule.nSdkType == PerimeterSdk) {
+ //todo 瑙ｆ瀽sdkrule 骞跺拰妫�娴嬬粨鏋滃姣�
+ if (m_sdkRule.strPerimeterObjType.toStdString().find(obj.properties["type"]) ==
+ m_sdkRule.strPerimeterObjType.toStdString().npos)//椤甸潰娌℃湁閰嶇疆浜嗚绠楁硶
{
- 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);
+ continue;
+ }
- if(ALARM_PERCENT <= per)
- {
- //DBG("per 1="<<per1<<" per2="<<per2<<" per="<<per);
- m_recVec.push_back(obj.rect);
- num++;
- }
+ 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);
+ m_scoreVec.push_back(obj.score);
+ m_objTypeVec.push_back(obj.properties["type"]);
+ num++;
+ DBG("============alarmObjType:" << obj.properties["type"] << " score:" << obj.score);
+ }
}
- }
- 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++;
}
-
-
-
}
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);
INFO("SDK Type: PerimeterSdk");
break;
case CrowdSdk:
- state = num > m_sdkRule.nAlarmNumLowerLimit && num !=mRealNum;
+ state = num > m_sdkRule.nAlarmNumLowerLimit && num != mRealNum;
INFO("SDK Type: CrowdSdk");
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;
INFO("SDK Type: PerHubSdk");
// if(m_sdkRule.nAlarmNumLowerLimit>=0)
@@ -166,24 +169,32 @@
default:
break;
}
- INFO("State:"<<state<<" Num:"<<num<<" mRealNum:"<<mRealNum<<" LowerLimit :"<<m_sdkRule.nAlarmNumLowerLimit<<" HightLimit: "<<m_sdkRule.nAlarmNumUpperLimit);
+ INFO("State:" << state << " Num:" << num << " mRealNum:" << mRealNum << " LowerLimit :"
+ << m_sdkRule.nAlarmNumLowerLimit << " HightLimit: " << m_sdkRule.nAlarmNumUpperLimit
+ << " m_triggerElement.getTriggerState() :" << m_triggerElement.getTriggerState());
m_triggerElement.setState(state);
m_triggerElement.triggerOnce();
- if (m_triggerElement.getTriggerState())
- {
- if(num > 0) {
- if(pointArray!=nullptr)
- {
- const cv::Point2i* ppt[1] = { pointArray };
+ DBG("m_triggerElement.getTriggerState():" << m_triggerElement.getTriggerState());
+ if (m_triggerElement.getTriggerState()) {
+ if (num > 0) {
+ if (pointArray != nullptr) {
+ const cv::Point2i *ppt[1] = {pointArray};
- int npt[]={npts};
+ int npt[] = {npts};
- cv::polylines(image, ppt,npt, 1, true,cv::Scalar(255,255,0), 2);
+ cv::polylines(image, ppt, npt, 1, true, cv::Scalar(255, 255, 0), 2);
}
- for(auto rect:m_recVec)
- {
- cv::rectangle(image, rect, cv::Scalar(0, 0, 255), 2);
+// for(auto rect:m_recVec)
+// {
+// cv::rectangle(image, rect, cv::Scalar(0, 0, 255), 2);
+// }
+ for (int i = 0; i < m_recVec.size(); i++) {
+ cv::rectangle(image, m_recVec[i], cv::Scalar(0, 0, 255), 2);
+ cv::putText(image, to_string(m_scoreVec[i]), cv::Point(m_recVec[i].x, m_recVec[i].y + 12),
+ cv::HersheyFonts::FONT_HERSHEY_PLAIN, 1.5, cv::Scalar(255, 255, 0));
+ cv::putText(image, m_objTypeVec[i], cv::Point(m_recVec[i].x, m_recVec[i].y + 24),
+ cv::HersheyFonts::FONT_HERSHEY_PLAIN, 1.5, cv::Scalar(255, 255, 0));
}
// cv::Mat t_image = image(CutMask()).clone();
// if(t_image.empty())
@@ -192,7 +203,7 @@
// return;
// }
std::string imgUrl = uploadImgToFdfs(image);
- saveInfoToEs(imgUrl, picDate,imgKey);
+ saveInfoToEs(imgUrl, picDate, imgKey);
}
DBG("num=" << num << " lastnum=" << mRealNum);
mRealNum = num;
@@ -262,31 +273,28 @@
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();
npts = size;
- 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];
+ 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() *sizeW;
- int y = obj.value("y").toDouble() *sizeH;
- pointArray[i]={x,y};
- if(m_sdkRule.nSdkType == PerimeterSdk)
- {
- poly1.push_back(Point(x,y));
+ 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));
+ } else {
+ mPolygon << (QPoint(x, y));
}
- else
- {
- mPolygon << (QPoint(x, y));
- }
- DBG("width="<<sizeW);
- DBG("height="<<sizeH);
+ DBG("width=" << sizeW);
+ DBG("height=" << sizeH);
}
@@ -307,10 +315,9 @@
// image = cv::Mat(value.rows, value.cols, CV_8UC3, sharedMemory->data());
// }
value.copyTo(image);
- if(!m_bSetWH)
- {
+ if (!m_bSetWH) {
setMask(m_sdkRule.strAreas.toStdString());
- m_bSetWH=true;
+ m_bSetWH = true;
}
}
@@ -327,7 +334,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);
@@ -336,7 +343,7 @@
return strImgUrl;
}
-bool PerimeterElement::saveInfoToEs(const std::string &imgUrl, const std::string &time,const std::string& imgKey) {
+bool PerimeterElement::saveInfoToEs(const std::string &imgUrl, const std::string &time, const std::string &imgKey) {
string str_uuid;
uuid_t t_uuid;
@@ -361,13 +368,13 @@
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());
+ DBG("picAddress=" << m_sdkRule.strAddr.toStdString());
t_json["picMaxUrl"] = ""; // 澶у浘璺緞
// t_json["Age"] ="wait todo";
t_json["picDate"] = time; // 鎶撴媿鏃堕棿锛屽繀椤绘湁
- DBG("picDate="<<time);
+ DBG("picDate=" << time);
t_json["picLocalUrl"] = ""; // 鏈湴璺緞
t_json["isDelete"] = "1";//榛樿1 ,0鏃犳晥 1鏈夋晥
@@ -389,20 +396,18 @@
t_json["imgKey"] = imgKey;
try {
auto server = m_rpcClient.getServer();
- if (!server)
- {
+ if (!server) {
ERR("server is null");
//return false;
}
- INFO("Record Video "<<imgKey);
+ INFO("Record Video " << imgKey);
server->recordVideo(imgKey);
}
- catch (std::exception &e)
- {
- ERR("Record Video Err: "<<imgKey <<" Message: "<<e.what());
+ catch (std::exception &e) {
+ ERR("Record Video Err: " << imgKey << " Message: " << e.what());
//return false;
}
- INFO("SaveImgKeyToES: "<<imgKey);
+ INFO("SaveImgKeyToES: " << imgKey);
bool retface = false;
if (pManagerEsDB)
retface = pManagerEsDB->insertData("personaction", "perVideoAction", t_json.toStyledString(), str_uuid);
--
Gitblit v1.8.0