Skip to content

Commit 9bec9e5

Browse files
visor841visor841
committed
Add Public IP to display window
1 parent 9576728 commit 9bec9e5

44 files changed

Lines changed: 143 additions & 275 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Kinect2JSON/Kinect2JSON.v12.suo‎

-19 KB
Binary file not shown.

‎Kinect2JSON/Kinect2JSON/Kinect2JSON.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<WarningLevel>4</WarningLevel>
1616
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
1717
<IsWebBootstrapper>false</IsWebBootstrapper>
18-
<PublishUrl>C:\Users\Isaac\Documents\Server Releases\v1.1.3\</PublishUrl>
18+
<PublishUrl>C:\Users\Isaac\Documents\Server Releases\v1.2.1\Kinect2JSON\</PublishUrl>
1919
<Install>true</Install>
2020
<InstallFrom>Disk</InstallFrom>
2121
<UpdateEnabled>false</UpdateEnabled>
@@ -25,7 +25,7 @@
2525
<UpdatePeriodically>false</UpdatePeriodically>
2626
<UpdateRequired>false</UpdateRequired>
2727
<MapFileExtensions>true</MapFileExtensions>
28-
<ApplicationRevision>5</ApplicationRevision>
28+
<ApplicationRevision>7</ApplicationRevision>
2929
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
3030
<UseApplicationTrust>false</UseApplicationTrust>
3131
<CreateDesktopShortcut>true</CreateDesktopShortcut>

‎Kinect2JSON/Kinect2JSON/MainWindow.xaml.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,7 @@ public string KinectStatusText
150150

