--- a/middleware/src/MainModule/KinectMain.cs	Thu Jun 21 17:51:27 2012 +0200
+++ b/middleware/src/MainModule/KinectMain.cs	Fri Jun 29 15:37:26 2012 +0200
@@ -158,7 +158,7 @@
             //On connecte le serveur à l'adresse locale sur le port 80.
             try
             {
-                server = new Server(debug.getConnexionHost(), debug.getConnexionPort(), debug.getTimerElapsing());
+                server = new Server(debug.getTuioConnexionHost(), debug.getTuioConnexionPort(), debug.getTuioTimerElapsing(), debug.getWsConnexionHost(), debug.getWsConnexionPort(), debug.getWsTimerElapsing());
                 //On crée le gestionnaire de modes.
                 modeManagement = new ModeManagement(server, debug, this);
             }
@@ -172,23 +172,6 @@
             debug.getSwitch().Click += new RoutedEventHandler(Switch_ClickInKinectMain);
             debug.Loaded += new RoutedEventHandler(Window_LoadedInKinectMain);
             debug.Closed += new EventHandler(Window_CloseInKinectMain);
-            /*debug.getQuitMenu().Click += new RoutedEventHandler(Quit_ClickInKinectMain);
-            debug.getParametersWindow().getModButton().Click += new RoutedEventHandler(updateParameters);*/
-
-            /*Console.WriteLine("DEBUG");
-
-            Console.WriteLine("searchMinDistance:" + debug.getMinDistHands());
-            Console.WriteLine("minDistance:" + debug.getMinDist());
-            Console.WriteLine("connexionHost:" + debug.getConnexionHost());
-            Console.WriteLine("timerElapsing:" + debug.getTimerElapsing());
-            Console.WriteLine("takenPoints:" + debug.getTakenPoints());
-            Console.WriteLine("directionChangeTresholdXY:" + debug.getDirectionChangeTresholdXY());
-            Console.WriteLine("connexionPort:" + debug.getConnexionPort());
-            Console.WriteLine("imagesToShow:" + debug.getImagesToShow());
-            Console.WriteLine("searchMaxDistance:" + debug.getMaxDistHands());
-            Console.WriteLine("maxDistance:" + debug.getMaxDist());
-            Console.WriteLine("zeroPoint:" + debug.getZeroPoint());
-            Console.WriteLine("directionChangeTresholdZ:" + debug.getDirectionChangeTresholdZ());*/
 
             //On affiche la fenêtre de debug.
             try
@@ -199,56 +182,6 @@
             }
         }
 
-        /*public bool loadParameters()
-        {
-            try
-            {
-                string[] lines = System.IO.File.ReadAllLines(@"config.txt");
-
-                foreach (string line in lines)
-                {
-                    Console.WriteLine(line);
-                }
-
-                /*minDistHands = Properties.Settings.Default.searchMinDistance;
-                maxDistHands = Properties.Settings.Default.searchMaxDistance;
-                minDist = Properties.Settings.Default.minDistance;
-                maxDist = Properties.Settings.Default.maxDistance;
-                zeroPoint = Properties.Settings.Default.zeroPoint;
-                connexionHost = Properties.Settings.Default.connexionHost;
-                connexionPort = Properties.Settings.Default.connexionPort;
-                timerElapsing = Properties.Settings.Default.timerElapsing;
-                imagesToShow = Properties.Settings.Default.imagesToShow;
-                takenPoints = Properties.Settings.Default.takenPoints;
-                directionChangeTresholdXY = Properties.Settings.Default.directionChangeTresholdXY;
-                directionChangeTresholdZ = Properties.Settings.Default.directionChangeTresholdZ;*/
-            /*}
-            catch (Exception)
-            {
-                return false;
-            }
-
-            if (maxDistHands <= 0f || minDistHands <= 0f || maxDistHands > maxDist || minDistHands > maxDist ||
-                minDistHands >= maxDistHands || zeroPoint < maxDistHands || minDistHands > minDist ||
-                zeroPoint >= maxDist || connexionPort < 0 || timerElapsing < 0 || imagesToShow < 1 ||
-                takenPoints <= 0 || directionChangeTresholdXY < 0 || directionChangeTresholdZ < 0)
-            {
-                ExceptionLbl.Content = rm.GetString("loadParametersIncorrect");
-                Console.WriteLine(ExceptionLbl.Content);
-                return false;
-            }
-            return true;
-        }
-
-        /*
-         * Envoi les paramètres mis à jour dans les différents modules.
-         */
-        public void updateParameters(object sender, RoutedEventArgs e)
-        {
-            userPositionDetector.setParams(debug.getMinDist(), debug.getMaxDist(), debug.getMinDistHands(), debug.getMaxDistHands(), debug.getZeroPoint());
-            server = new Server(debug.getConnexionHost(), debug.getConnexionPort(), debug.getTimerElapsing());
-        }
-
         /*
         *  Initialisation du sensor de la Kinect.
         */
@@ -566,12 +499,6 @@
                 {
                     RightHandTrackedEventArgs rightHandTrackedEvent = new RightHandTrackedEventArgs(server, debug, handRight, handRight.Position.Z);
                     OnRightHandTrackedEvent(rightHandTrackedEvent);
-                    /*if (circleDetector.CheckForRightCircle())
-                    {
-                        CircleEventArgs circleEvent = new CircleEventArgs(server, debug);
-                        OnCircleEvent(circleEvent);
-                        //Console.Out.WriteLine("CIRCLE");
-                    }*/
                 }
                 //Si la main droite quitte le champ, on lance l'événement approprié.
                 else