Skip to content

Eye-Tracking Classroom / gaze-server.cs

Go to a project
Commit 978ec7d3 by Stefan Schreistetter
Options

Configured project for x86. Added missing tobii dlls to the Product.wxs.

parent 4406c0dc
Inline Side-by-side
Showing with 52 additions and 56 deletions
GazeWebSocketServer.sln
......@@ -7,7 +7,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GazeWebSocketServer", "Gaze
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TrackerBridge", "TrackerBridge\TrackerBridge.csproj", "{64D52257-ECA7-4F4D-A901-B14D544A1D0A}"
EndProject
Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "MsiSetup", "MsiSetup\MsiSetup.wixproj", "{5A80ED30-7CA5-4A10-B2AB-7B3FE10FF56B}"
Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "MsiSetup", "MsiSetup\MsiSetup.wixproj", "{BCC5CAB0-AE84-4137-9BA0-77D311D3D271}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
......@@ -17,8 +17,8 @@ Global
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{F8F11E64-7946-4054-8C27-F0FCAF967F1A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F8F11E64-7946-4054-8C27-F0FCAF967F1A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F8F11E64-7946-4054-8C27-F0FCAF967F1A}.Debug|Any CPU.ActiveCfg = Tracker|Any CPU
{F8F11E64-7946-4054-8C27-F0FCAF967F1A}.Debug|Any CPU.Build.0 = Tracker|Any CPU
{F8F11E64-7946-4054-8C27-F0FCAF967F1A}.Debug|x86.ActiveCfg = Debug|Any CPU
{F8F11E64-7946-4054-8C27-F0FCAF967F1A}.Debug|x86.Build.0 = Debug|Any CPU
{F8F11E64-7946-4054-8C27-F0FCAF967F1A}.Release|Any CPU.ActiveCfg = Release|Any CPU
......@@ -33,12 +33,12 @@ Global
{64D52257-ECA7-4F4D-A901-B14D544A1D0A}.Release|Any CPU.Build.0 = Release|Any CPU
{64D52257-ECA7-4F4D-A901-B14D544A1D0A}.Release|x86.ActiveCfg = Release|Any CPU
{64D52257-ECA7-4F4D-A901-B14D544A1D0A}.Release|x86.Build.0 = Release|Any CPU
{5A80ED30-7CA5-4A10-B2AB-7B3FE10FF56B}.Debug|Any CPU.ActiveCfg = Debug|x86
{5A80ED30-7CA5-4A10-B2AB-7B3FE10FF56B}.Debug|x86.ActiveCfg = Debug|x86
{5A80ED30-7CA5-4A10-B2AB-7B3FE10FF56B}.Debug|x86.Build.0 = Debug|x86
{5A80ED30-7CA5-4A10-B2AB-7B3FE10FF56B}.Release|Any CPU.ActiveCfg = Release|x86
{5A80ED30-7CA5-4A10-B2AB-7B3FE10FF56B}.Release|x86.ActiveCfg = Release|x86
{5A80ED30-7CA5-4A10-B2AB-7B3FE10FF56B}.Release|x86.Build.0 = Release|x86
{BCC5CAB0-AE84-4137-9BA0-77D311D3D271}.Debug|Any CPU.ActiveCfg = Debug|x86
{BCC5CAB0-AE84-4137-9BA0-77D311D3D271}.Debug|x86.ActiveCfg = Debug|x86
{BCC5CAB0-AE84-4137-9BA0-77D311D3D271}.Debug|x86.Build.0 = Debug|x86
{BCC5CAB0-AE84-4137-9BA0-77D311D3D271}.Release|Any CPU.ActiveCfg = Release|x86
{BCC5CAB0-AE84-4137-9BA0-77D311D3D271}.Release|x86.ActiveCfg = Release|x86
{BCC5CAB0-AE84-4137-9BA0-77D311D3D271}.Release|x86.Build.0 = Release|x86
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
......
GazeWebSocketServer/GazeWebSocketServer.csproj
......@@ -31,7 +31,7 @@
<BootstrapperEnabled>true</BootstrapperEnabled>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>x64</PlatformTarget>
<PlatformTarget>x86</PlatformTarget>
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
......@@ -41,21 +41,21 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<PlatformTarget>x64</PlatformTarget>
<PlatformTarget>x86</PlatformTarget>
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
<Prefer32Bit>true</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Tracker|AnyCPU'">
<DebugSymbols>true</DebugSymbols>
<OutputPath>bin\Tracker\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<DebugType>full</DebugType>
<PlatformTarget>x64</PlatformTarget>
<PlatformTarget>x86</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
<Prefer32Bit>true</Prefer32Bit>
......@@ -71,9 +71,6 @@
<Reference Include="System.Data" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Xml" />
<Reference Include="Tobii.Research, Version=1.7.0.1070, Culture=neutral, PublicKeyToken=70326046dcdce6cb, processorArchitecture=MSIL">
<HintPath>..\packages\Tobii.Research.x64.1.7.0.1070\lib\net452\Tobii.Research.dll</HintPath>
</Reference>
<Reference Include="websocket-sharp, Version=1.0.2.59611, Culture=neutral, PublicKeyToken=5660b08a1845a91e, processorArchitecture=MSIL">
<HintPath>..\packages\WebSocketSharp.1.0.3-rc11\lib\websocket-sharp.dll</HintPath>
</Reference>
......@@ -109,11 +106,4 @@
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="..\packages\Tobii.Research.x64.1.7.0.1070\build\Tobii.Research.x64.targets" Condition="Exists('..\packages\Tobii.Research.x64.1.7.0.1070\build\Tobii.Research.x64.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>Dieses Projekt verweist auf mindestens ein NuGet-Paket, das auf diesem Computer fehlt. Verwenden Sie die Wiederherstellung von NuGet-Paketen, um die fehlenden Dateien herunterzuladen. Weitere Informationen finden Sie unter "http://go.microsoft.com/fwlink/?LinkID=322105". Die fehlende Datei ist "{0}".</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\packages\Tobii.Research.x64.1.7.0.1070\build\Tobii.Research.x64.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Tobii.Research.x64.1.7.0.1070\build\Tobii.Research.x64.targets'))" />
</Target>
</Project>
\ No newline at end of file
GazeWebSocketServer/packages.config
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Tobii.Research.x64" version="1.7.0.1070" targetFramework="net472" />
<package id="WebSocketSharp" version="1.0.3-rc11" targetFramework="net472" />
</packages>
\ No newline at end of file
MsiSetup/MsiSetup.wixproj
......@@ -4,7 +4,7 @@
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">x86</Platform>
<ProductVersion>3.10</ProductVersion>
<ProjectGuid>5a80ed30-7ca5-4a10-b2ab-7b3fe10ff56b</ProjectGuid>
<ProjectGuid>bcc5cab0-ae84-4137-9ba0-77d311d3d271</ProjectGuid>
<SchemaVersion>2.0</SchemaVersion>
<OutputName>GazeWSS</OutputName>
<OutputType>Package</OutputType>
......
MsiSetup/Product.wxs
<?xml version="1.0" encoding="UTF-8"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"><?define GazeWebSocketServer_TargetDir=$(var.GazeWebSocketServer.TargetDir)?><?define TrackerBridge_TargetDir=$(var.TrackerBridge.TargetDir)?>
<Product Id="9D55009E-629C-45A1-ADDC-8B64503A1517" Name="Gaze Web Socket Server" Language="1033" Version="1.0.0.0" Manufacturer="OTH Regensburg" UpgradeCode="972c80d8-c2bf-44ac-ae8c-beb6724671e8">
<Product Id="9D80C19D-9CF2-4630-A630-CF5F740991C4" Name="Gaze Web Socket Server" Language="1033" Version="1.0.0.2" Manufacturer="OTH Regensburg" UpgradeCode="972c80d8-c2bf-44ac-ae8c-beb6724671e8">
<Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" />
<MajorUpgrade DowngradeErrorMessage="A newer version of Gaze Web Socket Server is already installed." />
<MediaTemplate EmbedCab="yes"/>
<MediaTemplate EmbedCab="yes"/>
<Feature Id="ProductFeature" Title="Gaze Web Socket Server" Level="1">
<ComponentGroupRef Id="ProductComponents" />
<ComponentRef Id="ApplicationShortcut"/>
</Feature>
</Product>
<Feature Id="ProductFeature" Title="Gaze Web Socket Server" Level="1">
<ComponentGroupRef Id="ProductComponents" />
<ComponentRef Id="ApplicationShortcut"/>
</Feature>
</Product>
<Fragment>
<Directory Id="TARGETDIR" Name="SourceDir">
<Directory Id="ProgramFilesFolder">
<Directory Id="INSTALLFOLDER" Name="GazeWebSocketServer" />
</Directory>
<Fragment>
<Directory Id="TARGETDIR" Name="SourceDir">
<Directory Id="ProgramFilesFolder">
<Directory Id="INSTALLFOLDER" Name="GazeWebSocketServer" />
</Directory>
<Directory Id="ProgramMenuFolder">
<Directory Id="ApplicationProgramsFolder" Name="GazeWSS"/>
</Directory>
</Directory>
</Fragment>
</Directory>
</Fragment>
<Fragment>
<DirectoryRef Id="ApplicationProgramsFolder">
......@@ -33,27 +33,33 @@
</DirectoryRef>
</Fragment>
<Fragment>
<Fragment>
<ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER">
<!-- TODO: Remove the comments around this Component element and the ComponentRef below in order to add resources to this installer. -->
<!-- <Component Id="ProductComponent"> -->
<!-- TODO: Insert files, registry keys, and other resources here. -->
<!-- </Component> -->
<Component Id="GazeWebSocketServer.exe" Guid="4c9d7223-abbb-41c4-925b-42a5468f74b0">
<Component Id="GazeWebSocketServer.exe" Guid="68b4fbd4-c4f0-4cb0-bf52-e0dadff68059">
<File Id="GazeWebSocketServer.exe" Name="GazeWebSocketServer.exe" Source="$(var.GazeWebSocketServer_TargetDir)GazeWebSocketServer.exe" />
</Component>
<Component Id="GazeWebSocketServer.exe.config" Guid="fb5b121d-6d61-442a-889c-6449b3a529f5">
<Component Id="GazeWebSocketServer.exe.config" Guid="12a86b5a-e421-40b4-80be-94e41c5795e4">
<File Id="GazeWebSocketServer.exe.config" Name="GazeWebSocketServer.exe.config" Source="$(var.GazeWebSocketServer_TargetDir)GazeWebSocketServer.exe.config" />
</Component>
<Component Id="websocket_sharp.dll" Guid="3eb56476-b21f-4717-9c6f-d51de832afd2">
<Component Id="websocket_sharp.dll" Guid="737a032d-131b-488d-a0d1-012d117ec7d4">
<File Id="websocket_sharp.dll" Name="websocket-sharp.dll" Source="$(var.GazeWebSocketServer_TargetDir)websocket-sharp.dll" />
</Component>
<Component Id="TrackerBridge.dll" Guid="a54be885-fe5f-4fa2-a1bb-023c5cf0e050">
<Component Id="TrackerBridge.dll" Guid="1bd7f07f-13ff-4de5-adb8-5fdcf95376d9">
<File Id="TrackerBridge.dll" Name="TrackerBridge.dll" Source="$(var.TrackerBridge_TargetDir)TrackerBridge.dll" />
</Component>
<Component Id="Tobii.Research.dll" Guid="7ec1f6b5-9503-4079-8a31-c3528ef9863a">
<Component Id="Tobii.Research.dll" Guid="181547f2-afb8-4d8c-b983-a2a466d2811f">
<File Id="Tobii.Research.dll" Name="Tobii.Research.dll" Source="$(var.GazeWebSocketServer_TargetDir)Tobii.Research.dll" />
</Component>
</ComponentGroup>
<Component Id="tobii_pro.dll" Guid="A8F06B76-3189-4918-B012-252280B9CD30">
<File Id="tobii_pro.dll" Name="tobii_pro.dll" Source="$(var.GazeWebSocketServer_TargetDir)tobii_pro.dll" />
</Component>
<Component Id="tobii_firmware_upgrade.dll" Guid="">
<File Id="tobii_firmware_upgrade.dll" Name="tobii_firmware_upgrade.dll" Source="$(var.GazeWebSocketServer_TargetDir)tobii_firmware_upgrade.dll" />
</Component>
</ComponentGroup>
</Fragment>
</Wix>
TrackerBridge/TobiiEyeTracker.cs
......@@ -59,8 +59,7 @@ namespace TrackerBridge
public void Connect()
{
Task task = new Task(() => InitiateConnection());
task.Start();
Task.Run(() => InitiateConnection());
}
private void InitiateConnection()
{
......@@ -68,6 +67,8 @@ namespace TrackerBridge
while (eyeTracker == null)
{
EyeTrackerCollection eyeTrackers = EyeTrackingOperations.FindAllEyeTrackers();
Console.WriteLine("Searching for Tobii eye trackers");
if (eyeTrackers.Count > 0)
{
if (SerialNumber == null)
......
TrackerBridge/TrackerBridge.csproj
......@@ -23,7 +23,7 @@
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<PlatformTarget>x64</PlatformTarget>
<PlatformTarget>x86</PlatformTarget>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
......@@ -32,7 +32,7 @@
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<PlatformTarget>x64</PlatformTarget>
<PlatformTarget>x86</PlatformTarget>
</PropertyGroup>
<ItemGroup>
<Reference Include="PresentationFramework" />
......@@ -47,7 +47,7 @@
<Reference Include="System.Net.Http" />
<Reference Include="System.Xml" />
<Reference Include="Tobii.Research, Version=1.7.0.1070, Culture=neutral, PublicKeyToken=70326046dcdce6cb, processorArchitecture=MSIL">
<HintPath>..\packages\Tobii.Research.x64.1.7.0.1070\lib\net452\Tobii.Research.dll</HintPath>
<HintPath>..\packages\Tobii.Research.x86.1.7.0.1070\lib\net452\Tobii.Research.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
......@@ -64,11 +64,11 @@
<None Include="packages.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="..\packages\Tobii.Research.x64.1.7.0.1070\build\Tobii.Research.x64.targets" Condition="Exists('..\packages\Tobii.Research.x64.1.7.0.1070\build\Tobii.Research.x64.targets')" />
<Import Project="..\packages\Tobii.Research.x86.1.7.0.1070\build\Tobii.Research.x86.targets" Condition="Exists('..\packages\Tobii.Research.x86.1.7.0.1070\build\Tobii.Research.x86.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>Dieses Projekt verweist auf mindestens ein NuGet-Paket, das auf diesem Computer fehlt. Verwenden Sie die Wiederherstellung von NuGet-Paketen, um die fehlenden Dateien herunterzuladen. Weitere Informationen finden Sie unter "http://go.microsoft.com/fwlink/?LinkID=322105". Die fehlende Datei ist "{0}".</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\packages\Tobii.Research.x64.1.7.0.1070\build\Tobii.Research.x64.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Tobii.Research.x64.1.7.0.1070\build\Tobii.Research.x64.targets'))" />
<Error Condition="!Exists('..\packages\Tobii.Research.x86.1.7.0.1070\build\Tobii.Research.x86.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Tobii.Research.x86.1.7.0.1070\build\Tobii.Research.x86.targets'))" />
</Target>
</Project>
\ No newline at end of file
TrackerBridge/packages.config
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Tobii.Research.x64" version="1.7.0.1070" targetFramework="net472" />
<package id="Tobii.Research.x86" version="1.7.0.1070" targetFramework="net472" />
</packages>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment