text shift calculation is refactored

LdDl · LdDl · commit b42b9adc299c · 2021-04-23T15:47:59.000+03:00
diff --git a/v2/blob/kalman_blob.go b/v2/blob/kalman_blob.go
@@ -229,15 +229,15 @@ func (b *KalmanBlobie) DrawTrack(mat *gocv.Mat, optionalText ...string) {
 			gocv.Circle(mat, b.Track[i], b.drawingOptions.CentroidColor.Radius, b.drawingOptions.CentroidColor.Color, b.drawingOptions.CentroidColor.Thickness)
 		}
 		shiftTextY := 0
-		for i := len(optionalText) - 1; i >= 0; i-- {
+		for i := 0; i < len(optionalText); i++ {
 			text := optionalText[i]
 			if text != "" {
-				anchor := image.Pt(b.CurrentRect.Min.X, b.CurrentRect.Min.Y-i*shiftTextY)
 				textSize := gocv.GetTextSize(text, b.drawingOptions.TextColor.Font, b.drawingOptions.TextColor.Scale, b.drawingOptions.TextColor.Thickness)
+				anchor := image.Pt(b.CurrentRect.Min.X, b.CurrentRect.Min.Y-shiftTextY-b.drawingOptions.BBoxColor.Thickness) // substract extra margin = Thickness of BBox
 				textRect := image.Rectangle{Min: image.Point{X: anchor.X, Y: anchor.Y - textSize.Y}, Max: image.Point{X: anchor.X + textSize.X, Y: anchor.Y}}
 				gocv.Rectangle(mat, textRect, b.drawingOptions.BBoxColor.Color, b.drawingOptions.BBoxColor.Thickness)
 				gocv.PutText(mat, text, anchor, b.drawingOptions.TextColor.Font, b.drawingOptions.TextColor.Scale, b.drawingOptions.TextColor.Color, b.drawingOptions.TextColor.Thickness)
-				shiftTextY = textSize.Y
+				shiftTextY += textSize.Y
 			}
 		}
 	}
diff --git a/v2/blob/simple_blob.go b/v2/blob/simple_blob.go
@@ -217,15 +217,15 @@ func (b *SimpleBlobie) DrawTrack(mat *gocv.Mat, optionalText ...string) {
 			gocv.Circle(mat, b.Track[i], b.drawingOptions.CentroidColor.Radius, b.drawingOptions.CentroidColor.Color, b.drawingOptions.CentroidColor.Thickness)
 		}
 		shiftTextY := 0
