From 87baff1f74bc17dc7a664b3176288a235bd024f6 Mon Sep 17 00:00:00 2001
From: miyanhui <dennismi1024@gmail.com>
Date: 星期二, 19 二月 2019 17:02:59 +0800
Subject: [PATCH] 录像失败不直接返回
---
QiaoJiaSystem/StructureApp/JudgmentRetrogradeTool.h | 24 +++++++++++++++++++-----
1 files changed, 19 insertions(+), 5 deletions(-)
diff --git a/QiaoJiaSystem/StructureApp/JudgmentRetrogradeTool.h b/QiaoJiaSystem/StructureApp/JudgmentRetrogradeTool.h
index 9988245..e48fda6 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("RpcServerPort"),"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);
@@ -123,7 +129,8 @@
std::map<long, std::list<float>> m_mapPerDirection;
//璺熻釜id,閫嗚鐘舵��
- std::map<long, bool> m_mapPerRet;
+ // std::map<long, bool> m_mapPerRet;
+ std::map<long, int> m_mapPerRet;
QPolygon m_polygon;
@@ -137,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