From 7c714aab1a4d2c9aee5005a516b5bd87a26c2cd5 Mon Sep 17 00:00:00 2001
From: chenshijun <csj_sky@126.com>
Date: 星期二, 19 二月 2019 16:59:32 +0800
Subject: [PATCH] 修改连续两帧均报警的情况
---
QiaoJiaSystem/DataManagerServer/http_configserver.cpp | 2 +-
QiaoJiaSystem/StructureApp/PerimeterElement.cpp | 8 ++++++--
QiaoJiaSystem/DataManagerServer/web-server接口.txt | 2 +-
3 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/QiaoJiaSystem/DataManagerServer/http_configserver.cpp b/QiaoJiaSystem/DataManagerServer/http_configserver.cpp
index c9f86a9..0673a47 100644
--- a/QiaoJiaSystem/DataManagerServer/http_configserver.cpp
+++ b/QiaoJiaSystem/DataManagerServer/http_configserver.cpp
@@ -951,7 +951,7 @@
void devHttpServer_c::killVideoAnalysFromHCApp() const {
string local_passwd = appConfig.getStringProperty("localPasswd");
- string cmd_kill = "echo \"" + local_passwd + "\" | sudo -S pkill -9 VideoAnalysFrom";
+ string cmd_kill = "echo \"" + local_passwd + "\" | sudo -S pkill -9 VideoAnalys";
system(cmd_kill.c_str());
DBG("system(\"sudo -S pkill -9 VideoAnalysFromHC\");");
}
diff --git "a/QiaoJiaSystem/DataManagerServer/web-server\346\216\245\345\217\243.txt" "b/QiaoJiaSystem/DataManagerServer/web-server\346\216\245\345\217\243.txt"
index 2fc9ad8..64c52f1 100644
--- "a/QiaoJiaSystem/DataManagerServer/web-server\346\216\245\345\217\243.txt"
+++ "b/QiaoJiaSystem/DataManagerServer/web-server\346\216\245\345\217\243.txt"
@@ -461,7 +461,7 @@
"error": "erlang is null"
}
-鏌ユ壘鍚屾搴曞簱 findLocalDatabase
+鏌ユ壘鏈湴搴曞簱 findLocalDatabase
涓嬪彂锛氭棤
杩斿洖锛�
[{
diff --git a/QiaoJiaSystem/StructureApp/PerimeterElement.cpp b/QiaoJiaSystem/StructureApp/PerimeterElement.cpp
index e411855..34e0ba7 100644
--- a/QiaoJiaSystem/StructureApp/PerimeterElement.cpp
+++ b/QiaoJiaSystem/StructureApp/PerimeterElement.cpp
@@ -169,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)
@@ -178,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)
@@ -196,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)
--
Gitblit v1.8.0