Add code to delay public connection till window pops up. Not exactly what I wanted, but a good compromise. Close #34

Author: visor841

Kinect2JSON/Kinect2JSON.v12.suo

@@ -15,7 +15,7 @@
     <WarningLevel>4</WarningLevel>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <IsWebBootstrapper>false</IsWebBootstrapper>
-    <PublishUrl>C:\Users\Isaac\Documents\Server Releases\v1.0\</PublishUrl>
+    <PublishUrl>C:\Users\Isaac\Documents\Server Releases\v1.1.1\</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Disk</InstallFrom>
     <UpdateEnabled>false</UpdateEnabled>

Kinect2JSON/Kinect2JSON/Kinect2JSON.csproj

@@ -2,12 +2,13 @@
  * Authors: Isaac Zylstra and Victor Norman @ Calvin College, Grand Rapids, MI.
  * Contact: [email protected]
     -->
-    <Window x:Class="Kinect2JSON.MainWindow"
+<Window x:Class="Kinect2JSON.MainWindow"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         Title="MainWindow"
         Height="518" Width="1230"  
-        Closing="MainWindow_Closing">
+        Closing="MainWindow_Closing"
+        Activated="MainWindow_Activated">
     <Window.Resources>
         <SolidColorBrush x:Key="MediumGreyBrush" Color="#ff6e6e6e" />
         <SolidColorBrush x:Key="KinectPurpleBrush" Color="#ff52318f" />

Kinect2JSON/Kinect2JSON/MainWindow.xaml

@@ -148,6 +148,8 @@ public string KinectStatusText
             }
         }
 
+        //Boolean stating whether the server has started
+        public bool publicStarted = false;
         //The code that updates the status text based on whether the public connection has started.
         //Changed in InitializePublicConnection
         private string publicConnectionStatusText = "hello!";
@@ -175,7 +177,7 @@ public MainWindow()
             SetupColorDisplay();
             SetupBodyJointsDisplay();
             InitializeLocalConnection();
-            InitializePublicConnection();
+            //InitializePublicConnection();
 
             InitializeComponent();
         }
@@ -216,7 +218,6 @@ public static void InitializeLocalConnection()
          * */
         public void InitializePublicConnection()
         {
-
             //server on the public ip
             var server1 = new WebSocketServer("ws://" + GetPublicIP() + ":8181");
 
@@ -239,7 +240,6 @@ public void InitializePublicConnection()
 
                 };
             });
-
             PublicConnectionStatusText = "Public Connection Started";
         }
 
@@ -697,13 +697,13 @@ public static string GetPublicIP()
         /// </summary>
         /// <param name="sender">object sending the event</param>
         /// <param name="e">event arguments</param>
-        private void MainWindow_Loaded(object sender, RoutedEventArgs e)
+        private void MainWindow_Activated(object sender, EventArgs e)
         {
-            if (this.multiSourceFrameReader != null)
+            if (!publicStarted)
             {
-                this.multiSourceFrameReader.MultiSourceFrameArrived += this.Reader_MultiSourceFrameArrived;
+                InitializePublicConnection();
+                publicStarted = true;
             }
-            //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>iiz6imWifvVwQqijso7jGaCJy1WWcTGeJap8Dpucc44=</dsig:DigestValue>
+        <dsig:DigestValue>9q/zF6BZFc0m9G+afFE6KcDCNEi+1QNDmai5tW433yU=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

Kinect2JSON/Kinect2JSON/bin/Debug/Kinect2JSON.application

@@ -54,14 +54,14 @@
     </dependentAssembly>
   </dependency>
   <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="Kinect2JSON.exe" size="52736">
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="Kinect2JSON.exe" size="53248">
       <assemblyIdentity name="Kinect2JSON" version="1.0.0.0" language="neutral" processorArchitecture="msil" />
       <hash>
         <dsig:Transforms>
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>rT9s6ZJNpiBiLsSSLe0aLF+msRS3JnGwefoUJmYn/XM=</dsig:DigestValue>
+        <dsig:DigestValue>5+oNFPX5CItz4Wy2Hoiq7KZw1msOySAQo2n4iArS+6Q=</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>iiz6imWifvVwQqijso7jGaCJy1WWcTGeJap8Dpucc44=</dsig:DigestValue>
+        <dsig:DigestValue>T7vkiuZjBnkVZSEgsLSnJIXHR8Ak3Jv8IX0ek9Aw8SY=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

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

@@ -54,14 +54,14 @@
     </dependentAssembly>
   </dependency>
   <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="Kinect2JSON.exe" size="52736">
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="Kinect2JSON.exe" size="53248">
       <assemblyIdentity name="Kinect2JSON" version="1.0.0.0" language="neutral" processorArchitecture="msil" />
       <hash>
         <dsig:Transforms>
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>rT9s6ZJNpiBiLsSSLe0aLF+msRS3JnGwefoUJmYn/XM=</dsig:DigestValue>
+        <dsig:DigestValue>tyRw5jaOB/6htJHEjt9TmC09oDXuzrrsz/QCi91zzRQ=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>