BradleyRelyea/AiQ_GUI
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: BradleyRelyea:4c624d7e29b8036dc67b5ae9ba18343147bdf95b
Branches Tags
BradleyRelyea:master BradleyRelyea:Mav-Testing-GUI---AiQ,-AiQ-Lite,-Mobile-and-BayIQ BradleyRelyea:AddToActionList-Colours BradleyRelyea:ExcelStats
..
compare: BradleyRelyea:master
Branches Tags
BradleyRelyea:Mav-Testing-GUI---AiQ,-AiQ-Lite,-Mobile-and-BayIQ BradleyRelyea:master BradleyRelyea:AddToActionList-Colours BradleyRelyea:ExcelStats

5 Commits
4c624d7e29 ... master

Author SHA1 Message Date
Bradley Relyea
f30c35c02a Changed set to 115200 command to be in line with Flexi. 2026-01-14 09:41:07 +00:00
Bradley Relyea
62554d7fd6 God mode non optional on final test 2025-12-12 11:22:46 +00:00
Bradley Relyea
03dfb3414b V4.7 2025-12-09 09:00:16 +00:00
Bradley Relyea
760987fa75 Merged colours 2025-12-02 13:08:08 +00:00
Bradley Born
30bd2fe73c AddToAction List colours 2025-12-02 12:59:40 +00:00
20 changed files with 313 additions and 213 deletions
Expand all files Collapse all files

63
AiQ_GUI.Designer.cs generated
View File

@@ -141,9 +141,11 @@ namespace AiQ_GUI
groupBox3 = new GroupBox(); groupBox3 = new GroupBox();
groupBox2 = new GroupBox(); groupBox2 = new GroupBox();
groupBox1 = new GroupBox(); groupBox1 = new GroupBox();
BtnBaudModules = new Button();
BtnZoom8000 = new Button(); BtnZoom8000 = new Button();
BtnZoomWide = new Button(); BtnZoomWide = new Button();
TabSettings = new TabPage(); TabSettings = new TabPage();
BtnOpenMoba = new Button();
BtnUploadWonwooSetIR = new Button(); BtnUploadWonwooSetIR = new Button();
BtnUploadWonwooSetOV = new Button(); BtnUploadWonwooSetOV = new Button();
BtnAdminStart = new Button(); BtnAdminStart = new Button();
@@ -820,7 +822,7 @@ namespace AiQ_GUI
BtnCancel.Location = new Point(201, 185); BtnCancel.Location = new Point(201, 185);
BtnCancel.Margin = new Padding(4, 3, 4, 3); BtnCancel.Margin = new Padding(4, 3, 4, 3);
BtnCancel.Name = "BtnCancel"; BtnCancel.Name = "BtnCancel";
BtnCancel.Size = new Size(181, 37); BtnCancel.Size = new Size(180, 37);
BtnCancel.TabIndex = 174; BtnCancel.TabIndex = 174;
BtnCancel.Text = "Cancel"; BtnCancel.Text = "Cancel";
BtnCancel.UseVisualStyleBackColor = false; BtnCancel.UseVisualStyleBackColor = false;
@@ -836,7 +838,7 @@ namespace AiQ_GUI
BtnSave.Location = new Point(10, 185); BtnSave.Location = new Point(10, 185);
BtnSave.Margin = new Padding(4, 3, 4, 3); BtnSave.Margin = new Padding(4, 3, 4, 3);
BtnSave.Name = "BtnSave"; BtnSave.Name = "BtnSave";
BtnSave.Size = new Size(181, 37); BtnSave.Size = new Size(180, 37);
BtnSave.TabIndex = 173; BtnSave.TabIndex = 173;
BtnSave.Text = "Save && Check"; BtnSave.Text = "Save && Check";
BtnSave.UseVisualStyleBackColor = false; BtnSave.UseVisualStyleBackColor = false;
@@ -1254,7 +1256,7 @@ namespace AiQ_GUI
CbBxType.ForeColor = SystemColors.Control; CbBxType.ForeColor = SystemColors.Control;
CbBxType.FormattingEnabled = true; CbBxType.FormattingEnabled = true;
CbBxType.IntegralHeight = false; CbBxType.IntegralHeight = false;
CbBxType.Items.AddRange(new object[] { "Store & Forward", "Streaming", "Audit" }); CbBxType.Items.AddRange(new object[] { "Store & Forward", "Streaming", "Audit", "XML Server" });
CbBxType.Location = new Point(177, 62); CbBxType.Location = new Point(177, 62);
CbBxType.Margin = new Padding(4, 3, 4, 3); CbBxType.Margin = new Padding(4, 3, 4, 3);
CbBxType.MaxDropDownItems = 30; CbBxType.MaxDropDownItems = 30;
@@ -1781,6 +1783,7 @@ namespace AiQ_GUI
// //
// groupBox1 // groupBox1
// //
groupBox1.Controls.Add(BtnBaudModules);
groupBox1.Controls.Add(BtnZoom8000); groupBox1.Controls.Add(BtnZoom8000);
groupBox1.Controls.Add(BtnZoomWide); groupBox1.Controls.Add(BtnZoomWide);
groupBox1.Controls.Add(BtnLicVaxtor); groupBox1.Controls.Add(BtnLicVaxtor);
@@ -1801,18 +1804,35 @@ namespace AiQ_GUI
groupBox1.TabStop = false; groupBox1.TabStop = false;
groupBox1.Text = "Controls"; groupBox1.Text = "Controls";
// //
// BtnBaudModules
//
BtnBaudModules.BackColor = Color.FromArgb(70, 65, 80);
BtnBaudModules.Enabled = false;
BtnBaudModules.FlatAppearance.BorderSize = 0;
BtnBaudModules.FlatStyle = FlatStyle.Flat;
BtnBaudModules.Font = new Font("Segoe UI Semibold", 10F, FontStyle.Bold);
BtnBaudModules.ForeColor = SystemColors.Control;
BtnBaudModules.Location = new Point(12, 155);
BtnBaudModules.Margin = new Padding(4, 3, 4, 3);
BtnBaudModules.Name = "BtnBaudModules";
BtnBaudModules.Size = new Size(180, 37);
BtnBaudModules.TabIndex = 237;
BtnBaudModules.Text = "Set baudrate to 115200";
BtnBaudModules.UseVisualStyleBackColor = false;
BtnBaudModules.Click += BtnBaudModules_Click;
//
// BtnZoom8000 // BtnZoom8000
// //
BtnZoom8000.BackColor = Color.FromArgb(70, 65, 80); BtnZoom8000.BackColor = Color.FromArgb(70, 65, 80);
BtnZoom8000.Enabled = false; BtnZoom8000.Enabled = false;
BtnZoom8000.FlatAppearance.BorderSize = 0; BtnZoom8000.FlatAppearance.BorderSize = 0;
BtnZoom8000.FlatStyle = FlatStyle.Flat; BtnZoom8000.FlatStyle = FlatStyle.Flat;
BtnZoom8000.Font = new Font("Segoe UI Semibold", 10F, FontStyle.Bold); BtnZoom8000.Font = new Font("Segoe UI Semibold", 8F, FontStyle.Bold);
BtnZoom8000.ForeColor = SystemColors.Control; BtnZoom8000.ForeColor = SystemColors.Control;
BtnZoom8000.Location = new Point(204, 155); BtnZoom8000.Location = new Point(299, 155);
BtnZoom8000.Margin = new Padding(4, 3, 4, 3); BtnZoom8000.Margin = new Padding(4, 3, 4, 3);
BtnZoom8000.Name = "BtnZoom8000"; BtnZoom8000.Name = "BtnZoom8000";
BtnZoom8000.Size = new Size(180, 37); BtnZoom8000.Size = new Size(85, 37);
BtnZoom8000.TabIndex = 236; BtnZoom8000.TabIndex = 236;
BtnZoom8000.Text = "Zoom to 8000"; BtnZoom8000.Text = "Zoom to 8000";
BtnZoom8000.UseVisualStyleBackColor = false; BtnZoom8000.UseVisualStyleBackColor = false;
@@ -1824,12 +1844,12 @@ namespace AiQ_GUI
BtnZoomWide.Enabled = false; BtnZoomWide.Enabled = false;
BtnZoomWide.FlatAppearance.BorderSize = 0; BtnZoomWide.FlatAppearance.BorderSize = 0;
BtnZoomWide.FlatStyle = FlatStyle.Flat; BtnZoomWide.FlatStyle = FlatStyle.Flat;
BtnZoomWide.Font = new Font("Segoe UI Semibold", 10F, FontStyle.Bold); BtnZoomWide.Font = new Font("Segoe UI Semibold", 8F, FontStyle.Bold);
BtnZoomWide.ForeColor = SystemColors.Control; BtnZoomWide.ForeColor = SystemColors.Control;
BtnZoomWide.Location = new Point(12, 154); BtnZoomWide.Location = new Point(204, 155);
BtnZoomWide.Margin = new Padding(4, 3, 4, 3); BtnZoomWide.Margin = new Padding(4, 3, 4, 3);
BtnZoomWide.Name = "BtnZoomWide"; BtnZoomWide.Name = "BtnZoomWide";
BtnZoomWide.Size = new Size(180, 37); BtnZoomWide.Size = new Size(85, 37);
BtnZoomWide.TabIndex = 235; BtnZoomWide.TabIndex = 235;
BtnZoomWide.Text = "Zoom Full Wide"; BtnZoomWide.Text = "Zoom Full Wide";
BtnZoomWide.UseVisualStyleBackColor = false; BtnZoomWide.UseVisualStyleBackColor = false;
@@ -1838,6 +1858,7 @@ namespace AiQ_GUI
// TabSettings // TabSettings
// //
TabSettings.BackColor = Color.FromArgb(39, 37, 55); TabSettings.BackColor = Color.FromArgb(39, 37, 55);
TabSettings.Controls.Add(BtnOpenMoba);
TabSettings.Controls.Add(BtnUploadWonwooSetIR); TabSettings.Controls.Add(BtnUploadWonwooSetIR);
TabSettings.Controls.Add(BtnUploadWonwooSetOV); TabSettings.Controls.Add(BtnUploadWonwooSetOV);
TabSettings.Controls.Add(BtnAdminStart); TabSettings.Controls.Add(BtnAdminStart);
@@ -1850,6 +1871,22 @@ namespace AiQ_GUI
TabSettings.TabIndex = 3; TabSettings.TabIndex = 3;
TabSettings.Text = "Settings"; TabSettings.Text = "Settings";
// //
// BtnOpenMoba
//
BtnOpenMoba.BackColor = Color.FromArgb(70, 65, 80);
BtnOpenMoba.FlatAppearance.BorderSize = 0;
BtnOpenMoba.FlatStyle = FlatStyle.Flat;
BtnOpenMoba.Font = new Font("Segoe UI Semibold", 10F, FontStyle.Bold);
BtnOpenMoba.ForeColor = SystemColors.Control;
BtnOpenMoba.Location = new Point(210, 359);
BtnOpenMoba.Margin = new Padding(4, 3, 4, 3);
BtnOpenMoba.Name = "BtnOpenMoba";
BtnOpenMoba.Size = new Size(180, 37);
BtnOpenMoba.TabIndex = 245;
BtnOpenMoba.Text = "Open Moba";
BtnOpenMoba.UseVisualStyleBackColor = false;
BtnOpenMoba.Click += BtnOpenMoba_Click;
//
// BtnUploadWonwooSetIR // BtnUploadWonwooSetIR
// //
BtnUploadWonwooSetIR.BackColor = Color.FromArgb(70, 65, 80); BtnUploadWonwooSetIR.BackColor = Color.FromArgb(70, 65, 80);
@@ -1878,7 +1915,7 @@ namespace AiQ_GUI
BtnUploadWonwooSetOV.Location = new Point(19, 304); BtnUploadWonwooSetOV.Location = new Point(19, 304);
BtnUploadWonwooSetOV.Margin = new Padding(4, 3, 4, 3); BtnUploadWonwooSetOV.Margin = new Padding(4, 3, 4, 3);
BtnUploadWonwooSetOV.Name = "BtnUploadWonwooSetOV"; BtnUploadWonwooSetOV.Name = "BtnUploadWonwooSetOV";
BtnUploadWonwooSetOV.Size = new Size(181, 49); BtnUploadWonwooSetOV.Size = new Size(180, 49);
BtnUploadWonwooSetOV.TabIndex = 243; BtnUploadWonwooSetOV.TabIndex = 243;
BtnUploadWonwooSetOV.Text = "Upload Wonwoo Settings OV"; BtnUploadWonwooSetOV.Text = "Upload Wonwoo Settings OV";
BtnUploadWonwooSetOV.UseVisualStyleBackColor = false; BtnUploadWonwooSetOV.UseVisualStyleBackColor = false;
@@ -1894,7 +1931,7 @@ namespace AiQ_GUI
BtnAdminStart.Location = new Point(210, 261); BtnAdminStart.Location = new Point(210, 261);
BtnAdminStart.Margin = new Padding(4, 3, 4, 3); BtnAdminStart.Margin = new Padding(4, 3, 4, 3);
BtnAdminStart.Name = "BtnAdminStart"; BtnAdminStart.Name = "BtnAdminStart";
BtnAdminStart.Size = new Size(181, 37); BtnAdminStart.Size = new Size(180, 37);
BtnAdminStart.TabIndex = 241; BtnAdminStart.TabIndex = 241;
BtnAdminStart.Text = "Start in admin mode"; BtnAdminStart.Text = "Start in admin mode";
BtnAdminStart.UseVisualStyleBackColor = false; BtnAdminStart.UseVisualStyleBackColor = false;
@@ -1910,7 +1947,7 @@ namespace AiQ_GUI
BtnFirewall.Location = new Point(19, 261); BtnFirewall.Location = new Point(19, 261);
BtnFirewall.Margin = new Padding(4, 3, 4, 3); BtnFirewall.Margin = new Padding(4, 3, 4, 3);
BtnFirewall.Name = "BtnFirewall"; BtnFirewall.Name = "BtnFirewall";
BtnFirewall.Size = new Size(181, 37); BtnFirewall.Size = new Size(180, 37);
BtnFirewall.TabIndex = 240; BtnFirewall.TabIndex = 240;
BtnFirewall.Text = "Update Firewall"; BtnFirewall.Text = "Update Firewall";
BtnFirewall.UseVisualStyleBackColor = false; BtnFirewall.UseVisualStyleBackColor = false;
@@ -2251,5 +2288,7 @@ namespace AiQ_GUI
private Button BtnFactoryDefault; private Button BtnFactoryDefault;
private Button BtnUploadWonwooSetOV; private Button BtnUploadWonwooSetOV;
private Button BtnUploadWonwooSetIR; private Button BtnUploadWonwooSetIR;
private Button BtnBaudModules;
private Button BtnOpenMoba;
} }
} }

