From f676f7af18163b4532b6b982bbe1dc57b32e96dd Mon Sep 17 00:00:00 2001
From: zhangjixing <775834166@qq.com>
Date: 星期四, 24 一月 2019 15:38:22 +0800
Subject: [PATCH]
---
QiaoJiaSystem/StructureApp/JudgmentRetrogradeTool.h | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/QiaoJiaSystem/StructureApp/JudgmentRetrogradeTool.h b/QiaoJiaSystem/StructureApp/JudgmentRetrogradeTool.h
index 956c7ad..d69df24 100644
--- a/QiaoJiaSystem/StructureApp/JudgmentRetrogradeTool.h
+++ b/QiaoJiaSystem/StructureApp/JudgmentRetrogradeTool.h
@@ -9,7 +9,7 @@
#include <map>
#include <list>
#include <opencv2/opencv.hpp>
-#include <basic/pipe/TimerElement.h>
+//#include <basic/pipe/TimerElement.h>
#include "YoloRpcElement.h"
#include <QSharedMemory>
#include <QString>
@@ -20,10 +20,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,9 +51,9 @@
}
-class JudgmentRetrogradeTool : public TimerElement {
+class JudgmentRetrogradeTool : public basic::PipeElement{
public:
- JudgmentRetrogradeTool() : TimerElement(1000) {}
+ JudgmentRetrogradeTool() {}
JudgmentRetrogradeTool(const SdkRule &rule);
@@ -105,7 +105,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 +123,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 +138,9 @@
cv::Mat image;
EsDBTool *pManagerEsDB;
+ cv::Point2i* pointArray;
+
+ int npts;
};
--
Gitblit v1.8.0