From 5bf0020b189b2bc8c64737c2af4ea77c3e8f5612 Mon Sep 17 00:00:00 2001
From: xuxiuxi <554325746@qq.com>
Date: 星期五, 08 三月 2019 22:24:27 +0800
Subject: [PATCH] Merge branch 'yw.1.2.fixbug' of http://192.168.1.226:10010/r/development/c++ into yw.1.2.fixbug
---
QiaoJiaSystem/StructureApp/PerimeterElement.h | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/QiaoJiaSystem/StructureApp/PerimeterElement.h b/QiaoJiaSystem/StructureApp/PerimeterElement.h
index d259bb8..7f90643 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,8 +17,8 @@
class PerimeterElement : public basic::PipeElement
{
public:
- PerimeterElement(){}
- PerimeterElement(const SdkRule& rule,SaveVideoRpcClient_t& rpcClient);
+ PerimeterElement():m_rpcClient("RtspAnalysServer", "127.0.0.1",appPref.getIntData("RpcServerPort"),"tcp"){}
+ PerimeterElement(const SdkRule& rule);
public:
~PerimeterElement();
@@ -53,7 +54,7 @@
void setImage(const cv::Mat &value) const;
private:
- PerimeterElement(const SdkRule& rule);
+ //PerimeterElement(const SdkRule& rule);
virtual void threadInitial()override;
@@ -90,7 +91,7 @@
std::vector<Point> poly1;
bool m_bSetWH;
cv::Point2i* pointArray;
- SaveVideoRpcClient_t& m_rpcClient;
+ SaveVideoRpcClient_t m_rpcClient;
};
--
Gitblit v1.8.0