From f76e6f73d57015a04272f05a48c27bfd42b14015 Mon Sep 17 00:00:00 2001
From: miyanhui <dennismi1024@gmail.com>
Date: 星期三, 13 二月 2019 17:33:27 +0800
Subject: [PATCH] Merge branch 'ywv1.2' of http://192.168.1.226:10010/r/development/c++ into ywv1.2
---
QiaoJiaSystem/StructureApp/TrackingTrigger.h | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/QiaoJiaSystem/StructureApp/TrackingTrigger.h b/QiaoJiaSystem/StructureApp/TrackingTrigger.h
index a9aa7a8..05ccc42 100644
--- a/QiaoJiaSystem/StructureApp/TrackingTrigger.h
+++ b/QiaoJiaSystem/StructureApp/TrackingTrigger.h
@@ -9,8 +9,9 @@
using namespace std;
struct ScoredRect {
- ScoredRect() : id(-1) ,isMove(false){}
+ ScoredRect() : id(-1) ,isMove(false),times(0){}
bool isMove;
+ time_t times;
float score;
cv::Rect rect;
long id;
@@ -29,6 +30,7 @@
found = true;
rect.id = lastRect.id;
lastRect.properties["time"]=rect.properties["time"];
+ lastRect.properties["imgKey"]=rect.properties["imgKey"];
rect.properties = lastRect.properties;
tempScoreRects.push_back(rect);
break;
--
Gitblit v1.8.0