From 114e9783e9b7ad0e12fe24415fe34d75ee4b4af7 Mon Sep 17 00:00:00 2001
From: chenshijun <csj_sky@126.com>
Date: 星期四, 24 一月 2019 13:42:28 +0800
Subject: [PATCH] test
---
QiaoJiaSystem/StructureApp/JudgmentRetrogradeTool.h | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/QiaoJiaSystem/StructureApp/JudgmentRetrogradeTool.h b/QiaoJiaSystem/StructureApp/JudgmentRetrogradeTool.h
index 956c7ad..e3cd93f 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,7 +20,7 @@
#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;
@@ -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;
--
Gitblit v1.8.0