Release 1.101

Signed-off-by: matt <[email protected]>
QuantAsylum · Sep 2, 2022 · d41e905 · d41e905
1 parent ea193b9
commit d41e905
Show file tree

Hide file tree

Showing 20 changed files with 104 additions and 63 deletions.
diff --git a/Tractor/Com.QuantAsylum.Tractor.Tests/Distortion/ImdA01.cs b/Tractor/Com.QuantAsylum.Tractor.Tests/Distortion/ImdA01.cs
@@ -23,8 +23,8 @@ public class ImdA01 : AudioTestBase
         [ObjectEditorAttribute(Index = 210, DisplayText = "Analyzer Output Level (dBV)", MinValue = -50, MaxValue = 6)]
         public float AnalyzerOutputLevel = -10;
 
-        [ObjectEditorAttribute(Index = 215, DisplayText = "Analyzer Input Range", ValidInts = new int[] { 6, 26 })]
-        public int AnalyzerInputRange = 6;
+        [ObjectEditorAttribute(Index = 215, DisplayText = "Analyzer Input Range")]
+        public AudioAnalyzerInputRanges AnalyzerInputRange = new AudioAnalyzerInputRanges() { InputRange = 6 };
 
         public ImdA01() : base()
         {
@@ -41,7 +41,7 @@ public override void DoTest(string title, out TestResult tr)
             SetupBaseTests();
 
             ((IAudioAnalyzer)Tm.TestClass).AudioAnalyzerSetTitle(title);
-            ((IAudioAnalyzer)Tm.TestClass).SetInputRange(AnalyzerInputRange);
+            ((IAudioAnalyzer)Tm.TestClass).SetInputRange(AnalyzerInputRange.InputRange);
 
 
             // The RMS of two distinct but equal tones is 3 dBV above level of the tones

diff --git a/Tractor/Com.QuantAsylum.Tractor.Tests/Distortion/ImdA03.cs b/Tractor/Com.QuantAsylum.Tractor.Tests/Distortion/ImdA03.cs
@@ -35,8 +35,8 @@ public class ImdA03 : AudioTestBase
         [ObjectEditorAttribute(Index = 215, DisplayText = "Load Impedance", ValidInts = new int[] { 8, 4 })]
         public int ProgrammableLoadImpedance = 8;
 
-        [ObjectEditorAttribute(Index = 220, DisplayText = "Analyzer Input Range", ValidInts = new int[] { 6, 26 })]
-        public int AnalyzerInputRange = 6;
+        [ObjectEditorAttribute(Index = 220, DisplayText = "Analyzer Input Range")]
+        public AudioAnalyzerInputRanges AnalyzerInputRange = new AudioAnalyzerInputRanges() { InputRange = 6 };
 
 
         public ImdA03() : base()
@@ -54,7 +54,7 @@ public override void DoTest(string title, out TestResult tr)
             SetupBaseTests();
 
             ((IAudioAnalyzer)Tm.TestClass).AudioAnalyzerSetTitle(title);
-            ((IAudioAnalyzer)Tm.TestClass).SetInputRange(AnalyzerInputRange);
+            ((IAudioAnalyzer)Tm.TestClass).SetInputRange(AnalyzerInputRange.InputRange);
 
             ((IProgrammableLoad)Tm.TestClass).SetImpedance(ProgrammableLoadImpedance);
 

diff --git a/Tractor/Com.QuantAsylum.Tractor.Tests/Distortion/ThdA01.cs b/Tractor/Com.QuantAsylum.Tractor.Tests/Distortion/ThdA01.cs
@@ -25,8 +25,8 @@ public class ThdA01 : AudioTestBase
         [ObjectEditorAttribute(Index = 240, DisplayText = "Maximum THD to Pass (dB)", MinValue = -150, MaxValue = 10, MustBeGreaterThanIndex = 230)]
         public float MaximumOKTHD = -100;
 
-        [ObjectEditorAttribute(Index = 250, DisplayText = "Analyzer Input Range", ValidInts = new int[] { 6, 26 })]
-        public int InputRange = 6;
+        [ObjectEditorAttribute(Index = 250, DisplayText = "Analyzer Input Range")]
+        public AudioAnalyzerInputRanges AnalyzerInputRange = new AudioAnalyzerInputRanges() { InputRange = 6 };
 
         public ThdA01() : base()
         {
@@ -43,7 +43,7 @@ public override void DoTest(string title, out TestResult tr)
             SetupBaseTests();
 
             ((IAudioAnalyzer)Tm.TestClass).AudioAnalyzerSetTitle(title);
-            ((IAudioAnalyzer)Tm.TestClass).SetInputRange(InputRange);
+            ((IAudioAnalyzer)Tm.TestClass).SetInputRange(AnalyzerInputRange.InputRange);
 
             ((IAudioAnalyzer)Tm.TestClass).AudioGenSetGen1(true, OutputLevel, Freq);
             ((IAudioAnalyzer)Tm.TestClass).AudioGenSetGen2(false, OutputLevel, Freq);

diff --git a/Tractor/Com.QuantAsylum.Tractor.Tests/Distortion/ThdA03.cs b/Tractor/Com.QuantAsylum.Tractor.Tests/Distortion/ThdA03.cs
@@ -28,8 +28,8 @@ public class ThdA03 : AudioTestBase
         [ObjectEditorAttribute(Index = 250, DisplayText = "Load Impedance (ohms)", ValidInts = new int[] { 8, 4 })]
         public int ProgrammableLoadImpedance = 8;
 
-        [ObjectEditorAttribute(Index = 260, DisplayText = "Analyzer Input Range", ValidInts = new int[] { 6, 26 })]
-        public int InputRange = 6;
+        [ObjectEditorAttribute(Index = 260, DisplayText = "Analyzer Input Range")]
+        public AudioAnalyzerInputRanges AnalyzerInputRange = new AudioAnalyzerInputRanges() { InputRange = 6 };
 
         public ThdA03() : base()
         {
@@ -46,7 +46,7 @@ public override void DoTest(string title, out TestResult tr)
             SetupBaseTests();
 
             ((IAudioAnalyzer)Tm.TestClass).AudioAnalyzerSetTitle(title);
-            ((IAudioAnalyzer)Tm.TestClass).SetInputRange(InputRange);
+            ((IAudioAnalyzer)Tm.TestClass).SetInputRange(AnalyzerInputRange.InputRange);
             ((IProgrammableLoad)Tm.TestClass).SetImpedance(ProgrammableLoadImpedance);
 
             if (LeftChannel == true && RightChannel == false)

diff --git a/Tractor/Com.QuantAsylum.Tractor.Tests/Distortion/ThdB03.cs b/Tractor/Com.QuantAsylum.Tractor.Tests/Distortion/ThdB03.cs
@@ -28,8 +28,8 @@ public class ThdB03 : AudioTestBase
         [ObjectEditorAttribute(Index = 250, DisplayText = "Load Impedance (ohms)", ValidInts = new int[] { 8, 4 })]
         public int LoadImpedance = 8;
 
-        [ObjectEditorAttribute(Index = 260, DisplayText = "Analyzer Input Range", ValidInts = new int[] { 6, 26 })]
-        public int InputRange = 6;
+        [ObjectEditorAttribute(Index = 260, DisplayText = "Analyzer Input Range")]
+        public AudioAnalyzerInputRanges AnalyzerInputRange = new AudioAnalyzerInputRanges() { InputRange = 6 };
 
         public ThdB03() : base()
         {
@@ -46,7 +46,7 @@ public override void DoTest(string title, out TestResult tr)
             SetupBaseTests();
 
             ((IAudioAnalyzer)Tm.TestClass).AudioAnalyzerSetTitle(title);
-            ((IAudioAnalyzer)Tm.TestClass).SetInputRange(InputRange);
+            ((IAudioAnalyzer)Tm.TestClass).SetInputRange(AnalyzerInputRange.InputRange);
             ((IProgrammableLoad)Tm.TestClass).SetImpedance(LoadImpedance);
 
             ((IAudioAnalyzer)Tm.TestClass).AudioGenSetGen1(true, OutputLevel, Freq);

diff --git a/Tractor/Com.QuantAsylum.Tractor.Tests/Distortion/ThdNA01.cs b/Tractor/Com.QuantAsylum.Tractor.Tests/Distortion/ThdNA01.cs
@@ -31,8 +31,8 @@ public class ThdNA01 : AudioTestBase
         [ObjectEditorAttribute(Index = 240, DisplayText = "Maximum THD+N to Pass (dB)", MinValue = -130, MaxValue = 100, MustBeGreaterThanIndex = 230)]
         public float MaximumOkThdN = -100;
 
-        [ObjectEditorAttribute(Index = 250, DisplayText = "Analyzer Input Range", ValidInts = new int[] { 6, 26 })]
-        public int InputRange = 6;
+        [ObjectEditorAttribute(Index = 250, DisplayText = "Analyzer Input Range")]
+        public AudioAnalyzerInputRanges AnalyzerInputRange = new AudioAnalyzerInputRanges() { InputRange = 6 };
 
         public ThdNA01() : base()
         {
@@ -49,7 +49,7 @@ public override void DoTest(string title, out TestResult tr)
             SetupBaseTests();
 
             ((IAudioAnalyzer)Tm.TestClass).AudioAnalyzerSetTitle(title);
-            ((IAudioAnalyzer)Tm.TestClass).SetInputRange(InputRange);
+            ((IAudioAnalyzer)Tm.TestClass).SetInputRange(AnalyzerInputRange.InputRange);
 
             ((IAudioAnalyzer)Tm.TestClass).AudioGenSetGen1(true, OutputLevel, Freq);
             ((IAudioAnalyzer)Tm.TestClass).AudioGenSetGen2(false, OutputLevel, Freq);

diff --git a/Tractor/Com.QuantAsylum.Tractor.Tests/GainLevel/FreqResponseA01.cs b/Tractor/Com.QuantAsylum.Tractor.Tests/GainLevel/FreqResponseA01.cs
@@ -20,14 +20,8 @@ public class FreqResponseA01 : AudioTestBase
         [ObjectEditorAttribute(Index = 215, DisplayText = "Mask File Name", IsFileName = true, MaxLength = 512)]
         public string MaskFileName = "";
 
-        [ObjectEditorAttribute(Index = 250, DisplayText = "Analyzer Input Range", ValidInts = new int[] { 6, 26 })]
-        public int AnalyzerInputRange = 6;
-
-        //[ObjectEditorAttribute(Index = 270, DisplayText = "Display Y Max)", MinValue = -200, MaxValue = 200, MustBeGreaterThanIndex = 280)]
-        //public int YMax = 10;
-
-        //[ObjectEditorAttribute(Index = 280, DisplayText = "Display Y Min)", MinValue = -200, MaxValue = 200)]
-        //public int YMin = -20;
+        [ObjectEditorAttribute(Index = 250, DisplayText = "Analyzer Input Range")]
+        public AudioAnalyzerInputRanges AnalyzerInputRange = new AudioAnalyzerInputRanges() { InputRange = 6 };
 
         public FreqResponseA01() : base()
         {
@@ -45,7 +39,7 @@ public override void DoTest(string title, out TestResult tr)
             SetupBaseTests();
 
             ((IAudioAnalyzer)Tm.TestClass).AudioAnalyzerSetTitle(title);
-            ((IAudioAnalyzer)Tm.TestClass).SetInputRange(AnalyzerInputRange);
+            ((IAudioAnalyzer)Tm.TestClass).SetInputRange(AnalyzerInputRange.InputRange);
             ((IAudioAnalyzer)Tm.TestClass).DoFrAquisition(AnalyzerOutputLevel, 0, SmoothingDenominator);
             ((IAudioAnalyzer)Tm.TestClass).TestMask(MaskFileName, LeftChannel, RightChannel, false, out bool passLeft, out bool passRight, out _);
 

diff --git a/Tractor/Com.QuantAsylum.Tractor.Tests/GainLevel/FreqResponseA03.cs b/Tractor/Com.QuantAsylum.Tractor.Tests/GainLevel/FreqResponseA03.cs
@@ -20,8 +20,8 @@ public class FreqResponseA03 : AudioTestBase
         [ObjectEditorAttribute(Index = 215, DisplayText = "Mask File Name", IsFileName = true, MaxLength = 512)]
         public string MaskFileName = "";
 
-        [ObjectEditorAttribute(Index = 250, DisplayText = "Analyzer Input Range", ValidInts = new int[] { 6, 26 })]
-        public int AnalyzerInputRange = 6;
+        [ObjectEditorAttribute(Index = 250, DisplayText = "Analyzer Input Range")]
+        public AudioAnalyzerInputRanges AnalyzerInputRange = new AudioAnalyzerInputRanges() { InputRange = 6 };
 
         [ObjectEditorAttribute(Index = 260, DisplayText = "Load Impedance (ohms)", ValidInts = new int[] { 8, 4 })]
         public int ProgrammableLoadImpedance = 8;
@@ -43,7 +43,7 @@ public override void DoTest(string title, out TestResult tr)
             ((IProgrammableLoad)Tm.TestClass).SetImpedance(ProgrammableLoadImpedance);
 
             ((IAudioAnalyzer)Tm.TestClass).AudioAnalyzerSetTitle(title);
-            ((IAudioAnalyzer)Tm.TestClass).SetInputRange(AnalyzerInputRange);
+            ((IAudioAnalyzer)Tm.TestClass).SetInputRange(AnalyzerInputRange.InputRange);
             ((IAudioAnalyzer)Tm.TestClass).DoFrAquisition(AnalyzerOutputLevel, 0, SmoothingDenominator);
             ((IAudioAnalyzer)Tm.TestClass).TestMask(MaskFileName, LeftChannel, RightChannel, false, out bool passLeft, out bool passRight, out _);
 

diff --git a/Tractor/Com.QuantAsylum.Tractor.Tests/GainLevel/GainA01.cs b/Tractor/Com.QuantAsylum.Tractor.Tests/GainLevel/GainA01.cs
@@ -1,5 +1,6 @@
 using Com.QuantAsylum.Tractor.TestManagers;
 using System;
+using Tractor;
 using Tractor.Com.QuantAsylum.Tractor.Tests;
 
 namespace Com.QuantAsylum.Tractor.Tests.GainTests
@@ -25,15 +26,17 @@ public class GainA01 : AudioTestBase
         [ObjectEditorAttribute(Index = 240, DisplayText = "Maximum Gain to Pass (dB)", MinValue = -100, MaxValue = 100, MustBeGreaterThanIndex = 230)]
         public float MaximumPassGain = -9.5f;
 
-        [ObjectEditorAttribute(Index = 250, DisplayText = "Analyzer Input Range", ValidInts = new int[] { 6, 26 })]
-        public int AnalyzerInputRange = 6;
+        [ObjectEditorAttribute(Index = 250, DisplayText = "Analyzer Input Range")]
+        public AudioAnalyzerInputRanges AnalyzerInputRange = new AudioAnalyzerInputRanges() { InputRange = 6 };
 
         public GainA01() : base()
         {
             Name = this.GetType().Name;
             _TestType = TestTypeEnum.LevelGain;
         }
 
+
+
         public override void DoTest(string title, out TestResult tr)
         {
             // Two channels
@@ -42,7 +45,7 @@ public override void DoTest(string title, out TestResult tr)
             Tm.SetToDefaults();
             SetupBaseTests();
 
-            ((IAudioAnalyzer)Tm.TestClass).SetInputRange(AnalyzerInputRange);
+            ((IAudioAnalyzer)Tm.TestClass).SetInputRange(AnalyzerInputRange.InputRange);
             ((IAudioAnalyzer)Tm.TestClass).AudioAnalyzerSetTitle(title);
 
             ((IAudioAnalyzer)Tm.TestClass).AudioGenSetGen1(true, AnalyzerOutputLevel, TestFrequency);

diff --git a/Tractor/Com.QuantAsylum.Tractor.Tests/GainLevel/GainA03.cs b/Tractor/Com.QuantAsylum.Tractor.Tests/GainLevel/GainA03.cs
@@ -29,8 +29,8 @@ public class GainA03 : AudioTestBase
         [ObjectEditorAttribute(Index = 250, DisplayText = "Load Impedance (ohms)", ValidInts = new int[] { 8, 4 })]
         public int ProgrammableLoadImpedance = 8;
 
-        [ObjectEditorAttribute(Index = 260, DisplayText = "Analyzer Input Range", ValidInts = new int[] { 6, 26 })]
-        public int AnalyzerInputRange = 6;
+        [ObjectEditorAttribute(Index = 260, DisplayText = "Analyzer Input Range")]
+        public AudioAnalyzerInputRanges AnalyzerInputRange = new AudioAnalyzerInputRanges() { InputRange = 6 };
 
         public GainA03() : base()
         {
@@ -46,7 +46,7 @@ public override void DoTest(string title, out TestResult tr)
             Tm.SetToDefaults();
             SetupBaseTests();
 
-            ((IAudioAnalyzer)Tm.TestClass).SetInputRange(AnalyzerInputRange);
+            ((IAudioAnalyzer)Tm.TestClass).SetInputRange(AnalyzerInputRange.InputRange);
             ((IAudioAnalyzer)Tm.TestClass).AudioAnalyzerSetTitle(title);
             ((IProgrammableLoad)Tm.TestClass).SetImpedance(ProgrammableLoadImpedance);
 

diff --git a/Tractor/Com.QuantAsylum.Tractor.Tests/GainLevel/GainSorted3A01.cs b/Tractor/Com.QuantAsylum.Tractor.Tests/GainLevel/GainSorted3A01.cs
@@ -20,8 +20,8 @@ public class GainSorted3A01N : AudioTestBase
         //[ObjectEditorAttribute(Index = 220, DisplayText = "Pre-analyzer Input Gain (dB)", MinValue = -100, MaxValue = 100)]
         //public float ExternalAnalyzerInputGain = 0;
 
-        [ObjectEditorAttribute(Index = 225, DisplayText = "Analyzer Input Range", ValidInts = new int[] { 6, 26 })]
-        public int AnalyzerInputRange = 6;
+        [ObjectEditorAttribute(Index = 225, DisplayText = "Analyzer Input Range")]
+        public AudioAnalyzerInputRanges AnalyzerInputRange = new AudioAnalyzerInputRanges() { InputRange = 6 };
 
         //---------------
 
@@ -83,7 +83,7 @@ public override void DoTest(string title, out TestResult tr)
             SetupBaseTests();
 
             ((IAudioAnalyzer)Tm.TestClass).AudioAnalyzerSetTitle(title);
-            ((IAudioAnalyzer)Tm.TestClass).SetInputRange(AnalyzerInputRange);
+            ((IAudioAnalyzer)Tm.TestClass).SetInputRange(AnalyzerInputRange.InputRange);
             ((IAudioAnalyzer)Tm.TestClass).AudioGenSetGen1(true, AnalyzerOutputLevel, TestFrequency);
             ((IAudioAnalyzer)Tm.TestClass).AudioGenSetGen2(false, AnalyzerOutputLevel, TestFrequency);
 

diff --git a/Tractor/Com.QuantAsylum.Tractor.Tests/GainLevel/GainSorted5A01.cs b/Tractor/Com.QuantAsylum.Tractor.Tests/GainLevel/GainSorted5A01.cs
@@ -20,8 +20,8 @@ public class GainSorted5A01N : AudioTestBase
         //[ObjectEditorAttribute(Index = 220, DisplayText = "Pre-analyzer Input Gain (dB)", MinValue = -100, MaxValue = 100)]
         //public float ExternalAnalyzerInputGain = 0;
 
-        [ObjectEditorAttribute(Index = 225, DisplayText = "Analyzer Input Range", ValidInts = new int[] { 6, 26 })]
-        public int AnalyzerInputRange = 6;
+        [ObjectEditorAttribute(Index = 225, DisplayText = "Analyzer Input Range")]
+        public AudioAnalyzerInputRanges AnalyzerInputRange = new AudioAnalyzerInputRanges() { InputRange = 6 };
 
         //---------------
 
@@ -111,7 +111,7 @@ public override void DoTest(string title, out TestResult tr)
             SetupBaseTests();
 
             ((IAudioAnalyzer)Tm.TestClass).AudioAnalyzerSetTitle(title);
-            ((IAudioAnalyzer)Tm.TestClass).SetInputRange(AnalyzerInputRange);
+            ((IAudioAnalyzer)Tm.TestClass).SetInputRange(AnalyzerInputRange.InputRange);
             ((IAudioAnalyzer)Tm.TestClass).AudioGenSetGen1(true, AnalyzerOutputLevel, TestFrequency);
             ((IAudioAnalyzer)Tm.TestClass).AudioGenSetGen2(false, AnalyzerOutputLevel, TestFrequency);
 

diff --git a/Tractor/Com.QuantAsylum.Tractor.Tests/GainLevel/RmsLevelA01.cs b/Tractor/Com.QuantAsylum.Tractor.Tests/GainLevel/RmsLevelA01.cs
@@ -16,8 +16,8 @@ public class RmsLevelA01 : AudioTestBase
         [ObjectEditorAttribute(Index = 240, DisplayText = "Minimum Level to Pass (dBV)", MinValue = -150, MaxValue = 0)]
         public float MinimumPassLevel = -10.5f;
 
-        [ObjectEditorAttribute(Index = 250, DisplayText = "Analyzer Input Range", ValidInts = new int[] { 6, 26 })]
-        public int AnalyzerInputRange = 6;
+        [ObjectEditorAttribute(Index = 250, DisplayText = "Analyzer Input Range")]
+        public AudioAnalyzerInputRanges AnalyzerInputRange = new AudioAnalyzerInputRanges() { InputRange = 6 };
 
         [ObjectEditorAttribute(Index = 260, DisplayText = "RMS Measurement Start (Hz)", MinValue = 10, MaxValue = 20000)]
         public float StartFreq = 20;
@@ -39,7 +39,7 @@ public override void DoTest(string title, out TestResult tr)
             Tm.SetToDefaults();
             SetupBaseTests();
 
-            ((IAudioAnalyzer)Tm.TestClass).SetInputRange(AnalyzerInputRange);
+            ((IAudioAnalyzer)Tm.TestClass).SetInputRange(AnalyzerInputRange.InputRange);
             ((IAudioAnalyzer)Tm.TestClass).AudioAnalyzerSetTitle(title);
 
             // Disable generators

diff --git a/Tractor/Com.QuantAsylum.Tractor.Tests/GainLevel/RmsLevelA03.cs b/Tractor/Com.QuantAsylum.Tractor.Tests/GainLevel/RmsLevelA03.cs
@@ -20,8 +20,8 @@ public class RmsLevelA03 : AudioTestBase
         [ObjectEditorAttribute(Index = 250, DisplayText = "Load Impedance (ohms)", ValidInts = new int[] { 8, 4 })]
         public int ProgrammableLoadImpedance = 8;
 
-        [ObjectEditorAttribute(Index = 250, DisplayText = "Analyzer Input Range", ValidInts = new int[] { 6, 26 })]
-        public int AnalyzerInputRange = 6;
+        [ObjectEditorAttribute(Index = 250, DisplayText = "Analyzer Input Range")]
+        public AudioAnalyzerInputRanges AnalyzerInputRange = new AudioAnalyzerInputRanges() { InputRange = 6 };
 
         [ObjectEditorAttribute(Index = 260, DisplayText = "RMS Measurement Start (Hz)", MinValue = 10, MaxValue = 20000)]
         public float StartFreq = 20;
@@ -44,7 +44,7 @@ public override void DoTest(string title, out TestResult tr)
             SetupBaseTests();
 
             ((IAudioAnalyzer)Tm.TestClass).AudioAnalyzerSetTitle(title);
-            ((IAudioAnalyzer)Tm.TestClass).SetInputRange(AnalyzerInputRange);
+            ((IAudioAnalyzer)Tm.TestClass).SetInputRange(AnalyzerInputRange.InputRange);
             ((IProgrammableLoad)Tm.TestClass).SetImpedance(ProgrammableLoadImpedance);
 
             // Disable generators