renamed detector namespace to recognition

bbiwarg/Graphics/OutputWindow.cs

@@ -8,7 +8,7 @@ using System.Threading.Tasks;
 using OpenTK;
 using OpenTK.Graphics.OpenGL;
 using bbiwarg.Images;
-using bbiwarg.Detectors.TouchDetection;
+using bbiwarg.Recognition.TouchRecognition;
 using bbiwarg.Utility;
 
 using Emgu.CV;

bbiwarg/Graphics/TouchEventVisualizer.cs

@@ -4,7 +4,7 @@ using System.Drawing;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using bbiwarg.Detectors.TouchDetection;
+using bbiwarg.Recognition.TouchRecognition;
 using bbiwarg.Utility;
 
 namespace bbiwarg.Graphics

bbiwarg/Images/DepthImage.cs

@@ -7,8 +7,8 @@ using System.Threading.Tasks;
 using Emgu.CV;
 using Emgu.CV.Structure;
 using bbiwarg.Graphics;
-using bbiwarg.Detectors.FingerDetection;
-using bbiwarg.Detectors.HandDetection;
+using bbiwarg.Recognition.FingerRecognition;
+using bbiwarg.Recognition.HandRecognition;
 using bbiwarg.Utility;
 
 namespace bbiwarg.Images

bbiwarg/Images/EdgeImage.cs

@@ -6,7 +6,7 @@ using System.Text;
 using System.Threading.Tasks;
 using Emgu.CV;
 using Emgu.CV.Structure;
-using bbiwarg.Detectors.FingerDetection;
+using bbiwarg.Recognition.FingerRecognition;
 
 using System.Diagnostics;
 using bbiwarg.Utility;

bbiwarg/Detectors/FingerDetection/Finger.cs → bbiwarg/Recognition/FingerRecognition/Finger.cs

@@ -8,7 +8,7 @@ using bbiwarg.Images;
 using bbiwarg.Utility;
 using Emgu.CV;
 
