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/JudgmentRetrogradeTool.h | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/QiaoJiaSystem/StructureApp/JudgmentRetrogradeTool.h b/QiaoJiaSystem/StructureApp/JudgmentRetrogradeTool.h
index 63c7f68..e48fda6 100644
--- a/QiaoJiaSystem/StructureApp/JudgmentRetrogradeTool.h
+++ b/QiaoJiaSystem/StructureApp/JudgmentRetrogradeTool.h
@@ -10,6 +10,7 @@
#include <map>
#include <list>
#include <opencv2/opencv.hpp>
+#include <basic/util/app/AppPreference.hpp>
//#include <basic/pipe/TimerElement.h>
#include "YoloRpcElement.h"
#include <QSharedMemory>
@@ -54,10 +55,10 @@
class JudgmentRetrogradeTool : public basic::PipeElement{
public:
- JudgmentRetrogradeTool() {}
+ JudgmentRetrogradeTool():m_rpcClient("RtspAnalysServer", "127.0.0.1",appPref.getIntData("RpcServerPort"),"tcp") {}
-
- JudgmentRetrogradeTool(const SdkRule &rule,SaveVideoRpcClient_t& rpcClient);
+ JudgmentRetrogradeTool(const SdkRule &rule);
+ //JudgmentRetrogradeTool(const SdkRule &rule,SaveVideoRpcClient_t& rpcClient);
virtual ~JudgmentRetrogradeTool();
@@ -76,7 +77,7 @@
void setImage(const cv::Mat &value);
private:
- JudgmentRetrogradeTool(const SdkRule &rule);
+
bool setMask(QString area, QString line);
void setPerPoint(const long &, cv::Point2f);
@@ -149,7 +150,7 @@
QString m_area;
QString m_line;
bool m_bSetWH;
- SaveVideoRpcClient_t& m_rpcClient;
+ SaveVideoRpcClient_t m_rpcClient;
};
--
Gitblit v1.8.0