From 6eb847801e6d1d66105a8ec2fe8c449c9e24da4c Mon Sep 17 00:00:00 2001
From: 孙天宇 <suntianyu@aiotlink.com>
Date: 星期二, 12 七月 2022 15:52:27 +0800
Subject: [PATCH] Merge branch '3090' of http://192.168.5.5:10010/r/Algorithm/baseDetector into 3090
---
src/h_interface.cpp | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/src/h_interface.cpp b/src/h_interface.cpp
index 98e2595..32d519e 100644
--- a/src/h_interface.cpp
+++ b/src/h_interface.cpp
@@ -8,6 +8,8 @@
using namespace std;
string m_staticStruct::model_path = "path";
+string m_staticStruct::model_cfg = "0"; // 鍒濆鍖栫粨鏋勪綋闈欐�佸彉閲忓��
+string m_staticStruct::model_wts = "0"; // 鍒濆鍖栫粨鏋勪綋闈欐�佸彉閲忓��
int m_staticStruct::type = 1;
bool m_staticStruct::isTrack= true;
int m_staticStruct::max_cam_num = 0;
@@ -18,8 +20,8 @@
API void* create(const char *conf, int *max_chan)
{
- // CLog::Initialize("/opt/vasystem/bin/models/baseDetector/log.properties");
- CLog::Initialize("../config/log4cplus.properties");
+ CLog::Initialize("/opt/vasystem/bin/models/baseDetector/log.properties");
+ // CLog::Initialize("../config/log4cplus.properties");
ReadJsonFromFile(conf);
AriManager *handle = new AriManager();
*max_chan = m_staticStruct::max_cam_num;
@@ -60,10 +62,11 @@
}
h->single_SDK(chan, img, t_result, const_cast<char*>(timestamp), mode);
+ std::string mode_type = mode;
DEBUG("--cam id:" + to_string(chan) + " image human_count:" + to_string(t_result->count));
for (int i = 0; i < t_result->count; ++i)
{
- if(mode == "video"){
+ if(mode_type == "video"){
DEBUG("--human_id:" + to_string(t_result->targets[i].id)+" human_confidence:" + to_string(t_result->targets[i].confidence) + " human_attribute:" + std::string(t_result->targets[i].attribute) + " human_top:" + to_string(t_result->targets[i].rect.top)+" human_left:" + to_string(t_result->targets[i].rect.left) + " human_right:" + to_string(t_result->targets[i].rect.right)+ " human_bottom:" + to_string(t_result->targets[i].rect.bottom));
}
else{
@@ -115,6 +118,8 @@
if(reader.parse(in,root))
{
std::string model_path = root["param"]["model_path"].asString();
+ std::string model_cfg= root["param"]["model_cfg"].asString();
+ std::string model_wts = root["param"]["model_wts"].asString();
int type = root["param"]["type"].asInt();
bool isTrack = root["param"]["isTrack"].asBool();
int max_cam_num = root["param"]["max_cam_num"].asInt();
@@ -122,6 +127,8 @@
int mv_velocity = root["param"]["mv_velocity"].asFloat();
int fall_rate = root["param"]["fall_rate"].asFloat();
m_staticStruct::model_path = model_path;
+ m_staticStruct::model_cfg = model_cfg;
+ m_staticStruct::model_wts = model_wts;
m_staticStruct::type = type;
m_staticStruct::isTrack = isTrack;
m_staticStruct::max_cam_num = max_cam_num;
--
Gitblit v1.8.0