Skip to content

Commit

Permalink
Fixed a threading problem that would cause the data from a previous m…
Browse files Browse the repository at this point in the history
…inute to get carried over occasionally.
  • Loading branch information
IAmCoder committed Dec 24, 2013
1 parent cf43265 commit 90bd3e3
Show file tree
Hide file tree
Showing 5 changed files with 24 additions and 14 deletions.
10 changes: 5 additions & 5 deletions Installer/Lucid Scribe ThinkGear EEG.vdproj
Expand Up @@ -731,7 +731,7 @@
{
"AssemblyRegister" = "3:1"
"AssemblyIsInGAC" = "11:FALSE"
"AssemblyAsmDisplayName" = "8:ThinkGearNET, Version=1.0.1.0, Culture=neutral, processorArchitecture=x86"
"AssemblyAsmDisplayName" = "8:ThinkGearNET, Version=1.0.2.0, Culture=neutral, processorArchitecture=x86"
"ScatterAssemblies"
{
"_1FBA81496A2EC06B3748DE845685909D"
Expand Down Expand Up @@ -1295,7 +1295,7 @@
{
"AssemblyRegister" = "3:1"
"AssemblyIsInGAC" = "11:FALSE"
"AssemblyAsmDisplayName" = "8:ThinkGearNET, Version=1.0.1.0, Culture=neutral, processorArchitecture=x86"
"AssemblyAsmDisplayName" = "8:ThinkGearNET, Version=1.0.2.0, Culture=neutral, processorArchitecture=x86"
"ScatterAssemblies"
{
"_74CAE4B0BF7440C18EA8ED97292C459A"
Expand Down Expand Up @@ -2167,14 +2167,14 @@
{
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:Lucid Scribe ThinkGear EEG"
"ProductCode" = "8:{BD63B229-5851-4516-9A67-6D71CE6913AA}"
"PackageCode" = "8:{47BCF51B-F14B-4CBB-AD45-567107D281D9}"
"ProductCode" = "8:{BF0294D7-BB7D-4D1C-AE4B-ED230B944A9E}"
"PackageCode" = "8:{F7EEEB6C-F05E-47A8-BB19-73B1E20D517F}"
"UpgradeCode" = "8:{9B1E2A82-9D73-4675-9717-2311206ABC4E}"
"RestartWWWService" = "11:FALSE"
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:TRUE"
"ProductVersion" = "8:1.0.3"
"ProductVersion" = "8:1.0.4"
"Manufacturer" = "8:lucidcode"
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:http://www.lucidcode.com/Contact"
Expand Down
Binary file modified Lucid Scribe - ThinkGear EEG.suo
Binary file not shown.
24 changes: 17 additions & 7 deletions ThinkGear EEG/PluginHandler.cs
Expand Up @@ -261,9 +261,19 @@ public bool Initialize()
public event Interface.SenseHandler Sensed;
public void _thinkGearWrapper_ThinkGearChanged(object sender, ThinkGearChangedEventArgs e)
{
if (ClearTicks)
{
ClearTicks = false;
TickCount = "";
}
TickCount += e.ThinkGearState.Raw + ",";

if (ClearBuffer)
{
ClearBuffer = false;
BufferData = "";
}
BufferData += e.ThinkGearState.Raw + ",";
//if (Sensed != null) { Sensed(this, e.ThinkGearState.Raw); }
}

public void Dispose()
Expand Down Expand Up @@ -298,29 +308,29 @@ public Color Color
}
}

private Boolean ClearTicks = false;
public String TickCount = "";
public String Ticks
{
get
{
string temp = TickCount;
TickCount = "";
return temp;
ClearTicks = true;
return TickCount;
}
set
{
TickCount = value;
}
}

private Boolean ClearBuffer = false;
public String BufferData = "";
public String Buffer
{
get
{
string temp = BufferData;
BufferData = "";
return temp;
ClearBuffer = true;
return BufferData;
}
set
{
Expand Down
4 changes: 2 additions & 2 deletions ThinkGear EEG/Properties/AssemblyInfo.cs
Expand Up @@ -32,5 +32,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.3.0")]
[assembly: AssemblyFileVersion("1.0.3.0")]
[assembly: AssemblyVersion("1.0.4.0")]
[assembly: AssemblyFileVersion("1.0.4.0")]
Binary file modified ThinkGear EEG/ThinkGearNET/ThinkGearNET.suo
Binary file not shown.

0 comments on commit 90bd3e3

Please sign in to comment.