派生自 development/c++

pansen
2018-12-17 ac00f7d508e020e2e5d1a0d497f43155ed34e6a6
解决编译错误.(yoloServer未解决)
20个文件已修改
390 ■■■■ 已修改文件
QiaoJiaSystem/DataManagerServer/CMakeLists.txt 30 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
QiaoJiaSystem/FaceDetectServer/CMakeLists.txt 30 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
QiaoJiaSystem/FaceSearchServer/CMakeLists.txt 36 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
QiaoJiaSystem/FaceSearchServer/LoadFeaTool/CMakeLists.txt 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
QiaoJiaSystem/LocalDBTool/CMakeLists.txt 22 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
QiaoJiaSystem/PerimeterAlarm/CMakeLists.txt 83 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
QiaoJiaSystem/StructureApp/PerimeterElement.cpp 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
QiaoJiaSystem/StructureApp/PerimeterElement.h 24 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
QiaoJiaSystem/StructureApp/YoloRpcElement.cpp 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
QiaoJiaSystem/VideoServer/CMakeLists.txt 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
QiaoJiaSystem/YoloServer/CMakeLists.txt 40 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
QiaoJiaSystem/YoloServer/YoloDetectClientTest.cpp 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
QiaoJiaSystem/YoloServer/YoloDetectServerI.cpp 112 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
QiaoJiaSystem/build/DataWebServer 补丁 | 查看 | 原始文档 | blame | 历史
QiaoJiaSystem/build/FaceDetectServer 补丁 | 查看 | 原始文档 | blame | 历史
QiaoJiaSystem/build/FaceExtractServer 补丁 | 查看 | 原始文档 | blame | 历史
QiaoJiaSystem/build/FaceSearchServer 补丁 | 查看 | 原始文档 | blame | 历史
QiaoJiaSystem/build/StructureApp 补丁 | 查看 | 原始文档 | blame | 历史
QiaoJiaSystem/build/VideoAnalysFromHC 补丁 | 查看 | 原始文档 | blame | 历史
QiaoJiaSystem/build/syncDBClient 补丁 | 查看 | 原始文档 | blame | 历史
QiaoJiaSystem/DataManagerServer/CMakeLists.txt
@@ -36,7 +36,7 @@
    ../../../BasicPlatForm/libs/libuuid/include
    ../../../BasicPlatForm/libs/uniview/include
    ../../../Erlang/syncDBTool
    ../../syncDBTool
    ../../../BasicPlatForm/libs/hcTool/HCNetSDK64/incCn
@@ -54,28 +54,28 @@
link_directories(
    #glog
    ../../BasicPlatForm/libs/glog/lib
    ../../../BasicPlatForm/libs/glog/lib
    /usr/lib/erlang/lib/erl_interface-3.8.2/lib/
    /usr/local/cuda/lib64
    ../../BasicPlatForm/libs/opencv/lib
    ../../BasicPlatForm/libs/Casia_Face/FaceSdk/lib/cpu
    ../../BasicPlatForm/libs/crul/lib
    ../../BasicPlatForm/libs/FastDFS/lib
    ../../BasicPlatForm/libs/jsoncpp/lib
    ../../BasicPlatForm/libs/ffmpeg/lib
    ../../BasicPlatForm/libs/libuuid/lib
    ../../../BasicPlatForm/libs/opencv/lib
    ../../../BasicPlatForm/libs/Casia_Face/FaceSdk/lib/cpu
    ../../../BasicPlatForm/libs/crul/lib
    ../../../BasicPlatForm/libs/FastDFS/lib
    ../../../BasicPlatForm/libs/jsoncpp/lib
    ../../../BasicPlatForm/libs/ffmpeg/lib
    ../../../BasicPlatForm/libs/libuuid/lib
    ../../BasicPlatForm/libs/hcTool/HCNetSDK64/lib/
    ../../BasicPlatForm/libs/hcTool/HCNetSDK64/lib/HCNetSDKCom/
    ../../BasicPlatForm/libs/uniview/lib
    ../../../BasicPlatForm/libs/hcTool/HCNetSDK64/lib/
    ../../../BasicPlatForm/libs/hcTool/HCNetSDK64/lib/HCNetSDKCom/
    ../../../BasicPlatForm/libs/uniview/lib
    ../../BasicPlatForm/libs/libboost/lib
    ../../../BasicPlatForm/libs/libboost/lib
    ../../BasicPlatForm/basic/db/sqlite/
    ../../BasicPlatForm/basic/db/sqlite/sqlite-v-3220000
    ../../../BasicPlatForm/basic/db/sqlite/
    ../../../BasicPlatForm/basic/db/sqlite/sqlite-v-3220000
)
add_executable(DataWebServer
QiaoJiaSystem/FaceDetectServer/CMakeLists.txt
@@ -21,28 +21,28 @@
    )
