add X-axis threshold

Author: LdDl

blob/array_tracker.go

@@ -111,20 +111,23 @@ func (b *Blobie) DrawTrack(mat *gocv.Mat, optionalText string) {
 }
 
 // IsCrossedTheLine - Check if blob crossed the HORIZONTAL line
-func (b *Blobie) IsCrossedTheLine(horizontal int, direction bool) bool {
+func (b *Blobie) IsCrossedTheLine(vertical, leftX, rightX int, direction bool) bool {
 	trackLen := len(b.Track)
 	if b.isStillBeingTracked == true && trackLen >= 2 && b.crossedLine == false {
 		prevFrame := trackLen - 2
 		currFrame := trackLen - 1
-		if direction {
-			if b.Track[prevFrame].Y <= horizontal && b.Track[currFrame].Y > horizontal { // TO us
-				b.crossedLine = true
-				return true
-			}
-		} else {
-			if b.Track[prevFrame].Y > horizontal && b.Track[currFrame].Y <= horizontal { // FROM us
-				b.crossedLine = true
-				return true
+		if b.Track[currFrame].X >= leftX && b.Track[currFrame].X <= rightX {
+			if direction {
+
+				if b.Track[prevFrame].Y <= vertical && b.Track[currFrame].Y > vertical { // TO us
+					b.crossedLine = true
+					return true
+				}
+			} else {
+				if b.Track[prevFrame].Y > vertical && b.Track[currFrame].Y <= vertical { // FROM us
+					b.crossedLine = true
+					return true
+				}
 			}
 		}
 	}
@@ -133,20 +136,22 @@ func (b *Blobie) IsCrossedTheLine(horizontal int, direction bool) bool {
 
 // IsCrossedTheLineWithShift - Check if blob crossed the HORIZONTAL line with shift along the Y-axis
 // Purpose of this for "predicative" cropping when detection line very close to bottom of image
-func (b *Blobie) IsCrossedTheLineWithShift(horizontal int, direction bool, shift int) bool {
+func (b *Blobie) IsCrossedTheLineWithShift(vertical, leftX, rightX int, direction bool, shift int) bool {
 	trackLen := len(b.Track)
 	if b.isStillBeingTracked == true && trackLen >= 2 && b.crossedLine == false {
 		prevFrame := trackLen - 2
 		currFrame := trackLen - 1
-		if direction {
-			if b.Track[prevFrame].Y <= horizontal && (b.Track[currFrame].Y+shift) > horizontal { // TO us
-				b.crossedLine = true
-				return true
-			}
-		} else {
-			if b.Track[prevFrame].Y > horizontal && (b.Track[currFrame].Y+shift) <= horizontal { // FROM us
-				b.crossedLine = true
-				return true
+		if b.Track[currFrame].X >= leftX && b.Track[currFrame].X <= rightX {
+			if direction {
+				if (b.Track[prevFrame].Y+shift) <= vertical && (b.Track[currFrame].Y+shift) > vertical { // TO us
+					b.crossedLine = true
+					return true
+				}
+			} else {
+				if (b.Track[prevFrame].Y+shift) > vertical && (b.Track[currFrame].Y+shift) <= vertical { // FROM us
+					b.crossedLine = true
+					return true
+				}
 			}
 		}
 	}

blob/blob.go

@@ -85,7 +85,7 @@ func (b *Blobie) Update(newb Blobie) {
 	b.Track = append(b.Track, newb.Center)
 	// Restrict number of points in track (shift to the left)
 	if len(b.Track) > b.maxPointsInTrack {
-		 b.Track = b.Track[1:]
+		b.Track = b.Track[1:]
 	}
 }