matchfuction: go to blobies instead of rects

Author: LdDl

blob/array_tracker.go

@@ -1,7 +1,6 @@
 package blob
 
 import (
-	"image"
 	"math"
 
 	uuid "github.com/satori/go.uuid"
@@ -35,14 +34,8 @@ func NewBlobiesDefaults() *Blobies {
 }
 
 // MatchToExisting Check if some of blobs already exists
-func (bt *Blobies) MatchToExisting(rects []image.Rectangle) {
+func (bt *Blobies) MatchToExisting(blobies []*Blobie) {
 	bt.prepare()
-	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 {
 		minUUID := uuid.UUID{}
 		minDistance := math.MaxFloat64
@@ -61,10 +54,10 @@ func (bt *Blobies) MatchToExisting(rects []image.Rectangle) {
 			bt.Register(blobies[i])
 		}
 	}
-
 	bt.RefreshNoMatch()
 }
 
+// RefreshNoMatch - Refresh state of each blob
 func (bt *Blobies) RefreshNoMatch() {
 	for i, b := range (*bt).Objects {
 		if b.isExists == false {

blob/blob.go

@@ -23,13 +23,16 @@ type Blobie struct {
 	noMatchTimes          int
 	PredictedNextPosition image.Point
 
+	classID   int
+	className string
+
 	// For array tracker
 	drawingOptions *DrawOptions
 	crossedLine    bool
 }
 
 // NewBlobie - Constructor for Blobie (default values)
-func NewBlobie(rect image.Rectangle, maxPointsInTrack int) *Blobie {
+func NewBlobie(rect image.Rectangle, maxPointsInTrack, classID int, className string) *Blobie {
 	center := image.Pt((rect.Min.X*2+rect.Dx())/2, (rect.Min.Y*2+rect.Dy())/2)
 	width := float64(rect.Dx())
 	height := float64(rect.Dy())
@@ -45,6 +48,8 @@ func NewBlobie(rect image.Rectangle, maxPointsInTrack int) *Blobie {
 		isStillBeingTracked: true,
 		noMatchTimes:        0,
 
+		classID:     classID,
+		className:   className,
 		crossedLine: false,
 	}
 }
@@ -70,10 +75,28 @@ func NewBlobieDefaults(rect image.Rectangle) *Blobie {
 		isStillBeingTracked: true,
 		noMatchTimes:        0,
 
+		classID:     -1,
+		className:   "No class",
 		crossedLine: false,
 	}
 }
 
+// SetClass - Set class information (eg. classID=1, className=vehicle)
+func (b *Blobie) SetClass(classID int, className string) {
+	b.SetClassID(classID)
+	b.SetClassName(className)
+}
+
+// SetClassID - Set class identifier
+func (b *Blobie) SetClassID(classID int) {
+	b.classID = classID
+}
+
+// SetClassName - Set class name
+func (b *Blobie) SetClassName(className string) {
+	b.className = className
+}
+
 // Update - Update info about blob
 func (b *Blobie) Update(newb Blobie) {
 	b.CurrentRect = newb.CurrentRect