148
AiQ_GUI.cs
View File

@@ -9,7 +9,8 @@ namespace AiQ_GUI
{ {
ERROR, ERROR,
WARNING, WARNING,
LOG LOG,
Success
} }
public partial class MainForm : Form public partial class MainForm : Form
@@ -73,14 +74,16 @@ namespace AiQ_GUI
// Load local data store // Load local data store
localDataStore = await LDSWAIT; localDataStore = await LDSWAIT;
Logging.LogMessage("Opening GUI"); // Done after LDS to make sure directory exists.
if (localDataStore == null) if (localDataStore == null)
{ {
AddToActionsList("Could not deserialise LDS.json please help!"); AddToActionsList("Could not deserialise LDS.json please help!", Level.WARNING);
return; return;
} }
Logging.LogMessage("Opening GUI"); // Done after LDS to make sure directory exists.
this.Location = new Point(localDataStore.GUIPosX, localDataStore.GUIPosY);
Task CheckHWOnline = PingCheck(); // Async check all hardware is online Task CheckHWOnline = PingCheck(); // Async check all hardware is online
PopulateUIWithLDS(localDataStore); // Update fields that depend on LDS PopulateUIWithLDS(localDataStore); // Update fields that depend on LDS
CbBxCameraType.Text = localDataStore.LastModel; // Set last model that was tested into combobox CbBxCameraType.Text = localDataStore.LastModel; // Set last model that was tested into combobox
@@ -138,7 +141,7 @@ namespace AiQ_GUI
string LEDreply = await FlexiAPI.APIHTTPLED(CamOnTest.IP, LEDPOWER.SAFE); // Set LED's to safe (0x0E) to help with eye safety and trim check. string LEDreply = await FlexiAPI.APIHTTPLED(CamOnTest.IP, LEDPOWER.SAFE); // Set LED's to safe (0x0E) to help with eye safety and trim check.
if (!LEDreply.Contains("Power levels set successfully")) if (!LEDreply.Contains("Power levels set successfully"))
AddToActionsList($"LED level could not be set: {LEDreply}"); AddToActionsList($"LED level could not be set: {LEDreply}", Level.ERROR);
} }
else if (!await TestTube.CheckInTestTube(CamOnTest.IP)) // Sets LED's to medium power after checking it is in the test tube else if (!await TestTube.CheckInTestTube(CamOnTest.IP)) // Sets LED's to medium power after checking it is in the test tube
await TestFailed(BtnStartTest, "Camera not in test tube"); await TestFailed(BtnStartTest, "Camera not in test tube");
@@ -157,7 +160,7 @@ namespace AiQ_GUI
string VISCAReply = await FlexiAPI.APIHTTPVISCA(CamOnTest.IP, "8101043903FF", true); // Manual mode to be able to manipulate the SIG settings. string VISCAReply = await FlexiAPI.APIHTTPVISCA(CamOnTest.IP, "8101043903FF", true); // Manual mode to be able to manipulate the SIG settings.
if (VISCAReply != "9041FF9051FF") if (VISCAReply != "9041FF9051FF")
AddToActionsList("Couldn't set to manual mode"); AddToActionsList("Couldn't set to manual mode", Level.ERROR);
await CameraModules.SetSIG(CbBxShutter, CbBxIris, CbBxGain, CamOnTest.IP); // Set SIG according to the drop downs in settings for a good picture ready for image check await CameraModules.SetSIG(CbBxShutter, CbBxIris, CbBxGain, CamOnTest.IP); // Set SIG according to the drop downs in settings for a good picture ready for image check
await ImageProcessing.ImageCheck(PicBxOV, PicBxIRF2, PicBxIRF16, LblIRImageF2, LblIRImageF16, CamOnTest); // Populates the picture boxes and checks iris changes await ImageProcessing.ImageCheck(PicBxOV, PicBxIRF2, PicBxIRF16, LblIRImageF2, LblIRImageF16, CamOnTest); // Populates the picture boxes and checks iris changes
@@ -169,9 +172,6 @@ namespace AiQ_GUI
// TODO - Force expire sighting. // TODO - Force expire sighting.
Task Wait = Task.Delay(5000); // Wait for 5 seconds to allow the camera to zoom in, set settings and capture some plates before auto trim Task Wait = Task.Delay(5000); // Wait for 5 seconds to allow the camera to zoom in, set settings and capture some plates before auto trim
if (CameraAccessInfo.HardwareExtras.Contains("GPS")) // Check GPS if the hardware has it
await FlexiAPI.GPSFix(CamOnTest.IP);
// While waiting do the SSH tasks. // While waiting do the SSH tasks.
sshData = SSH.CollectSSHData(CamOnTest.IP); // SSH into camera to get Vaxtor packages, filesystem size and if tailscale is installed. sshData = SSH.CollectSSHData(CamOnTest.IP); // SSH into camera to get Vaxtor packages, filesystem size and if tailscale is installed.
await SSH.CheckFSSize(CamOnTest.IP, LblFilesystemSize, sshData); // Check Filesystem size is between 100GB & 150GB await SSH.CheckFSSize(CamOnTest.IP, LblFilesystemSize, sshData); // Check Filesystem size is between 100GB & 150GB
@@ -203,7 +203,7 @@ namespace AiQ_GUI
string LEDreply = await FlexiAPI.APIHTTPLED(CamOnTest.IP, LEDPOWER.MID); // Set LED's to medium (0x30) string LEDreply = await FlexiAPI.APIHTTPLED(CamOnTest.IP, LEDPOWER.MID); // Set LED's to medium (0x30)
if (!LEDreply.Contains("Power levels set successfully")) if (!LEDreply.Contains("Power levels set successfully"))
AddToActionsList($"LED level could not be set: {LEDreply}"); AddToActionsList($"LED level could not be set: {LEDreply}", Level.ERROR);
} }
await FlexiAPI.SetVaxtorMinMaxPlate(CamOnTest.IP); await FlexiAPI.SetVaxtorMinMaxPlate(CamOnTest.IP);
@@ -244,7 +244,7 @@ namespace AiQ_GUI
string LEDreply = await FlexiAPI.APIHTTPLED(CamOnTest.IP, LEDPOWER.MID); // Set LED's to medium (0x30) string LEDreply = await FlexiAPI.APIHTTPLED(CamOnTest.IP, LEDPOWER.MID); // Set LED's to medium (0x30)
if (!LEDreply.Contains("Power levels set successfully")) if (!LEDreply.Contains("Power levels set successfully"))
AddToActionsList($"LED level could not be set: {LEDreply}"); AddToActionsList($"LED level could not be set: {LEDreply}", Level.ERROR);
await CameraModules.FactoryResetModules(CamOnTest.IP); // Reset both modules and double check await CameraModules.FactoryResetModules(CamOnTest.IP); // Reset both modules and double check
@@ -276,7 +276,7 @@ namespace AiQ_GUI
if (await DisplayQuestion($"Would you like to allocate a serial number to this camera?")) if (await DisplayQuestion($"Would you like to allocate a serial number to this camera?"))
await AllocateSerial(); await AllocateSerial();
else if (GoogleAPI.UpdateSpreadSheetRePreTest(CameraAccessInfo.SpreadsheetID, Vers) != "OK") // If rerun might be different values so update SS 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"); AddToActionsList("Failed to write to spreadsheet, please check manually", Level.WARNING);
// 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");
} }
@@ -299,23 +299,23 @@ namespace AiQ_GUI
string err = GoogleAPI.UpdateSpreadSheetFinalTest(CameraAccessInfo.SpreadsheetID, DiagsAPI, sshData, CamOnTest.RMANum); string err = GoogleAPI.UpdateSpreadSheetFinalTest(CameraAccessInfo.SpreadsheetID, DiagsAPI, sshData, CamOnTest.RMANum);
if (err != string.Empty) // If there is an error message, display it if (err != string.Empty) // If there is an error message, display it
AddToActionsList("Failed to write to spreadsheet " + err); AddToActionsList("Failed to write to spreadsheet " + err, Level.ERROR);
// Purge camera of all reads // Purge camera of all reads
await FlexiAPI.APIHTTPRequest("/api/purge-all", CamOnTest.IP); await FlexiAPI.APIHTTPRequest("/api/purge-all", CamOnTest.IP);
if (await DisplayQuestion("Do you want to set this camera to 211 and God mode off?")) // Turn off God mode
{ string[,] GOD_JSON = { { "propGodMode", "false" } };
// Turn off God mode string IntConf = await FlexiAPI.HTTP_Update("GLOBAL--FlexiApplication", CamOnTest.IP, GOD_JSON);
string[,] GOD_JSON = { { "propGodMode", "false" } }; if (!IntConf.Contains("\"propGodMode\": {\"value\": \"false\", \"datatype\": \"boolean\"},"))
string IntConf = await FlexiAPI.HTTP_Update("GLOBAL--FlexiApplication", CamOnTest.IP, GOD_JSON); AddToActionsList("Could not turn off God mode", Level.WARNING);
if (!IntConf.Contains("\"propGodMode\": {\"value\": \"false\", \"datatype\": \"boolean\"},"))
AddToActionsList("Could not turn off God mode");
if (await DisplayQuestion("Do you want to set this camera to 211?"))
{
Thread Thr211 = new(async () => Thread Thr211 = new(async () =>
{ {
if (!await FlexiAPI.ChangeNetwork211(CamOnTest.IP)) // Change camera IP to 192.168.1.211. Waits for camera to come back. if (!await FlexiAPI.ChangeNetwork211(CamOnTest.IP)) // Change camera IP to 192.168.1.211. Waits for camera to come back.
AddToActionsList("Could not find camera at 192.168.1.211. Please check manually"); AddToActionsList("Could not find camera at 192.168.1.211. Please check manually", Level.WARNING);
}); });
Thr211.IsBackground = true; Thr211.IsBackground = true;
Thr211.Start(); Thr211.Start();
@@ -356,7 +356,7 @@ namespace AiQ_GUI
else else
Access.Stats("RMA Final Tests Failed", CamOnTest.Model); Access.Stats("RMA Final Tests Failed", CamOnTest.Model);
AddToActionsList(ErrMssg); AddToActionsList(ErrMssg, Level.ERROR);
string RedLbls = string.Join(Environment.NewLine, PnlLbls.Controls string RedLbls = string.Join(Environment.NewLine, PnlLbls.Controls
.OfType<Label>() .OfType<Label>()
@@ -505,12 +505,12 @@ namespace AiQ_GUI
else if (RegexCache.MACRegex().IsMatch(DiagsAPI.MAC)) // Is a valid MAC, but not NVIDIA else if (RegexCache.MACRegex().IsMatch(DiagsAPI.MAC)) // Is a valid MAC, but not NVIDIA
{ {
lblMac.ForeColor = Color.Red; lblMac.ForeColor = Color.Red;
AddToActionsList($"{DiagsAPI.MAC} not recognised as NVIDIA MAC address"); AddToActionsList($"{DiagsAPI.MAC} not recognised as NVIDIA MAC address", Level.ERROR);
} }
else else
{ {
lblMac.ForeColor = Color.Red; lblMac.ForeColor = Color.Red;
AddToActionsList($"{DiagsAPI.MAC} not recognised as a MAC address"); AddToActionsList($"{DiagsAPI.MAC} not recognised as a MAC address", Level.ERROR);
} }
// Check timestamp // Check timestamp
@@ -574,7 +574,7 @@ namespace AiQ_GUI
if (DiagsAPI.modelNumber != CamOnTest.Model) if (DiagsAPI.modelNumber != CamOnTest.Model)
{ {
AddToActionsList("Model number in camera doesn't match what has been selected"); AddToActionsList("Model number in camera doesn't match what has been selected", Level.WARNING);
lblModel.ForeColor = Color.Red; lblModel.ForeColor = Color.Red;
} }
else if (!GoogleAPI.CheckWIP(DiagsAPI.serialNumber, CameraAccessInfo.SpreadsheetID)) // Check WIP column in serial number register, if not ticked then RMA else if (!GoogleAPI.CheckWIP(DiagsAPI.serialNumber, CameraAccessInfo.SpreadsheetID)) // Check WIP column in serial number register, if not ticked then RMA
@@ -600,7 +600,7 @@ namespace AiQ_GUI
} }
else else
{ {
AddToActionsList("Camera has not been given a valid serial and model number, suggest you run through pre test again and check serial number register for any issues."); AddToActionsList("Camera has not been given a valid serial and model number, suggest you run through pre test again and check serial number register for any issues.", Level.ERROR);
} }
} }
catch { } catch { }
@@ -696,12 +696,12 @@ namespace AiQ_GUI
if (NewSerial.Contains("ERROR")) if (NewSerial.Contains("ERROR"))
{ {
AddToActionsList(NewSerial + Environment.NewLine + "Please remove any information that was put into the serial number mistake, change the camera model/serial to 'N/A' and retry the test."); AddToActionsList(NewSerial + Environment.NewLine + "Please remove any information that was put into the serial number mistake, change the camera model/serial to 'N/A' and retry the test.", Level.ERROR);
return; return;
} }
else if (NewSerial == "Last serial number not found") else if (NewSerial == "Last serial number not found")
{ {
AddToActionsList("Last serial number not found in spreadsheet. Please check spreadsheet is in correct format before retrying."); AddToActionsList("Last serial number not found in spreadsheet. Please check spreadsheet is in correct format before retrying.", Level.WARNING);
return; return;
} }
@@ -711,7 +711,7 @@ namespace AiQ_GUI
if (!JSONResponse.Contains(NewSerial) || !JSONResponse.Contains(CamOnTest.Model)) if (!JSONResponse.Contains(NewSerial) || !JSONResponse.Contains(CamOnTest.Model))
{ {
AddToActionsList("Could not set model or serial numbers into camera."); AddToActionsList("Could not set model or serial numbers into camera.", Level.ERROR);
await PreTestFailed("Failed To Set Model Or Serial Number"); await PreTestFailed("Failed To Set Model Or Serial Number");
} }
@@ -732,6 +732,8 @@ namespace AiQ_GUI
// Save user settings in LDS for next time if values are valid // Save user settings in LDS for next time if values are valid
if (CbBxUserName.Text.Length > 2 && CbBxCameraType.Text.Length > 6) if (CbBxUserName.Text.Length > 2 && CbBxCameraType.Text.Length > 6)
{ {
localDataStore.GUIPosX = this.Location.X;
localDataStore.GUIPosY = this.Location.Y;
localDataStore.User = CbBxUserName.Text; localDataStore.User = CbBxUserName.Text;
localDataStore.LastModel = CbBxCameraType.Text; localDataStore.LastModel = CbBxCameraType.Text;
LDS.SetLDS(localDataStore); LDS.SetLDS(localDataStore);
@@ -865,7 +867,7 @@ namespace AiQ_GUI
if (Vers == null) // If failed to get versions then return. Flexi most likely not running yet. if (Vers == null) // If failed to get versions then return. Flexi most likely not running yet.
{ {
AddToActionsList("Failed to get API from camera. Flexi not running yet or not an AiQ"); AddToActionsList("Failed to get API from camera. Flexi not running yet or not an AiQ", Level.WARNING);
return; return;
} }
@@ -928,7 +930,7 @@ namespace AiQ_GUI
} }
catch (Exception ex) catch (Exception ex)
{ {
AddToActionsList($"Failed to set God mode for camera {CamOnTest.IP}. Reason: {ex.Message}"); AddToActionsList($"Failed to set God mode for camera {CamOnTest.IP}. Reason: {ex.Message}", Level.ERROR);
} }
} }
@@ -946,6 +948,11 @@ namespace AiQ_GUI
RhTxBxActions.SelectionColor = Color.Orange; RhTxBxActions.SelectionColor = Color.Orange;
} }
else if (Lvl == Level.LOG) else if (Lvl == Level.LOG)
{
Logging.LogMessage(Mssg);
RhTxBxActions.SelectionColor = Color.White;
}
else if (Lvl == Level.Success)
{ {
Logging.LogMessage(Mssg); Logging.LogMessage(Mssg);
RhTxBxActions.SelectionColor = Color.LightGreen; RhTxBxActions.SelectionColor = Color.LightGreen;
@@ -1121,6 +1128,26 @@ namespace AiQ_GUI
Windows.StartAsAdmin(ExeLoc); Windows.StartAsAdmin(ExeLoc);
} }
private void BtnBaudModules_Click(object sender, EventArgs e)
{
SSH.SetTo115200(CamOnTest.IP);
}
private void BtnOpenMoba_Click(object sender, EventArgs e)
{
const string mobaPath = @"C:\Program Files (x86)\Mobatek\MobaXterm\MobaXterm.exe";
string sshCommand = $"ssh -o StrictHostKeyChecking=no -p 22 mav@{CamOnTest.IP}"; // optional: skip host check
var psi = new ProcessStartInfo
{
FileName = mobaPath,
Arguments = $"-newtab \"{sshCommand}\"",
UseShellExecute = false,
};
Process.Start(psi);
}
// Flips between setting camera to 211 and DHCP // Flips between setting camera to 211 and DHCP
private async void BtnSet211_Click(object sender, EventArgs e) private async void BtnSet211_Click(object sender, EventArgs e)
{ {
@@ -1129,7 +1156,7 @@ namespace AiQ_GUI
bool Online = await FlexiAPI.ChangeNetwork211(CamOnTest.IP); // Change camera IP to 192.168.1.211 and hardware reboot. Waits for camera to come back for 50s. bool Online = await FlexiAPI.ChangeNetwork211(CamOnTest.IP); // Change camera IP to 192.168.1.211 and hardware reboot. Waits for camera to come back for 50s.
if (!Online) if (!Online)
AddToActionsList("Could not find camera at 192.168.1.211. Please check manually"); AddToActionsList("Could not find camera at 192.168.1.211. Please check manually", Level.ERROR);
else else
BtnSet211.Text = "Set to DHCP"; BtnSet211.Text = "Set to DHCP";
} }
@@ -1158,7 +1185,7 @@ namespace AiQ_GUI
} }
catch (Exception ex) catch (Exception ex)
{ {
AddToActionsList("Failed to set all cameras to 211. Reason: " + ex.Message); // In case non AiQ's get caught up AddToActionsList("Failed to set all cameras to 211. Reason: " + ex.Message, Level.ERROR); // In case non AiQ's get caught up
} }
} }
@@ -1185,7 +1212,7 @@ namespace AiQ_GUI
} }
catch (Exception ex) catch (Exception ex)
{ {
AddToActionsList($"Failed to set God mode for camera {SCL.IP}. Reason: {ex.Message}"); AddToActionsList($"Failed to set God mode for camera {SCL.IP}. Reason: {ex.Message}", Level.ERROR);
} }
} }
@@ -1279,6 +1306,8 @@ namespace AiQ_GUI
CbBxType.SelectedIndex = 1; CbBxType.SelectedIndex = 1;
else if (type == "A") // Audit else if (type == "A") // Audit
CbBxType.SelectedIndex = 2; CbBxType.SelectedIndex = 2;
else if (type == "X") // XML Server
CbBxType.SelectedIndex = 3;
BtnGenerate.Enabled = true; BtnGenerate.Enabled = true;
} }
@@ -1313,7 +1342,7 @@ namespace AiQ_GUI
} }
catch catch
{ {
AddToActionsList("Failed to communicate with camera, please check network and try again."); AddToActionsList("Failed to communicate with camera, please check network and try again.", Level.ERROR);
return; return;
} }
@@ -1330,7 +1359,7 @@ namespace AiQ_GUI
string err = GoogleAPI.UpdateSpreadSheetVaxtor(VaxtorLicResp, Vers.Serial, CamOnTest.Model); string err = GoogleAPI.UpdateSpreadSheetVaxtor(VaxtorLicResp, Vers.Serial, CamOnTest.Model);
if (err != string.Empty) // If there is an error message, display it if (err != string.Empty) // If there is an error message, display it
AddToActionsList("Failed to update Vaxtor spreadsheet: " + err); AddToActionsList("Failed to update Vaxtor spreadsheet: " + err, Level.ERROR);
RhTxBxCode.AppendText("Licencing Success, Key ID: " + VaxtorLicResp.protectionKeyId + Environment.NewLine + "Waiting for files to save"); RhTxBxCode.AppendText("Licencing Success, Key ID: " + VaxtorLicResp.protectionKeyId + Environment.NewLine + "Waiting for files to save");
@@ -1588,14 +1617,16 @@ namespace AiQ_GUI
} }
else else
{ {
BtnSoak.BackColor = BtnColour; // Reset button colour BtnSoak.BackColor = Color.Red;
BtnSoak.Text = "Start Soak"; BtnSoak.Text = "Please Wait";
foreach (CancellationTokenSource cts in soakCtsList) foreach (CancellationTokenSource cts in soakCtsList)
cts.Cancel(); cts.Cancel();
soakCtsList.Clear(); soakCtsList.Clear();
soakTasks.Clear(); soakTasks.Clear();
int i = soakCameraList.Count + 1; // Add 1 for 211 itself staying in the list int i = soakCameraList.Count + 1; // Add 1 for 211 itself staying in the list
RhTxBxActions.Clear();
string[,] Network_JSON = { { "propDHCP", "false" }, { "propHost", "192.168.1.211" }, { "propNetmask", "255.255.255.0" }, { "propGateway", "192.168.1.1" } }; string[,] Network_JSON = { { "propDHCP", "false" }, { "propHost", "192.168.1.211" }, { "propNetmask", "255.255.255.0" }, { "propGateway", "192.168.1.1" } };
string[,] GOD_JSON = { { "propGodMode", "false" } }; string[,] GOD_JSON = { { "propGodMode", "false" } };
foreach (Camera SCL in soakCameraList.Where(c => c.IsChecked)) // only checked cameras foreach (Camera SCL in soakCameraList.Where(c => c.IsChecked)) // only checked cameras
@@ -1612,13 +1643,13 @@ namespace AiQ_GUI
if (GOD.Contains("Error")) if (GOD.Contains("Error"))
throw new Exception("Could not set God mode off"); throw new Exception("Could not set God mode off");
// Update GLOBAL--NetworkConfig with fixed IP and turn off DHCP // Update GLOBAL--NetworkConfig with fixed IP and turn off DHCP. Don't await to save time.
await FlexiAPI.HTTP_Update("GLOBAL--NetworkConfig", SCL.IP, Network_JSON); FlexiAPI.HTTP_Update("GLOBAL--NetworkConfig", SCL.IP, Network_JSON);
i--; // Decriment count becuase they will stack into 211 i--; // Decriment count becuase they will stack into 211
} }
catch (Exception ex) catch (Exception ex)
{ {
AddToActionsList("Failed to set all cameras to 211 and god mode off. Reason: " + ex.Message); // In case non AiQ's get caught up AddToActionsList("Failed to set all cameras to 211 and god mode off. Reason: " + ex.Message, Level.ERROR); // In case non AiQ's get caught up
} }
if (SCL.CheckBox.ForeColor == Color.Red) if (SCL.CheckBox.ForeColor == Color.Red)
@@ -1634,12 +1665,15 @@ namespace AiQ_GUI
if ((FoundCams.Count == i && FoundCams.Contains("192.168.1.211")) || FoundCams.Count == 1) if ((FoundCams.Count == i && FoundCams.Contains("192.168.1.211")) || FoundCams.Count == 1)
{ {
AddToActionsList("All cameras successfully changed to 211.", Level.LOG); AddToActionsList("All cameras successfully changed to 211.", Level.Success);
} }
else else
{ {
AddToActionsList($"Some cameras failed: Found {FoundCams.Count}, expected {i}.", Level.ERROR); AddToActionsList($"Some cameras failed: Found {FoundCams.Count}, expected {i}.", Level.ERROR);
} }
BtnSoak.BackColor = BtnColour; // Reset button colour
BtnSoak.Text = "Start Soak";
} }
} }
@@ -1706,7 +1740,7 @@ namespace AiQ_GUI
} }
// ***** Test & Debug ***** // ***** Test & Debug *****
private void BtnTest_Click(object sender, EventArgs e) private async void BtnTest_Click(object sender, EventArgs e)
{ {
Stopwatch stopWatchTest = Stopwatch.StartNew(); Stopwatch stopWatchTest = Stopwatch.StartNew();
@@ -1716,24 +1750,24 @@ namespace AiQ_GUI
// /api/config-ids - For getting all available config IDs // /api/config-ids - For getting all available config IDs
// Make every log file in the soak log directory into a soak test report PDF // Make every log file in the soak log directory into a soak test report PDF
var files = from file in Directory.EnumerateFiles("C:\\ProgramData\\MAV\\AiQ_GUI") select file; //var files = from file in Directory.EnumerateFiles("C:\\ProgramData\\MAV\\AiQ_GUI") select file;
foreach (var file in files) //foreach (var file in files)
{ //{
if (file.Contains("SoakLog")) // if (file.Contains("SoakLog"))
{ // {
// File name: SoakLog_{Serial}_{Model}.log // // File name: SoakLog_{Serial}_{Model}.log
string[] parts = file.Split('_', '.').Select(p => p.Trim()).ToArray(); // string[] parts = file.Split('_', '.').Select(p => p.Trim()).ToArray();
Camera NewCam = new() // Camera NewCam = new()
{ // {
Model = parts[3], // Model = parts[3],
Serial = parts[2], // Serial = parts[2],
}; // };
PDF.CreateSoakTestReport(NewCam, "SoakTestRig", DateTime.Now, file); // PDF.CreateSoakTestReport(NewCam, "SoakTestRig", DateTime.Now, file);
} // }
} //}
stopWatchTest.Stop(); stopWatchTest.Stop();
AddToActionsList("RunTime " + stopWatchTest.Elapsed.ToString(@"hh\:mm\:ss\.ff"), Level.LOG); AddToActionsList("RunTime " + stopWatchTest.Elapsed.ToString(@"hh\:mm\:ss\.ff"), Level.LOG);

8
AiQ_GUI_NET_Test.csproj
View File

@@ -16,7 +16,7 @@
<Product>AiQ GUI</Product> <Product>AiQ GUI</Product>
<Authors>MAV Systems Ltd</Authors> <Authors>MAV Systems Ltd</Authors>
<PackageId>AiQ GUI</PackageId> <PackageId>AiQ GUI</PackageId>
<Version>4.6.0</Version> <Version>4.7.0</Version>
<Description>A GUI to control and test the AiQ</Description> <Description>A GUI to control and test the AiQ</Description>
<Copyright>MAV Systems Ltd 2025</Copyright> <Copyright>MAV Systems Ltd 2025</Copyright>
<PackageIcon>MAV - Plain - Blue.png</PackageIcon> <PackageIcon>MAV - Plain - Blue.png</PackageIcon>
@@ -59,9 +59,9 @@
<PackageReference Include="Google.Apis.Sheets.v4" Version="1.72.0.3966" /> <PackageReference Include="Google.Apis.Sheets.v4" Version="1.72.0.3966" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.4" /> <PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
<PackageReference Include="PDFsharp-MigraDoc-gdi" Version="6.2.3" /> <PackageReference Include="PDFsharp-MigraDoc-gdi" Version="6.2.3" />
<PackageReference Include="Selenium.Support" Version="4.38.0" /> <PackageReference Include="Selenium.Support" Version="4.39.0" />
<PackageReference Include="Selenium.WebDriver" Version="4.38.0" /> <PackageReference Include="Selenium.WebDriver" Version="4.39.0" />
<PackageReference Include="Selenium.WebDriver.ChromeDriver" Version="142.0.7444.17500" /> <PackageReference Include="Selenium.WebDriver.ChromeDriver" Version="143.0.7499.4000" />
<PackageReference Include="SSH.NET" Version="2025.1.0" /> <PackageReference Include="SSH.NET" Version="2025.1.0" />
<PackageReference Include="System.Data.OleDb" Version="10.0.0" /> <PackageReference Include="System.Data.OleDb" Version="10.0.0" />
</ItemGroup> </ItemGroup>

14
Camera/CameraModules.cs
View File

@@ -8,7 +8,7 @@ namespace AiQ_GUI
{ {
if (CamMod == null || Lbl == null) if (CamMod == null || Lbl == null)
{ {
MainForm.Instance.AddToActionsList("Camera module or label was null in CheckCamModule."); MainForm.Instance.AddToActionsList("Camera module or label was null in CheckCamModule.", Level.ERROR);
return; return;
} }
@@ -25,7 +25,7 @@ namespace AiQ_GUI
} }
catch catch
{ {
MainForm.Instance.AddToActionsList($"{CamMod.firmwareVer} or {UniversalData.WonwooFirmware} could not be converted to a double"); MainForm.Instance.AddToActionsList($"{CamMod.firmwareVer} or {UniversalData.WonwooFirmware} could not be converted to a double", Level.ERROR);
} }
if (CamOnTest.RMANum > 0 && !LessTanOrEqualTo) if (CamOnTest.RMANum > 0 && !LessTanOrEqualTo)
@@ -55,7 +55,7 @@ namespace AiQ_GUI
} }
catch (Exception ex) catch (Exception ex)
{ {
MainForm.Instance.AddToActionsList("Exception in CheckCamModule: " + ex.Message); MainForm.Instance.AddToActionsList("Exception in CheckCamModule: " + ex.Message, Level.ERROR);
} }
} }
@@ -65,7 +65,7 @@ namespace AiQ_GUI
{ {
if (Shutter.SelectedIndex == -1 || Iris.SelectedIndex == -1 || Gain.SelectedIndex == -1) if (Shutter.SelectedIndex == -1 || Iris.SelectedIndex == -1 || Gain.SelectedIndex == -1)
{ {
MainForm.Instance.AddToActionsList("Shutter, Iris and Gain need selecting in images tab."); MainForm.Instance.AddToActionsList("Shutter, Iris and Gain need selecting in images tab.", Level.WARNING);
return; return;
} }
@@ -75,7 +75,7 @@ namespace AiQ_GUI
if (ShutterVISCA.Contains("ERROR") || IrisVISCA.Contains("ERROR") || GainVISCA.Contains("ERROR")) if (ShutterVISCA.Contains("ERROR") || IrisVISCA.Contains("ERROR") || GainVISCA.Contains("ERROR"))
{ {
MainForm.Instance.AddToActionsList("Problem with selected SIG values"); MainForm.Instance.AddToActionsList("Problem with selected SIG values", Level.ERROR);
return; return;
} }
@@ -85,7 +85,7 @@ namespace AiQ_GUI
string OneshotReply = await FlexiAPI.APIHTTPVISCA(IPAddress, "8101041801FF", true); // Oneshot auto focus string OneshotReply = await FlexiAPI.APIHTTPVISCA(IPAddress, "8101041801FF", true); // Oneshot auto focus
if (!ShutterReply.Contains("41") || !IrisReply.Contains("41") || !GainReply.Contains("41") || !OneshotReply.Contains("41")) if (!ShutterReply.Contains("41") || !IrisReply.Contains("41") || !GainReply.Contains("41") || !OneshotReply.Contains("41"))
MainForm.Instance.AddToActionsList("Could not set Shutter, Iris, Gain correctly" + Environment.NewLine + "Shutter: " + ShutterReply + Environment.NewLine + "Iris: " + IrisReply + Environment.NewLine + "Gain: " + GainReply + Environment.NewLine + "Oneshot: " + OneshotReply); MainForm.Instance.AddToActionsList("Could not set Shutter, Iris, Gain correctly" + Environment.NewLine + "Shutter: " + ShutterReply + Environment.NewLine + "Iris: " + IrisReply + Environment.NewLine + "Gain: " + GainReply + Environment.NewLine + "Oneshot: " + OneshotReply, Level.ERROR);
} }
// Sets back to the latest factory defaults CSV that is in Flexi. // Sets back to the latest factory defaults CSV that is in Flexi.
@@ -97,7 +97,7 @@ namespace AiQ_GUI
await Task.WhenAll(IRReply, OVReply); await Task.WhenAll(IRReply, OVReply);
if (IRReply.Result != "Factory reset OK." || OVReply.Result != "Factory reset OK.") if (IRReply.Result != "Factory reset OK." || OVReply.Result != "Factory reset OK.")
MainForm.Instance.AddToActionsList($"Could not reset camera modules to factory default.{Environment.NewLine}{IRReply}{Environment.NewLine}{OVReply}"); MainForm.Instance.AddToActionsList($"Could not reset camera modules to factory default.{Environment.NewLine}{IRReply}{Environment.NewLine}{OVReply}", Level.ERROR);
} }
public static string BuildVISCACommand(string command, int hexValue) public static string BuildVISCACommand(string command, int hexValue)

