From ac00f7d508e020e2e5d1a0d497f43155ed34e6a6 Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期一, 17 十二月 2018 20:53:56 +0800
Subject: [PATCH] 解决编译错误.(yoloServer未解决)
---
QiaoJiaSystem/StructureApp/PerimeterElement.h | 24 +++++++++++++-----------
1 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/QiaoJiaSystem/StructureApp/PerimeterElement.h b/QiaoJiaSystem/StructureApp/PerimeterElement.h
index b6fbd88..9bf6eb4 100644
--- a/QiaoJiaSystem/StructureApp/PerimeterElement.h
+++ b/QiaoJiaSystem/StructureApp/PerimeterElement.h
@@ -1,7 +1,8 @@
#ifndef PERIMETERELEMENT
#define PERIMETERELEMENT
+
#include <basic/pipe/PipeElement.h>
-#include <basic/event/EventHandler.hpp>
+//#include <basic/event/EventHandler.hpp>
#include <opencv2/opencv.hpp>
#include <Ice/Ice.h>
#include <YoloServer.h>
@@ -10,15 +11,17 @@
#include <QJsonArray>
#include <RapidStructureApp/TriggerElement.h>
#include <basic/util/fastdfs/FastFds.hpp>
-class PerimeterElement : public basic::PipeElement
-{
+
+class PerimeterElement : public basic::PipeElement {
public:
- PerimeterElement(int alarm_people_num=1);
+ PerimeterElement(int alarm_people_num = 1);
+
public:
~PerimeterElement();
//鏄惁鏈夌煩褰�
bool hasRects();
+
//璁剧疆ROI鍖哄煙
void setMask(std::string mask);
@@ -51,16 +54,15 @@
private:
- virtual void threadInitial()override;
+ virtual void threadInitial() override;
- virtual void threadFunc()override;
+ virtual void threadFunc() override;
- QJsonArray getJsonArrayFromQString(const QString& strJson);
+ QJsonArray getJsonArrayFromQString(const QString &strJson);
- std::string uploadImgToFdfs(cv::Mat& image);
+ std::string uploadImgToFdfs(cv::Mat &image);
- bool saveInfoToEs(const std::string& imgUrl,const ::YoloDetect::ObjInfo& obj);
-
+ bool saveInfoToEs(const std::string &imgUrl, const ::YoloDetect::ObjInfo &obj);
private:
@@ -76,7 +78,7 @@
int m_nAlarmPeopleNum;
std::vector<ScoredRect> mObjs;
TriggerElement m_triggerElement;
- FastFdsWithLock* fdfsClient;
+ FastFdsWithLock *fdfsClient;
};
#endif // PAELEMENT_H
--
Gitblit v1.8.0