V4.2 with stats and vaxtor settings changes. Fixed merge problems

AiQ_GUI.cs

@@ -1,6 +1,5 @@
 using Newtonsoft.Json;
 using System.ComponentModel;
-using System.Data.OleDb;
 using System.Diagnostics;
 using System.Reflection;
 
@@ -220,73 +219,10 @@ namespace AiQ_GUI
             // If there are any actions identified then fail the test. 
             // If any labels are red then fail. Only labels in panel so can foreach on labels not controls
             if (RhTxBxActions.Text.Length > 2 || PnlLbls.Controls.OfType<Label>().Any(c => c.ForeColor == Color.Red) == true)
-                await TestFailed(BtnStartTest, "Failed due to action box text and/or red label");// If approved then pass otherwise GUI would have restarted before getting to TestPassed.
-            {
                 await TestFailed(BtnStartTest, "Diagnostic Failure");// If approved then pass otherwise GUI would have restarted before getting to TestPassed.
-            }
 
             await TestPassed(PCTime);
         }
-        public void Stats(string TypeOfTest)
-        {
-            Stats([TypeOfTest]);
-        }
-
-        public void Stats(string[] TypeOfTest)
-        {
-            using OleDbConnection conn = new(Access.connString); // Opens connection to Access database
-            try
-            {
-                conn.Open(); // Opens DB
-                string modelNumber = CbBxCameraType.Text.Substring(0, 6); // Get model number from combobox and make sure it is only 6 characters.
-
-                foreach (string type in TypeOfTest)
-                {
-                    string query = $"UPDATE AiQ SET [{type}] = [{type}] + 1 WHERE [ModelNumber] = ?"; // Add one for every test ran of this type for this model number
-                    using OleDbCommand cmd = new(query, conn); // Create command
-                    cmd.Parameters.AddWithValue("?", modelNumber); // Add model number to prevent injection
-
-                    int rowsAffected = cmd.ExecuteNonQuery();
-                    // Execute the command and get the number of rows affected
-                    //if (rowsAffected > 0) // If one or more rows were updated
-                    //    AddToActionsList($"Updated {TypeOfTest} for {modelNumber}");
-                    //else
-                    //    AddToActionsList($"No rows found for {modelNumber}");
-                }
-            }
-            catch
-            {
-                AddToActionsList("Could not access Access in Google Drive. Is it running?");
-                return;
-            }
-        }
-
-        public void StatsDiags(string redDiagLabels, string RhTxBxActionsText, string IsRMA, int RMA)
-        {
-            using OleDbConnection conn = new(Access.connString);
-            conn.Open();
-
-            // Null checks
-            string redVal = string.IsNullOrWhiteSpace(redDiagLabels) ? "-" : redDiagLabels;
-            string actVal = string.IsNullOrWhiteSpace(RhTxBxActionsText) ? "-" : RhTxBxActionsText;
-            string model = string.IsNullOrWhiteSpace(CamOnTest?.Model) ? "-" : CamOnTest.Model;
-
-            string sql = @"
-                INSERT INTO DiagsStats ([Date], [Model], [Red Diags Labels], [RhTxBxActions Contents],[IsRMA],[RMA])
-                VALUES (?, ?, ?, ?, ?, ?)";
-
-            using OleDbCommand cmd = new(sql, conn);
-
-            // OleDb uses positional parameters — order must match the VALUES list above
-            cmd.Parameters.Add(new OleDbParameter { OleDbType = OleDbType.Date, Value = DateTime.Now });
-            cmd.Parameters.Add(new OleDbParameter { OleDbType = OleDbType.VarWChar, Value = model });
-            cmd.Parameters.Add(new OleDbParameter { OleDbType = OleDbType.VarWChar, Value = redVal });
-            cmd.Parameters.Add(new OleDbParameter { OleDbType = OleDbType.VarWChar, Value = actVal });
-            cmd.Parameters.Add(new OleDbParameter { OleDbType = OleDbType.Boolean, Value = IsRMA });
-            cmd.Parameters.Add(new OleDbParameter { OleDbType = OleDbType.VarWChar, Value = RMA });
-
-            cmd.ExecuteNonQuery();
-        }
 
         private async void BtnPreTest_Click(object sender, EventArgs e)
         {
@@ -335,8 +271,8 @@ namespace AiQ_GUI
                         await AllocateSerial();
                     else if (GoogleAPI.UpdateSpreadSheetRePreTest(CameraAccessInfo.SpreadsheetID, Vers) != "OK") // If rerun might be different values so update SS
                         AddToActionsList("Failed to write to spreadsheet, please check manually");
-                   // else if (Excel.UpdateSpreadSheetPreTest(CameraAccessInfo.SpreadsheetID, Vers, CamOnTest.GetCamDesc(), CamOnTest.Model) != "OK")
+                    // else if (Excel.UpdateSpreadSheetPreTest(CameraAccessInfo.SpreadsheetID, Vers, CamOnTest.GetCamDesc(), CamOnTest.Model) != "OK")
-                   //     AddToActionsList("Failed to write to spreadsheet, please check manually");
+                    //     AddToActionsList("Failed to write to spreadsheet, please check manually");
                 }
                 else // No serial or model so allocate one
                     await AllocateSerial();