57
Camera/FlexiAPI.cs
View File

@@ -24,7 +24,7 @@ namespace AiQ_GUI
} }
catch (Exception ex) catch (Exception ex)
{ {
return $"Error during GET request: {ex.Message}"; return $"Error during GET request: {ex.Message}{Level.ERROR}";
} }
} }
@@ -42,7 +42,7 @@ namespace AiQ_GUI
} }
catch (Exception ex) catch (Exception ex)
{ {
return $"Error in HTTP_Update: {ex.Message}"; return $"Error in HTTP_Update: {ex.Message}{Level.ERROR}";
} }
} }
@@ -56,7 +56,7 @@ namespace AiQ_GUI
} }
catch (Exception ex) catch (Exception ex)
{ {
return $"Error in HTTP_Fetch: {ex.Message}"; return $"Error in HTTP_Fetch: {ex.Message}{Level.ERROR}";
} }
} }
@@ -101,21 +101,22 @@ namespace AiQ_GUI
string responseBody = await response.Content.ReadAsStringAsync(); string responseBody = await response.Content.ReadAsStringAsync();
if (!response.IsSuccessStatusCode) if (!response.IsSuccessStatusCode)
return $"Server returned {(int)response.StatusCode}: {response.ReasonPhrase}. Details: {responseBody}"; return $"Server returned {(int)response.StatusCode}: {response.ReasonPhrase}. Details: {responseBody}{Level.ERROR}";
return responseBody; return responseBody;
} }
catch (TaskCanceledException) catch (TaskCanceledException)
{ {
return $"Timeout uploading to {url}."; return $"Timeout uploading to {url}.{Level.ERROR}";
} }
catch (HttpRequestException ex) catch (HttpRequestException ex)
{ {
return $"HTTP error uploading to {url}: {ex.Message}"; return $"HTTP error uploading to {url}: {ex.Message}{Level.ERROR}";
} }
catch (Exception ex) catch (Exception ex)
{ {
return $"Unexpected error uploading to {url}: {ex.Message} {(ex.InnerException?.Message ?? "")}"; return $"Unexpected error uploading to {url}: {ex.Message} {(ex.InnerException?.Message ?? string.Empty)} {Level.ERROR}";
} }
} }
@@ -145,7 +146,7 @@ namespace AiQ_GUI
if (JSON == null || JSON.Contains("Error") || JSON.Contains("Timeout")) if (JSON == null || JSON.Contains("Error") || JSON.Contains("Timeout"))
{ {
MainForm.Instance.AddToActionsList("Error talking to Flexi, are you sure this is an AiQ?" + Environment.NewLine + JSON); MainForm.Instance.AddToActionsList($"Error talking to Flexi, are you sure this is an AiQ?{Level.WARNING}" + Environment.NewLine + JSON);
return null; return null;
} }
@@ -173,7 +174,7 @@ namespace AiQ_GUI
// Treat "operation was canceled" as a successful apply // Treat "operation was canceled" as a successful apply
if (response.Contains("The operation was canceled", StringComparison.OrdinalIgnoreCase)) if (response.Contains("The operation was canceled", StringComparison.OrdinalIgnoreCase))
{ {
Logging.LogMessage("SetVaxtorMinMaxPlate: Camera applied config but closed connection early (safe to ignore)."); Logging.LogMessage($"SetVaxtorMinMaxPlate: Camera applied config but closed connection early (safe to ignore).");
return true; return true;
} }
@@ -187,23 +188,11 @@ namespace AiQ_GUI
} }
catch (Exception ex) catch (Exception ex)
{ {
MainForm.Instance.AddToActionsList($"Could not set Vaxtor Plate height and min confidence: {ex.Message}"); MainForm.Instance.AddToActionsList($"Could not set Vaxtor Plate height and min confidence: {ex.Message}", Level.ERROR);
return false; return false;
} }
} }
public static async Task GPSFix(string IPAddress)
{
string sysstatus = await APIHTTPRequest("/sysstatus", IPAddress, 5);
SysStatus status = JsonConvert.DeserializeObject<SysStatus>(sysstatus);
if (status.gpsState == 0 || status.gpsPresent == "Not Fitted")
{
MainForm.Instance.AddToActionsList($"GPS not present in camera. State: {status.gpsState} & Status: {status.gpsPresent}");
return;
}
}
public static async Task SetTrim(string IPAddress, string LblTxt, int RetryCount = 0) // Sets trim by getting plate postion as metric public static async Task SetTrim(string IPAddress, string LblTxt, int RetryCount = 0) // Sets trim by getting plate postion as metric
{ {
Trim trim; Trim trim;
@@ -216,7 +205,7 @@ namespace AiQ_GUI
} }
catch catch
{ {
MainForm.Instance.AddToActionsList("Error reading trim JSON - " + trimData); MainForm.Instance.AddToActionsList($"Error reading trim JSON - {Level.ERROR}" + trimData);
return; return;
} }
@@ -225,7 +214,7 @@ namespace AiQ_GUI
{ {
if (RetryCount >= 3) if (RetryCount >= 3)
{ {
await MainForm.Instance.DisplayOK("Please align trim in webpage then click OK."); // Awaited till OK has been clicked await MainForm.Instance.DisplayOK($"Please align trim in webpage then click OK.{Level.WARNING}"); // Awaited till OK has been clicked
return; return;
} }
@@ -253,11 +242,11 @@ namespace AiQ_GUI
} }
else // Ask user to centre the plate in the field of view else // Ask user to centre the plate in the field of view
{ {
await MainForm.Instance.DisplayOK("Please centralise plate in view THEN press OK"); // Awaited till OK has been clicked await MainForm.Instance.DisplayOK($"Please centralise plate in view THEN press OK"); // Awaited till OK has been clicked
if (RetryCount >= 3) if (RetryCount >= 3)
{ {
await MainForm.Instance.DisplayOK("Please align trim in webpage then click OK."); // Awaited till OK has been clicked await MainForm.Instance.DisplayOK($"Please align trim in webpage then click OK. {Level.WARNING}"); // Awaited till OK has been clicked
return; return;
} }
await Task.Delay(5000); // Give 5 second delay for it to see a plate await Task.Delay(5000); // Give 5 second delay for it to see a plate
@@ -274,7 +263,7 @@ namespace AiQ_GUI
string TrimResp = await HTTP_Update("SightingCreator", IPAddress, Trim_JSON); string TrimResp = await HTTP_Update("SightingCreator", IPAddress, Trim_JSON);
if (!TrimResp.Contains($"\"propInterCameraOffsetX\": {{\"value\": \"{Convert.ToString(TrimX)}\", \"datatype\": \"int\"}}, \"propInterCameraOffsetY\": {{\"value\": \"{Convert.ToString(TrimY)}\", \"datatype\": \"int\"}},")) if (!TrimResp.Contains($"\"propInterCameraOffsetX\": {{\"value\": \"{Convert.ToString(TrimX)}\", \"datatype\": \"int\"}}, \"propInterCameraOffsetY\": {{\"value\": \"{Convert.ToString(TrimY)}\", \"datatype\": \"int\"}},"))
MainForm.Instance.AddToActionsList("Could not set camera trim"); MainForm.Instance.AddToActionsList($"Could not set camera trim{Level.ERROR}");
} }
// Processes the network config from the camera and returns a string indicating the status // Processes the network config from the camera and returns a string indicating the status
@@ -292,7 +281,7 @@ namespace AiQ_GUI
} }
catch (Exception ex) catch (Exception ex)
{ {
MainForm.Instance.AddToActionsList($"Error in getting network config from camera: {ex.Message}"); MainForm.Instance.AddToActionsList($"Error in getting network config from camera: {ex.Message}{Level.ERROR}");
return null; // Return empty string if there is an error return null; // Return empty string if there is an error
} }
} }
@@ -348,11 +337,11 @@ namespace AiQ_GUI
if (FoundCams.Contains("192.168.1.211")) if (FoundCams.Contains("192.168.1.211"))
{ {
MainForm.Instance.AddToActionsList("Could not set camera to DHCP please check camera."); MainForm.Instance.AddToActionsList($"Could not set camera to DHCP please check camera.{Level.ERROR}");
return false; return false;
} }
MainForm.Instance.AddToActionsList("Camera successfully set to DHCP."); MainForm.Instance.AddToActionsList($"Camera successfully set to DHCP.{Level.Success}");
return true; return true;
} }
@@ -410,14 +399,14 @@ namespace AiQ_GUI
string result = await APIHTTPVISCA(ipAddress, command, isIR); string result = await APIHTTPVISCA(ipAddress, command, isIR);
if (result.Contains(expectedResponse)) if (result.Contains(expectedResponse))
MainForm.Instance.AddToActionsList($"{name}: Success ({(isIR ? "IR" : "Colour")})", Level.LOG); MainForm.Instance.AddToActionsList($"{name}: Success ({(isIR ? "IR" : "Colour")})", Level.Success);
else else
MainForm.Instance.AddToActionsList($"{name}: Unexpected response ({result})", Level.ERROR); MainForm.Instance.AddToActionsList($"{name}: Unexpected response ({result})", Level.ERROR);
await Task.Delay(150); await Task.Delay(150);
} }
MainForm.Instance.AddToActionsList($"Upload complete ({(isIR ? "IR" : "Colour")}).", Level.LOG); MainForm.Instance.AddToActionsList($"Upload complete ({(isIR ? "IR" : "Colour")}).", Level.Success);
} }
public static async void UploadBlob(List<Camera> soakCameraList) public static async void UploadBlob(List<Camera> soakCameraList)
@@ -431,7 +420,7 @@ namespace AiQ_GUI
if (fileToUpload == null) if (fileToUpload == null)
{ {
MainForm.Instance.AddToActionsList("No .blob file found in the directory.", Level.ERROR); MainForm.Instance.AddToActionsList("No .blob file found in the directory.", Level.WARNING);
return; return;
} }
} }
@@ -472,7 +461,7 @@ namespace AiQ_GUI
result = await SendBlobFileUpload(apiUrl, fileToUpload, fileName); result = await SendBlobFileUpload(apiUrl, fileToUpload, fileName);
} }
MainForm.Instance.AddToActionsList($"Upload result for {cam.IP}: {result}", Level.LOG); MainForm.Instance.AddToActionsList($"Upload result for {cam.IP}: {result}");
await Task.Delay(500); await Task.Delay(500);
} }
} }

