From 46d65b4f604c898a37e903792d27b1084216002d Mon Sep 17 00:00:00 2001 From: Stefan Schreistetter Date: Mon, 7 Oct 2019 18:26:11 +0200 Subject: [PATCH] Adapted project to work with Tracker. --- GazeWebSocketServer.sln | 9 ++------- GazeWebSocketServer/App.config | 2 +- GazeWebSocketServer/GazeWebSocketServer.csproj | 43 +++++++++++++++++++++++++++++-------------- GazeWebSocketServer/Program.cs | 2 -- TobiiBridge/Class1.cs | 17 ----------------- TobiiBridge/TobiiBridge.csproj | 15 --------------- TrackerBridge/DSP/GazeDecimator.cs | 9 +++------ TrackerBridge/GazeDataProcessor.cs | 4 ++-- TrackerBridge/TobiiEyeTracker.cs | 23 ++++++++++++----------- TrackerBridge/TrackerBridge.csproj | 2 +- 10 files changed, 50 insertions(+), 76 deletions(-) delete mode 100644 TobiiBridge/Class1.cs delete mode 100644 TobiiBridge/TobiiBridge.csproj diff --git a/GazeWebSocketServer.sln b/GazeWebSocketServer.sln index 4b1ccaf..29f8d33 100644 --- a/GazeWebSocketServer.sln +++ b/GazeWebSocketServer.sln @@ -11,21 +11,16 @@ Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU Release|Any CPU = Release|Any CPU - Tracker|Any CPU = Tracker|Any CPU 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 = Release|Any CPU + {F8F11E64-7946-4054-8C27-F0FCAF967F1A}.Debug|Any CPU.Build.0 = Release|Any CPU {F8F11E64-7946-4054-8C27-F0FCAF967F1A}.Release|Any CPU.ActiveCfg = Release|Any CPU {F8F11E64-7946-4054-8C27-F0FCAF967F1A}.Release|Any CPU.Build.0 = Release|Any CPU - {F8F11E64-7946-4054-8C27-F0FCAF967F1A}.Tracker|Any CPU.ActiveCfg = Tracker|Any CPU - {F8F11E64-7946-4054-8C27-F0FCAF967F1A}.Tracker|Any CPU.Build.0 = Tracker|Any CPU {64D52257-ECA7-4F4D-A901-B14D544A1D0A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {64D52257-ECA7-4F4D-A901-B14D544A1D0A}.Debug|Any CPU.Build.0 = Debug|Any CPU {64D52257-ECA7-4F4D-A901-B14D544A1D0A}.Release|Any CPU.ActiveCfg = Release|Any CPU {64D52257-ECA7-4F4D-A901-B14D544A1D0A}.Release|Any CPU.Build.0 = Release|Any CPU - {64D52257-ECA7-4F4D-A901-B14D544A1D0A}.Tracker|Any CPU.ActiveCfg = Release|Any CPU - {64D52257-ECA7-4F4D-A901-B14D544A1D0A}.Tracker|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/GazeWebSocketServer/App.config b/GazeWebSocketServer/App.config index 26b239c..8acd040 100644 --- a/GazeWebSocketServer/App.config +++ b/GazeWebSocketServer/App.config @@ -2,7 +2,7 @@ - + diff --git a/GazeWebSocketServer/GazeWebSocketServer.csproj b/GazeWebSocketServer/GazeWebSocketServer.csproj index 4948539..ae28b1f 100644 --- a/GazeWebSocketServer/GazeWebSocketServer.csproj +++ b/GazeWebSocketServer/GazeWebSocketServer.csproj @@ -14,6 +14,21 @@ true + publish\ + true + Disk + false + Foreground + 7 + Days + false + false + true + 0 + 1.0.0.%2a + false + false + true x64 @@ -26,32 +41,20 @@ 4 - AnyCPU + x64 pdbonly true bin\Release\ TRACE prompt 4 - - - true - bin\Tracker\ - DEBUG;TRACE - full - x64 - prompt - MinimumRecommendedRules.ruleset - true + false - - - @@ -78,6 +81,18 @@ + + False + Microsoft .NET Framework 4.7.2 %28x86 und x64%29 + true + + + False + .NET Framework 3.5 SP1 + false + + + {64d52257-eca7-4f4d-a901-b14d544a1d0a} TrackerBridge diff --git a/GazeWebSocketServer/Program.cs b/GazeWebSocketServer/Program.cs index da983f2..7e8753c 100644 --- a/GazeWebSocketServer/Program.cs +++ b/GazeWebSocketServer/Program.cs @@ -1,7 +1,5 @@ using System; -using System.Threading.Tasks; using TrackerBridge; -using TrackerBridge.DSP; namespace GazeWebSocketServer { diff --git a/TobiiBridge/Class1.cs b/TobiiBridge/Class1.cs deleted file mode 100644 index a84680e..0000000 --- a/TobiiBridge/Class1.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System; - -namespace TobiiBridge -{ - public class EyeTracker - { - public EyeTracker() - { - - } - - public EyeTracker(String serialNumber) - { - - } - } -} diff --git a/TobiiBridge/TobiiBridge.csproj b/TobiiBridge/TobiiBridge.csproj deleted file mode 100644 index b9a4f46..0000000 --- a/TobiiBridge/TobiiBridge.csproj +++ /dev/null @@ -1,15 +0,0 @@ - - - - netstandard2.0 - - - - x64 - - - - - - - diff --git a/TrackerBridge/DSP/GazeDecimator.cs b/TrackerBridge/DSP/GazeDecimator.cs index e7e4cb7..c68ee86 100644 --- a/TrackerBridge/DSP/GazeDecimator.cs +++ b/TrackerBridge/DSP/GazeDecimator.cs @@ -11,14 +11,12 @@ namespace TrackerBridge.DSP { public event GazeDataHandler OutputAvailable; - private Single inputFrequency; private GazeData output; private Single outputFrequency; - private Object outputLock = new Object(); - private Object valueCountLock = new Object(); + private readonly Object outputLock = new Object(); + private readonly Object valueCountLock = new Object(); private Int64 valueCount; - public Single InputFrequency { get => inputFrequency; set => inputFrequency = value; } private Int64 ValueCount { get { lock (valueCountLock) @@ -49,10 +47,9 @@ namespace TrackerBridge.DSP } } - public GazeDecimator(Single outputFrequency, Single inputFrequency) + public GazeDecimator(Single outputFrequency) { this.outputFrequency = outputFrequency; - this.InputFrequency = inputFrequency; Task.Run(() => TriggerOutput(outputFrequency)); } public void Input(GazeData input, Object sender = null) diff --git a/TrackerBridge/GazeDataProcessor.cs b/TrackerBridge/GazeDataProcessor.cs index 71ee8d3..04d811d 100644 --- a/TrackerBridge/GazeDataProcessor.cs +++ b/TrackerBridge/GazeDataProcessor.cs @@ -30,7 +30,7 @@ namespace TrackerBridge screenHeight = Convert.ToSingle(SystemParameters.PrimaryScreenHeight); screenWidth = Convert.ToSingle(SystemParameters.PrimaryScreenWidth); gazeFilters = new IGazeFilter[1]; - gazeFilters[0] = new GazeDecimator(60, tracker.GetTrackingFrequency()); //TODO: Refactor frequency passthrough + gazeFilters[0] = new GazeDecimator(60); //TODO: Refactor frequency passthrough //Chain filters for(Int32 index= 0; index < gazeFilters.Length; index++) @@ -85,7 +85,7 @@ namespace TrackerBridge if(filter.GetType() == typeof(GazeDecimator)) { GazeDecimator decimator = (GazeDecimator)filter; - decimator.InputFrequency = frequency; + throw new NotImplementedException(); } } } diff --git a/TrackerBridge/TobiiEyeTracker.cs b/TrackerBridge/TobiiEyeTracker.cs index 22269a4..69d99d2 100644 --- a/TrackerBridge/TobiiEyeTracker.cs +++ b/TrackerBridge/TobiiEyeTracker.cs @@ -14,7 +14,17 @@ namespace TrackerBridge public event ConnectionEventHandler ConnectionEvent; public event ConnectionEventHandler ConnectionTimeout; - public event GazeDataHandler GazeDataAvailable; + private event GazeDataHandler gazeDataAvailable; + public event GazeDataHandler GazeDataAvailable { + add { + gazeDataAvailable += value; + GazeDataProcessor.AddClient(value); + } + remove { + gazeDataAvailable -= value; + GazeDataProcessor.RemoveClient(value); + } + } public event EventHandler TrackingFrequencyChanged; private IEyeTracker eyeTracker = null; @@ -23,11 +33,7 @@ namespace TrackerBridge public Boolean IsConnected { get; private set; } = false; public String SerialNumber { get; private set; } = null; - public GazeDataHandler GazeDataAvailableMembers { - get { - return GazeDataAvailable; - } - } + public GazeDataHandler GazeDataAvailableMembers => gazeDataAvailable; public TobiiEyeTracker() { @@ -56,11 +62,6 @@ namespace TrackerBridge } } - Single IBridgeTracker.GetTrackingFrequency() - { - throw new NotImplementedException(); - } - public void SetTrackingFrequency(float value) { if (eyeTracker != null && eyeTracker.GetAllGazeOutputFrequencies().Contains(value)) diff --git a/TrackerBridge/TrackerBridge.csproj b/TrackerBridge/TrackerBridge.csproj index 3ff6ee5..8a44d5d 100644 --- a/TrackerBridge/TrackerBridge.csproj +++ b/TrackerBridge/TrackerBridge.csproj @@ -32,9 +32,9 @@ TRACE prompt 4 + x64 - -- libgit2 0.26.0