-		for i := len(optionalText) - 1; i >= 0; i-- {
+		for i := 0; i < len(optionalText); i++ {
 			text := optionalText[i]
 			if text != "" {
-				anchor := image.Pt(b.CurrentRect.Min.X, b.CurrentRect.Min.Y-i*shiftTextY)
 				textSize := gocv.GetTextSize(text, b.drawingOptions.TextColor.Font, b.drawingOptions.TextColor.Scale, b.drawingOptions.TextColor.Thickness)
+				anchor := image.Pt(b.CurrentRect.Min.X, b.CurrentRect.Min.Y-shiftTextY-b.drawingOptions.BBoxColor.Thickness) // substract extra margin = Thickness of BBox
 				textRect := image.Rectangle{Min: image.Point{X: anchor.X, Y: anchor.Y - textSize.Y}, Max: image.Point{X: anchor.X + textSize.X, Y: anchor.Y}}
 				gocv.Rectangle(mat, textRect, b.drawingOptions.BBoxColor.Color, b.drawingOptions.BBoxColor.Thickness)
 				gocv.PutText(mat, text, anchor, b.drawingOptions.TextColor.Font, b.drawingOptions.TextColor.Scale, b.drawingOptions.TextColor.Color, b.drawingOptions.TextColor.Thickness)
-				shiftTextY = textSize.Y
+				shiftTextY += textSize.Y
 			}
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -229,15 +229,15 @@ func (b KalmanBlobie) DrawTrack(mat gocv.Mat, optionalText ...string) {`
`229`	`229`	`gocv.Circle(mat, b.Track[i], b.drawingOptions.CentroidColor.Radius, b.drawingOptions.CentroidColor.Color, b.drawingOptions.CentroidColor.Thickness)`
`230`	`230`	`}`
`231`	`231`	`shiftTextY := 0`
`232`		`- for i := len(optionalText) - 1; i >= 0; i-- {`
	`232`	`+ for i := 0; i < len(optionalText); i++ {`
`233`	`233`	`text := optionalText[i]`
`234`	`234`	`if text != "" {`
`235`		`- anchor := image.Pt(b.CurrentRect.Min.X, b.CurrentRect.Min.Y-i*shiftTextY)`
`236`	`235`	`textSize := gocv.GetTextSize(text, b.drawingOptions.TextColor.Font, b.drawingOptions.TextColor.Scale, b.drawingOptions.TextColor.Thickness)`
	`236`	`+ anchor := image.Pt(b.CurrentRect.Min.X, b.CurrentRect.Min.Y-shiftTextY-b.drawingOptions.BBoxColor.Thickness) // substract extra margin = Thickness of BBox`
`237`	`237`	`textRect := image.Rectangle{Min: image.Point{X: anchor.X, Y: anchor.Y - textSize.Y}, Max: image.Point{X: anchor.X + textSize.X, Y: anchor.Y}}`
`238`	`238`	`gocv.Rectangle(mat, textRect, b.drawingOptions.BBoxColor.Color, b.drawingOptions.BBoxColor.Thickness)`
`239`	`239`	`gocv.PutText(mat, text, anchor, b.drawingOptions.TextColor.Font, b.drawingOptions.TextColor.Scale, b.drawingOptions.TextColor.Color, b.drawingOptions.TextColor.Thickness)`
`240`		`- shiftTextY = textSize.Y`
	`240`	`+ shiftTextY += textSize.Y`
`241`	`241`	`}`
`242`	`242`	`}`
`243`	`243`	`}`
Original file line number	Diff line number	Diff line change
`@@ -217,15 +217,15 @@ func (b SimpleBlobie) DrawTrack(mat gocv.Mat, optionalText ...string) {`
`217`	`217`	`gocv.Circle(mat, b.Track[i], b.drawingOptions.CentroidColor.Radius, b.drawingOptions.CentroidColor.Color, b.drawingOptions.CentroidColor.Thickness)`
`218`	`218`	`}`
`219`	`219`	`shiftTextY := 0`
`220`		`- for i := len(optionalText) - 1; i >= 0; i-- {`
	`220`	`+ for i := 0; i < len(optionalText); i++ {`
`221`	`221`	`text := optionalText[i]`
`222`	`222`	`if text != "" {`
`223`		`- anchor := image.Pt(b.CurrentRect.Min.X, b.CurrentRect.Min.Y-i*shiftTextY)`
`224`	`223`	`textSize := gocv.GetTextSize(text, b.drawingOptions.TextColor.Font, b.drawingOptions.TextColor.Scale, b.drawingOptions.TextColor.Thickness)`
	`224`	`+ anchor := image.Pt(b.CurrentRect.Min.X, b.CurrentRect.Min.Y-shiftTextY-b.drawingOptions.BBoxColor.Thickness) // substract extra margin = Thickness of BBox`
`225`	`225`	`textRect := image.Rectangle{Min: image.Point{X: anchor.X, Y: anchor.Y - textSize.Y}, Max: image.Point{X: anchor.X + textSize.X, Y: anchor.Y}}`
`226`	`226`	`gocv.Rectangle(mat, textRect, b.drawingOptions.BBoxColor.Color, b.drawingOptions.BBoxColor.Thickness)`
`227`	`227`	`gocv.PutText(mat, text, anchor, b.drawingOptions.TextColor.Font, b.drawingOptions.TextColor.Scale, b.drawingOptions.TextColor.Color, b.drawingOptions.TextColor.Thickness)`
`228`		`- shiftTextY = textSize.Y`
	`228`	`+ shiftTextY += textSize.Y`
`229`	`229`	`}`
`230`	`230`	`}`
`231`	`231`	`}`