14
Camera/ImageProcessing.cs
View File

@@ -26,7 +26,7 @@ namespace AiQ_GUI
HttpResponseMessage response = await httpClient.GetAsync(requestUrl); HttpResponseMessage response = await httpClient.GetAsync(requestUrl);
if (!response.IsSuccessStatusCode) if (!response.IsSuccessStatusCode)
{ {
MainForm.Instance.AddToActionsList($"No success from {requestUrl} replied {response.StatusCode}"); MainForm.Instance.AddToActionsList($"No success from {requestUrl} replied {response.StatusCode}{Level.ERROR}");
return null; return null;
} }
@@ -34,7 +34,7 @@ namespace AiQ_GUI
if (imageBytes.Length == 0) // Check if the imageBytes is empty if (imageBytes.Length == 0) // Check if the imageBytes is empty
{ {
MainForm.Instance.AddToActionsList($"No image data received from {requestUrl}"); MainForm.Instance.AddToActionsList($"No image data received from {requestUrl}{Level.ERROR}");
return null; return null;
} }
@@ -43,7 +43,7 @@ namespace AiQ_GUI
CvInvoke.Imdecode(imageBytes, ImreadModes.AnyColor, mat); CvInvoke.Imdecode(imageBytes, ImreadModes.AnyColor, mat);
if (mat.IsEmpty) if (mat.IsEmpty)
{ {
MainForm.Instance.AddToActionsList("Failed to decode image with Emgu CV."); MainForm.Instance.AddToActionsList($"Failed to decode image with Emgu CV.{Level.ERROR}");
return null; return null;
} }
@@ -70,12 +70,12 @@ namespace AiQ_GUI
} }
catch (HttpRequestException ex) catch (HttpRequestException ex)
{ {
MainForm.Instance.AddToActionsList($"HTTP error: {ex.Message}"); MainForm.Instance.AddToActionsList($"HTTP error: {ex.Message}{Level.ERROR}");
return null; return null;
} }
catch (Exception ex) catch (Exception ex)
{ {
MainForm.Instance.AddToActionsList($"Error processing image: {ex.Message}"); MainForm.Instance.AddToActionsList($"Error processing image: {ex.Message} {Level.ERROR}");
return null; return null;
} }
} }
@@ -123,7 +123,7 @@ namespace AiQ_GUI
} }
catch (Exception ex) catch (Exception ex)
{ {
MainForm.Instance.AddToActionsList($"Error awaiting Colour snapshot: {ex.Message}"); MainForm.Instance.AddToActionsList($"Error awaiting Colour snapshot: {ex.Message} {Level.ERROR}");
return; return;
} }
@@ -146,7 +146,7 @@ namespace AiQ_GUI
} }
catch (Exception ex) catch (Exception ex)
{ {
MainForm.Instance.AddToActionsList($"Error calculating luminance: {ex.Message}"); MainForm.Instance.AddToActionsList($"Error calculating luminance: {ex.Message} {Level.ERROR}");
return; return;
} }
} }