@@ -501,14 +437,11 @@ namespace AiQ_GUI
             PnlQuestion.Visible = true;
             BtnNo.Visible = false;
             Logging.LogMessage("Pre Test Passed");
+
             if (CamOnTest.RMANum == 0) // Yap to check if it is not a RMA
-            {
                 Access.Stats("Pre Tests Passed", CamOnTest.Model);
-            }
             else
-            {
                 Access.Stats("RMA Pre Tests Passed", CamOnTest.Model);
-            }
 
             if (await DisplayQuestion("Test passed, restart?"))
                 Helper.RestartApp();
@@ -523,13 +456,9 @@ namespace AiQ_GUI
             Logging.LogMessage("Pre Test Failed");
 
             if (CamOnTest.RMANum == 0) // Yap to check if it is not a RMA
-            {
                 Access.Stats(["Pre Tests Failed", ErrMssg], CamOnTest.Model);
-            }
             else
-            {
                 Access.Stats("RMA Pre Tests Failed", CamOnTest.Model);
-            }
 
             string RedLbls = string.Join(Environment.NewLine, PnlLbls.Controls
                     .OfType<Label>()
@@ -539,17 +468,6 @@ namespace AiQ_GUI
 
             Access.StatsDiags(RedLbls, RhTxBxActions.Text, CamOnTest.Model); // Log to Access database
 
-            if (CamOnTest.RMANum == 0) // Yap to check if it is not a RMA
-            {
-                Stats(["Pre Tests Failed", ErrMssg]);
-                StatsDiags(RedLbls, RhTxBxActions.Text, "FALSE", CamOnTest.RMANum);
-            }
-            else
-            {
-                Stats("RMA Pre Tests Failed");
-                StatsDiags(RedLbls, RhTxBxActions.Text, "TRUE", CamOnTest.RMANum);
-            }
-
             if (await DisplayQuestion("Test failed, restart?" + Environment.NewLine + "See Actions textbox for details."))
                 Helper.RestartApp();
         }

AiQ_GUI_NET_Test.csproj

@@ -51,8 +51,8 @@
     <PackageReference Include="PDFsharp-MigraDoc-gdi" Version="6.2.2" />
     <PackageReference Include="Selenium.Support" Version="4.38.0" />
     <PackageReference Include="Selenium.WebDriver" Version="4.38.0" />
-    <PackageReference Include="Selenium.WebDriver.ChromeDriver" Version="141.0.7390.12200" />
+    <PackageReference Include="Selenium.WebDriver.ChromeDriver" Version="142.0.7444.5900" />
-    <PackageReference Include="SSH.NET" Version="2025.0.0" />
+    <PackageReference Include="SSH.NET" Version="2025.1.0" />
     <PackageReference Include="System.Data.OleDb" Version="9.0.10" />
   </ItemGroup>
 

Camera/FlexiAPI.cs

@@ -81,7 +81,7 @@ namespace AiQ_GUI
             // Always Infrared as LED's are controlled from infrared page
             // Level can be word eg. SAFE or hex eg. 0x0E
             string suffix = $"/Infrared/led-controls?power={LEVEL}";
