From 7e58157f116d5dde56ac21f1be8cb67457b8b625 Mon Sep 17 00:00:00 2001
From: chenshijun <csj_sky@126.com>
Date: 星期四, 07 三月 2019 14:49:42 +0800
Subject: [PATCH] Merge branch 'yw.1.2.fixbug' of ssh://192.168.1.226:29418/development/c++ into yw.1.2.fixbug
---
QiaoJiaSystem/StructureApp/JudgmentRetrogradeTool.h | 33 ++++++++++++++++++++++++---------
1 files changed, 24 insertions(+), 9 deletions(-)
diff --git a/QiaoJiaSystem/StructureApp/JudgmentRetrogradeTool.h b/QiaoJiaSystem/StructureApp/JudgmentRetrogradeTool.h
index 956c7ad..e48fda6 100644
--- a/QiaoJiaSystem/StructureApp/JudgmentRetrogradeTool.h
+++ b/QiaoJiaSystem/StructureApp/JudgmentRetrogradeTool.h
@@ -1,15 +1,17 @@
-//
+锘�//
// 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/pipe/TimerElement.h>
+#include <basic/util/app/AppPreference.hpp>
+//#include <basic/pipe/TimerElement.h>
#include "YoloRpcElement.h"
#include <QSharedMemory>
#include <QString>
@@ -20,10 +22,10 @@
#include "DBStruct.h"
#include <basic/db/Elasticsearch/EsDBTool.h>
#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;
@@ -51,11 +53,12 @@
}
-class JudgmentRetrogradeTool : public TimerElement {
+class JudgmentRetrogradeTool : public basic::PipeElement{
public:
- JudgmentRetrogradeTool() : TimerElement(1000) {}
+ 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);
@@ -105,7 +111,8 @@
private:
// virtual void threadInitial() override;
- virtual void timerFunc() override;
+ virtual void threadFunc()override;
+ // virtual void timerFunc() override;
// virtual void threadClosing()override;
private:
@@ -122,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;
@@ -136,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