2
Camera/LED.cs
View File

@@ -45,7 +45,7 @@
} }
catch (Exception ex) catch (Exception ex)
{ {
MainForm.Instance.AddToActionsList($"Error checking LEDs: {ex.Message}"); MainForm.Instance.AddToActionsList($"Error checking LEDs: {ex.Message} {Level.ERROR}");
} }
} }
} }

28
Camera/Licences.cs
View File

@@ -11,27 +11,29 @@ namespace AiQ_GUI
const string SAFsalt = "F7W?wbD#'[+:v44]tA<:_iK4hQ}+$R{U"; const string SAFsalt = "F7W?wbD#'[+:v44]tA<:_iK4hQ}+$R{U";
const string Streamsalt = "*;5WPsR5i/$8s1I(M)K5=z3fms{_8x4U"; const string Streamsalt = "*;5WPsR5i/$8s1I(M)K5=z3fms{_8x4U";
const string Auditsalt = "4t5e[E06:dXWf:C09Z[h)}V*n>}t0POP"; const string Auditsalt = "4t5e[E06:dXWf:C09Z[h)}V*n>}t0POP";
const string XMLsalt = "ap(r]oN?t V@WvI=IX=[+$n(<5J,&Ygd";
const string PasswordSalt = "eP@4^4T2@e@^h12oqf!590"; const string PasswordSalt = "eP@4^4T2@e@^h12oqf!590";
// Generates the license response based on the challenge and type of license // Generates the license response based on the challenge and type of license
public static string GenerateLicCode(string challenge, string Type) public static string GenerateLicCode(string challenge, string Type)
{ {
string salt; // Different salts for differnet licenses string? salt = Type switch
{
"Store & Forward" => SAFsalt,
"Streaming" => Streamsalt,
"Audit" => Auditsalt,
"XML Server" => XMLsalt,
_ => null
};
if (Type == "Store & Forward") if (salt == null)
salt = SAFsalt; return $"Unrecognised challenge type:{Level.ERROR}" + Type;
else if (Type == "Streaming")
salt = Streamsalt;
else if (Type == "Audit")
salt = Auditsalt;
else
return "Unrecognised challenge type: " + Type;
if (string.IsNullOrEmpty(challenge) || challenge.Length != 6) // Check challenge format if (string.IsNullOrEmpty(challenge) || challenge.Length != 6) // Check challenge format
return "Invalid challenge format. Challenge must be 6 characters."; return $"Invalid challenge format. Challenge must be 6 characters.{Level.ERROR}";
if (string.IsNullOrEmpty(salt) || salt.Length != 32) // Check salt format if (string.IsNullOrEmpty(salt) || salt.Length != 32) // Check salt format
return "Invalid salt format. Salt must be 32 characters."; return $"Invalid salt format. Salt must be 32 characters.{Level.ERROR}";
// Hash computation using SHA256 algorithm // Hash computation using SHA256 algorithm
byte[] inputBytes = Encoding.UTF8.GetBytes(challenge + " " + salt); // SHA hash format challenge and salt with space between byte[] inputBytes = Encoding.UTF8.GetBytes(challenge + " " + salt); // SHA hash format challenge and salt with space between
@@ -60,7 +62,7 @@ namespace AiQ_GUI
} }
catch (Exception ex) catch (Exception ex)
{ {
return "Error: Could not generate password " + ex.Message; return $"Error: Could not generate password{Level.ERROR}" + ex.Message;
} }
} }
@@ -85,7 +87,7 @@ namespace AiQ_GUI
} }
catch (Exception ex) catch (Exception ex)
{ {
MainForm.Instance.AddToActionsList("Exception in FetchDevPassword: " + ex.Message); MainForm.Instance.AddToActionsList($"Exception in FetchDevPassword: {Level.ERROR}" + ex.Message);
return null; return null;
} }
} }

