Skip to content

Commit

Permalink
Signed-off-by: matt <[email protected]>
Browse files Browse the repository at this point in the history
  • Loading branch information
QuantAsylum committed Feb 26, 2020
1 parent 2cfe505 commit f795e09
Show file tree
Hide file tree
Showing 6 changed files with 39 additions and 35 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,8 @@ interface IAudioAnalyzer
void AuditionSetVolume(double volume);
void AuditionStop();

PointD[] GetData(ChannelEnum channel);
//PointD[] GetData(ChannelEnum channel);

Bitmap GetBitmap();
}
}
50 changes: 25 additions & 25 deletions Tractor/Com.QuantAsylum.Tractor.TestManagers/QA401.cs
Original file line number Diff line number Diff line change
Expand Up @@ -230,27 +230,27 @@ public void AuditionStop()
Qa401.AuditionStop();
}

public PointD[] GetData(ChannelEnum channel)
{
QuantAsylum.QA401.PointD[] dataIn;
PointD[] dataOut;

switch (channel)
{
case ChannelEnum.Left:
dataIn = Qa401.GetData(ChannelType.LeftIn);
break;
case ChannelEnum.Right:
dataIn = Qa401.GetData(ChannelType.RightIn);
break;
default:
throw new ArgumentException("Invalid arguement in GetData()");
}

dataOut = new PointD[dataIn.Length];

return dataOut = MarshallToPointD(dataIn);
}
//public PointD[] GetData(ChannelEnum channel)
//{
// QuantAsylum.QA401.PointD[] dataIn;
// PointD[] dataOut;

// switch (channel)
// {
// case ChannelEnum.Left:
// dataIn = Qa401.GetData(ChannelType.LeftIn);
// break;
// case ChannelEnum.Right:
// dataIn = Qa401.GetData(ChannelType.RightIn);
// break;
// default:
// throw new ArgumentException("Invalid arguement in GetData()");
// }

// dataOut = new PointD[dataIn.Length];

// return dataOut = MarshallToPointD(dataIn);
//}

public Bitmap GetBitmap()
{
Expand All @@ -260,10 +260,10 @@ public Bitmap GetBitmap()
return (Bitmap)Image.FromStream(ms);
}

public double ComputeRms(PointD[] data, float startFreq, float stopFreq)
{
return Qa401.ComputePowerDb(MarshallToQAPointD(data), startFreq, stopFreq);
}
//public double ComputeRms(PointD[] data, float startFreq, float stopFreq)
//{
// return Qa401.ComputePowerDb(MarshallToQAPointD(data), startFreq, stopFreq);
//}

public void ComputeRms(double startFreq, double stopFreq, out double rmsDbL, out double rmsDbR)
{
Expand Down
8 changes: 4 additions & 4 deletions Tractor/Com.QuantAsylum.Tractor.TestManagers/QA401_QA450.cs
Original file line number Diff line number Diff line change
Expand Up @@ -203,10 +203,10 @@ public Bitmap GetBitmap()
return Qa401.GetBitmap();
}

public PointD[] GetData(ChannelEnum channel)
{
return Qa401.GetData(channel);
}
//public PointD[] GetData(ChannelEnum channel)
//{
// return Qa401.GetData(channel);
//}

public void SetToDefaults()
{
Expand Down
2 changes: 1 addition & 1 deletion Tractor/Constants.cs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ static class Constants
public static string VersionSuffix = "";

public static double RequiredWebserviceVersion = 0.5;
public static double RequiredQa401Version = 1.900;
public static double RequiredQa401Version = 1.905;
public static double RequiredQa450Version = 1.21;

public static string DataFilePath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments), "QuantAsylum", "Tractor");
Expand Down
6 changes: 3 additions & 3 deletions Tractor/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("Tractor")]
[assembly: AssemblyCopyright("Copyright QuantAsylum © 2019")]
[assembly: AssemblyCopyright("Copyright QuantAsylum © 2020")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

Expand All @@ -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("0.9.9.0")]
[assembly: AssemblyFileVersion("0.9.9.0")]
[assembly: AssemblyVersion("0.9.9.5")]
[assembly: AssemblyFileVersion("0.9.9.5")]
5 changes: 4 additions & 1 deletion Tractor/Releases.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
0.994
0.995
- Removed old-style deprecated interfaces (old style = pass data back and forth via remoting. new style = don't pull data over, just ask for calc to be done on host)

0.994
- Fixed bug where older-style audit records could get stuck and never upload to server
- Fixed bug where stuck records hogged all the upload time and fresh records were ignored
- Fixed bug so that AuditDb warning was only shown when first enabled instead of everytime you entered settings
Expand Down

0 comments on commit f795e09

Please sign in to comment.