-            return await APIHTTPRequest(suffix, IPAddress);
+            return await APIHTTPRequest(suffix, IPAddress, 5);
         }
 
         public static async Task<string> SendBlobFileUpload(string url, string filePath, string fileName)
@@ -161,12 +161,13 @@ namespace AiQ_GUI
                 return null; // If it fails to parse the JSON
             }
         }
+
         public static async Task<bool> SetVaxtorMinMaxPlate(string IP)
         {
             try
             {
                 // Build JSON array for Vaxtor min/max plate configuration
-                string[,] Vaxtor_JSON = { { "propMinCharHeight", "18" }, { "propMinGlobalConfidence", "30" } };
+                string[,] Vaxtor_JSON = { { "propMinCharHeight", "14" }, { "propMaxCharHeight", "40" }, { "propMinGlobalConfidence", "30" } };
                 string response = await HTTP_Update("RaptorOCR".Trim(), IP, Vaxtor_JSON);
 
                 // Treat "operation was canceled" as a successful apply
@@ -191,8 +192,6 @@ namespace AiQ_GUI
             }
         }
 
-
-
         public static async Task<bool> SetZoomLockOn(string IP)
         {
             // Set Zoomlock on and if it fails ask user to set it manually
@@ -238,8 +237,7 @@ namespace AiQ_GUI
             }
 
             // Check no value is -1 (no plate found) or if the positions are identical (one plate found). If it is then try again 3 times
-            if (new[] { trim.infraredX, trim.infraredY, trim.colourX, trim.colourY }.Any(value => value == -1)
+            if (new[] { trim.infraredX, trim.infraredY, trim.colourX, trim.colourY }.Any(value => value == -1) || (trim.infraredX == trim.colourX && trim.infraredY == trim.colourY))
-                || (trim.infraredX == trim.colourX && trim.infraredY == trim.colourY))
             {
                 if (RetryCount >= 3)
                 {
@@ -248,7 +246,7 @@ namespace AiQ_GUI
                 }
 
                 await Task.Delay(5000); // Give 5 second delay for it to see a plate
-                await SetTrim(IPAddress, LblTxt, RetryCount++);
+                await SetTrim(IPAddress, LblTxt, RetryCount + 1);
             }
 
             int offset = 105;
@@ -279,7 +277,7 @@ namespace AiQ_GUI
                         return;
                     }
                     await Task.Delay(5000); // Give 5 second delay for it to see a plate
-                    await SetTrim(IPAddress, LblTxt, RetryCount++);
+                    await SetTrim(IPAddress, LblTxt, RetryCount + 1);
                 }
             }
 

Microsoft/StatsExcel.cs

@@ -23,7 +23,7 @@ namespace AiQ_GUI
                 DateTime? lastStatsRun = null;
                 try
                 {
-                    using (var cmdPeriod = new OleDbCommand("SELECT LastStatsRun FROM UniversalData", conn))
+                    using (OleDbCommand cmdPeriod = new OleDbCommand("SELECT LastStatsRun FROM UniversalData", conn))
                     {
                         object res = cmdPeriod.ExecuteScalar();
                         if (res != null && res != DBNull.Value)
@@ -136,12 +136,12 @@ namespace AiQ_GUI
                         FROM DiagsStats
                         WHERE [Date] >= ? AND [Date] < ?";
 
-                using (var diagsCmd = new OleDbCommand(diagsQuery, conn))
+                using (OleDbCommand diagsCmd = new OleDbCommand(diagsQuery, conn))
                 {
                     diagsCmd.Parameters.Add(new OleDbParameter { OleDbType = OleDbType.Date, Value = monthStart });
                     diagsCmd.Parameters.Add(new OleDbParameter { OleDbType = OleDbType.Date, Value = nextMonth });
 
-                    using (var diagsAdapter = new OleDbDataAdapter(diagsCmd))
+                    using (OleDbDataAdapter diagsAdapter = new OleDbDataAdapter(diagsCmd))
                     {
                         DataTable diagsTable = new();
                         diagsAdapter.Fill(diagsTable);
@@ -195,7 +195,7 @@ namespace AiQ_GUI
                     return;
                 }
 
-                using (var tx = conn.BeginTransaction())
+                using (OleDbTransaction tx = conn.BeginTransaction())
                 {
                     try
                     {