12
Camera/Router.cs
View File

@@ -32,7 +32,7 @@ namespace AiQ_GUI
} }
catch catch
{ {
MainForm.Instance.AddToActionsList("Is the router on the network? Has the MAV Config file been applied?"); MainForm.Instance.AddToActionsList($"Is the router on the network? Has the MAV Config file been applied?{Level.WARNING}");
} }
return null; return null;
@@ -48,31 +48,31 @@ namespace AiQ_GUI
if (Strength < 25.0) if (Strength < 25.0)
{ {
MainForm.Instance.AddToActionsList($"Router signal strength is {Strength} which is below 25%. Please check the router connection."); MainForm.Instance.AddToActionsList($"Router signal strength is {Strength} which is below 25%. Please check the router connection.{Level.WARNING}");
PassTest = false; PassTest = false;
} }
if (!Router.SimStatus.Contains("SIM Ready")) if (!Router.SimStatus.Contains("SIM Ready"))
{ {
MainForm.Instance.AddToActionsList($"SIM card is not ready. {Router.SimStatus} Please check the SIM card status."); MainForm.Instance.AddToActionsList($"SIM card is not ready. {Router.SimStatus} Please check the SIM card status.{Level.WARNING}");
PassTest = false; PassTest = false;
} }
if (!Router.Port3Status.Contains("port:3 link:up speed:100baseT full-duplex")) if (!Router.Port3Status.Contains("port:3 link:up speed:100baseT full-duplex"))
{ {
MainForm.Instance.AddToActionsList($"Port 3 is not connected properly. {Router.Port3Status} Please check the connection."); MainForm.Instance.AddToActionsList($"Port 3 is not connected properly. {Router.Port3Status} Please check the connection. {Level.WARNING}");
PassTest = false; PassTest = false;
} }
if (!Router.Port4Status.Contains("port:4 link:up speed:100baseT full-duplex")) if (!Router.Port4Status.Contains("port:4 link:up speed:100baseT full-duplex"))
{ {
MainForm.Instance.AddToActionsList($"Port 4 is not connected properly. {Router.Port4Status} Please check the connection."); MainForm.Instance.AddToActionsList($"Port 4 is not connected properly. {Router.Port4Status} Please check the connection. {Level.WARNING}");
PassTest = false; PassTest = false;
} }
if (!Router.GoodPing) if (!Router.GoodPing)
{ {
MainForm.Instance.AddToActionsList("Router could not ping 8.8.8.8. Please check the online connection."); MainForm.Instance.AddToActionsList($"Router could not ping 8.8.8.8. Please check the online connection.{Level.WARNING}");
PassTest = false; PassTest = false;
} }

40
Camera/SSH.cs
View File

@@ -25,7 +25,7 @@ namespace AiQ_GUI
} }
catch (Exception Ex) catch (Exception Ex)
{ {
MainForm.Instance.AddToActionsList($"SSH connection failed: {Ex.Message}. Check password or network."); MainForm.Instance.AddToActionsList($"SSH connection failed: {Ex.Message}. Check password or network. {Level.WARNING}");
} }
return null; return null;
@@ -75,7 +75,7 @@ namespace AiQ_GUI
} }
catch (Exception ex) catch (Exception ex)
{ {
MainForm.Instance.AddToActionsList($"SSH connection failed: {ex.Message}. Check password or network."); MainForm.Instance.AddToActionsList($"SSH connection failed: {ex.Message}. Check password or network. {Level.WARNING}");
} }
string LogMssg = string.Join(" | ", typeof(SSHData).GetProperties().Select(p => $"{p.Name}: {p.GetValue(Data)}")); string LogMssg = string.Join(" | ", typeof(SSHData).GetProperties().Select(p => $"{p.Name}: {p.GetValue(Data)}"));
@@ -170,7 +170,7 @@ namespace AiQ_GUI
} }
catch (Exception ex) catch (Exception ex)
{ {
MainForm.Instance.AddToActionsList($"SSH connection failed: {ex.Message}. Check password or network."); MainForm.Instance.AddToActionsList($"SSH connection failed: {ex.Message}. Check password or network. {Level.WARNING}");
} }
return (string.Empty, string.Empty); return (string.Empty, string.Empty);
@@ -323,7 +323,7 @@ namespace AiQ_GUI
if (checkDevice.Result.Trim() != "OK") // Device not found if (checkDevice.Result.Trim() != "OK") // Device not found
{ {
MainForm.Instance.AddToActionsList($"Block device {device} not found."); MainForm.Instance.AddToActionsList($"Block device {device} not found.", Level.WARNING);
return false; return false;
} }
@@ -378,7 +378,7 @@ namespace AiQ_GUI
if (checkDevice.Result.Trim().Length > 1) // Device not found if (checkDevice.Result.Trim().Length > 1) // Device not found
{ {
MainForm.Instance.AddToActionsList($"Cannot sync files to disk. Replied: {checkDevice.Result}. DO NOT TURN OFF, GET SUPERVISOR"); MainForm.Instance.AddToActionsList($"Cannot sync files to disk. Replied: {checkDevice.Result}. DO NOT TURN OFF, GET SUPERVISOR", Level.ERROR);
return; return;
} }
@@ -387,7 +387,33 @@ namespace AiQ_GUI
} }
catch (Exception ex) catch (Exception ex)
{ {
MainForm.Instance.AddToActionsList($"Cannot sync becuase: {ex.Message}. DO NOT TURN OFF, GET SUPERVISOR"); MainForm.Instance.AddToActionsList($"Cannot sync becuase: {ex.Message}. DO NOT TURN OFF, GET SUPERVISOR", Level.ERROR);
}
}
public static void SetTo115200(string IPAddress)
{
try
{
string Cmd = "sudo sh -c \"stty -F /dev/ttyInfrared 9600 raw -echo -echoe -echok -echoctl -echoke -iexten -onlcr ignbrk cs8 -cstopb -parenb; echo '81 01 04 01 04 FF' | xxd -r -p > /dev/ttyInfrared\"";
SshClient client = SshConnect(IPAddress);
SshCommand checkDevice = client.RunCommand(Cmd);
if (!string.IsNullOrWhiteSpace(checkDevice.Error))
throw new Exception(checkDevice.Error);
Cmd = Cmd.Replace("Infrared", "Colour");
checkDevice = client.RunCommand(Cmd);
if (!string.IsNullOrWhiteSpace(checkDevice.Error))
throw new Exception(checkDevice.Error);
client.Disconnect();
client.Dispose();
}
catch (Exception ex)
{
MainForm.Instance.AddToActionsList($"Cannot set cameras to 115200 becuase: {ex.Message}", Level.ERROR);
} }
} }
} }
@@ -399,4 +425,4 @@ namespace AiQ_GUI
public string FilesystemSize { get; set; } = string.Empty; public string FilesystemSize { get; set; } = string.Empty;
public bool tailscale { get; set; } public bool tailscale { get; set; }
} }
} }

2
GUIUpdate.cs
View File

@@ -46,7 +46,7 @@ namespace AiQ_GUI
{ {
if (ComapreVersions()) // Checks if the current version is older than the latest version if (ComapreVersions()) // Checks if the current version is older than the latest version
{ {
const string GUIPath = $"{GoogleAPI.DrivePath}AiQ\\GUI's\\AiQ_Final_Test\\AiQ_GUI.application"; const string GUIPath = $"{GoogleAPI.DrivePath}AiQ\\GUI's\\AiQ_Final_Test\\setup.exe";
// Check if path is real // Check if path is real
if (!File.Exists(GUIPath)) if (!File.Exists(GUIPath))

12
GoogleAPI.cs
View File

@@ -107,12 +107,12 @@ namespace AiQ_GUI
} }
else else
{ {
return "Last serial number not found"; return $"Last serial number not found{Level.ERROR}";
} }
} }
catch (Exception ex) catch (Exception ex)
{ {
return $"ERROR: {ex.Message}"; return $"ERROR: {ex.Message}{Level.ERROR}";
} }
} }
@@ -148,12 +148,12 @@ namespace AiQ_GUI
} }
else else
{ {
return "Serial number not found"; return $"Serial number not found{Level.ERROR}";
} }
} }
catch (Exception ex) catch (Exception ex)
{ {
return $"ERROR: {ex.Message}"; return $"ERROR: {ex.Message}{Level.ERROR}";
} }
} }
@@ -196,7 +196,7 @@ namespace AiQ_GUI
} }
catch (Exception ex) catch (Exception ex)
{ {
return "Failed to update spreadsheet data, please check manually" + ex.Message; return $"Failed to update spreadsheet data, please check manually{Level.ERROR}" + ex.Message;
} }
} }
@@ -225,7 +225,7 @@ namespace AiQ_GUI
} }
catch (Exception ex) catch (Exception ex)
{ {
return "Failed to update spreadsheet data, please check manually" + ex.Message; return $"Failed to update spreadsheet data, please check manually{Level.WARNING}" + ex.Message;
} }
} }

12
Helper.cs
View File

