From e4c9b5bfb1d9000c08d84f2f044cd0c3605a2945 Mon Sep 17 00:00:00 2001
From: miyanhui <dennismi1024@gmail.com>
Date: 星期三, 13 二月 2019 14:17:13 +0800
Subject: [PATCH] 修复检测结果ImgKey不对应的问题
---
QiaoJiaSystem/StructureApp/YoloRpcElement.h | 21 ++++++---------------
1 files changed, 6 insertions(+), 15 deletions(-)
diff --git a/QiaoJiaSystem/StructureApp/YoloRpcElement.h b/QiaoJiaSystem/StructureApp/YoloRpcElement.h
index 857f2d7..2582b91 100644
--- a/QiaoJiaSystem/StructureApp/YoloRpcElement.h
+++ b/QiaoJiaSystem/StructureApp/YoloRpcElement.h
@@ -8,30 +8,23 @@
#include <basic/util/fastdfs/FastFds.hpp>
#include <RapidStructureApp/TriggerElement.h>
#include "TrackingTrigger.h"
+#include "DBStruct.h"
class QSharedMemory;
class YoloRpcElement : public basic::PipeElement {
public:
- YoloRpcElement(string);
+ YoloRpcElement(std::string shareMemoryName);
~YoloRpcElement();
void setImage(const cv::Mat &value);
+ cv::Mat getImage() const;
+
::YoloDetect::ObjInfos getObjects() const;
- std::vector<cv::Mat> getTriggerMats();
-
std::vector<ScoredRect> getLastScoreRects() const;
-
- void setFdfs(FastFdsWithLock *p_fdfsClient) {
- fdfsClient = p_fdfsClient;
- }
-
- bool getTriggerState() const;
-
- bool getTrigger() const;
private:
virtual void threadFunc() override;
@@ -41,12 +34,10 @@
cv::Mat image;
QSharedMemory *sharedMemory;
::YoloDetect::ObjInfos objs;
- TrackingTrigger *trackingTrigger;
- std::vector<cv::Mat> triggerMats;
::YoloDetect::stringData cocoData;
- FastFdsWithLock *fdfsClient;
+ std::vector<ScoredRect> triggerScoredRects;
+ TrackingTrigger *trackingTrigger;
- TriggerElement m_triggerElement;
};
#endif // YOLORPCELEMENT_H
--
Gitblit v1.8.0