From b5ac5f7d1e0f79d332dcddc3dabd8709b1e2a2ea Mon Sep 17 00:00:00 2001
From: chenshijun <csj_sky@126.com>
Date: 星期三, 10 四月 2019 19:42:29 +0800
Subject: [PATCH] 解决nsg消费者的topic名称带有./的bug 注释一些错误打印
---
QiaoJiaSystem/StructureApp/JudgmentRetrogradeTool.h | 21 +++++++++++++++++----
1 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/QiaoJiaSystem/StructureApp/JudgmentRetrogradeTool.h b/QiaoJiaSystem/StructureApp/JudgmentRetrogradeTool.h
index e3cd93f..08de8ba 100644
--- a/QiaoJiaSystem/StructureApp/JudgmentRetrogradeTool.h
+++ b/QiaoJiaSystem/StructureApp/JudgmentRetrogradeTool.h
@@ -1,14 +1,16 @@
-//
+锘�//
// Created by basic on 18-8-24.
//
#ifndef JUDGINGRETROGRADE_JUDGMENTRETROGRADETOOL_H
#define JUDGINGRETROGRADE_JUDGMENTRETROGRADETOOL_H
+#include "SaveVideoRpc.h"
#include <iostream>
#include <map>
#include <list>
#include <opencv2/opencv.hpp>
+#include <basic/util/app/AppPreference.hpp>
//#include <basic/pipe/TimerElement.h>
#include "YoloRpcElement.h"
#include <QSharedMemory>
@@ -22,8 +24,8 @@
#include <jsoncpp/json/json.h>
#include <basic/pipe/PipeElement.h>
struct VectorPoint {
- cv::Point2f start_Point;
- cv::Point2f end_Point;
+ cv::Point2i start_Point;
+ cv::Point2i end_Point;
};
typedef VectorPoint BaseLine;
@@ -53,9 +55,10 @@
class JudgmentRetrogradeTool : public basic::PipeElement{
public:
- JudgmentRetrogradeTool() {}
+ JudgmentRetrogradeTool():m_rpcClient("RtspAnalysServer", "127.0.0.1",appPref.getIntData("RpcVTIMPort"),"tcp") {}
JudgmentRetrogradeTool(const SdkRule &rule);
+ //JudgmentRetrogradeTool(const SdkRule &rule,SaveVideoRpcClient_t& rpcClient);
virtual ~JudgmentRetrogradeTool();
@@ -74,6 +77,9 @@
void setImage(const cv::Mat &value);
private:
+
+ bool setMask(QString area, QString line);
+
void setPerPoint(const long &, cv::Point2f);
void setPerRect(const long &, cv::Rect rect);
@@ -138,6 +144,13 @@
cv::Mat image;
EsDBTool *pManagerEsDB;
+ cv::Point2i* pointArray;
+
+ int npts;
+ QString m_area;
+ QString m_line;
+ bool m_bSetWH;
+ SaveVideoRpcClient_t m_rpcClient;
};
--
Gitblit v1.8.0