151151
//Boolean stating whether the server has started
152152
public bool publicStarted = false;
153+
153154
//The code that updates the status text based on whether the public connection has started.
154155
//Changed in InitializePublicConnection
155156
private string publicConnectionStatusText = "hello!";
@@ -202,7 +203,7 @@ public void InitializePublicConnection()
202203
//server on the public ip
203204
var server2 = new WebSocketServer("ws://" + GetPublicIP() + ":8181");
204205
ServerSetup(ref server2);
205-
PublicConnectionStatusText = "Public Connection Started";
206+
PublicConnectionStatusText = "Public Connection Started at " + GetPublicIP();
206207
}
207208
catch(System.Net.WebException e)
208209
{
@@ -360,7 +361,6 @@ private void Reader_MultiSourceFrameArrived(
360361
{
361362
ShowBodyJoints(dc);
362363
}
363-
364364
TransmitBodyJoints();
365365
}
366366

‎Kinect2JSON/Kinect2JSON/bin/Debug/Kinect2JSON.application‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<asmv1:assembly xsi:schemaLocation="urn:schemas-microsoft-com:asm.v1 assembly.adaptive.xsd" manifestVersion="1.0" xmlns:asmv1="urn:schemas-microsoft-com:asm.v1" xmlns="urn:schemas-microsoft-com:asm.v2" xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:xrml="urn:mpeg:mpeg21:2003:01-REL-R-NS" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:co.v1="urn:schemas-microsoft-com:clickonce.v1" xmlns:co.v2="urn:schemas-microsoft-com:clickonce.v2">
3-
<assemblyIdentity name="Kinect2JSON.application" version="1.0.0.5" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="msil" xmlns="urn:schemas-microsoft-com:asm.v1" />
3+
<assemblyIdentity name="Kinect2JSON.application" version="1.0.0.7" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="msil" xmlns="urn:schemas-microsoft-com:asm.v1" />
44
<description asmv2:publisher="Kinect2JSON" asmv2:product="Kinect2JSON" xmlns="urn:schemas-microsoft-com:asm.v1" />
55
<deployment install="true" mapFileExtensions="true" co.v1:createDesktopShortcut="true" />
66
<compatibleFrameworks xmlns="urn:schemas-microsoft-com:clickonce.v2">
77
<framework targetVersion="4.5.1" profile="Full" supportedRuntime="4.0.30319" />
88
</compatibleFrameworks>
99
<dependency>
1010
<dependentAssembly dependencyType="install" codebase="Kinect2JSON.exe.manifest" size="4762">
11-
<assemblyIdentity name="Kinect2JSON.exe" version="1.0.0.5" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="msil" type="win32" />
11+
<assemblyIdentity name="Kinect2JSON.exe" version="1.0.0.7" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="msil" type="win32" />
1212
<hash>
1313
<dsig:Transforms>
1414
<dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
1515
</dsig:Transforms>
1616
<dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
17-
<dsig:DigestValue>meFebPrUqLlhC7gp5NW9t9WOIbgz74BmCiDvqN5PSLE=</dsig:DigestValue>
17+
<dsig:DigestValue>MLwDgbWONwKeBUnzKT0DjLXnUBF5HAfH5LOTt9x28gA=</dsig:DigestValue>
1818
</hash>
1919
</dependentAssembly>
2020
</dependency>

‎Kinect2JSON/Kinect2JSON/bin/Debug/Kinect2JSON.exe‎

0 Bytes
Binary file not shown.

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<asmv1:assembly xsi:schemaLocation="urn:schemas-microsoft-com:asm.v1 assembly.adaptive.xsd" manifestVersion="1.0" xmlns:asmv1="urn:schemas-microsoft-com:asm.v1" xmlns="urn:schemas-microsoft-com:asm.v2" xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:co.v1="urn:schemas-microsoft-com:clickonce.v1" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:co.v2="urn:schemas-microsoft-com:clickonce.v2">
3-
<asmv1:assemblyIdentity name="Kinect2JSON.exe" version="1.0.0.5" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="msil" type="win32" />
3+
<asmv1:assemblyIdentity name="Kinect2JSON.exe" version="1.0.0.7" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="msil" type="win32" />
44
<application />
55
<entryPoint>
66
<assemblyIdentity name="Kinect2JSON" version="1.0.0.0" language="neutral" processorArchitecture="msil" />
@@ -54,14 +54,14 @@
5454
</dependentAssembly>
5555
</dependency>
5656
<dependency>
57-
<dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="Kinect2JSON.exe" size="52736">
57+
<dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="Kinect2JSON.exe" size="53704">
5858
<assemblyIdentity name="Kinect2JSON" version="1.0.0.0" language="neutral" processorArchitecture="msil" />
5959
<hash>
6060
<dsig:Transforms>
6161
<dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
6262
</dsig:Transforms>
6363
<dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
64-
<dsig:DigestValue>FTQLC05FN5XUnWWNRgR3RYWYNQXywVOnpk3FtL9hiqE=</dsig:DigestValue>
64+
<dsig:DigestValue>7h5rvK6AYK1H++NS7RiVS4/D5I+zu9JZzOyt05A2bGw=</dsig:DigestValue>
6565
</hash>
6666
</dependentAssembly>
6767
</dependency>

‎Kinect2JSON/Kinect2JSON/bin/Debug/Kinect2JSON.pdb‎

0 Bytes
Binary file not shown.

‎Kinect2JSON/Kinect2JSON/bin/Debug/Kinect2JSON.vshost.application‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<asmv1:assembly xsi:schemaLocation="urn:schemas-microsoft-com:asm.v1 assembly.adaptive.xsd" manifestVersion="1.0" xmlns:asmv1="urn:schemas-microsoft-com:asm.v1" xmlns="urn:schemas-microsoft-com:asm.v2" xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:xrml="urn:mpeg:mpeg21:2003:01-REL-R-NS" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:co.v1="urn:schemas-microsoft-com:clickonce.v1" xmlns:co.v2="urn:schemas-microsoft-com:clickonce.v2">
3-
<assemblyIdentity name="Kinect2JSON.application" version="1.0.0.5" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="msil" xmlns="urn:schemas-microsoft-com:asm.v1" />
3+
<assemblyIdentity name="Kinect2JSON.application" version="1.0.0.6" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="msil" xmlns="urn:schemas-microsoft-com:asm.v1" />
44
<description asmv2:publisher="Kinect2JSON" asmv2:product="Kinect2JSON" xmlns="urn:schemas-microsoft-com:asm.v1" />
55
<deployment install="true" mapFileExtensions="true" co.v1:createDesktopShortcut="true" />
66
<compatibleFrameworks xmlns="urn:schemas-microsoft-com:clickonce.v2">
77
<framework targetVersion="4.5.1" profile="Full" supportedRuntime="4.0.30319" />
88
</compatibleFrameworks>
99
<dependency>
1010
<dependentAssembly dependencyType="install" codebase="Kinect2JSON.exe.manifest" size="4762">
11-
<assemblyIdentity name="Kinect2JSON.exe" version="1.0.0.5" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="msil" type="win32" />
11+
<assemblyIdentity name="Kinect2JSON.exe" version="1.0.0.6" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="msil" type="win32" />
1212
<hash>
1313
<dsig:Transforms>
1414
<dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
1515
</dsig:Transforms>
1616
<dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
17-
<dsig:DigestValue>jIHenRgd/GSYQklIakuwLLQdAxDJeRDmPXAUqGuwWGg=</dsig:DigestValue>
17+
<dsig:DigestValue>63gXky/JJvzhgrBCCuQ0FKiP2PRo59zN39mYBJJY3w0=</dsig:DigestValue>
1818
</hash>
1919
</dependentAssembly>
2020
</dependency>

‎Kinect2JSON/Kinect2JSON/bin/Debug/Kinect2JSON.vshost.exe‎

-1.03 KB
Binary file not shown.

‎Kinect2JSON/Kinect2JSON/bin/Debug/Kinect2JSON.vshost.exe.manifest‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<asmv1:assembly xsi:schemaLocation="urn:schemas-microsoft-com:asm.v1 assembly.adaptive.xsd" manifestVersion="1.0" xmlns:asmv1="urn:schemas-microsoft-com:asm.v1" xmlns="urn:schemas-microsoft-com:asm.v2" xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:co.v1="urn:schemas-microsoft-com:clickonce.v1" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:co.v2="urn:schemas-microsoft-com:clickonce.v2">
3-
<asmv1:assemblyIdentity name="Kinect2JSON.exe" version="1.0.0.5" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="msil" type="win32" />
3+
<asmv1:assemblyIdentity name="Kinect2JSON.exe" version="1.0.0.6" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="msil" type="win32" />
44
<application />
55
<entryPoint>
66
<assemblyIdentity name="Kinect2JSON" version="1.0.0.0" language="neutral" processorArchitecture="msil" />
@@ -54,14 +54,14 @@
5454
</dependentAssembly>
5555
</dependency>
5656
<dependency>
57-
<dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="Kinect2JSON.exe" size="52736">
57+
<dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="Kinect2JSON.exe" size="53704">
5858
<assemblyIdentity name="Kinect2JSON" version="1.0.0.0" language="neutral" processorArchitecture="msil" />
5959
<hash>
6060
<dsig:Transforms>
6161
<dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
6262
</dsig:Transforms>
6363
<dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
64-
<dsig:DigestValue>8MDRwWBe4IBoLgPyIRN2PSl52MDW735/u/vyZVER9jA=</dsig:DigestValue>
64+
<dsig:DigestValue>+F1uMI02d4rubh0ZQCUKVtzsU2Zicn2FhXZr52Iv6cI=</dsig:DigestValue>
6565
</hash>
6666
</dependentAssembly>
6767
</dependency>

0 commit comments

Comments
 (0)