@@ -83,26 +83,26 @@ namespace AiQ_GUI
case 0: case 0:
if (!await MainForm.Instance.DisplayQuestion("Is the sleeve aligned correctly?")) if (!await MainForm.Instance.DisplayQuestion("Is the sleeve aligned correctly?"))
{ {
await MainForm.Instance.TestFailed(Btn, "Visual Test Fail - Sleeve not aligned"); await MainForm.Instance.TestFailed(Btn, $"Visual Test Fail - Sleeve not aligned{Level.ERROR}");
} }
break; break;
case 1: case 1:
if (!await MainForm.Instance.DisplayQuestion("Are all the screws fitted in the front?")) if (!await MainForm.Instance.DisplayQuestion("Are all the screws fitted in the front?"))
{ {
await MainForm.Instance.TestFailed(Btn, "Visual Test Fail - Not all front screws fitted"); await MainForm.Instance.TestFailed(Btn, $"Visual Test Fail - Not all front screws fitted{Level.ERROR}");
} }
break; break;
case 2: case 2:
if (!await MainForm.Instance.DisplayQuestion("Are all the screws fitted in the rear?")) if (!await MainForm.Instance.DisplayQuestion("Are all the screws fitted in the rear?"))
{ {
await MainForm.Instance.TestFailed(Btn, "Visual Test Fail - Not all rear screws fitted"); await MainForm.Instance.TestFailed(Btn, $"Visual Test Fail - Not all rear screws fitted{Level.ERROR}");
} }
break; break;
case 3: case 3:
if (await MainForm.Instance.DisplayQuestion("Shake unit, does it rattle?")) if (await MainForm.Instance.DisplayQuestion("Shake unit, does it rattle?"))
{ {
await MainForm.Instance.TestFailed(Btn, "Visual Test Fail - Unit rattles"); await MainForm.Instance.TestFailed(Btn, $"Visual Test Fail - Unit rattles{Level.ERROR}");
} }
break; break;
default: default:
@@ -123,7 +123,7 @@ namespace AiQ_GUI
} }
catch (Exception ex) catch (Exception ex)
{ {
MainForm.Instance.AddToActionsList($"Error fetching versions for {IPAddress}: {ex.Message}"); MainForm.Instance.AddToActionsList($"Error fetching versions for {IPAddress}: {ex.Message}{Level.ERROR}");
return null; return null;
} }
@@ -220,7 +220,7 @@ namespace AiQ_GUI
[GeneratedRegex(@"^[A-Z]{2}\d{2}[A-Z]{2}$", RegexOptions.Compiled)] [GeneratedRegex(@"^[A-Z]{2}\d{2}[A-Z]{2}$", RegexOptions.Compiled)]
internal static partial Regex ModelRegex(); internal static partial Regex ModelRegex();
[GeneratedRegex(@"^(?:[FSA])?\d{6}$", RegexOptions.Compiled)] [GeneratedRegex(@"^(?:[FSAX])?\d{6}$", RegexOptions.Compiled)]
internal static partial Regex LicCodeRegex(); internal static partial Regex LicCodeRegex();
[GeneratedRegex(@"^(?<value>[\d\.]+)(?<unit>[KMGTP]?)(?<suffix>B?)$", RegexOptions.Compiled | RegexOptions.IgnoreCase)] [GeneratedRegex(@"^(?<value>[\d\.]+)(?<unit>[KMGTP]?)(?<suffix>B?)$", RegexOptions.Compiled | RegexOptions.IgnoreCase)]

14
LDS.cs
View File

@@ -10,7 +10,7 @@ namespace AiQ_GUI
public const string IROpensavePath = "IR_Open_image.jpg"; // Path to save the downloaded image public const string IROpensavePath = "IR_Open_image.jpg"; // Path to save the downloaded image
public const string IRTightsavePath = "IR_Tight_image.jpg"; // Path to save the downloaded image public const string IRTightsavePath = "IR_Tight_image.jpg"; // Path to save the downloaded image
public const string LDSFileName = "LDS.json"; // Local Data Store file name public const string LDSFileName = "LDS.json"; // Local Data Store file name
const string DefaultJSON = "{\r\n \"User\": \"\",\r\n \"LastModel\": \"\",\r\n \"PSUIP\": \"\",\r\n \"EzIP\": \"\",\r\n \"ZebraIP\": \"\",\r\n \"TestTubeIP\": \"\",\r\n \"Shutter\": 0,\r\n \"Iris\": 0,\r\n \"Gain\": 0\r\n}"; const string DefaultJSON = "{\r\n \"User\": \"\",\r\n \"LastModel\": \"\",\r\n \"PSUIP\": \"\",\r\n \"EzIP\": \"\",\r\n \"ZebraIP\": \"\",\r\n \"TestTubeIP\": \"\",\r\n \"Shutter\": 0,\r\n \"Iris\": 0,\r\n \"Gain\": 0\r\n \"GUIPosX\": 0\r\n \"GUIPosY\": 0\r\n}";
public static LocalDataStore GetLDS() public static LocalDataStore GetLDS()
{ {
@@ -30,7 +30,7 @@ namespace AiQ_GUI
} }
catch // If file can't deserialise catch // If file can't deserialise
{ {
MainForm.Instance.AddToActionsList("Error loading Local Data Store"); MainForm.Instance.AddToActionsList($"Error loading Local Data Store{Level.WARNING}");
return null; // Return null to indicate failure return null; // Return null to indicate failure
} }
} }
@@ -45,7 +45,7 @@ namespace AiQ_GUI
} }
catch (Exception ex) catch (Exception ex)
{ {
MainForm.Instance.AddToActionsList($"Error saving Local Data Store: {ex.Message}"); MainForm.Instance.AddToActionsList($"Error saving Local Data Store: {ex.Message}{Level.WARNING}");
} }
} }
} }
@@ -58,8 +58,10 @@ namespace AiQ_GUI
public string EzIP { get; set; } = string.Empty; public string EzIP { get; set; } = string.Empty;
public string ZebraIP { get; set; } = string.Empty; public string ZebraIP { get; set; } = string.Empty;
public string TestTubeIP { get; set; } = string.Empty; public string TestTubeIP { get; set; } = string.Empty;
public int Shutter { get; set; } public int Shutter { get; set; } = 0;
public int Iris { get; set; } public int Iris { get; set; } = 0;
public int Gain { get; set; } public int Gain { get; set; } = 0;
public int GUIPosX { get; set; } = 0;
public int GUIPosY { get; set; } = 0;
} }
} }

9
Logging.cs
View File

@@ -1,4 +1,7 @@
namespace AiQ_GUI using System.Diagnostics;
using System.Security.Principal;
namespace AiQ_GUI
{ {
internal class Logging internal class Logging
{ {
@@ -23,6 +26,10 @@
{ {
try try
{ {
WindowsPrincipal wp = new(WindowsIdentity.GetCurrent()); // Log in a seperate file when admin
if (wp.IsInRole(WindowsBuiltInRole.Administrator))
FileName = FileName.Replace(".log", "_ADMIN.log");
string logFilePath = LDS.MAVPath + FileName; string logFilePath = LDS.MAVPath + FileName;
FileInfo fi = new(logFilePath); FileInfo fi = new(logFilePath);

6
Microsoft/Access.cs
View File

@@ -123,13 +123,13 @@ namespace AiQ_GUI
int rowsAffected = cmd.ExecuteNonQuery(); int rowsAffected = cmd.ExecuteNonQuery();
// Execute the command and get the number of rows affected // Execute the command and get the number of rows affected
if (rowsAffected == 0) // If one or more rows were updated if (rowsAffected == 0) // If one or more rows were updated
MainForm.Instance.AddToActionsList($"No rows affected for {modelNumber}"); MainForm.Instance.AddToActionsList($"No rows affected for {modelNumber}{Level.ERROR}");
} }
conn.Close(); conn.Close();
} }
catch catch
{ {
MainForm.Instance.AddToActionsList("Could not access Access in Google Drive. Is it running?"); MainForm.Instance.AddToActionsList($"Could not access Access in Google Drive. Is it running?{Level.WARNING}");
return; return;
} }
} }
@@ -161,7 +161,7 @@ namespace AiQ_GUI
conn.Close(); conn.Close();
if (rows == 0) if (rows == 0)
MainForm.Instance.AddToActionsList("No rows inserted into DiagsStats (unexpected)."); MainForm.Instance.AddToActionsList($"No rows inserted into DiagsStats (unexpected).{Level.ERROR}");
} }
} }

39
Microsoft/Excel.cs
View File

@@ -17,7 +17,7 @@ namespace AiQ_GUI
} }
else else
{ {
MainForm.Instance.AddToActionsList("Could not find spreadsheet :("); MainForm.Instance.AddToActionsList($"Could not find spreadsheet :( {Level.ERROR}");
} }
} }
@@ -31,7 +31,7 @@ namespace AiQ_GUI
} }
else else
{ {
MainForm.Instance.AddToActionsList("Could not find spreadsheet :("); MainForm.Instance.AddToActionsList($"Could not find spreadsheet :( {Level.ERROR}");
} }
return null; return null;
} }
@@ -40,7 +40,7 @@ namespace AiQ_GUI
{ {
if (!File.Exists(FilePath)) if (!File.Exists(FilePath))
{ {
MainForm.Instance.AddToActionsList("Could not find spreadsheet :("); MainForm.Instance.AddToActionsList($"Could not find spreadsheet :( {Level.ERROR}");
return -1; return -1;
} }
@@ -62,7 +62,7 @@ namespace AiQ_GUI
{ {
if (!File.Exists(FilePath)) if (!File.Exists(FilePath))
{ {
MainForm.Instance.AddToActionsList("Could not find spreadsheet :("); MainForm.Instance.AddToActionsList($"Could not find spreadsheet :( {Level.ERROR}");
return "Spreadsheet not found"; return "Spreadsheet not found";
} }
@@ -114,7 +114,7 @@ namespace AiQ_GUI
{ {
if (!File.Exists(filePath)) if (!File.Exists(filePath))
{ {
MainForm.Instance.AddToActionsList("Could not find spreadsheet :("); MainForm.Instance.AddToActionsList($"Could not find spreadsheet :) {Level.ERROR}");
return "Spreadsheet not found"; return "Spreadsheet not found";
} }
@@ -150,7 +150,7 @@ namespace AiQ_GUI
} }
catch (Exception ex) catch (Exception ex)
{ {
MainForm.Instance.AddToActionsList("Error updating spreadsheet: " + ex.Message); MainForm.Instance.AddToActionsList($"Error updating spreadsheet:{Level.ERROR} " + ex.Message);
return $"ERROR: {ex.Message}"; return $"ERROR: {ex.Message}";
} }
} }
@@ -161,7 +161,7 @@ namespace AiQ_GUI
{ {
if (!File.Exists(FilePath)) if (!File.Exists(FilePath))
{ {
MainForm.Instance.AddToActionsList("Could not find spreadsheet :("); MainForm.Instance.AddToActionsList($"Could not find spreadsheet :( {Level.ERROR}");
return "Spreadsheet not found"; return "Spreadsheet not found";
} }
@@ -202,8 +202,8 @@ namespace AiQ_GUI
} }
catch (Exception ex) catch (Exception ex)
{ {
MainForm.Instance.AddToActionsList("Error updating spreadsheet: " + ex.Message); MainForm.Instance.AddToActionsList($"Error updating spreadsheet: {Level.WARNING}" + ex.Message);
return "Failed to update spreadsheet data, please check manually: " + ex.Message; return $"Failed to update spreadsheet data, please check manually: {Level.WARNING}" + ex.Message;
} }
} }
@@ -213,8 +213,9 @@ namespace AiQ_GUI
{ {
if (!File.Exists(FilePath)) if (!File.Exists(FilePath))
{ {
MainForm.Instance.AddToActionsList("Could not find spreadsheet :("); MainForm.Instance.AddToActionsList($"Could not find spreadsheet :( {Level.ERROR}");
return "Spreadsheet not found"; return $"Spreadsheet not found{ Level.ERROR}"
;
} }
using XLWorkbook workbook = new(FilePath); using XLWorkbook workbook = new(FilePath);
@@ -239,8 +240,8 @@ namespace AiQ_GUI
} }
catch (Exception ex) catch (Exception ex)
{ {
MainForm.Instance.AddToActionsList("Error updating Vaxtor spreadsheet: " + ex.Message); MainForm.Instance.AddToActionsList($"Error updating Vaxtor spreadsheet: {Level.WARNING}" + ex.Message);
return "Failed to update spreadsheet data, please check manually: " + ex.Message; return $"Failed to update spreadsheet data, please check manually: {Level.WARNING}" + ex.Message;
} }
} }
@@ -250,7 +251,7 @@ namespace AiQ_GUI
{ {
if (!File.Exists(filePath)) if (!File.Exists(filePath))
{ {
MainForm.Instance.AddToActionsList("Could not find RMA Control spreadsheet :("); MainForm.Instance.AddToActionsList($"Could not find RMA Control spreadsheet :({Level.ERROR}");
return 0; return 0;
} }
@@ -280,7 +281,7 @@ namespace AiQ_GUI
} }
catch (Exception ex) catch (Exception ex)
{ {
MainForm.Instance.AddToActionsList("Error reading RMA Control spreadsheet: " + ex.Message); MainForm.Instance.AddToActionsList($"Error reading RMA Control spreadsheet: {Level.ERROR}" + ex.Message);
} }
return 0; // Default if not found return 0; // Default if not found
@@ -292,7 +293,7 @@ namespace AiQ_GUI
{ {
if (!File.Exists(filePath)) if (!File.Exists(filePath))
{ {
MainForm.Instance.AddToActionsList("Could not find spreadsheet :("); MainForm.Instance.AddToActionsList($"Could not find spreadsheet :( {Level.ERROR}");
return 0; return 0;
} }
@@ -316,7 +317,7 @@ namespace AiQ_GUI
} }
catch (Exception ex) catch (Exception ex)
{ {
MainForm.Instance.AddToActionsList("Error checking serial number row: " + ex.Message); MainForm.Instance.AddToActionsList($"Error checking serial number row: {Level.ERROR}" + ex.Message);
} }
return 0; return 0;
@@ -328,7 +329,7 @@ namespace AiQ_GUI
{ {
if (!File.Exists(filePath)) if (!File.Exists(filePath))
{ {
MainForm.Instance.AddToActionsList("Could not find spreadsheet :("); MainForm.Instance.AddToActionsList($"Could not find spreadsheet :({Level.ERROR}");
return -1; return -1;
} }
@@ -343,7 +344,7 @@ namespace AiQ_GUI
} }
catch (Exception ex) catch (Exception ex)
{ {
MainForm.Instance.AddToActionsList("Error checking next free row: " + ex.Message); MainForm.Instance.AddToActionsList($"Error checking next free row: {Level.ERROR}" + ex.Message);
return -1; return -1;
} }
} }

