Cleanup for 0.91 based on "Automated Amplifier Test with Tractor" blog post

QuantAsylum · QuantAsylum · commit ef3b471fa5d9 · 2019-04-22T14:21:00.000-07:00
Signed-off-by: matt &lt;github@quantasylum.com&gt;
diff --git a/QA Tractor.sln b/QA Tractor.sln
@@ -1,9 +1,9 @@
 ﻿
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
+# Visual Studio 15
+VisualStudioVersion = 15.0.28307.329
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tractor", "Tractor\Tractor.csproj", "{FCC7870E-B36F-4C9D-BB55-89FA1AAA7907}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "QA Tractor", "Tractor\QA Tractor.csproj", "{FCC7870E-B36F-4C9D-BB55-89FA1AAA7907}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -19,4 +19,7 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {BC00CD58-C0EF-4857-AC6D-3B1F9F9D025C}
+	EndGlobalSection
 EndGlobal
diff --git a/Tractor/Com.QuantAsylum.Tractor.Dialogs/DlgAudition.cs b/Tractor/Com.QuantAsylum.Tractor.Dialogs/DlgAudition.cs
@@ -31,7 +31,7 @@ private void button1_Click(object sender, EventArgs e)
         {
             try
             {
-                AuditionVolume += 0.05f;
+                AuditionVolume += 0.01f;
 
                 if (AuditionVolume > 1.0f)
                     AuditionVolume = 1.0f;
@@ -50,7 +50,7 @@ private void button2_Click(object sender, EventArgs e)
         {
             try
             {
-                AuditionVolume -= 0.05f;
+                AuditionVolume -= 0.01f;
 
                 if (AuditionVolume < 0f)
                     AuditionVolume = 0f;
diff --git a/Tractor/Com.QuantAsylum.Tractor.Dialogs/DlgTestRun.cs b/Tractor/Com.QuantAsylum.Tractor.Dialogs/DlgTestRun.cs
@@ -251,10 +251,10 @@ private void Start()
                                 {
                                     SubmitToAuditDb(testGroup, 1, Form1.AppSettings.TestList[i], tr);
                                 }
-                                else
-                                {
-                                    SubmitToAuditDb(testGroup, 0, Form1.AppSettings.TestList[i], tr);
-                                }
+                            }
+                            else
+                            {
+                                SubmitToAuditDb(testGroup, 0, Form1.AppSettings.TestList[i], tr);
                             }
                         }
 
diff --git a/Tractor/Com.QuantAsylum.Tractor.TestManagers/TestManager.cs b/Tractor/Com.QuantAsylum.Tractor.TestManagers/TestManager.cs
@@ -24,9 +24,9 @@ class TestManager
     {
         public object TestClass;
 
-        public delegate void StartEditing();
-        public delegate void DoneEditing();
-        public delegate void CancelEditing();
+        //public delegate void StartEditing();
+        //public delegate void DoneEditing();
+        //public delegate void CancelEditing();
 
         /// <summary>
         /// This allows different tests to share data.
@@ -36,15 +36,6 @@ class TestManager
         public void SetToDefaults()
         {
             ((IInstrument)TestClass).SetToDefaults();
-
-            //if (TestClass is IInstrument)
-            //{
-            //    ((IInstrument)TestClass).SetToDefaults();
-            //}
-            //else if (TestClass is IComposite)
-            //{
-            //    ((IComposite)TestClass).SetToDefaults();
-            //}
         }
     }
 }
diff --git a/Tractor/Com.QuantAsylum.Tractor.Tests/GainLevel/RmsLevelA01.cs b/Tractor/Com.QuantAsylum.Tractor.Tests/GainLevel/RmsLevelA01.cs
@@ -10,10 +10,10 @@ namespace Com.QuantAsylum.Tractor.Tests.NoiseFloors
     [Serializable]
     public class RmsLevelA01 : AudioTestBase
     {
-        [ObjectEditorAttribute(Index = 230, DisplayText = "Minimum Level to Pass (dB)", MinValue = -100, MaxValue = 100)]
+        [ObjectEditorAttribute(Index = 230, DisplayText = "Minimum Level to Pass (dBV)", MinValue = -100, MaxValue = 100)]
         public float MinimumPassLevel = -10.5f;
 
-        [ObjectEditorAttribute(Index = 240, DisplayText = "Maximum Level to Pass (dB)", MinValue = -100, MaxValue = 100, MustBeGreaterThanIndex = 230)]
+        [ObjectEditorAttribute(Index = 240, DisplayText = "Maximum Level to Pass (dBV)", MinValue = -100, MaxValue = 100, MustBeGreaterThanIndex = 230)]
         public float MaximumPassLevel = -9.5f;
 
         [ObjectEditorAttribute(Index = 250, DisplayText = "Analyzer Input Range", ValidInts = new int[] { 6, 26 })]
diff --git a/Tractor/Com.QuantAsylum.Tractor.Tests/GainLevel/RmsLevelA03.cs b/Tractor/Com.QuantAsylum.Tractor.Tests/GainLevel/RmsLevelA03.cs
@@ -10,10 +10,10 @@ namespace Com.QuantAsylum.Tractor.Tests.NoiseFloors
     [Serializable]
     public class RmsLevelA03 : AudioTestBase
     {
-        [ObjectEditorAttribute(Index = 230, DisplayText = "Minimum Level to Pass (dB)", MinValue = -100, MaxValue = 100)]
+        [ObjectEditorAttribute(Index = 230, DisplayText = "Minimum Level to Pass (dBV)", MinValue = -100, MaxValue = 100)]
         public float MinimumPassLevel = -10.5f;
 
-        [ObjectEditorAttribute(Index = 240, DisplayText = "Maximum Level to Pass (dB)", MinValue = -100, MaxValue = 100, MustBeGreaterThanIndex = 230)]
+        [ObjectEditorAttribute(Index = 240, DisplayText = "Maximum Level to Pass (dBV)", MinValue = -100, MaxValue = 100, MustBeGreaterThanIndex = 230)]
         public float MaximumPassLevel = -9.5f;
 
         [ObjectEditorAttribute(Index = 250, DisplayText = "Load Impedance (ohms)", ValidInts = new int[] { 8, 4 })]
diff --git a/Tractor/Com.QuantAsylum.Tractor.Tests/ObjectEditorUiBuilder.cs b/Tractor/Com.QuantAsylum.Tractor.Tests/ObjectEditorUiBuilder.cs
@@ -129,7 +129,7 @@ private void PopulateUi()
                 {
                     bool value = (bool)fi.GetValue(ObjectToEdit);
                     CheckBox tb = new CheckBox() { Checked = value, Anchor = AnchorStyles.Left };
-                    tb.TextChanged += ValueChanged;
+                    tb.CheckedChanged+= ValueChanged;
                     Tlp.Controls.Add(tb, 1, row);
                 }
                 else if (o is ObjectEditorSpacer)
@@ -371,7 +371,7 @@ public bool VerifyChanges(bool commit = false)
                     {
                         if (commit)
                         {
-                            string s = Tlp.GetControlFromPosition(1, i).Text;
+                            string s = Tlp.GetControlFromPosition(1, i).Text.Trim();
                             f[i].SetValue(ObjectToEdit, s.Substring(0, Math.Min(s.Length, f[i].GetCustomAttribute<ObjectEditorAttribute>().MaxLength)));
                         }
 
diff --git a/Tractor/Com.QuantAsylum.Tractor.Tests/Operator/IdInputA00.cs b/Tractor/Com.QuantAsylum.Tractor.Tests/Operator/IdInputA00.cs
@@ -12,7 +12,7 @@ public class IdInputA00 : UiTestBase
     {
 
         [ObjectEditorAttribute(Index = 200, DisplayText = "Prompt Message:", MaxLength = 32)]
-        public string Id = "";
+        public string Msg = "";
 
         public IdInputA00() : base()
         {
@@ -25,24 +25,25 @@ public override void DoTest(string title, out TestResult tr)
             // Two channels of testing
             tr = new TestResult(2);
 
-            DlgInput dlg = new DlgInput("Enter serial number");
+            DlgInput dlg = new DlgInput(Msg);
 
             if (dlg.ShowDialog() == System.Windows.Forms.DialogResult.OK)
             {
-                Id = dlg.Result;
-                if (Id != "")
+                string serialNumber = dlg.Result.Trim().ToUpper();
+                if (serialNumber != "")
                 {
-                    Tm.LocalStash.Add("SerialNumber", Id);
+                    Tm.LocalStash.Add("SerialNumber", serialNumber);
                     tr.Pass = true;
-                    tr.StringValue[0] = Id;
+                    tr.StringValue[0] = serialNumber;
                 }
             }
         }
 
         public override string GetTestDescription()
         {
-            return "Prompts the user to enter a serial number. This function returns 'pass = true' if the user " +
-                   "entered something, but no further qualification is performed on the input string. " + 
+            return "Prompts the user to enter some information as a string. This function returns 'pass = true' if the user " +
+                   "entered something, it will be converted to upper case and leading and trailing spaces will be removed, " +
+                   "but no further qualification is performed on the input string. " + 
                    "If the user hit cancel or if the string is empty, then 'pass = false' is returned";
         }
     }
diff --git a/Tractor/Com.QuantAsylum.Tractor.Tests/Operator/PromptA00.cs b/Tractor/Com.QuantAsylum.Tractor.Tests/Operator/PromptA00.cs
@@ -54,7 +54,8 @@ public override void DoTest(string title, out TestResult tr)
 
         public override string GetTestDescription()
         {
-            return "Instructs the user to complete an action. 'Pass = true' is always returned.";
+            return "Instructs the user to complete an action. A PNG image may be specified as an instruction aid, and the operator" +
+                "may optionally decide if the action succeeded or failed.";
         }
     }
 }
diff --git a/Tractor/Constants.cs b/Tractor/Constants.cs
@@ -9,7 +9,7 @@ namespace Tractor
     static class Constants
     {
         public static string TitleBarText = "QuantAsylum TRACTOR";
-        public static readonly double Version = 0.90;
+        public static readonly double Version = 0.91;
         public static string VersionSuffix = "";
 
         public static double RequiredWebserviceVersion = 0.5;
diff --git a/Tractor/Form1.cs b/Tractor/Form1.cs
@@ -117,7 +117,12 @@ private void Form1_Load(object sender, EventArgs e)
 
         private void UpdateTitleBar()
         {
-            Text = string.Format("{0} {1} [{2:0.00}{3}]", Constants.TitleBarText, Constants.Version, Path.GetFileName(SettingsFile), AppSettingsDirty ? "*" : "");
+            string s = string.Format("{0} {1}", Constants.TitleBarText, Constants.Version);
+
+            if (SettingsFile != "")
+                Text = s + string.Format(" [{0:0.00}{1}]", Path.GetFileName(SettingsFile), AppSettingsDirty ? "*" : "");
+            else
+                Text = s;
         }
 
 
@@ -653,7 +658,6 @@ private void queryCloudToolStripMenuItem_Click(object sender, EventArgs e)
             {
 
             }
-
         }
 
         public void AcceptChanges()
@@ -662,6 +666,12 @@ public void AcceptChanges()
             UpdateTitleBar();
             EditingInProgress = false;
             treeView1.Enabled = true;
+            if (AppSettings.TestList.Where(o => o.Name == SelectedTb.Name).ToList().Count > 1)
+            {
+                // Name isn't unqiue. Make it unique
+                SelectedTb.Name = AppSettings.FindUniqueName(SelectedTb.Name);
+            }
+            RePopulateTreeView(SelectedTb.Name);
             SetTreeviewControls();
         }
 
diff --git a/Tractor/Properties/AssemblyInfo.cs b/Tractor/Properties/AssemblyInfo.cs
@@ -10,7 +10,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("Tractor")]
-[assembly: AssemblyCopyright("Copyright ©  2018")]
+[assembly: AssemblyCopyright("Copyright ©  2019")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -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.7.5.0")]
-[assembly: AssemblyFileVersion("0.7.5.0")]
+[assembly: AssemblyVersion("0.9.0.0")]
+[assembly: AssemblyFileVersion("0.9.0.0")]
diff --git a/Tractor/QA Tractor.csproj b/Tractor/QA Tractor.csproj
diff --git a/Tractor/Releases.txt b/Tractor/Releases.txt
@@ -1,4 +1,10 @@
-﻿0.75
+﻿0.91 
+- Minor bug fixing
+
+0.9 
+- Massive cleanup and re-structuring
+
+0.75
 - Added splash
 - Added cloud database support
 - QA401 Test flow now resembles QA401H test flow (eg processing done without pulling data across)

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ private void button1_Click(object sender, EventArgs e)`
`31`	`31`	`{`
`32`	`32`	`try`
`33`	`33`	`{`
`34`		`- AuditionVolume += 0.05f;`
	`34`	`+ AuditionVolume += 0.01f;`
`35`	`35`
`36`	`36`	`if (AuditionVolume > 1.0f)`
`37`	`37`	`AuditionVolume = 1.0f;`
`@@ -50,7 +50,7 @@ private void button2_Click(object sender, EventArgs e)`
`50`	`50`	`{`
`51`	`51`	`try`
`52`	`52`	`{`
`53`		`- AuditionVolume -= 0.05f;`
	`53`	`+ AuditionVolume -= 0.01f;`
`54`	`54`
`55`	`55`	`if (AuditionVolume < 0f)`
`56`	`56`	`AuditionVolume = 0f;`
Original file line number	Diff line number	Diff line change
`@@ -251,10 +251,10 @@ private void Start()`
`251`	`251`	`{`
`252`	`252`	`SubmitToAuditDb(testGroup, 1, Form1.AppSettings.TestList[i], tr);`
`253`	`253`	`}`
`254`		`- else`
`255`		`- {`
`256`		`- SubmitToAuditDb(testGroup, 0, Form1.AppSettings.TestList[i], tr);`
`257`		`- }`
	`254`	`+ }`
	`255`	`+ else`
	`256`	`+ {`
	`257`	`+ SubmitToAuditDb(testGroup, 0, Form1.AppSettings.TestList[i], tr);`
`258`	`258`	`}`
`259`	`259`	`}`
`260`	`260`
Original file line number	Diff line number	Diff line change
`@@ -24,9 +24,9 @@ class TestManager`
`24`	`24`	`{`
`25`	`25`	`public object TestClass;`
`26`	`26`
`27`		`- public delegate void StartEditing();`
`28`		`- public delegate void DoneEditing();`
`29`		`- public delegate void CancelEditing();`
	`27`	`+ //public delegate void StartEditing();`
	`28`	`+ //public delegate void DoneEditing();`
	`29`	`+ //public delegate void CancelEditing();`
`30`	`30`
`31`	`31`	`/// <summary>`
`32`	`32`	`/// This allows different tests to share data.`
`@@ -36,15 +36,6 @@ class TestManager`
`36`	`36`	`public void SetToDefaults()`
`37`	`37`	`{`
`38`	`38`	`((IInstrument)TestClass).SetToDefaults();`
`39`		`-`
`40`		`- //if (TestClass is IInstrument)`
`41`		`- //{`
`42`		`- // ((IInstrument)TestClass).SetToDefaults();`
`43`		`- //}`
`44`		`- //else if (TestClass is IComposite)`
`45`		`- //{`
`46`		`- // ((IComposite)TestClass).SetToDefaults();`
`47`		`- //}`
`48`	`39`	`}`
`49`	`40`	`}`
`50`	`41`	`}`
Original file line number	Diff line number	Diff line change
`@@ -129,7 +129,7 @@ private void PopulateUi()`
`129`	`129`	`{`
`130`	`130`	`bool value = (bool)fi.GetValue(ObjectToEdit);`
`131`	`131`	`CheckBox tb = new CheckBox() { Checked = value, Anchor = AnchorStyles.Left };`
`132`		`- tb.TextChanged += ValueChanged;`
	`132`	`+ tb.CheckedChanged+= ValueChanged;`
`133`	`133`	`Tlp.Controls.Add(tb, 1, row);`
`134`	`134`	`}`
`135`	`135`	`else if (o is ObjectEditorSpacer)`
`@@ -371,7 +371,7 @@ public bool VerifyChanges(bool commit = false)`
`371`	`371`	`{`
`372`	`372`	`if (commit)`
`373`	`373`	`{`
`374`		`- string s = Tlp.GetControlFromPosition(1, i).Text;`
	`374`	`+ string s = Tlp.GetControlFromPosition(1, i).Text.Trim();`
`375`	`375`	`f[i].SetValue(ObjectToEdit, s.Substring(0, Math.Min(s.Length, f[i].GetCustomAttribute<ObjectEditorAttribute>().MaxLength)));`
`376`	`376`	`}`
`377`	`377`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ public class IdInputA00 : UiTestBase`
`12`	`12`	`{`
`13`	`13`
`14`	`14`	`[ObjectEditorAttribute(Index = 200, DisplayText = "Prompt Message:", MaxLength = 32)]`
`15`		`- public string Id = "";`
	`15`	`+ public string Msg = "";`
`16`	`16`
`17`	`17`	`public IdInputA00() : base()`
`18`	`18`	`{`
`@@ -25,24 +25,25 @@ public override void DoTest(string title, out TestResult tr)`
`25`	`25`	`// Two channels of testing`
`26`	`26`	`tr = new TestResult(2);`
`27`	`27`
`28`		`- DlgInput dlg = new DlgInput("Enter serial number");`
	`28`	`+ DlgInput dlg = new DlgInput(Msg);`
`29`	`29`
`30`	`30`	`if (dlg.ShowDialog() == System.Windows.Forms.DialogResult.OK)`
`31`	`31`	`{`
`32`		`- Id = dlg.Result;`
`33`		`- if (Id != "")`
	`32`	`+ string serialNumber = dlg.Result.Trim().ToUpper();`
	`33`	`+ if (serialNumber != "")`
`34`	`34`	`{`
`35`		`- Tm.LocalStash.Add("SerialNumber", Id);`
	`35`	`+ Tm.LocalStash.Add("SerialNumber", serialNumber);`
`36`	`36`	`tr.Pass = true;`
`37`		`- tr.StringValue[0] = Id;`
	`37`	`+ tr.StringValue[0] = serialNumber;`
`38`	`38`	`}`
`39`	`39`	`}`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`public override string GetTestDescription()`
`43`	`43`	`{`
`44`		`- return "Prompts the user to enter a serial number. This function returns 'pass = true' if the user " +`
`45`		`- "entered something, but no further qualification is performed on the input string. " +`
	`44`	`+ return "Prompts the user to enter some information as a string. This function returns 'pass = true' if the user " +`
	`45`	`+ "entered something, it will be converted to upper case and leading and trailing spaces will be removed, " +`
	`46`	`+ "but no further qualification is performed on the input string. " +`
`46`	`47`	`"If the user hit cancel or if the string is empty, then 'pass = false' is returned";`
`47`	`48`	`}`
`48`	`49`	`}`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,8 @@ public override void DoTest(string title, out TestResult tr)`
`54`	`54`
`55`	`55`	`public override string GetTestDescription()`
`56`	`56`	`{`
`57`		`- return "Instructs the user to complete an action. 'Pass = true' is always returned.";`
	`57`	`+ return "Instructs the user to complete an action. A PNG image may be specified as an instruction aid, and the operator" +`
	`58`	`+ "may optionally decide if the action succeeded or failed.";`
`58`	`59`	`}`
`59`	`60`	`}`
`60`	`61`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ namespace Tractor`
`9`	`9`	`static class Constants`
`10`	`10`	`{`
`11`	`11`	`public static string TitleBarText = "QuantAsylum TRACTOR";`
`12`		`- public static readonly double Version = 0.90;`
	`12`	`+ public static readonly double Version = 0.91;`
`13`	`13`	`public static string VersionSuffix = "";`
`14`	`14`
`15`	`15`	`public static double RequiredWebserviceVersion = 0.5;`