Release 0.981

Signed-off-by: matt <github@quantasylum.com>

Author: QuantAsylum

Tractor/Com.QuantAsylum.Tractor.Dialogs/DlgPrompt.Designer.cs

@@ -22,11 +22,8 @@ public DlgPrompt(string instruction, bool showFailButton, Bitmap image)
 
             if (image != null)
             {
-                this.Height = 650;
                 pictureBox1.Image = image;
             }
-            else
-                this.Height = 300;
         }
     }
 }

Tractor/Com.QuantAsylum.Tractor.Dialogs/DlgPrompt.cs

@@ -278,6 +278,10 @@ private PointD[] MarshallToPointD(QuantAsylum.QA401.PointD[] dataIn)
 
 
 
+        /// <summary>
+        /// Returns true if the QA401 application is running. 
+        /// </summary>
+        /// <returns></returns>
         bool IsAppAlreadyRunning()
         {
             System.Threading.Mutex mutex;
@@ -290,7 +294,6 @@ bool IsAppAlreadyRunning()
                 mutex.ReleaseMutex();
                 mutex.Dispose();
                 return false;
-          
             }
 
             return true;
@@ -330,16 +333,22 @@ bool LaunchApp(string name)
                         // Wait up to 20 seconds for the app to get running
                         for (int i=0; i<20; i++)
                         {
-                            if (IsAppAlreadyRunning())
+                            if (IsAppAlreadyRunning() == true)
                             {
-                                Thread.Sleep(1000);
+                                // At this point we've launched the app and we've determiend
+                                // it's running. Now we must wait to ensure it has been configured
+                                // which could take up to 20 seconds. BUGBUG: Should add a another 
+                                // global mutex to QA401 app to determine that FPGA is configured
+                                Thread.Sleep(20000);
                                 return true;
                             }
 
+                            // Wait 1 second and try again
                             Thread.Sleep(1000);
                         }
 
-                        return true;
+                        // Here we couldn't confirm the app had launched
+                        return false;
                     }
                     catch (Exception ex)
                     {

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

@@ -7,7 +7,7 @@ namespace Com.QuantAsylum.Tractor.Tests.Other
 {
     public class AuditionA01 : UiTestBase
     {
-        [ObjectEditorAttribute(Index = 200, DisplayText = "WAV File Name:", MaxLength = 128)]
+        [ObjectEditorAttribute(Index = 200, DisplayText = "WAV File Name:", MaxLength = 512, IsFileName = true)]
         public string AuditionFileName = "";
 
         [ObjectEditorAttribute(Index = 210, DisplayText = "Output Level (0..1)", MinValue = 0, MaxValue = 1)]

Tractor/Com.QuantAsylum.Tractor.Tests/Operator/AuditionA01.cs

@@ -15,7 +15,7 @@ public class PromptA00 : UiTestBase
         [ObjectEditorAttribute(Index = 200, DisplayText = "Prompt Message:", MaxLength = 128)]
         public string PromptMessage = "";
 
-        [ObjectEditorAttribute(Index = 210, DisplayText = "Bitmap File Name:", MaxLength = 128)]
+        [ObjectEditorAttribute(Index = 210, DisplayText = "Bitmap File Name:", MaxLength = 512, IsFileName = true)]
         public string BitmapFile = "";
 
         [ObjectEditorAttribute(Index = 220, DisplayText = "Display Fail Button")]
@@ -37,9 +37,9 @@ public override void DoTest(string title, out TestResult tr)
             {
                 bmp = new Bitmap(BitmapFile);
             }
-            catch
+            catch (Exception ex)
             {
-
+                MessageBox.Show($"Failed to load specified bitmap file {BitmapFile}. Exception: " + ex.Message);
             }
 
             DlgPrompt dlg = new DlgPrompt(PromptMessage, ShowFailButton, bmp);
@@ -54,8 +54,9 @@ public override void DoTest(string title, out TestResult tr)
 
         public override string GetTestDescription()
         {
-            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.";
+            return "Instructs the user to complete an action. A PNG image (512x384) may be specified as an instruction aid, and the operator" +
+                "may optionally decide if the action succeeded or failed. If an image is specified, it will be stretched to fit, maintaining" +
+                "its current aspect ratio.";
         }
     }
 }

Tractor/Com.QuantAsylum.Tractor.Tests/Operator/PromptA00.cs

@@ -9,7 +9,7 @@ namespace Tractor
     static class Constants
     {
         public static string TitleBarText = "QuantAsylum TRACTOR";
-        public static readonly double Version = 0.98;
+        public static readonly double Version = 0.981;
         public static string VersionSuffix = "";
 
         public static double RequiredWebserviceVersion = 0.5;

Tractor/Constants.cs

@@ -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.3.0")]
-[assembly: AssemblyFileVersion("0.9.3.0")]
+[assembly: AssemblyVersion("0.9.8.1")]
+[assembly: AssemblyFileVersion("0.9.8.1")]

Tractor/Properties/AssemblyInfo.cs

@@ -1,4 +1,8 @@
-0.98
+0.981
+- Add new file picker button to PromptA00 and AuditionA01 tests.
+- Minor cleanup to QA401 app launch code
+
+0.98
 - UI made more finger friendly with fatter buttons for touch screens
 - Added ThdNA01 for measuring THD+N
 - Activated lock code so that run screen can be locked down. The intent here is to ensure that accidental button presses won't close the test screen