Move the public connection setup to window onload, fixes #34

Author: visor841

Kinect2JSON/Kinect2JSON.v12.suo

@@ -155,16 +155,15 @@ public MainWindow()
             SetupColorDisplay();
             SetupBodyJointsDisplay();
             InitializeLocalConnection();
-            InitializePublicConnection();
 
             InitializeComponent();
         }
-
-        //starting up the websocket server
-        //we use 0.0.0.0:8181 because reasons. (I followed other people's ideas, and it works fine)
+        /*
+         * starting up the local websocket server
+         * we use 127.0.0.1:8181 because that's the local computer ip.
+         */
         public static void InitializeLocalConnection()
         {
-            //System.Threading.Thread.Sleep(5000);
             //local server
             var server = new WebSocketServer("ws://127.0.0.1:8181");
 
@@ -189,11 +188,19 @@ public static void InitializeLocalConnection()
             });
         }
 
+        /*
+         * starting up the public websocket server
+         * we use 127.0.0.1:8181 because that's the local computer ip.
+         * this is run after the window loads so as to not slow down the window loading
+         * */
         public static void InitializePublicConnection()
         {
 
             //server on the public ip
-            var server1 = new WebSocketServer("ws://"+GetPublicIP()+":8181");
+            var server1 = new WebSocketServer("ws://" + GetPublicIP() + ":8181");
+
+            //When a socket opens, add it to the client list, when it closes, remove it,
+            //and when the socket recieves a message, transmit the message.
             server1.Start(socket =>
             {
                 socket.OnOpen = () =>
@@ -649,7 +656,6 @@ private void SetupBodyJointsDisplay()
         public static string GetPublicIP()
         {
             string url = "http://checkip.dyndns.org";
-            //System.Threading.Thread.Sleep(5000);
             System.Net.WebRequest req = System.Net.WebRequest.Create(url);
             System.Net.WebResponse resp = req.GetResponse();
             System.IO.StreamReader sr = new System.IO.StreamReader(resp.GetResponseStream());
@@ -662,7 +668,9 @@ public static string GetPublicIP()
         }
 
         /// <summary>
-        /// Execute start up tasks
+        /// Execute start up tasks.
+        /// InitializePublicConnection is here instead of in Main Window,
+        /// because it is sometimes slow.
         /// </summary>
         /// <param name="sender">object sending the event</param>
         /// <param name="e">event arguments</param>
@@ -672,8 +680,7 @@ private void MainWindow_Loaded(object sender, RoutedEventArgs e)
             {
                 this.multiSourceFrameReader.MultiSourceFrameArrived += this.Reader_MultiSourceFrameArrived;
             }
-
-
+            InitializePublicConnection();
         }
 
         /// <summary>

Kinect2JSON/Kinect2JSON/MainWindow.xaml.cs

@@ -14,7 +14,7 @@
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>6OBWke/3qc3YrQNCmJ1zxUv/SDXF25atnOAZNCeLWhg=</dsig:DigestValue>
+        <dsig:DigestValue>3ULdQDYE42vAbmFvSpUc3Zb23p2pLu+r72zCcvVedXs=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

Kinect2JSON/Kinect2JSON/bin/Debug/Kinect2JSON.application

@@ -61,7 +61,7 @@
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>hAigRapW1JxbRQvqZWGe9+n98/gjykjUcYOmU6XbiwA=</dsig:DigestValue>
+        <dsig:DigestValue>hSnyUIEI9WrHhlqlVXIr7JxgiE0B1IKOKzaw3cIOhMo=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

Kinect2JSON/Kinect2JSON/bin/Debug/Kinect2JSON.exe

@@ -14,7 +14,7 @@
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>AK748VXAnDg1mf3bEjAnQ5ENKnqftID2gUVUuevHLNM=</dsig:DigestValue>
+        <dsig:DigestValue>3ULdQDYE42vAbmFvSpUc3Zb23p2pLu+r72zCcvVedXs=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

Kinect2JSON/Kinect2JSON/bin/Debug/Kinect2JSON.exe.manifest

@@ -61,7 +61,7 @@
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>DO69nezRXIQnNurw9ymcww62gxp4QqnEQbBwExdwGEg=</dsig:DigestValue>
+        <dsig:DigestValue>hSnyUIEI9WrHhlqlVXIr7JxgiE0B1IKOKzaw3cIOhMo=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

Kinect2JSON/Kinect2JSON/bin/Debug/Kinect2JSON.pdb

@@ -14,7 +14,7 @@
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>6OBWke/3qc3YrQNCmJ1zxUv/SDXF25atnOAZNCeLWhg=</dsig:DigestValue>
+        <dsig:DigestValue>3ULdQDYE42vAbmFvSpUc3Zb23p2pLu+r72zCcvVedXs=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>