-namespace bbiwarg.Detectors.FingerDetection
+namespace bbiwarg.Recognition.FingerRecognition
 {
     class Finger
     {

bbiwarg/Detectors/FingerDetection/FingerDetector.cs → bbiwarg/Recognition/FingerRecognition/FingerDetector.cs

@@ -11,7 +11,7 @@ using Emgu.CV.Structure;
 using Emgu.CV;
 using bbiwarg.Graphics;
 
-namespace bbiwarg.Detectors.FingerDetection
+namespace bbiwarg.Recognition.FingerRecognition
 {
     class FingerDetector
     {

bbiwarg/Detectors/FingerDetection/FingerSlice.cs → bbiwarg/Recognition/FingerRecognition/FingerSlice.cs

@@ -5,7 +5,7 @@ using System.Text;
 using System.Threading.Tasks;
 using bbiwarg.Utility;
 
-namespace bbiwarg.Detectors.FingerDetection
+namespace bbiwarg.Recognition.FingerRecognition
 {
     class FingerSlice
     {

bbiwarg/Detectors/FingerDetection/FingerSliceTrail.cs → bbiwarg/Recognition/FingerRecognition/FingerSliceTrail.cs

@@ -7,7 +7,7 @@ using System.Threading.Tasks;
 using bbiwarg.Utility;
 using Emgu.CV;
 
-namespace bbiwarg.Detectors.FingerDetection
+namespace bbiwarg.Recognition.FingerRecognition
 {
     class FingerSliceTrail
     {

bbiwarg/Detectors/FingerDetection/FingerTracker.cs → bbiwarg/Recognition/FingerRecognition/FingerTracker.cs

@@ -7,7 +7,7 @@ using System.Threading.Tasks;
 using bbiwarg.Images;
 using bbiwarg.Graphics;
 
-namespace bbiwarg.Detectors.FingerDetection
+namespace bbiwarg.Recognition.FingerRecognition
 {
     class FingerTracker
     {

bbiwarg/Detectors/HandDetection/Hand.cs → bbiwarg/Recognition/HandRecognition/Hand.cs

@@ -5,10 +5,10 @@ using System.Text;
 using System.Threading.Tasks;
 using Emgu.CV;
 using Emgu.CV.Structure;
-using bbiwarg.Detectors.FingerDetection;
+using bbiwarg.Recognition.FingerRecognition;
 using bbiwarg.Utility;
 
-namespace bbiwarg.Detectors.HandDetection
+namespace bbiwarg.Recognition.HandRecognition
 {
     class Hand
     {

bbiwarg/Detectors/HandDetection/HandDetector.cs → bbiwarg/Recognition/HandRecognition/HandDetector.cs

@@ -5,13 +5,13 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using bbiwarg.Images;
-using bbiwarg.Detectors.FingerDetection;
+using bbiwarg.Recognition.FingerRecognition;
 using bbiwarg.Graphics;
 using bbiwarg.Utility;
 using Emgu.CV;
 using Emgu.CV.Structure;
 
-namespace bbiwarg.Detectors.HandDetection
+namespace bbiwarg.Recognition.HandRecognition
 {
     class HandDetector
     {

bbiwarg/Detectors/PalmDetection/PalmDetector.cs → bbiwarg/Recognition/PalmRecognition/PalmDetector.cs

@@ -10,11 +10,11 @@ using Emgu.CV.Structure;
 
 using bbiwarg.Utility;
 using bbiwarg.Images;
-using bbiwarg.Detectors.FingerDetection;
-using bbiwarg.Detectors.HandDetection;
+using bbiwarg.Recognition.FingerRecognition;
+using bbiwarg.Recognition.HandRecognition;
 using bbiwarg.Graphics;
 
-namespace bbiwarg.Detectors.PalmDetection
+namespace bbiwarg.Recognition.PalmRecognition
 {
     class PalmDetector
     {

bbiwarg/Detectors/TouchDetection/PalmTouchDetector.cs → bbiwarg/Recognition/TouchRecognition/PalmTouchDetector.cs

@@ -3,11 +3,11 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using bbiwarg.Detectors.FingerDetection;
-using bbiwarg.Detectors.PalmDetection;
+using bbiwarg.Recognition.FingerRecognition;
+using bbiwarg.Recognition.PalmRecognition;
 using bbiwarg.Utility;
 
-namespace bbiwarg.Detectors.TouchDetection
+namespace bbiwarg.Recognition.TouchRecognition
 {
     class PalmTouchDetector
     {

bbiwarg/Detectors/TouchDetection/PalmTouchEvent.cs → bbiwarg/Recognition/TouchRecognition/PalmTouchEvent.cs

@@ -4,10 +4,10 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using bbiwarg.Utility;
-using bbiwarg.Detectors.FingerDetection;
-using bbiwarg.Detectors.PalmDetection;
+using bbiwarg.Recognition.FingerRecognition;
+using bbiwarg.Recognition.PalmRecognition;
 
-namespace bbiwarg.Detectors.TouchDetection
+namespace bbiwarg.Recognition.TouchRecognition
 {
     class PalmTouchEvent : TouchEvent
     {

bbiwarg/Detectors/TouchDetection/TouchDetector.cs → bbiwarg/Recognition/TouchRecognition/TouchDetector.cs

@@ -7,12 +7,12 @@ using System.Threading.Tasks;
 using Emgu.CV;
 using Emgu.CV.Structure;
 using bbiwarg.Images;
-using bbiwarg.Detectors.FingerDetection;
-using bbiwarg.Detectors.PalmDetection;
+using bbiwarg.Recognition.FingerRecognition;
+using bbiwarg.Recognition.PalmRecognition;
 using bbiwarg.Utility;
 using bbiwarg.Graphics;
 
-namespace bbiwarg.Detectors.TouchDetection
+namespace bbiwarg.Recognition.TouchRecognition
 {
     class TouchDetector
     {

bbiwarg/Detectors/TouchDetection/TouchEvent.cs → bbiwarg/Recognition/TouchRecognition/TouchEvent.cs

@@ -3,10 +3,10 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using bbiwarg.Detectors.FingerDetection;
+using bbiwarg.Recognition.FingerRecognition;
 using bbiwarg.Utility;
 
-namespace bbiwarg.Detectors.TouchDetection
+namespace bbiwarg.Recognition.TouchRecognition
 {
     class TouchEvent
     {

bbiwarg/Detectors/TouchDetection/TouchTracker.cs → bbiwarg/Recognition/TouchRecognition/TouchTracker.cs

@@ -7,7 +7,7 @@ using System.Threading.Tasks;
 using bbiwarg.Images;
 using bbiwarg.Graphics;
 
-namespace bbiwarg.Detectors.TouchDetection
+namespace bbiwarg.Recognition.TouchRecognition
 {
     class TouchTracker
     {

bbiwarg/VideoHandle.cs

@@ -6,10 +6,10 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Diagnostics;
 using bbiwarg.Utility;
-using bbiwarg.Detectors.FingerDetection;
-using bbiwarg.Detectors.PalmDetection;
-using bbiwarg.Detectors.TouchDetection;
-using bbiwarg.Detectors.HandDetection;
+using bbiwarg.Recognition.FingerRecognition;
+using bbiwarg.Recognition.PalmRecognition;
+using bbiwarg.Recognition.TouchRecognition;
+using bbiwarg.Recognition.HandRecognition;
 using bbiwarg.Images;
 using bbiwarg.InputProviders;
 using Emgu.CV;
@@ -59,10 +59,6 @@ namespace bbiwarg
         public VideoHandle(IInputProvider inputProvider)
         {
             this.inputProvider = inputProvider;
-
-            //initialize trackers
-            touchTracker = new TouchTracker();
-            fingerTracker = new FingerTracker();
         }
 
         public void start()
@@ -124,6 +120,12 @@ namespace bbiwarg
         {
             Timer.start("processFrameUpdate");
 
+            if (CurrentFrame == 0) {
+                //initialize trackers
+                touchTracker = new TouchTracker();
+                fingerTracker = new FingerTracker();
+            }
+
             //read data from inputProvider
             Timer.start("readInputData");
             inputFrame = inputProvider.getInputFrame();