Skip to content

Commit f795e09

Browse files
committed
Signed-off-by: matt <github@quantasylum.com>
1 parent 2cfe505 commit f795e09

File tree

6 files changed

+39
-35
lines changed

6 files changed

+39
-35
lines changed

Tractor/Com.QuantAsylum.Tractor.TestManagers/IAudioAnalyzer.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,8 @@ interface IAudioAnalyzer
4444
void AuditionSetVolume(double volume);
4545
void AuditionStop();
4646

47-
PointD[] GetData(ChannelEnum channel);
47+
//PointD[] GetData(ChannelEnum channel);
48+
4849
Bitmap GetBitmap();
4950
}
5051
}

Tractor/Com.QuantAsylum.Tractor.TestManagers/QA401.cs

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -230,27 +230,27 @@ public void AuditionStop()
230230
Qa401.AuditionStop();
231231
}
232232

233-
public PointD[] GetData(ChannelEnum channel)
234-
{
235-
QuantAsylum.QA401.PointD[] dataIn;
236-
PointD[] dataOut;
237-
238-
switch (channel)
239-
{
240-
case ChannelEnum.Left:
241-
dataIn = Qa401.GetData(ChannelType.LeftIn);
242-
break;
243-
case ChannelEnum.Right:
244-
dataIn = Qa401.GetData(ChannelType.RightIn);
245-
break;
246-
default:
247-
throw new ArgumentException("Invalid arguement in GetData()");
248-
}
249-
250-
dataOut = new PointD[dataIn.Length];
251-
252-
return dataOut = MarshallToPointD(dataIn);
253-
}
233+
//public PointD[] GetData(ChannelEnum channel)
234+
//{
235+
// QuantAsylum.QA401.PointD[] dataIn;
236+
// PointD[] dataOut;
237+
238+
// switch (channel)
239+
// {
240+
// case ChannelEnum.Left:
241+
// dataIn = Qa401.GetData(ChannelType.LeftIn);
242+
// break;
243+
// case ChannelEnum.Right:
244+
// dataIn = Qa401.GetData(ChannelType.RightIn);
245+
// break;
246+
// default:
247+
// throw new ArgumentException("Invalid arguement in GetData()");
248+
// }
249+
250+
// dataOut = new PointD[dataIn.Length];
251+
252+
// return dataOut = MarshallToPointD(dataIn);
253+
//}
254254

255255
public Bitmap GetBitmap()
256256
{
@@ -260,10 +260,10 @@ public Bitmap GetBitmap()
260260
return (Bitmap)Image.FromStream(ms);
261261
}
262262

263-
public double ComputeRms(PointD[] data, float startFreq, float stopFreq)
264-
{
265-
return Qa401.ComputePowerDb(MarshallToQAPointD(data), startFreq, stopFreq);
266-
}
263+
//public double ComputeRms(PointD[] data, float startFreq, float stopFreq)
264+
//{
265+
// return Qa401.ComputePowerDb(MarshallToQAPointD(data), startFreq, stopFreq);
266+
//}
267267

268268
public void ComputeRms(double startFreq, double stopFreq, out double rmsDbL, out double rmsDbR)
269269
{

Tractor/Com.QuantAsylum.Tractor.TestManagers/QA401_QA450.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -203,10 +203,10 @@ public Bitmap GetBitmap()
203203
return Qa401.GetBitmap();
204204
}
205205

206-
public PointD[] GetData(ChannelEnum channel)
207-
{
208-
return Qa401.GetData(channel);
209-
}
206+
//public PointD[] GetData(ChannelEnum channel)
207+
//{
208+
// return Qa401.GetData(channel);
209+
//}
210210

211211
public void SetToDefaults()
212212
{

Tractor/Constants.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ static class Constants
1414
public static string VersionSuffix = "";
1515

1616
public static double RequiredWebserviceVersion = 0.5;
17-
public static double RequiredQa401Version = 1.900;
17+
public static double RequiredQa401Version = 1.905;
1818
public static double RequiredQa450Version = 1.21;
1919

2020
public static string DataFilePath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments), "QuantAsylum", "Tractor");

Tractor/Properties/AssemblyInfo.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
[assembly: AssemblyConfiguration("")]
1111
[assembly: AssemblyCompany("")]
1212
[assembly: AssemblyProduct("Tractor")]
13-
[assembly: AssemblyCopyright("Copyright QuantAsylum © 2019")]
13+
[assembly: AssemblyCopyright("Copyright QuantAsylum © 2020")]
1414
[assembly: AssemblyTrademark("")]
1515
[assembly: AssemblyCulture("")]
1616

@@ -32,5 +32,5 @@
3232
// You can specify all the values or you can default the Build and Revision Numbers
3333
// by using the '*' as shown below:
3434
// [assembly: AssemblyVersion("1.0.*")]
35-
[assembly: AssemblyVersion("0.9.9.0")]
36-
[assembly: AssemblyFileVersion("0.9.9.0")]
35+
[assembly: AssemblyVersion("0.9.9.5")]
36+
[assembly: AssemblyFileVersion("0.9.9.5")]

Tractor/Releases.txt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
0.994
1+
0.995
2+
- 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)
3+
4+
0.994
25
- Fixed bug where older-style audit records could get stuck and never upload to server
36
- Fixed bug where stuck records hogged all the upload time and fresh records were ignored
47
- Fixed bug so that AuditDb warning was only shown when first enabled instead of everytime you entered settings

0 commit comments

Comments
 (0)