From 4d1c2ee860222138fc7932225ea6d91e7483646a Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期一, 22 四月 2019 11:18:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.3nsq' into 1.3nsq
---
QiaoJiaSystem/StructureApp/PerimeterElement.h | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/QiaoJiaSystem/StructureApp/PerimeterElement.h b/QiaoJiaSystem/StructureApp/PerimeterElement.h
index b9d28a2..cdc80d7 100644
--- a/QiaoJiaSystem/StructureApp/PerimeterElement.h
+++ b/QiaoJiaSystem/StructureApp/PerimeterElement.h
@@ -8,6 +8,7 @@
#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>
@@ -16,7 +17,7 @@
class PerimeterElement : public basic::PipeElement
{
public:
- PerimeterElement():m_rpcClient("RtspAnalysServer", "127.0.0.1",10009,"tcp"){}
+ PerimeterElement():m_rpcClient("RtspAnalysServer", "127.0.0.1",appPref.getIntData("RpcVTIMPort"),"tcp"){}
PerimeterElement(const SdkRule& rule);
public:
~PerimeterElement();
@@ -84,7 +85,12 @@
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;
--
Gitblit v1.8.0