From ad8ee0872802ba5d0194458bf215a6cc89f4d0d0 Mon Sep 17 00:00:00 2001
From: chenshijun <csj_sky@126.com>
Date: 星期一, 15 四月 2019 15:30:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.3nsq' into 1.3nsq
---
QiaoJiaSystem/StructureApp/PerimeterElement.h | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/QiaoJiaSystem/StructureApp/PerimeterElement.h b/QiaoJiaSystem/StructureApp/PerimeterElement.h
index d0056b9..cdc80d7 100644
--- a/QiaoJiaSystem/StructureApp/PerimeterElement.h
+++ b/QiaoJiaSystem/StructureApp/PerimeterElement.h
@@ -8,14 +8,16 @@
#include "TrackingTrigger.h"
#include <QJsonArray>
#include <RapidStructureApp/TriggerElement.h>
+#include <basic/util/app/AppPreference.hpp>
#include <basic/util/fastdfs/FastFds.hpp>
#include "DBStruct.h"
#include <basic/db/Elasticsearch/EsDBTool.h>
#include "IntAreaCalcUtil.h"
+#include "SaveVideoRpc.h"
class PerimeterElement : public basic::PipeElement
{
public:
- PerimeterElement(){}
+ PerimeterElement():m_rpcClient("RtspAnalysServer", "127.0.0.1",appPref.getIntData("RpcVTIMPort"),"tcp"){}
PerimeterElement(const SdkRule& rule);
public:
~PerimeterElement();
@@ -52,7 +54,7 @@
void setImage(const cv::Mat &value) const;
private:
-
+ //PerimeterElement(const SdkRule& rule);
virtual void threadInitial()override;
@@ -83,12 +85,18 @@
int npts;
- std::vector<cv::Rect> m_recVec;
+ std::vector<cv::Rect> m_recVec;
+
+ //todo debug
+ std::vector<float> m_scoreVec;
+ std::vector<std::string> m_objTypeVec;
+
bool m_bIsMask;
std::vector<Point> poly1;
bool m_bSetWH;
cv::Point2i* pointArray;
+ SaveVideoRpcClient_t m_rpcClient;
};
--
Gitblit v1.8.0