include_directories(
    ./rpc
    ../../BasicPlatForm
    ../../BasicPlatForm/libs/opencv/include
    ../../BasicPlatForm/libs/jsoncpp/include
    ../../BasicPlatForm/libs/Ice-3.7.0/include
    ../../BasicPlatForm/libs/ffmpeg/include
    ../../BasicPlatForm/wrapper/casia/include
    ../../BasicPlatForm/libs/Casia_Face/FaceSdk/include
    ../../../BasicPlatForm
    ../../../BasicPlatForm/libs/opencv/include
    ../../../BasicPlatForm/libs/jsoncpp/include
    ../../../BasicPlatForm/libs/Ice-3.7.0/include
    ../../../BasicPlatForm/libs/ffmpeg/include
    ../../../BasicPlatForm/wrapper/casia/include
    ../../../BasicPlatForm/libs/Casia_Face/FaceSdk/include
    /usr/include/x86_64-linux-gnu/qt5
    #glog
    ../../BasicPlatForm/libs/glog/include
    ../../../BasicPlatForm/libs/glog/include
)
link_directories(
    #glog
    ../../BasicPlatForm/libs/glog/lib
    ../../BasicPlatForm/libs/jsoncpp/lib
    ../../../BasicPlatForm/libs/glog/lib
    ../../../BasicPlatForm/libs/jsoncpp/lib
    /usr/local/cuda/lib64
    ../../BasicPlatForm/libs/openssl/lib/
    ../../BasicPlatForm/libs/Ice-3.7.0/lib64
    ../../BasicPlatForm/libs/openssl/lib
    ../../BasicPlatForm/libs/opencv/lib
    ../../BasicPlatForm/libs/Casia_Face/FaceSdk/lib/gpu
    ../../../BasicPlatForm/libs/openssl/lib/
    ../../../BasicPlatForm/libs/Ice-3.7.0/lib64
    ../../../BasicPlatForm/libs/openssl/lib
    ../../../BasicPlatForm/libs/opencv/lib
    ../../../BasicPlatForm/libs/Casia_Face/FaceSdk/lib/gpu
)
add_executable(${PROJECT_NAME}
QiaoJiaSystem/FaceSearchServer/CMakeLists.txt
@@ -32,31 +32,31 @@
    ./CasiaFaceWrapper
    #glog
    ../../BasicPlatForm/libs/glog/include
    ../../../BasicPlatForm/libs/glog/include
    ../LocalDBTool
    ../../BasicPlatForm
    ../../BasicPlatForm/libs/crul/include
    ../../BasicPlatForm/libs/opencv/include
    ../../BasicPlatForm/libs/Ice-3.7.0/include
    ../../BasicPlatForm/libs/ffmpeg/include
    ../../BasicPlatForm/libs/Casia_Face/FaceSdk/include
    ../../../BasicPlatForm
    ../../../BasicPlatForm/libs/crul/include
    ../../../BasicPlatForm/libs/opencv/include
    ../../../BasicPlatForm/libs/Ice-3.7.0/include
    ../../../BasicPlatForm/libs/ffmpeg/include
    ../../../BasicPlatForm/libs/Casia_Face/FaceSdk/include
    #    ../../BasicPlatForm/libs/erlang/erl_interface/include
    ../../BasicPlatForm/libs/jsoncpp/include
    ../../BasicPlatForm/libs/crul/include
    ../../BasicPlatForm/libs/libuuid/include/
    ../../BasicPlatForm/basic/util/curl/
    ../../BasicPlatForm/basic/util/ShareMemory/
    ../../BasicPlatForm/basic/db/Elasticsearch/
    ../../BasicPlatForm/wrapper/casia/include
    ../../BasicPlatForm/libs/libboost/include
    ../../../BasicPlatForm/libs/jsoncpp/include
    ../../../BasicPlatForm/libs/crul/include
    ../../../BasicPlatForm/libs/libuuid/include/
    ../../../BasicPlatForm/basic/util/curl/
    ../../../BasicPlatForm/basic/util/ShareMemory/
    ../../../BasicPlatForm/basic/db/Elasticsearch/
    ../../../BasicPlatForm/wrapper/casia/include
    ../../../BasicPlatForm/libs/libboost/include
    ../../../Erlang/syncDBTool/
    ../../syncDBTool/
    ../../BasicPlatForm/basic/db/sqlite/
    ../../BasicPlatForm/basic/db/sqlite/sqlite-v-3220000
    ../../../BasicPlatForm/basic/db/sqlite/
    ../../../BasicPlatForm/basic/db/sqlite/sqlite-v-3220000
    /usr/include/x86_64-linux-gnu/qt5
    /usr/include/x86_64-linux-gnu/qt5/QtCore/
QiaoJiaSystem/FaceSearchServer/LoadFeaTool/CMakeLists.txt
@@ -11,7 +11,7 @@
    ../../../../BasicPlatForm/libs/glog/include
    ../../../../BasicPlatForm/libs/jsoncpp/include
    ../../../../BasicPlatForm/basic/util/ShareMemory/
    ../../../../Erlang/syncDBTool
    ../../../syncDBTool
)
link_directories(
@@ -31,6 +31,8 @@
target_link_libraries(
    syncDBClient
    glog
    Qt5Core
    Qt5Sql
    ei
    erl_interface_st
    ei_st
QiaoJiaSystem/LocalDBTool/CMakeLists.txt
@@ -13,16 +13,16 @@
include_directories(
    ./
    ../../BasicPlatForm
    ../../../BasicPlatForm
    ../../BasicPlatForm/basic/util/app
    ../../../BasicPlatForm/basic/util/app
    ../../BasicPlatForm/basic/db/sqlite/
    ../../BasicPlatForm/basic/db/sqlite/sqlite-v-3220000
    ../../../BasicPlatForm/basic/db/sqlite/
    ../../../BasicPlatForm/basic/db/sqlite/sqlite-v-3220000
    ../../BasicPlatForm/libs/libuuid/include
    ../../BasicPlatForm/libs/glog/include
    ../../BasicPlatForm/libs/jsoncpp/include
    ../../../BasicPlatForm/libs/libuuid/include
    ../../../BasicPlatForm/libs/glog/include
    ../../../BasicPlatForm/libs/jsoncpp/include
    /usr/include/x86_64-linux-gnu/qt5
    /usr/include/x86_64-linux-gnu/qt5/QtCore/
@@ -31,10 +31,10 @@
)
link_directories(
    ../../BasicPlatForm/basic/db/sqlite/sqlite-v-3220000
    ../../BasicPlatForm/libs/libuuid/lib
    ../../BasicPlatForm/libs/glog/lib
    ../../BasicPlatForm/libs/jsoncpp/lib
    ../../../BasicPlatForm/basic/db/sqlite/sqlite-v-3220000
    ../../../BasicPlatForm/libs/libuuid/lib
    ../../../BasicPlatForm/libs/glog/lib
    ../../../BasicPlatForm/libs/jsoncpp/lib
)
QiaoJiaSystem/PerimeterAlarm/CMakeLists.txt
@@ -7,34 +7,33 @@
add_definitions(-DDEBUG_ERR -DDEBUG_INFO -DTESTCODE -fpermissive)
SET(SOURCES
#    TrackingTrigger.cpp
    #    TrackingTrigger.cpp
    PaYoloRpcElement.cpp
    PaImageDrawElement.cpp
#    rpc/StructureApp.cpp
    #    rpc/StructureApp.cpp
    AppPaController.cpp
    ../YoloServer/rpc/YoloServer.cpp
    ../RecordVideo/rpc/RecordVideo.cpp
    ../RapidStructureApp/TriggerElement.cpp
    ../StructureApp/TrackingTrigger.cpp
    ../StructureApp/RecordVideoElement.cpp
#    ../Alarm/rpc/Alarm.cpp
 #   ../netsoundbox/rpc/NetSoundBox.cpp
    #    ../Alarm/rpc/Alarm.cpp
    #   ../netsoundbox/rpc/NetSoundBox.cpp
#    rpc/AlarmInfo.cpp
    #    rpc/AlarmInfo.cpp
    ../../BasicPlatForm/basic/pipe_element/ffmpeg/FfmpegElement.cpp
    ../../BasicPlatForm/basic/pipe_element/ffmpeg/VideoChangeScore.cpp
    ../../BasicPlatForm/basic/pipe_element/ImageFactoryElement.cpp
    ../../BasicPlatForm/basic/util/BASE64/Base64.cpp
    ../../BasicPlatForm/basic/util/fastdfs/FastdfsClient.cpp
    ../../BasicPlatForm/basic/pipe/TimerElement.cpp
    ../../BasicPlatForm/basic/db/Elasticsearch/EsDBTool.cpp
    ../../BasicPlatForm/basic/util/curl/HttpRequestWithCrul.hpp
    ../../BasicPlatForm/basic/util/net_config/net_config.cpp
    ../../../BasicPlatForm/basic/pipe_element/ffmpeg/FfmpegElement.cpp
    ../../../BasicPlatForm/basic/pipe_element/ffmpeg/VideoChangeScore.cpp
    ../../../BasicPlatForm/basic/pipe_element/ImageFactoryElement.cpp
    ../../../BasicPlatForm/basic/util/BASE64/Base64.cpp
    ../../../BasicPlatForm/basic/util/fastdfs/FastdfsClient.cpp
    ../../../BasicPlatForm/basic/pipe/TimerElement.cpp
    ../../../BasicPlatForm/basic/db/Elasticsearch/EsDBTool.cpp
    ../../../BasicPlatForm/basic/util/curl/HttpRequestWithCrul.hpp
    ../../../BasicPlatForm/basic/util/net_config/net_config.cpp
    )
SET(LIBS
@@ -65,47 +64,47 @@
    )
include_directories(
#    ./rpc
    #    ./rpc
    ../YoloServer/rpc
    ../RecordVideo/rpc
    ../RapidStructureApp/
#    ../netsoundbox/rpc/
#    ../Alarm/rpc
    #    ../netsoundbox/rpc/
    #    ../Alarm/rpc
    ../../BasicPlatForm
    ../../BasicPlatForm/libs/opencv/include
    ../../BasicPlatForm/libs/Ice-3.7.0/include
    ../../BasicPlatForm/libs/ffmpeg/include
    ../../BasicPlatForm/libs/jsoncpp/include
    ../../../BasicPlatForm
    ../../../BasicPlatForm/libs/opencv/include
    ../../../BasicPlatForm/libs/Ice-3.7.0/include
    ../../../BasicPlatForm/libs/ffmpeg/include
    ../../../BasicPlatForm/libs/jsoncpp/include
    ../../BasicPlatForm/basic/util/net_config/
    ../../BasicPlatForm/basic/util/fastdfs/
    ../../BasicPlatForm/libs/FastDFS/include
    ../../BasicPlatForm/libs/FastDFS/include/fastdfs
    ../../BasicPlatForm/libs/FastDFS/include/fastcommon
    ../../../BasicPlatForm/basic/util/net_config/
    ../../../BasicPlatForm/basic/util/fastdfs/
    ../../../BasicPlatForm/libs/FastDFS/include
    ../../../BasicPlatForm/libs/FastDFS/include/fastdfs
    ../../../BasicPlatForm/libs/FastDFS/include/fastcommon
    ../../BasicPlatForm/basic/pipe/
    ../../BasicPlatForm/libs/crul/include
    ../../BasicPlatForm/basic/util/curl/
    ../../BasicPlatForm/libs/libuuid/include
    ../../BasicPlatForm/libs/glog/include
    ../../../BasicPlatForm/basic/pipe/
    ../../../BasicPlatForm/libs/crul/include
    ../../../BasicPlatForm/basic/util/curl/
    ../../../BasicPlatForm/libs/libuuid/include
    ../../../BasicPlatForm/libs/glog/include
    /usr/include/x86_64-linux-gnu/qt5
)
link_directories(
    /usr/local/cuda/lib64
    ../../BasicPlatForm/libs/Ice-3.7.0/lib64
    ../../BasicPlatForm/libs/openssl/lib
    ../../BasicPlatForm/libs/opencv/lib
    ../../BasicPlatForm/libs/ffmpeg/lib
    ../../BasicPlatForm/libs/jsoncpp/lib
    ../../BasicPlatForm/libs/FastDFS/lib
    ../../BasicPlatForm/libs/libuuid/lib
    ../../../BasicPlatForm/libs/Ice-3.7.0/lib64
    ../../../BasicPlatForm/libs/openssl/lib
    ../../../BasicPlatForm/libs/opencv/lib
    ../../../BasicPlatForm/libs/ffmpeg/lib
    ../../../BasicPlatForm/libs/jsoncpp/lib
    ../../../BasicPlatForm/libs/FastDFS/lib
    ../../../BasicPlatForm/libs/libuuid/lib
    ../../BasicPlatForm/libs/glog/lib
    ../../BasicPlatForm/libs/crul/lib
    ../../../BasicPlatForm/libs/glog/lib
    ../../../BasicPlatForm/libs/crul/lib
)
add_executable(${PROJECT_NAME}
QiaoJiaSystem/StructureApp/PerimeterElement.cpp
@@ -1,5 +1,5 @@
#include "PerimeterElement.h"
#include <basic/event/EventBus.hpp>
//#include <basic/event/EventBus.hpp>
#include <basic/debug/Debug.h>
#include <iostream>
#include <opencv2/opencv.hpp>
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
QiaoJiaSystem/StructureApp/YoloRpcElement.cpp
@@ -10,7 +10,6 @@
#include <uuid/uuid.h>
#include <jsoncpp/json/json.h>
#include <basic/db/ES/es/ManagerEsDB.h>
#include <QtCore/QJsonDocument>
#include <QtCore/QJsonObject>
QiaoJiaSystem/VideoServer/CMakeLists.txt
@@ -16,14 +16,14 @@
    /usr/include/x86_64-linux-gnu/qt5/QtCore/
    /usr/include/x86_64-linux-gnu/qt5/QtSql/
    ../../BasicPlatForm/
    ../../../BasicPlatForm/
    ./QiaoJia/DB
    ./QiaoJia/dispatchTool
)
link_directories(
    /usr/local/cuda/lib64
    ../../BasicPlatForm/libs/opencv/lib
    ../../../BasicPlatForm/libs/opencv/lib
    )
add_executable(${PROJECT_NAME}
QiaoJiaSystem/YoloServer/CMakeLists.txt
@@ -22,43 +22,43 @@
    )
include_directories(
    ./rpc
    ../../BasicPlatForm
    ../../BasicPlatForm/libs/opencv/include
    ../../BasicPlatForm/libs/jsoncpp/include
    ../../BasicPlatForm/libs/Ice-3.7.0/include
    ../../BasicPlatForm/libs/ffmpeg/include
    ../../BasicPlatForm/libs/DarkNet/include
    ../../../BasicPlatForm
    ../../../BasicPlatForm/libs/opencv/include
    ../../../BasicPlatForm/libs/jsoncpp/include
    ../../../BasicPlatForm/libs/Ice-3.7.0/include
    ../../../BasicPlatForm/libs/ffmpeg/include
    ../../../BasicPlatForm/libs/DarkNet/include
    /usr/local/cuda/include/
    /usr/include/x86_64-linux-gnu/qt5
    #glog
    ../../BasicPlatForm/libs/glog/include
    ../../../BasicPlatForm/libs/glog/include
)
link_directories(
    /usr/local/cuda/lib64
    ../../BasicPlatForm/libs/jsoncpp/lib
    ../../BasicPlatForm/libs/openssl/lib/
    ../../BasicPlatForm/libs/Ice-3.7.0/lib64
    ../../BasicPlatForm/libs/opencv/lib
    ../../BasicPlatForm/libs/DarkNet/lib
    ../../../BasicPlatForm/libs/jsoncpp/lib
    ../../../BasicPlatForm/libs/openssl/lib/
    ../../../BasicPlatForm/libs/Ice-3.7.0/lib64
    ../../../BasicPlatForm/libs/opencv/lib
    ../../../BasicPlatForm/libs/DarkNet/lib
    #glog
    ../../BasicPlatForm/libs/glog/lib
    ../../../BasicPlatForm/libs/glog/lib
)
link_directories(
    /usr/local/cuda/lib64
    ../../BasicPlatForm/libs/opencv/lib
    ../../BasicPlatForm/libs/Ice-3.7.0/include
    ../../BasicPlatForm/libs/DarkNet
    ../../../BasicPlatForm/libs/opencv/lib
    ../../../BasicPlatForm/libs/Ice-3.7.0/include
    ../../../BasicPlatForm/libs/DarkNet
)
link_directories(
    /usr/local/cuda/lib64
    ../../BasicPlatForm/libs/opencv/lib
    ../../BasicPlatForm/libs/Ice-3.7.0/include
    ../../BasicPlatForm/libs/DarkNet/lib
    ../../BasicPlatForm/libs/ffmpeg/lib
    ../../../BasicPlatForm/libs/opencv/lib
    ../../../BasicPlatForm/libs/Ice-3.7.0/include
    ../../../BasicPlatForm/libs/DarkNet/lib
    ../../../BasicPlatForm/libs/ffmpeg/lib
)
add_executable(${PROJECT_NAME}
QiaoJiaSystem/YoloServer/YoloDetectClientTest.cpp
@@ -53,7 +53,7 @@
    ImageDrawElement m_imageDrawElement;
};
using namespace std;
//using namespace std;
int main(int argc, char *argv[])
{
    SAVE_APP_ARGS
QiaoJiaSystem/YoloServer/YoloDetectServerI.cpp
@@ -5,30 +5,29 @@
#include <QtCore/QSharedMemory>
#include <basic/timer_counter/Clocktimer.h>
YoloDetectServerI::YoloDetectServerI():m_thresh(0.5),m_hier_thresh(0.5),m_nms(0.5),names(nullptr),alphabet(nullptr),
    m_thdInit(init,this),m_bInitThd(false)
{
YoloDetectServerI::YoloDetectServerI() : m_thresh(0.5), m_hier_thresh(0.5), m_nms(0.5), names(nullptr),
                                         alphabet(nullptr),
                                         m_thdInit(init, this), m_bInitThd(false) {
}
YoloDetectServerI::~YoloDetectServerI()
{}
YoloDetectServerI::~YoloDetectServerI() {}
::YoloDetect::ObjInfos YoloDetectServerI::YoloDetect(::Ice::Int w, ::Ice::Int h, const ::std::string& shM, const ::Ice::Current&)
{
::YoloDetect::ObjInfos
YoloDetectServerI::YoloDetect(::Ice::Int w, ::Ice::Int h, const ::std::string &shM, const ::Ice::Current &) {
    ClockTimer ct("YoloDetectServerI::YoloDetect");
    ::YoloDetect::ObjInfos objInfos;
    if(!m_bInitThd) return objInfos;
    if (!m_bInitThd) return objInfos;
    QSharedMemory shareMemory(QString(shM.c_str()));
    if(shareMemory.attach()){
    if (shareMemory.attach()) {
        int channel = 3;
        cv::Mat _mat = bufferToMat(w,h,channel,shareMemory.constData());
        cv::Mat _mat = bufferToMat(w, h, channel, shareMemory.constData());
//        double bttime=what_time_is_it_now();
        image im = matToImg(_mat);
//        DBG("matToImg : "<<what_time_is_it_now()-bttime);
//        printf("matToImg %f seconds.\n", what_time_is_it_now()-bttime);
        image sized = letterbox_image(im, m_net->w, m_net->h);
        layer l = m_net->layers[m_net->n-1];
        layer l = m_net->layers[m_net->n - 1];
        float *X = sized.data;
        //attime=what_time_is_it_now();p->
@@ -38,42 +37,41 @@
        detection *dets = get_network_boxes(m_net, im.w, im.h, m_thresh, m_hier_thresh, 0, 1, &nboxes);
        if (m_nms) do_nms_sort(dets, nboxes, l.classes, m_nms);
        //  draw_detections(im, dets, nboxes, m_thresh, names, alphabet, l.classes);
        for(int i=0;i<nboxes;i++)
        {
        for (int i = 0; i < nboxes; i++) {
            ::YoloDetect::ObjInfo objInfo;
            std::vector<float> vec(80);
            memcpy(&vec[0],dets[i].prob,sizeof(float)*80);
            memcpy(&vec[0], dets[i].prob, sizeof(float) * 80);
            int type = -1;
            for(int j = 0; j < l.classes; ++j){
            for (int j = 0; j < l.classes; ++j) {
//                if(j != 0){
//                    continue;
//                }
                if (dets[i].prob[j] > 0.0f){
                if (dets[i].prob[j] > 0.0f) {
                    if (type < 0) {
                        type = j;
                        objInfo.prob = dets[i].prob[j];
                    } else {
                    }
                } else{
                } else {
                }
            }
            if(type >= 0){
            if (type >= 0) {
//                if(type != 0){
//                    continue;
//                }
                objInfo.type = type;
                objInfo.rcObj.left = (dets[i].bbox.x-dets[i].bbox.w/2.);
                objInfo.rcObj.top = (dets[i].bbox.y-dets[i].bbox.h/2.);
                objInfo.rcObj.right = (dets[i].bbox.x+dets[i].bbox.w/2.);
                objInfo.rcObj.bottom = (dets[i].bbox.y+dets[i].bbox.h/2.);
                objInfo.rcObj.left = (dets[i].bbox.x - dets[i].bbox.w / 2.);
                objInfo.rcObj.top = (dets[i].bbox.y - dets[i].bbox.h / 2.);
                objInfo.rcObj.right = (dets[i].bbox.x + dets[i].bbox.w / 2.);
                objInfo.rcObj.bottom = (dets[i].bbox.y + dets[i].bbox.h / 2.);
                objInfos.push_back(objInfo);
            }
        }
        free_detections(dets, nboxes);
    //    show_image(im, "Video");
    //    cv::waitKey(10);
        //    show_image(im, "Video");
        //    cv::waitKey(10);
        free_image(im);
        free_image(sized);
        //printf("all time use %f seconds.\n", what_time_is_it_now()-bttime);
@@ -81,9 +79,8 @@
    return objInfos;
}
int YoloDetectServerI::init(void* arg)
{
    YoloDetectServerI* p = (YoloDetectServerI*)arg;
int YoloDetectServerI::init(void *arg) {
    YoloDetectServerI *p = (YoloDetectServerI *) arg;
    p->m_thresh = appPref.getFloatData("thresh.detect");
    cuda_set_device(appPref.getIntData("gpu.index"));
@@ -100,22 +97,38 @@
    p->alphabet = load_alphabet();
    p->m_net = load_network(cfgfile, weightfile, 0);
    set_batch_network(p->m_net, 1);
    printf("load mod use %f seconds.\n", what_time_is_it_now()-loadtime);
    printf("load mod use %f seconds.\n", what_time_is_it_now() - loadtime);
    srand(2222222);
    p->m_bInitThd = true;
    return 0;
}
cv::Mat YoloDetectServerI::bufferToMat(const int w,const int h,const int channels,const void* buffer)
{
cv::Mat YoloDetectServerI::bufferToMat(const int w, const int h, const int channels, const void *buffer) {
    int nType = -1;
    switch(channels){case 1:{nType=CV_8UC1;break;}case 2:{nType=CV_8UC2;break;}case 3:{nType=CV_8UC3;break;}default:{nType=CV_8UC3;break;}}
    cv::Mat mat(h,w,nType,(void*)buffer);
    switch (channels) {
        case 1: {
            nType = CV_8UC1;
            break;
        }
        case 2: {
            nType = CV_8UC2;
            break;
        }
        case 3: {
            nType = CV_8UC3;
            break;
        }
        default: {
            nType = CV_8UC3;
            break;
        }
    }
    cv::Mat mat(h, w, nType, (void *) buffer);
    return mat;
}
image YoloDetectServerI::matToImg(cv::Mat& RefImg) {
image YoloDetectServerI::matToImg(cv::Mat &RefImg) {
    CV_Assert(RefImg.depth() == CV_8U);
    int h = RefImg.rows;
@@ -123,29 +136,29 @@
    int channels = RefImg.channels();
    image im = make_image(w, h, 3);
    int count = 0;
    switch(channels){
        case 1:{
    switch (channels) {
        case 1: {
            cv::MatIterator_<unsigned char> it, end;
            for (it = RefImg.begin<unsigned char>(), end = RefImg.end<unsigned char>(); it != end; ++it){
                im.data[count] = im.data[w*h + count] = im.data[w*h*2 + count] = (float)(*it)/255.0;
            for (it = RefImg.begin<unsigned char>(), end = RefImg.end<unsigned char>(); it != end; ++it) {
                im.data[count] = im.data[w * h + count] = im.data[w * h * 2 + count] = (float) (*it) / 255.0;
                ++count;
            }
            break;
        }
        case 3:{
            float* desData = im.data;
            uchar* srcData = RefImg.data;
        case 3: {
            float *desData = im.data;
            uchar *srcData = RefImg.data;
            int size = w*h;
            int size2 = size*2;
            for(int i = 0;i<size;i++){
                *(desData) = *(srcData + 2) /255.0f;
                *(desData+size) = *(srcData + 1) /255.0f;
                *(desData+size2) = *(srcData) /255.0f;
            int size = w * h;
            int size2 = size * 2;
            for (int i = 0; i < size; i++) {
                *(desData) = *(srcData + 2) / 255.0f;
                *(desData + size) = *(srcData + 1) / 255.0f;
                *(desData + size2) = *(srcData) / 255.0f;
                desData++;
                srcData+=3;
                srcData += 3;
            }
            break;
        }
@@ -157,12 +170,11 @@
    return im;
}
YoloDetect::stringData YoloDetectServerI::getCocoData(const Ice::Current &)
{
YoloDetect::stringData YoloDetectServerI::getCocoData(const Ice::Current &) {
    YoloDetect::stringData retval;
    std::fstream fs("./data/coco.names");
    std::string str;
    while(fs>>str){
    while (fs >> str) {
        retval.push_back(str);
    }
    return retval;
QiaoJiaSystem/build/DataWebServer
Binary files differ
QiaoJiaSystem/build/FaceDetectServer
Binary files differ
QiaoJiaSystem/build/FaceExtractServer
Binary files differ
QiaoJiaSystem/build/FaceSearchServer
Binary files differ
QiaoJiaSystem/build/StructureApp
Binary files differ
QiaoJiaSystem/build/VideoAnalysFromHC
Binary files differ
QiaoJiaSystem/build/syncDBClient
Binary files differ