From 2c43d36c526392576b8fb99b31c85ed977299f53 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期四, 21 十一月 2019 17:38:04 +0800
Subject: [PATCH] ---
---
insertdata/insertDataToEs.go | 4 ++--
util/image.go | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/insertdata/insertDataToEs.go b/insertdata/insertDataToEs.go
index bf65120..3b86ac5 100644
--- a/insertdata/insertDataToEs.go
+++ b/insertdata/insertDataToEs.go
@@ -361,7 +361,7 @@
var target1 = new(Target)
target1.TargetId = target.Id
target1.TargetScore = target.Score
- target1.TargetType = target.Type
+ target1.TargetType = "action"
target1.TargetLocation = Points{TopLeft: Point{target.Location.X, target.Location.Y}, BottomRight: Point{target.Location.X + target.Location.Width, target.Location.Y + target.Location.Height}}
targetInfos = append(targetInfos, *target1)
}
@@ -562,7 +562,7 @@
var target1 = new(Target)
target1.TargetId = target.Id
target1.TargetScore = target.Score
- target1.TargetType = target.Type
+ target1.TargetType = "action"
target1.TargetLocation = Points{TopLeft: Point{target.Location.X, target.Location.Y}, BottomRight: Point{target.Location.X + target.Location.Width, target.Location.Y + target.Location.Height}}
targetInfos = append(targetInfos, *target1)
}
diff --git a/util/image.go b/util/image.go
index 6616bf7..1257d97 100644
--- a/util/image.go
+++ b/util/image.go
@@ -57,7 +57,7 @@
}
// 姣忚竟鍚勬墿鐧惧垎涔�20
-func EnlargeSizeForCar(x0, y0, x1, y1 int, i protomsg.Image) (x0_new, y0_new, x1_new, y1_new int) {
+func EnlargeSizeForCar(x0, y0, x1, y1 int, i protomsg.Image) (int,int,int,int) {
// 鍏堟妸闀垮鍙樹负涓�姣斾竴
chazhi := (y1 - y0) - (x1 - x0)
@@ -69,5 +69,5 @@
if x1 > int(i.Width) {
x1 = int(i.Width)
}
- return
+ return x0, y0, x1, y1
}
--
Gitblit v1.8.0