Changed output from FingerTracker to use Logger.

bbiwarg/Constants.cs

@@ -11,18 +11,15 @@ namespace bbiwarg
 {
     class Constants
     {
-        // BBIWARG
+        // Logger
         public static readonly Logger.LogSubject LogLevel =
-            Logger.LogSubject.TUIOServer;
+            Logger.LogSubject.FingerTracker;
+        
+        // BBIWARG
         public static readonly int OutputNumImages = 5;
         public static readonly int OutputNumImagesPerRow = 3;
         public static readonly float OutputScaleFactor = 1f; // output window size is scaled by this factor (from necessary size for images)
 
-        // debug
-        public static readonly bool OutputTimerEnabled = false;
-        public static readonly bool VerboseTUIO = false;
-        public static readonly bool VerboseFingerTracker = true;
-
         // confidence image
         public static readonly int ConfidenceImageMinThreshold = 500;
 

bbiwarg/Recognition/FingerRecognition/FingerTracker.cs

@@ -7,6 +7,8 @@ using System.Threading.Tasks;
 using bbiwarg.Images;
 using bbiwarg.Graphics;
 
+using bbiwarg.Utility;
+
 namespace bbiwarg.Recognition.FingerRecognition
 {
     struct FingerSimilarity
@@ -36,7 +38,7 @@ namespace bbiwarg.Recognition.FingerRecognition
                 {
                     FingerHistory fh = new FingerHistory(finger);
                     FingerHistories.Add(fh);
-                    if (Constants.VerboseFingerTracker) Console.WriteLine("Finger #" + fh.ID + " detected");
+                    Logger.log("Finger #" + fh.ID + " detected", Logger.LogSubject.FingerTracker);
                 }
             }
             else
@@ -81,13 +83,14 @@ namespace bbiwarg.Recognition.FingerRecognition
             {
                 FingerHistory fh = new FingerHistory(finger);
                 FingerHistories.Add(fh);
-                if (Constants.VerboseFingerTracker) Console.WriteLine("Finger #" + fh.ID + " detected");
+                Logger.log("Finger #" + fh.ID + " detected", Logger.LogSubject.FingerTracker);
             }
 
             //add null finger to TrackedFingers that haven't found a match in this frame (status tracked->lost)
             foreach (FingerHistory fh in unasignedFingerHistories)
             {
-                if (Constants.VerboseFingerTracker && fh.CurrentState != TrackingState.Lost) Console.WriteLine("Finger #" + fh.ID + " lost");
+                if (fh.CurrentState != TrackingState.Lost) 
+                    Logger.log("Finger #" + fh.ID + " lost", Logger.LogSubject.FingerTracker);
                 fh.addFinger(null);
             }
 
@@ -143,7 +146,7 @@ namespace bbiwarg.Recognition.FingerRecognition
                 if (fh.CurrentState == TrackingState.Lost && fh.getNumFramesInCurrentState() >= Constants.FingerNumFramesUntilLost)
                 {
                     FingerHistories.RemoveAt(i);
-                    if (Constants.VerboseFingerTracker) Console.WriteLine("Finger #" + fh.ID + " deleted");
+                    Logger.log("Finger #" + fh.ID + " deleted", Logger.LogSubject.FingerTracker);
                 }
             }
         }