From 839c5a5c5800fadb14d829794a70e23157eef179 Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期二, 18 十二月 2018 14:04:45 +0800
Subject: [PATCH] 增加testcode
---
QiaoJiaSystem/testCodeMod/FaceTrackingWrapper.h | 30 +++++++
QiaoJiaSystem/build/FaceSearchServer | 0
QiaoJiaSystem/testCodeMod/main.cpp | 13 +++
QiaoJiaSystem/build/syncDBClient | 0
syncDBTool/ErlangDbTool.cpp | 4
QiaoJiaSystem/build/FaceDetectServer | 0
README.md | 61 ++++++++++++++
QiaoJiaSystem/build/DataWebServer | 0
QiaoJiaSystem/testCodeMod/FaceTrackingWrapper.cpp | 13 +++
QiaoJiaSystem/build/FaceExtractServer | 0
QiaoJiaSystem/testCodeMod/FaceDefine.h | 60 +++++++++++++++
QiaoJiaSystem/build/VideoAnalysFromHC | 0
QiaoJiaSystem/testCodeMod/CMakeLists.txt | 48 ++++++++++++
QiaoJiaSystem/build/StructureApp | 0
14 files changed, 225 insertions(+), 4 deletions(-)
diff --git a/QiaoJiaSystem/build/DataWebServer b/QiaoJiaSystem/build/DataWebServer
index 5a54edd..47ad9d1 100644
--- a/QiaoJiaSystem/build/DataWebServer
+++ b/QiaoJiaSystem/build/DataWebServer
Binary files differ
diff --git a/QiaoJiaSystem/build/FaceDetectServer b/QiaoJiaSystem/build/FaceDetectServer
index a726aed..32eba35 100644
--- a/QiaoJiaSystem/build/FaceDetectServer
+++ b/QiaoJiaSystem/build/FaceDetectServer
Binary files differ
diff --git a/QiaoJiaSystem/build/FaceExtractServer b/QiaoJiaSystem/build/FaceExtractServer
index aef2c42..28b2e8a 100644
--- a/QiaoJiaSystem/build/FaceExtractServer
+++ b/QiaoJiaSystem/build/FaceExtractServer
Binary files differ
diff --git a/QiaoJiaSystem/build/FaceSearchServer b/QiaoJiaSystem/build/FaceSearchServer
index 375cf8b..0843223 100644
--- a/QiaoJiaSystem/build/FaceSearchServer
+++ b/QiaoJiaSystem/build/FaceSearchServer
Binary files differ
diff --git a/QiaoJiaSystem/build/StructureApp b/QiaoJiaSystem/build/StructureApp
index 5689f3e..45095a3 100644
--- a/QiaoJiaSystem/build/StructureApp
+++ b/QiaoJiaSystem/build/StructureApp
Binary files differ
diff --git a/QiaoJiaSystem/build/VideoAnalysFromHC b/QiaoJiaSystem/build/VideoAnalysFromHC
index 34eb827..81df8c6 100644
--- a/QiaoJiaSystem/build/VideoAnalysFromHC
+++ b/QiaoJiaSystem/build/VideoAnalysFromHC
Binary files differ
diff --git a/QiaoJiaSystem/build/syncDBClient b/QiaoJiaSystem/build/syncDBClient
index a14d80d..5584639 100644
--- a/QiaoJiaSystem/build/syncDBClient
+++ b/QiaoJiaSystem/build/syncDBClient
Binary files differ
diff --git a/QiaoJiaSystem/testCodeMod/CMakeLists.txt b/QiaoJiaSystem/testCodeMod/CMakeLists.txt
new file mode 100644
index 0000000..b95da27
--- /dev/null
+++ b/QiaoJiaSystem/testCodeMod/CMakeLists.txt
@@ -0,0 +1,48 @@
+cmake_minimum_required(VERSION 3.5)
+project(testCode)
+set(EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/../build)
+set(CMAKE_CXX_STANDARD 11)
+set(CMAKE_BUILD_TYPE debug)
+add_definitions(-DDEBUG_ERR -DDEBUG_INFO)
+add_definitions(-DGLOG)
+add_compile_options(-fPIC)
+
+SET(LIBS
+ glog
+ opencv_world
+ Qt5Core
+ THFaceImage
+ THFaceTracking
+ THFeature
+ THFaceProperty
+ pthread
+ )
+include_directories(
+ ./rpc
+ ../../../BasicPlatForm
+ ../../../BasicPlatForm/basic/debug
+ ../../../BasicPlatForm/libs/opencv/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
+)
+
+link_directories(
+ #glog
+ ../../../BasicPlatForm/libs/glog/lib
+ /usr/local/cuda/lib64
+ ../../../BasicPlatForm/libs/opencv/lib
+ ../../../BasicPlatForm/libs/Casia_Face/FaceSdk/lib/gpu
+)
+
+add_executable(${PROJECT_NAME}
+ main.cpp
+ FaceTrackingWrapper.cpp FaceTrackingWrapper.h FaceDefine.h)
+target_link_libraries(${PROJECT_NAME}
+ ${LIBS}
+ )
+
+
diff --git a/QiaoJiaSystem/testCodeMod/FaceDefine.h b/QiaoJiaSystem/testCodeMod/FaceDefine.h
new file mode 100644
index 0000000..58bd5a6
--- /dev/null
+++ b/QiaoJiaSystem/testCodeMod/FaceDefine.h
@@ -0,0 +1,60 @@
+//
+// Created by ps on 18-12-18.
+//
+
+#ifndef TESTCODE_FACEDEFINE_H
+#define TESTCODE_FACEDEFINE_H
+
+#include <vector>
+#include <string>
+
+//using namespace std;
+using std::vector;
+using std::string;
+
+struct FaceFeatureResult {
+ vector<unsigned char> feature;
+ float score;
+};
+
+struct FaceDetectResult {
+ FaceDetectResult() : attributes(256), trackingId(-1) {}
+
+ int id;
+ int left;
+ int top;
+ int width;
+ int height;
+ float score;
+ float yaw; // 姘村钩杞锛岀湡瀹炲害閲忕殑宸﹁礋鍙虫, 鍗曚綅锛岃搴�
+ float pitch; // 淇话瑙掞紝鐪熷疄搴﹂噺鐨勪笂璐熶笅姝�, 鍗曚綅锛岃搴�
+ float roll; // 鏃嬭浆瑙掞紝鐪熷疄搴﹂噺鐨勫乏璐熷彸姝�, 鍗曚綅锛岃搴�
+ float angle; // sqrt(yaw*yaw/3+pitch*pitch/3+roll*roll/3)
+ vector<char> attributes;
+ float trackingId;
+};
+
+struct DbSearchResult {
+ int index;
+ float confidence;
+ string dbId;
+};
+
+struct FaceSearchResult {
+ int index;
+ int left;
+ int top;
+ int width;
+ int height;
+ float score;
+ float confidence;
+ string dbId;
+};
+
+struct FaceImage {
+ int width;
+ int height;
+ int stride;
+ unsigned char *data;
+};
+#endif //TESTCODE_FACEDEFINE_H
diff --git a/QiaoJiaSystem/testCodeMod/FaceTrackingWrapper.cpp b/QiaoJiaSystem/testCodeMod/FaceTrackingWrapper.cpp
new file mode 100644
index 0000000..ca5fb81
--- /dev/null
+++ b/QiaoJiaSystem/testCodeMod/FaceTrackingWrapper.cpp
@@ -0,0 +1,13 @@
+//
+// Created by ps on 18-12-18.
+//
+
+#include "FaceTrackingWrapper.h"
+
+FaceTrackingWrapper::FaceTrackingWrapper() {
+
+}
+
+FaceTrackingWrapper::~FaceTrackingWrapper() {
+
+}
diff --git a/QiaoJiaSystem/testCodeMod/FaceTrackingWrapper.h b/QiaoJiaSystem/testCodeMod/FaceTrackingWrapper.h
new file mode 100644
index 0000000..b1c5ff4
--- /dev/null
+++ b/QiaoJiaSystem/testCodeMod/FaceTrackingWrapper.h
@@ -0,0 +1,30 @@
+//
+// Created by ps on 18-12-18.
+//
+
+#ifndef TESTCODE_FACETRACKINGWRAPPER_H
+#define TESTCODE_FACETRACKINGWRAPPER_H
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/time.h>
+#include <time.h>
+
+#include <opencv2/opencv.hpp>
+#include <FiStdDefEx.h>
+
+#include <THFaceTracking_i.h>
+
+
+class FaceTrackingWrapper {
+public:
+ explicit FaceTrackingWrapper();
+
+ virtual ~FaceTrackingWrapper();
+
+// std::vector<FaceDetectResult> void detectFace(FaceImage image);
+};
+
+
+#endif //TESTCODE_FACETRACKINGWRAPPER_H
diff --git a/QiaoJiaSystem/testCodeMod/main.cpp b/QiaoJiaSystem/testCodeMod/main.cpp
new file mode 100644
index 0000000..7bd3451
--- /dev/null
+++ b/QiaoJiaSystem/testCodeMod/main.cpp
@@ -0,0 +1,13 @@
+//
+// Created by ps on 18-12-18.
+//
+
+#include <Debug.h>
+
+int main(int argc, char **argv) {
+
+ ENABLEGLOG("./log/");
+
+ INFO("test");
+
+}
\ No newline at end of file
diff --git a/README.md b/README.md
index 1a89e5d..6038924 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,61 @@
-## c++
-
+# c++
C++绋嬪簭
+*****
+
+
+
+## 1.QiaoJiaSystem
+涓婚」鐩�
+
+* DataManagerServer
+
+ http server 鏈嶅姟鍣�
+
+* FaceDetectServer
+
+ 浜鸿劯妫�娴媔ce鏈嶅姟
+
+* FaceSearchServer
+
+ 浜鸿劯鎼滅储ice鏈嶅姟
+
+* LocalDBTool
+
+ 鏈湴搴撳伐鍏锋ā鍧�
+
+* PerimeterAlarm
+
+ 鍛ㄧ晫鎶ヨ妯″潡
+
+* RapidStructureApp
+
+ 瑙嗛瑁佸壀妯″潡
+
+* RecordVideo
+
+ 褰曞儚妯″潡
+
+* StructureApp
+
+ 鍘熻棰戝垎鏋愪富妯″潡
+
+* VideoAnalysFromHC
+
+ 鐜拌棰戝垎鏋愪富妯″潡
+
+* VideoServer
+
+ http Server 宸ュ叿妯″潡
+ VideoAnalysFromHC宸ュ叿妯″潡
+
+* YoloServer
+
+ 浜轰綋妫�娴媔ce鏈嶅姟
+
+------
+
+## 2.syncDBTool
+c涓巈rlang浜や簰鐨勯┍鍔�
+
+
diff --git a/syncDBTool/ErlangDbTool.cpp b/syncDBTool/ErlangDbTool.cpp
index a96f15d..8c3e12a 100755
--- a/syncDBTool/ErlangDbTool.cpp
+++ b/syncDBTool/ErlangDbTool.cpp
@@ -190,7 +190,7 @@
//#todo
addr.s_addr = inet_addr("127.0.0.1");
- m_pName.append(to_string((int) getpid()));
+ m_pName.append(std::to_string((int) getpid()));
std::string t_cNodeName(m_pName);
t_cNodeName.append("@127.0.0.1");
@@ -1567,7 +1567,7 @@
}
return true;
} else {
- erl_close_connection(m_fd);
+ erl_close_connection(m_fd);
m_fd = erl_connect(const_cast<char *>(m_nodeName.c_str()));
if (0 > m_fd) {
// erl_err_quit("erl_connect");
--
Gitblit v1.8.0