Browse Source

made LogLevel global

Alexander Hendrich 10 năm trước cách đây
mục cha
commit
bed506e222

+ 2 - 2
bbiwarg/Constants.cs

@@ -12,8 +12,8 @@ namespace bbiwarg
     class Constants
     {
         // Logger
-        public static readonly Logger.LogSubject LogLevel =
-            Logger.LogSubject.FingerTracker;
+        public static readonly LogSubject LogLevel =
+            LogSubject.FingerTracker;
         
         // Output
         public static readonly int OutputNumImages = 5;

+ 2 - 2
bbiwarg/Recognition/Tracking/Tracker.cs

@@ -29,12 +29,12 @@ namespace bbiwarg.Recognition.Tracking
         public List<T> TrackedObjects { get; private set; }
         private List<SimilarityContainer<T>> similarities;
         private String className;
-        private Logger.LogSubject logSubject;
+        private LogSubject logSubject;
         private int numFramesUntilTracked;
         private int numFramesUntilLost;
         private float minSimilarityForTracking;
 
-        public Tracker(Logger.LogSubject logSubject, int numFramesUntilTracked, int numFramesUntilLost, float minSimilarityForTracking)
+        public Tracker(LogSubject logSubject, int numFramesUntilTracked, int numFramesUntilLost, float minSimilarityForTracking)
         {
             this.className = typeof(T).Name;
             this.logSubject = logSubject;

+ 1 - 1
bbiwarg/Server/TUIO/TuioServer.cs

@@ -134,7 +134,7 @@ namespace TUIO
                 }*/
                 packet.Append(currentMessage);
 
-                Logger.log("Send Cursor "+cursor.getSessionID()+" at time "+TuioTime.getSystemTime().ToString(), Logger.LogSubject.TUIOServer);
+                Logger.log("Send Cursor "+cursor.getSessionID()+" at time "+TuioTime.getSystemTime().ToString(), LogSubject.TUIOServer);
 
             }
             currentMessage = new OSCMessage("/tuio/2Dcur");

+ 11 - 12
bbiwarg/Utility/Logger.cs

@@ -6,20 +6,19 @@ using System.Threading.Tasks;
 
 namespace bbiwarg.Utility
 {
+    public enum LogSubject
+    {
+        FingerDetector = 1,
+        FingerTracker = 2,
+        HandDetector = 4,
+        PalmDetector = 8,
+        TouchDetector = 16,
+        TouchTracker = 32,
+        TUIOServer = 64,
+        Timer = 128
+    }
     static class Logger
     {
-        public enum LogSubject
-        {
-            FingerDetector = 1,
-            FingerTracker = 2,
-            HandDetector = 4,
-            PalmDetector = 8,
-            TouchDetector = 16,
-            TouchTracker = 32,
-            TUIOServer = 64,
-            Timer = 128
-        }
-
         public static void log(string message, LogSubject subject)
         {
             if (Constants.LogLevel.HasFlag(subject))

+ 3 - 3
bbiwarg/Utility/Timer.cs

@@ -38,15 +38,15 @@ namespace bbiwarg.Utility
 
         public static void output(String name) {
             Logger.log(String.Format("name:{0}\tavg:{1:00.00}\tmin:{2:00.00}\tmax:{3:00.00}",
-                name, sumTimes[name] / Math.Max(numTimes[name], 1), minTimes[name], maxTimes[name]), Logger.LogSubject.Timer);
+                name, sumTimes[name] / Math.Max(numTimes[name], 1), minTimes[name], maxTimes[name]), LogSubject.Timer);
         }
 
         public static void outputAll() {
-            Logger.log("---TIMERS-START---", Logger.LogSubject.Timer);
+            Logger.log("---TIMERS-START---", LogSubject.Timer);
             foreach (String name in stopwatches.Keys) {
                 output(name);
             }
-            Logger.log("---TIMERS-END---", Logger.LogSubject.Timer);
+            Logger.log("---TIMERS-END---", LogSubject.Timer);
         }
 
     }

+ 1 - 1
bbiwarg/VideoHandle.cs

@@ -122,7 +122,7 @@ namespace bbiwarg
 
         private void initTrackers() {
             touchTracker = new TouchTracker();
-            fingerTracker = new Tracker<Finger>(Logger.LogSubject.FingerTracker, Constants.FingerNumFramesUntilTracked, Constants.FingerNumFramesUntilLost, Constants.FingerMinSimilarityForTracking);
+            fingerTracker = new Tracker<Finger>(LogSubject.FingerTracker, Constants.FingerNumFramesUntilTracked, Constants.FingerNumFramesUntilLost, Constants.FingerMinSimilarityForTracking);
         }
 
         private void processFrameUpdate()