From 2cf69b4bbe56fc379c7f433037e043d0dba42493 Mon Sep 17 00:00:00 2001
From: miyanhui <dennismi1024@gmail.com>
Date: 星期五, 15 二月 2019 15:58:59 +0800
Subject: [PATCH] Merge branch 'ywv1.2' of http://192.168.1.226:10010/r/development/c++ into ywv1.2
---
QiaoJiaSystem/StructureApp/JudgmentRetrogradeTool.h | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/QiaoJiaSystem/StructureApp/JudgmentRetrogradeTool.h b/QiaoJiaSystem/StructureApp/JudgmentRetrogradeTool.h
index 6ab8995..3d6cd76 100644
--- a/QiaoJiaSystem/StructureApp/JudgmentRetrogradeTool.h
+++ b/QiaoJiaSystem/StructureApp/JudgmentRetrogradeTool.h
@@ -5,6 +5,7 @@
#ifndef JUDGINGRETROGRADE_JUDGMENTRETROGRADETOOL_H
#define JUDGINGRETROGRADE_JUDGMENTRETROGRADETOOL_H
+#include "SaveVideoRpc.h"
#include <iostream>
#include <map>
#include <list>
@@ -53,9 +54,10 @@
class JudgmentRetrogradeTool : public basic::PipeElement{
public:
- JudgmentRetrogradeTool() {}
+ JudgmentRetrogradeTool():m_rpcClient("RtspAnalysServer", "127.0.0.1",10009,"tcp") {}
JudgmentRetrogradeTool(const SdkRule &rule);
+ //JudgmentRetrogradeTool(const SdkRule &rule,SaveVideoRpcClient_t& rpcClient);
virtual ~JudgmentRetrogradeTool();
@@ -74,6 +76,7 @@
void setImage(const cv::Mat &value);
private:
+
bool setMask(QString area, QString line);
void setPerPoint(const long &, cv::Point2f);
@@ -146,6 +149,7 @@
QString m_area;
QString m_line;
bool m_bSetWH;
+ SaveVideoRpcClient_t m_rpcClient;
};
--
Gitblit v1.8.0