12
Network.cs
View File

@@ -71,15 +71,15 @@ namespace AiQ_GUI
} }
catch (TaskCanceledException ex) catch (TaskCanceledException ex)
{ {
return $"HTTP error calling {url}: {ex.Message}"; return $"HTTP error calling {url}: {ex.Message}{Level.ERROR}";
} }
catch (HttpRequestException ex) catch (HttpRequestException ex)
{ {
return $"HTTP error calling {url}: {ex.Message}"; return $"HTTP error calling {url}: {ex.Message}{Level.ERROR}";
} }
catch (Exception ex) catch (Exception ex)
{ {
return $"Unexpected error calling {url}: {ex.Message}"; return $"Unexpected error calling {url}: {ex.Message}{Level.ERROR}";
} }
} }
@@ -157,9 +157,9 @@ namespace AiQ_GUI
PingReply reply = await myPing.SendPingAsync(ipAddress, 1000); // Timeout is 1s PingReply reply = await myPing.SendPingAsync(ipAddress, 1000); // Timeout is 1s
return reply.Status == IPStatus.Success; return reply.Status == IPStatus.Success;
} }
catch (PingException ex) { MainForm.Instance.AddToActionsList($"PingException: Unable to ping {ipAddress}. Reason: {ex.Message}"); } catch (PingException ex) { MainForm.Instance.AddToActionsList($"PingException: Unable to ping {ipAddress}. Reason: {ex.Message}{Level.WARNING}"); }
catch (SocketException ex) { MainForm.Instance.AddToActionsList($"SocketException: Network error while pinging {ipAddress}. Reason: {ex.Message}"); } catch (SocketException ex) { MainForm.Instance.AddToActionsList($"SocketException: Network error while pinging {ipAddress}. Reason: {ex.Message}{Level.ERROR}"); }
catch (Exception ex) { MainForm.Instance.AddToActionsList($"Unexpected error while pinging {ipAddress}: {ex.Message}"); } catch (Exception ex) { MainForm.Instance.AddToActionsList($"Unexpected error while pinging {ipAddress}: {ex.Message}{Level.ERROR}"); }
} }
return false; return false;

10
Soak/Selenium.cs
View File

@@ -19,7 +19,7 @@ namespace AiQ_GUI
} }
catch (WebDriverTimeoutException) catch (WebDriverTimeoutException)
{ {
MainForm.Instance.AddToActionsList("Could not load web page " + url + "1. Check camera has no password set. " + Environment.NewLine + "2. If unable to fix speak to supervisor."); MainForm.Instance.AddToActionsList($"Could not load web page {Level.ERROR}" + url + $"1. Check camera has no password set. {Level.ERROR}" + Environment.NewLine + $"2. If unable to fix speak to supervisor.{Level.ERROR}");
} }
} }
@@ -71,11 +71,11 @@ namespace AiQ_GUI
loginBtn.Click(); loginBtn.Click();
MainForm.Instance.AddToActionsList("Switched user and logged in."); MainForm.Instance.AddToActionsList($"Switched user and logged in.{Level.Success}");
} }
catch (Exception ex) catch (Exception ex)
{ {
MainForm.Instance.AddToActionsList("SwitchUser failed: " + ex.Message); MainForm.Instance.AddToActionsList($"SwitchUser failed: {Level.ERROR}" + ex.Message);
} }
} }
@@ -99,7 +99,7 @@ namespace AiQ_GUI
ClickElementByID(elementID, driver, false); ClickElementByID(elementID, driver, false);
} }
MainForm.Instance.AddToActionsList("Could not click " + elementID); MainForm.Instance.AddToActionsList($"Could not click {Level.WARNING}" + elementID);
} }
} }
@@ -134,7 +134,7 @@ namespace AiQ_GUI
} }
catch (Exception ex) catch (Exception ex)
{ {
MainForm.Instance.AddToActionsList("Failed to create ChromeDriver: " + ex.Message); MainForm.Instance.AddToActionsList($"Failed to create ChromeDriver: {Level.ERROR}" + ex.Message);
throw; throw;
} }
} }

24
Soak/SoakTest.cs
View File

@@ -37,7 +37,7 @@ namespace AiQ_GUI
catch (Exception ex) catch (Exception ex)
{ {
SoakError($"Initial connection failed: {ex.Message}", SoakLogFile, CamInfo.CheckBox); SoakError($"Initial connection failed: {ex.Message}", SoakLogFile, CamInfo.CheckBox);
MainForm.Instance.AddToActionsList($"[{CamInfo.IP}] Initial connection failed: {ex.Message}"); MainForm.Instance.AddToActionsList($"[{CamInfo.IP}] Initial connection failed: {Level.ERROR}{ex.Message}");
// Wait 10 seconds before trying again // Wait 10 seconds before trying again
await Task.Delay(TimeSpan.FromSeconds(10), token); await Task.Delay(TimeSpan.FromSeconds(10), token);
@@ -52,7 +52,7 @@ namespace AiQ_GUI
} }
catch (Exception ex) catch (Exception ex)
{ {
SoakError($"Failed to get element IDs: {ex.Message}", SoakLogFile, CamInfo.CheckBox); SoakError($"Failed to get element IDs: {Level.ERROR} {ex.Message}", SoakLogFile, CamInfo.CheckBox);
return; return;
} }
@@ -84,7 +84,7 @@ namespace AiQ_GUI
// Retry ping until camera responds or cancelled // Retry ping until camera responds or cancelled
while (!await Network.PingIP(CamInfo.IP) && !token.IsCancellationRequested) while (!await Network.PingIP(CamInfo.IP) && !token.IsCancellationRequested)
{ {
SoakError($"Camera did not respond after restart.", SoakLogFile, CamInfo.CheckBox); SoakError($"Camera did not respond after restart.{Level.ERROR}", SoakLogFile, CamInfo.CheckBox);
await Task.Delay(TimeSpan.FromMinutes(1), token); // Retry after delay of 1 minute await Task.Delay(TimeSpan.FromMinutes(1), token); // Retry after delay of 1 minute
} }
@@ -98,7 +98,7 @@ namespace AiQ_GUI
} }
catch (Exception ex) catch (Exception ex)
{ {
SoakError($"Error during power cycle: {ex.Message}", SoakLogFile, CamInfo.CheckBox); SoakError($"Error during power cycle: {Level.ERROR} {ex.Message}", SoakLogFile, CamInfo.CheckBox);
} }
} }
@@ -112,7 +112,7 @@ namespace AiQ_GUI
} }
catch (Exception ex) catch (Exception ex)
{ {
SoakError($"ImageCheck failed: {ex.Message}", SoakLogFile, CamInfo.CheckBox); SoakError($"ImageCheck failed: {Level.ERROR}{Level.ERROR} {ex.Message}", SoakLogFile, CamInfo.CheckBox);
} }
lastHour = currentHour; lastHour = currentHour;
} }
@@ -131,7 +131,7 @@ namespace AiQ_GUI
} }
catch (Exception ex) catch (Exception ex)
{ {
SoakError($"ChangeRandomDropdown failed: {ex.Message}", SoakLogFile, CamInfo.CheckBox); SoakError($"ChangeRandomDropdown failed: {Level.WARNING} {ex.Message}", SoakLogFile, CamInfo.CheckBox);
} }
try try
@@ -184,13 +184,13 @@ namespace AiQ_GUI
} }
catch (Exception ex) catch (Exception ex)
{ {
MainForm.Instance.AddToActionsList($"Failed to find final test report: {ex.Message}"); MainForm.Instance.AddToActionsList($"Failed to find final test report: {Level.ERROR}{ex.Message}");
} }
// Link PDFs if both exist // Link PDFs if both exist
if (!string.IsNullOrEmpty(finalTestPath) && File.Exists(finalTestPath) && !string.IsNullOrEmpty(SoakTestPath) && File.Exists(SoakTestPath)) if (!string.IsNullOrEmpty(finalTestPath) && File.Exists(finalTestPath) && !string.IsNullOrEmpty(SoakTestPath) && File.Exists(SoakTestPath))
{ {
string outputPath = finalTestDir + $"Final&SoakTestReport_{CamInfo.Model}_{CamInfo.Serial}_{DateTime.Now.ToString("dd-MM-yyyy_HH-mm-ss")}.pdf"; string outputPath = finalTestDir + $"Final&SoakTestReport_{CamInfo.Model}_{CamInfo.Serial}_{DateTime.Now.ToString("dd-MM-yyyy_HH-mm-ss")}.pdf{Level.Success}";
try try
{ {
if (PDF.LinkPDFs(finalTestPath, SoakTestPath, outputPath)) // Delete the separate soak and final test reports if Linking was successful if (PDF.LinkPDFs(finalTestPath, SoakTestPath, outputPath)) // Delete the separate soak and final test reports if Linking was successful
@@ -200,7 +200,7 @@ namespace AiQ_GUI
File.Delete(SoakTestPath); File.Delete(SoakTestPath);
} }
else else
MainForm.Instance.AddToActionsList($"Failed to link or delete PDFs"); MainForm.Instance.AddToActionsList($"Failed to link or delete PDFs {Level.ERROR}");
} }
catch (Exception ex) catch (Exception ex)
{ {
@@ -226,7 +226,7 @@ namespace AiQ_GUI
if (ImageBright == null) if (ImageBright == null)
{ {
Logging.LogWarningMessage($"Bright image is null for {controlType} at setting {SettingMinMax[0]}", SoakLogFile); Logging.LogWarningMessage($"Bright image is null for {controlType} at setting {SettingMinMax[0]}", SoakLogFile);
MainForm.Instance.AddToActionsList($"Bright image is null for {controlType} at setting {SettingMinMax[0]}"); MainForm.Instance.AddToActionsList($"Bright image is null for {controlType} at setting {SettingMinMax[0]}{Level.WARNING}");
return; return;
} }
@@ -240,7 +240,7 @@ namespace AiQ_GUI
if (ImageDark == null) if (ImageDark == null)
{ {
Logging.LogWarningMessage($"Dark image is null for {controlType} at setting {SettingMinMax[1]}", SoakLogFile); Logging.LogWarningMessage($"Dark image is null for {controlType} at setting {SettingMinMax[1]}", SoakLogFile);
MainForm.Instance.AddToActionsList($"Dark image is null for {controlType} at setting {SettingMinMax[1]}"); MainForm.Instance.AddToActionsList($"Dark image is null for {controlType} at setting {SettingMinMax[1]}{Level.WARNING}");
return; return;
} }
@@ -251,7 +251,7 @@ namespace AiQ_GUI
if (Bright_Lum < Dark_Lum * 1.01) if (Bright_Lum < Dark_Lum * 1.01)
{ {
SoakError( SoakError(
$"Insufficient luminance contrast. Bright: {Bright_Lum:F2}, Dark: {Dark_Lum:F2} | Type: {controlType} | Bright Setting: {SettingMinMax[0]}, Dark Setting: {SettingMinMax[1]}", $"Insufficient luminance contrast. Bright: {Bright_Lum:F2}, Dark: {Dark_Lum:F2} | Type: {controlType} | Bright Setting: {SettingMinMax[0]}, Dark Setting: {SettingMinMax[1]}{Level.WARNING}",
SoakLogFile, SoakLogFile,
CamInfo.CheckBox CamInfo.CheckBox
); );