upd tracker

Author: LdDl

blob/array_tracker.go

@@ -2,11 +2,9 @@ package blob
 
 import (
 	"image"
-	"image/color"
 	"math"
 
 	uuid "github.com/satori/go.uuid"
-	"gocv.io/x/gocv"
 )
 
 // Blobies - Array of blobs
@@ -15,6 +13,8 @@ type Blobies struct {
 	maxNoMatch           int
 	minThresholdDistance float64
 	maxPointsInTrack     int
+
+	DrawingOptions *DrawOptions
 }
 
 // NewBlobiesDefaults - Constructor for Blobies (default values)
@@ -30,6 +30,7 @@ func NewBlobiesDefaults() *Blobies {
 		maxNoMatch:           5,
 		minThresholdDistance: 15,
 		maxPointsInTrack:     10,
+		DrawingOptions:       NewDrawOptionsDefault(),
 	}
 }
 
@@ -39,6 +40,7 @@ func (bt *Blobies) MatchToExisting(rects []image.Rectangle) {
 	blobies := make([]*Blobie, len(rects))
 	for i := range blobies {
 		blobies[i] = NewBlobie(rects[i], bt.maxPointsInTrack)
+		blobies[i].drawingOptions = bt.DrawingOptions
 	}
 
 	for i := range blobies {
@@ -98,18 +100,6 @@ func (bt *Blobies) deregister(guid uuid.UUID) {
 	delete(bt.Objects, guid)
 }
 
-// DrawTrack - Draw blob's track
-func (b *Blobie) DrawTrack(mat *gocv.Mat, optionalText string) {
-	gocv.Rectangle(mat, (*b).CurrentRect, color.RGBA{255, 255, 0, 0}, 2)
-	if (*b).isStillBeingTracked {
-		for i := range (*b).Track {
-			gocv.Circle(mat, (*b).Track[i], 4, color.RGBA{255, 0, 0, 0}, 1)
-		}
-		pt := image.Pt((*b).CurrentRect.Min.X, (*b).CurrentRect.Min.Y)
-		gocv.PutText(mat, optionalText, pt, gocv.FontHersheyPlain, 1.2, color.RGBA{0, 255, 0, 0}, 2)
-	}
-}
-
 // IsCrossedTheLine - Check if blob crossed the HORIZONTAL line
 func (b *Blobie) IsCrossedTheLine(vertical, leftX, rightX int, direction bool) bool {
 	trackLen := len(b.Track)

blob/blob.go

@@ -5,6 +5,7 @@ import (
 	"math"
 
 	uuid "github.com/satori/go.uuid"
+	"gocv.io/x/gocv"
 )
 
 // Blobie - Main blob structure
@@ -23,7 +24,8 @@ type Blobie struct {
 	PredictedNextPosition image.Point
 
 	// For array tracker
-	crossedLine bool
+	drawingOptions *DrawOptions
+	crossedLine    bool
 }
 
 // NewBlobie - Constructor for Blobie (default values)
@@ -113,39 +115,20 @@ func (b *Blobie) PredictNextPosition(n int) {
 	(*b).PredictedNextPosition.Y = (*b).Track[len((*b).Track)-1].Y + deltaY
 }
 
-// // IsCrossedTheLine - Check if blob crossed the HORIZONTAL line
-// func (b *Blobie) IsCrossedTheLine(horizontal int, counter *int, direction bool) bool {
-// 	if (*b).isStillBeingTracked == true && len((*b).Track) >= 2 && (*b).counted == false {
-// 		prevFrame := len((*b).Track) - 2
-// 		currFrame := len((*b).Track) - 1
-// 		if direction {
-// 			if (*b).Track[prevFrame].Y <= horizontal && (*b).Track[currFrame].Y > horizontal { // TO us
-// 				*counter++
-// 				b.AsCounted()
-// 				return true
-// 			}
-// 		} else {
-// 			if (*b).Track[prevFrame].Y > horizontal && (*b).Track[currFrame].Y <= horizontal { // FROM us
-// 				*counter++
-// 				b.AsCounted()
-// 				return true
-// 			}
-// 		}
-// 	}
-// 	return false
-// }
-
-// // DrawTrack - Draw blob's track
-// func (b *Blobie) DrawTrack(mat *gocv.Mat, optionalText string) {
-// 	if (*b).isStillBeingTracked == true {
-// 		for i := range (*b).Track {
-// 			gocv.Circle(mat, (*b).Track[i], 4, color.RGBA{255, 0, 0, 0}, 1)
-// 		}
-// 		gocv.Rectangle(mat, (*b).CurrentRect, color.RGBA{0, 255, 255, 0}, 2)
-// 		pt := image.Pt((*b).CurrentRect.Min.X, (*b).CurrentRect.Min.Y)
-// 		gocv.PutText(mat, optionalText, pt, gocv.FontHersheyPlain, 1.2, color.RGBA{0, 255, 0, 0}, 2)
-// 	}
-// }
+// DrawTrack - Draw blob's track
+func (b *Blobie) DrawTrack(mat *gocv.Mat, optionalText string) {
+	if b.drawingOptions == nil {
+		b.drawingOptions = NewDrawOptionsDefault()
+	}
+	gocv.Rectangle(mat, b.CurrentRect, b.drawingOptions.BBoxColor.Color, b.drawingOptions.BBoxColor.Thickness)
+	if b.isStillBeingTracked {
+		for i := range b.Track {
+			gocv.Circle(mat, b.Track[i], b.drawingOptions.CentroidColor.Radius, b.drawingOptions.CentroidColor.Color, b.drawingOptions.CentroidColor.Thickness)
+		}
+		pt := image.Pt(b.CurrentRect.Min.X, b.CurrentRect.Min.Y)
+		gocv.PutText(mat, optionalText, pt, gocv.FontHersheyPlain, b.drawingOptions.TextColor.Scale, b.drawingOptions.TextColor.Color, b.drawingOptions.TextColor.Thickness)
+	}
+}
 
 func min(x, y int) int {
 	if x < y {

blob/draw_options.go

@@ -0,0 +1,70 @@
+package blob
+
+import (
+	"image/color"
+
+	"gocv.io/x/gocv"
+)
+
+// DrawOptions Options for blob.DrawTrack function
+type DrawOptions struct {
+	BBoxColor     DrawBBoxOptions
+	CentroidColor DrawCentroidOptions
+	TextColor     DrawTextOptions
+}
+
+// DrawBBoxOptions Options for bounding box of blob
+type DrawBBoxOptions struct {
+	Color     color.RGBA
+	Thickness int
+}
+
+// DrawCentroidOptions Options for centroid of blob
+type DrawCentroidOptions struct {
+	Color     color.RGBA
+	Radius    int
+	Thickness int
+}
+
+// DrawTextOptions Options for text if top left corner bounding box of blob
+type DrawTextOptions struct {
+	Color     color.RGBA
+	Scale     float64
+	Thickness int
+	Font      gocv.HersheyFont
+}
+
+// NewDrawOptionsDefault Returns pointer to new DrawOptions (default)
+func NewDrawOptionsDefault() *DrawOptions {
+	bbox := DrawBBoxOptions{
+		Color:     color.RGBA{255, 255, 0, 0},
+		Thickness: 2,
+	}
+	centroid := DrawCentroidOptions{
+		Color:     color.RGBA{255, 0, 0, 0},
+		Radius:    4,
+		Thickness: 2,
+	}
+	text := DrawTextOptions{
+		Color:     color.RGBA{0, 255, 0, 0},
+		Scale:     1.2,
+		Thickness: 2,
+		Font:      gocv.FontHersheyPlain,
+	}
+	opts := DrawOptions{
+		BBoxColor:     bbox,
+		CentroidColor: centroid,
+		TextColor:     text,
+	}
+	return &opts
+}
+
+// NewDrawOptions Returns pointer to new DrawOptions (custom)
+func NewDrawOptions(bbox DrawBBoxOptions, centroid DrawCentroidOptions, text DrawTextOptions) *DrawOptions {
+	opts := DrawOptions{
+		BBoxColor:     bbox,
+		CentroidColor: centroid,
+		TextColor:     text,
+	}
+	return &opts
+}