From 779b80d18f41fb855bc91eb6e5470d26665e6683 Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期四, 11 四月 2019 15:36:32 +0800
Subject: [PATCH] 添加VptElement
---
QiaoJiaSystem/VptServer/rpc/VptServer.h | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/QiaoJiaSystem/VptServer/rpc/VptServer.h b/QiaoJiaSystem/VptServer/rpc/VptServer.h
index e41584d..aaaa9eb 100644
--- a/QiaoJiaSystem/VptServer/rpc/VptServer.h
+++ b/QiaoJiaSystem/VptServer/rpc/VptServer.h
@@ -135,14 +135,15 @@
struct VptDetectResult
{
int sdkDetectType;
+ float obj_score;
::VptDetect::RECT bskRect;
::VptDetect::PersonDetectRes personDetectRes;
::VptDetect::PerRideCarDetectRes perRideCarDetectRes;
::VptDetect::CarDetectRes carDetectRes;
- std::tuple<const int&, const ::VptDetect::RECT&, const ::VptDetect::PersonDetectRes&, const ::VptDetect::PerRideCarDetectRes&, const ::VptDetect::CarDetectRes&> ice_tuple() const
+ std::tuple<const int&, const float&, const ::VptDetect::RECT&, const ::VptDetect::PersonDetectRes&, const ::VptDetect::PerRideCarDetectRes&, const ::VptDetect::CarDetectRes&> ice_tuple() const
{
- return std::tie(sdkDetectType, bskRect, personDetectRes, perRideCarDetectRes, carDetectRes);
+ return std::tie(sdkDetectType, obj_score, bskRect, personDetectRes, perRideCarDetectRes, carDetectRes);
}
};
@@ -450,7 +451,7 @@
struct StreamableTraits<::VptDetect::VptDetectResult>
{
static const StreamHelperCategory helper = StreamHelperCategoryStruct;
- static const int minWireSize = 68;
+ static const int minWireSize = 72;
static const bool fixedLength = false;
};
@@ -459,7 +460,7 @@
{
static void read(S* istr, ::VptDetect::VptDetectResult& v)
{
- istr->readAll(v.sdkDetectType, v.bskRect, v.personDetectRes, v.perRideCarDetectRes, v.carDetectRes);
+ istr->readAll(v.sdkDetectType, v.obj_score, v.bskRect, v.personDetectRes, v.perRideCarDetectRes, v.carDetectRes);
}
};
@@ -550,6 +551,7 @@
struct VptDetectResult
{
::Ice::Int sdkDetectType;
+ ::Ice::Float obj_score;
::VptDetect::RECT bskRect;
::VptDetect::PersonDetectRes personDetectRes;
::VptDetect::PerRideCarDetectRes perRideCarDetectRes;
@@ -1061,7 +1063,7 @@
struct StreamableTraits< ::VptDetect::VptDetectResult>
{
static const StreamHelperCategory helper = StreamHelperCategoryStruct;
- static const int minWireSize = 68;
+ static const int minWireSize = 72;
static const bool fixedLength = false;
};
@@ -1071,6 +1073,7 @@
static void write(S* ostr, const ::VptDetect::VptDetectResult& v)
{
ostr->write(v.sdkDetectType);
+ ostr->write(v.obj_score);
ostr->write(v.bskRect);
ostr->write(v.personDetectRes);
ostr->write(v.perRideCarDetectRes);
@@ -1084,6 +1087,7 @@
static void read(S* istr, ::VptDetect::VptDetectResult& v)
{
istr->read(v.sdkDetectType);
+ istr->read(v.obj_score);
istr->read(v.bskRect);
istr->read(v.personDetectRes);
istr->read(v.perRideCarDetectRes);
--
Gitblit v1.8.0