From ed223aee5fe5f3b222488549597976f34c679c3d Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期二, 05 三月 2019 14:00:47 +0800
Subject: [PATCH] 代码格式化及部分bug修改
---
QiaoJiaSystem/StructureApp/PerimeterElement.cpp | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/QiaoJiaSystem/StructureApp/PerimeterElement.cpp b/QiaoJiaSystem/StructureApp/PerimeterElement.cpp
index 49e86a4..19f3a92 100644
--- a/QiaoJiaSystem/StructureApp/PerimeterElement.cpp
+++ b/QiaoJiaSystem/StructureApp/PerimeterElement.cpp
@@ -24,15 +24,13 @@
pManagerEsDB(nullptr),
m_bIsMask(true),
m_bSetWH(false),
- pointArray(nullptr)
+ pointArray(nullptr),
+ m_rpcClient("RtspAnalysServer", "127.0.0.1",appPref.getIntData("RpcServerPort"),"tcp")
{
pManagerEsDB = new EsDBTool(appPref.getStringData("ipAdd"), appPref.getIntData("ipPort"));
}
-PerimeterElement::PerimeterElement(const SdkRule &rule,SaveVideoRpcClient_t &rpcClient):PerimeterElement(rule){
- m_rpcClient=rpcClient;
-}
PerimeterElement::~PerimeterElement() {
if (pManagerEsDB) {
delete pManagerEsDB;
@@ -171,7 +169,7 @@
INFO("State:"<<state<<" Num:"<<num<<" mRealNum:"<<mRealNum<<" LowerLimit :"<<m_sdkRule.nAlarmNumLowerLimit<<" HightLimit: "<<m_sdkRule.nAlarmNumUpperLimit);
m_triggerElement.setState(state);
m_triggerElement.triggerOnce();
- if (m_triggerElement.getTriggerState() )
+ if (m_triggerElement.getTriggerState())
{
if(num > 0) {
if(pointArray!=nullptr)
@@ -180,7 +178,7 @@
int npt[]={npts};
- cv::polylines(image, ppt,npt, 1, true,cv::Scalar(255,255,0));
+ cv::polylines(image, ppt,npt, 1, true,cv::Scalar(255,255,0), 2);
}
for(auto rect:m_recVec)
@@ -198,6 +196,10 @@
}
DBG("num=" << num << " lastnum=" << mRealNum);
mRealNum = num;
+
+ //todo 閲嶇疆鎶ヨtrigger
+ m_triggerElement.setState(false);
+ m_triggerElement.triggerOnce();
}
// if (m_triggerElement.getTriggerState() && num!=mRealNum)
@@ -390,7 +392,7 @@
if (!server)
{
ERR("server is null");
- return false;
+ //return false;
}
INFO("Record Video "<<imgKey);
server->recordVideo(imgKey);
@@ -398,7 +400,7 @@
catch (std::exception &e)
{
ERR("Record Video Err: "<<imgKey <<" Message: "<<e.what());
- return false;
+ //return false;
}
INFO("SaveImgKeyToES: "<<imgKey);
bool retface = false;
--
Gitblit v1.8.0