Compare commits
2 Commits
4c624d7e29
...
760987fa75
| Author | SHA1 | Date | |
|---|---|---|---|
| 760987fa75 | |||
| 30bd2fe73c |
92
AiQ_GUI.cs
92
AiQ_GUI.cs
@@ -9,7 +9,8 @@ namespace AiQ_GUI
|
||||
{
|
||||
ERROR,
|
||||
WARNING,
|
||||
LOG
|
||||
LOG,
|
||||
Success
|
||||
}
|
||||
|
||||
public partial class MainForm : Form
|
||||
@@ -77,7 +78,7 @@ namespace AiQ_GUI
|
||||
|
||||
if (localDataStore == null)
|
||||
{
|
||||
AddToActionsList("Could not deserialise LDS.json please help!");
|
||||
AddToActionsList("Could not deserialise LDS.json please help!", Level.WARNING);
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -138,7 +139,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.
|
||||
|
||||
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
|
||||
await TestFailed(BtnStartTest, "Camera not in test tube");
|
||||
@@ -157,7 +158,7 @@ namespace AiQ_GUI
|
||||
|
||||
string VISCAReply = await FlexiAPI.APIHTTPVISCA(CamOnTest.IP, "8101043903FF", true); // Manual mode to be able to manipulate the SIG settings.
|
||||
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 ImageProcessing.ImageCheck(PicBxOV, PicBxIRF2, PicBxIRF16, LblIRImageF2, LblIRImageF16, CamOnTest); // Populates the picture boxes and checks iris changes
|
||||
@@ -203,7 +204,7 @@ namespace AiQ_GUI
|
||||
string LEDreply = await FlexiAPI.APIHTTPLED(CamOnTest.IP, LEDPOWER.MID); // Set LED's to medium (0x30)
|
||||
|
||||
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);
|
||||
|
||||
@@ -244,7 +245,7 @@ namespace AiQ_GUI
|
||||
string LEDreply = await FlexiAPI.APIHTTPLED(CamOnTest.IP, LEDPOWER.MID); // Set LED's to medium (0x30)
|
||||
|
||||
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
|
||||
|
||||
@@ -276,7 +277,7 @@ namespace AiQ_GUI
|
||||
if (await DisplayQuestion($"Would you like to allocate a serial number to this camera?"))
|
||||
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");
|
||||
AddToActionsList("Failed to write to spreadsheet, please check manually",Level.WARNING);
|
||||
// else if (Excel.UpdateSpreadSheetPreTest(CameraAccessInfo.SpreadsheetID, Vers, CamOnTest.GetCamDesc(), CamOnTest.Model) != "OK")
|
||||
// AddToActionsList("Failed to write to spreadsheet, please check manually");
|
||||
}
|
||||
@@ -299,7 +300,7 @@ namespace AiQ_GUI
|
||||
string err = GoogleAPI.UpdateSpreadSheetFinalTest(CameraAccessInfo.SpreadsheetID, DiagsAPI, sshData, CamOnTest.RMANum);
|
||||
|
||||
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
|
||||
await FlexiAPI.APIHTTPRequest("/api/purge-all", CamOnTest.IP);
|
||||
@@ -310,12 +311,12 @@ namespace AiQ_GUI
|
||||
string[,] GOD_JSON = { { "propGodMode", "false" } };
|
||||
string IntConf = await FlexiAPI.HTTP_Update("GLOBAL--FlexiApplication", CamOnTest.IP, GOD_JSON);
|
||||
if (!IntConf.Contains("\"propGodMode\": {\"value\": \"false\", \"datatype\": \"boolean\"},"))
|
||||
AddToActionsList("Could not turn off God mode");
|
||||
AddToActionsList("Could not turn off God mode", Level.WARNING);
|
||||
|
||||
Thread Thr211 = new(async () =>
|
||||
{
|
||||
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.Start();
|
||||
@@ -356,7 +357,7 @@ namespace AiQ_GUI
|
||||
else
|
||||
Access.Stats("RMA Final Tests Failed", CamOnTest.Model);
|
||||
|
||||
AddToActionsList(ErrMssg);
|
||||
AddToActionsList(ErrMssg, Level.ERROR);
|
||||
|
||||
string RedLbls = string.Join(Environment.NewLine, PnlLbls.Controls
|
||||
.OfType<Label>()
|
||||
@@ -505,12 +506,12 @@ namespace AiQ_GUI
|
||||
else if (RegexCache.MACRegex().IsMatch(DiagsAPI.MAC)) // Is a valid MAC, but not NVIDIA
|
||||
{
|
||||
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
|
||||
{
|
||||
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
|
||||
@@ -574,7 +575,7 @@ namespace AiQ_GUI
|
||||
|
||||
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;
|
||||
}
|
||||
else if (!GoogleAPI.CheckWIP(DiagsAPI.serialNumber, CameraAccessInfo.SpreadsheetID)) // Check WIP column in serial number register, if not ticked then RMA
|
||||
@@ -600,7 +601,7 @@ namespace AiQ_GUI
|
||||
}
|
||||
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 { }
|
||||
@@ -696,12 +697,12 @@ namespace AiQ_GUI
|
||||
|
||||
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;
|
||||
}
|
||||
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;
|
||||
}
|
||||
|
||||
@@ -711,7 +712,7 @@ namespace AiQ_GUI
|
||||
|
||||
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");
|
||||
}
|
||||
|
||||
@@ -865,7 +866,7 @@ namespace AiQ_GUI
|
||||
|
||||
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;
|
||||
}
|
||||
|
||||
@@ -928,7 +929,7 @@ namespace AiQ_GUI
|
||||
}
|
||||
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,12 +947,17 @@ namespace AiQ_GUI
|
||||
RhTxBxActions.SelectionColor = Color.Orange;
|
||||
}
|
||||
else if (Lvl == Level.LOG)
|
||||
{
|
||||
Logging.LogMessage(Mssg);
|
||||
RhTxBxActions.SelectionColor = Color.White;
|
||||
}
|
||||
else if (Lvl == Level.Success)
|
||||
{
|
||||
Logging.LogMessage(Mssg);
|
||||
RhTxBxActions.SelectionColor = Color.LightGreen;
|
||||
}
|
||||
|
||||
RhTxBxActions.AppendText(Mssg + Environment.NewLine);
|
||||
RhTxBxActions.AppendText(Mssg + Environment.NewLine);
|
||||
RhTxBxActions.SelectionStart = RhTxBxActions.Text.Length;
|
||||
RhTxBxActions.SelectionColor = SystemColors.Control;
|
||||
RhTxBxActions.ScrollToCaret();
|
||||
@@ -1129,7 +1135,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.
|
||||
|
||||
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
|
||||
BtnSet211.Text = "Set to DHCP";
|
||||
}
|
||||
@@ -1158,7 +1164,7 @@ namespace AiQ_GUI
|
||||
}
|
||||
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 +1191,7 @@ namespace AiQ_GUI
|
||||
}
|
||||
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);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1313,7 +1319,7 @@ namespace AiQ_GUI
|
||||
}
|
||||
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;
|
||||
}
|
||||
|
||||
@@ -1330,7 +1336,7 @@ namespace AiQ_GUI
|
||||
string err = GoogleAPI.UpdateSpreadSheetVaxtor(VaxtorLicResp, Vers.Serial, CamOnTest.Model);
|
||||
|
||||
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");
|
||||
|
||||
@@ -1618,7 +1624,7 @@ namespace AiQ_GUI
|
||||
}
|
||||
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)
|
||||
@@ -1634,7 +1640,7 @@ namespace AiQ_GUI
|
||||
|
||||
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
|
||||
{
|
||||
@@ -1716,24 +1722,24 @@ namespace AiQ_GUI
|
||||
// /api/config-ids - For getting all available config IDs
|
||||
|
||||
// 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)
|
||||
{
|
||||
if (file.Contains("SoakLog"))
|
||||
{
|
||||
// File name: SoakLog_{Serial}_{Model}.log
|
||||
string[] parts = file.Split('_', '.').Select(p => p.Trim()).ToArray();
|
||||
//foreach (var file in files)
|
||||
//{
|
||||
// if (file.Contains("SoakLog"))
|
||||
// {
|
||||
// // File name: SoakLog_{Serial}_{Model}.log
|
||||
// string[] parts = file.Split('_', '.').Select(p => p.Trim()).ToArray();
|
||||
|
||||
Camera NewCam = new()
|
||||
{
|
||||
Model = parts[3],
|
||||
Serial = parts[2],
|
||||
};
|
||||
// Camera NewCam = new()
|
||||
// {
|
||||
// Model = parts[3],
|
||||
// Serial = parts[2],
|
||||
// };
|
||||
|
||||
PDF.CreateSoakTestReport(NewCam, "SoakTestRig", DateTime.Now, file);
|
||||
}
|
||||
}
|
||||
// PDF.CreateSoakTestReport(NewCam, "SoakTestRig", DateTime.Now, file);
|
||||
// }
|
||||
//}
|
||||
|
||||
stopWatchTest.Stop();
|
||||
AddToActionsList("RunTime " + stopWatchTest.Elapsed.ToString(@"hh\:mm\:ss\.ff"), Level.LOG);
|
||||
|
||||
@@ -8,7 +8,7 @@ namespace AiQ_GUI
|
||||
{
|
||||
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;
|
||||
}
|
||||
|
||||
@@ -25,7 +25,7 @@ namespace AiQ_GUI
|
||||
}
|
||||
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)
|
||||
@@ -55,7 +55,7 @@ namespace AiQ_GUI
|
||||
}
|
||||
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)
|
||||
{
|
||||
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;
|
||||
}
|
||||
|
||||
@@ -75,7 +75,7 @@ namespace AiQ_GUI
|
||||
|
||||
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;
|
||||
}
|
||||
|
||||
@@ -85,7 +85,7 @@ namespace AiQ_GUI
|
||||
string OneshotReply = await FlexiAPI.APIHTTPVISCA(IPAddress, "8101041801FF", true); // Oneshot auto focus
|
||||
|
||||
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.
|
||||
@@ -97,7 +97,7 @@ namespace AiQ_GUI
|
||||
await Task.WhenAll(IRReply, OVReply);
|
||||
|
||||
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)
|
||||
|
||||
@@ -24,7 +24,7 @@ namespace AiQ_GUI
|
||||
}
|
||||
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)
|
||||
{
|
||||
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)
|
||||
{
|
||||
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();
|
||||
|
||||
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;
|
||||
}
|
||||
catch (TaskCanceledException)
|
||||
{
|
||||
return $"Timeout uploading to {url}.";
|
||||
return $"Timeout uploading to {url}.{Level.ERROR}";
|
||||
}
|
||||
catch (HttpRequestException ex)
|
||||
{
|
||||
return $"HTTP error uploading to {url}: {ex.Message}";
|
||||
return $"HTTP error uploading to {url}: {ex.Message}{Level.ERROR}";
|
||||
|
||||
}
|
||||
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"))
|
||||
{
|
||||
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;
|
||||
}
|
||||
|
||||
@@ -173,13 +174,13 @@ namespace AiQ_GUI
|
||||
// Treat "operation was canceled" as a successful apply
|
||||
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).{Level.WARNING}");
|
||||
return true;
|
||||
}
|
||||
|
||||
if (response.Contains("error", StringComparison.OrdinalIgnoreCase))
|
||||
{
|
||||
MainForm.Instance.DisplayQuestion($"SetVaxtorMinMaxPlate: failed - Please set manually");
|
||||
MainForm.Instance.DisplayQuestion($"SetVaxtorMinMaxPlate: failed - Please set manually{Level.WARNING}");
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -187,7 +188,7 @@ namespace AiQ_GUI
|
||||
}
|
||||
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;
|
||||
}
|
||||
}
|
||||
@@ -216,7 +217,7 @@ namespace AiQ_GUI
|
||||
}
|
||||
catch
|
||||
{
|
||||
MainForm.Instance.AddToActionsList("Error reading trim JSON - " + trimData);
|
||||
MainForm.Instance.AddToActionsList($"Error reading trim JSON - {Level.ERROR}" + trimData);
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -225,7 +226,7 @@ namespace AiQ_GUI
|
||||
{
|
||||
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;
|
||||
}
|
||||
|
||||
@@ -253,11 +254,11 @@ namespace AiQ_GUI
|
||||
}
|
||||
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 {Level.WARNING}"); // Awaited till OK has been clicked
|
||||
|
||||
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;
|
||||
}
|
||||
await Task.Delay(5000); // Give 5 second delay for it to see a plate
|
||||
@@ -274,7 +275,7 @@ namespace AiQ_GUI
|
||||
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\"}},"))
|
||||
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
|
||||
@@ -292,7 +293,7 @@ namespace AiQ_GUI
|
||||
}
|
||||
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
|
||||
}
|
||||
}
|
||||
@@ -348,11 +349,11 @@ namespace AiQ_GUI
|
||||
|
||||
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;
|
||||
}
|
||||
|
||||
MainForm.Instance.AddToActionsList("Camera successfully set to DHCP.");
|
||||
MainForm.Instance.AddToActionsList($"Camera successfully set to DHCP.{Level.Success}");
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -410,14 +411,14 @@ namespace AiQ_GUI
|
||||
string result = await APIHTTPVISCA(ipAddress, command, isIR);
|
||||
|
||||
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
|
||||
MainForm.Instance.AddToActionsList($"{name}: Unexpected response ({result})", Level.ERROR);
|
||||
|
||||
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)
|
||||
@@ -431,7 +432,7 @@ namespace AiQ_GUI
|
||||
|
||||
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;
|
||||
}
|
||||
}
|
||||
@@ -472,7 +473,7 @@ namespace AiQ_GUI
|
||||
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);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -26,7 +26,7 @@ namespace AiQ_GUI
|
||||
HttpResponseMessage response = await httpClient.GetAsync(requestUrl);
|
||||
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;
|
||||
}
|
||||
|
||||
@@ -34,7 +34,7 @@ namespace AiQ_GUI
|
||||
|
||||
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;
|
||||
}
|
||||
|
||||
@@ -43,7 +43,7 @@ namespace AiQ_GUI
|
||||
CvInvoke.Imdecode(imageBytes, ImreadModes.AnyColor, mat);
|
||||
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;
|
||||
}
|
||||
|
||||
@@ -70,12 +70,12 @@ namespace AiQ_GUI
|
||||
}
|
||||
catch (HttpRequestException ex)
|
||||
{
|
||||
MainForm.Instance.AddToActionsList($"HTTP error: {ex.Message}");
|
||||
MainForm.Instance.AddToActionsList($"HTTP error: {ex.Message}{Level.ERROR}");
|
||||
return null;
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
MainForm.Instance.AddToActionsList($"Error processing image: {ex.Message}");
|
||||
MainForm.Instance.AddToActionsList($"Error processing image: {ex.Message} {Level.ERROR}");
|
||||
return null;
|
||||
}
|
||||
}
|
||||
@@ -123,7 +123,7 @@ namespace AiQ_GUI
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
MainForm.Instance.AddToActionsList($"Error awaiting Colour snapshot: {ex.Message}");
|
||||
MainForm.Instance.AddToActionsList($"Error awaiting Colour snapshot: {ex.Message} {Level.ERROR}");
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -146,7 +146,7 @@ namespace AiQ_GUI
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
MainForm.Instance.AddToActionsList($"Error calculating luminance: {ex.Message}");
|
||||
MainForm.Instance.AddToActionsList($"Error calculating luminance: {ex.Message} {Level.ERROR}");
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -45,7 +45,7 @@
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
MainForm.Instance.AddToActionsList($"Error checking LEDs: {ex.Message}");
|
||||
MainForm.Instance.AddToActionsList($"Error checking LEDs: {ex.Message} {Level.ERROR}");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -25,13 +25,13 @@ namespace AiQ_GUI
|
||||
else if (Type == "Audit")
|
||||
salt = Auditsalt;
|
||||
else
|
||||
return "Unrecognised challenge type: " + Type;
|
||||
return $"Unrecognised challenge type:{Level.ERROR}" + Type;
|
||||
|
||||
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
|
||||
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
|
||||
byte[] inputBytes = Encoding.UTF8.GetBytes(challenge + " " + salt); // SHA hash format challenge and salt with space between
|
||||
@@ -60,7 +60,7 @@ namespace AiQ_GUI
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
return "Error: Could not generate password " + ex.Message;
|
||||
return $"Error: Could not generate password{Level.ERROR}" + ex.Message;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -85,7 +85,7 @@ namespace AiQ_GUI
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
MainForm.Instance.AddToActionsList("Exception in FetchDevPassword: " + ex.Message);
|
||||
MainForm.Instance.AddToActionsList($"Exception in FetchDevPassword: {Level.ERROR}" + ex.Message);
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -32,7 +32,7 @@ namespace AiQ_GUI
|
||||
}
|
||||
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;
|
||||
@@ -48,31 +48,31 @@ namespace AiQ_GUI
|
||||
|
||||
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;
|
||||
}
|
||||
|
||||
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;
|
||||
}
|
||||
|
||||
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;
|
||||
}
|
||||
|
||||
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;
|
||||
}
|
||||
|
||||
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;
|
||||
}
|
||||
|
||||
|
||||
@@ -25,7 +25,7 @@ namespace AiQ_GUI
|
||||
}
|
||||
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;
|
||||
@@ -75,7 +75,7 @@ namespace AiQ_GUI
|
||||
}
|
||||
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)}"));
|
||||
@@ -170,7 +170,7 @@ namespace AiQ_GUI
|
||||
}
|
||||
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);
|
||||
@@ -323,7 +323,7 @@ namespace AiQ_GUI
|
||||
|
||||
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;
|
||||
}
|
||||
|
||||
@@ -378,7 +378,7 @@ namespace AiQ_GUI
|
||||
|
||||
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;
|
||||
}
|
||||
|
||||
@@ -387,7 +387,7 @@ namespace AiQ_GUI
|
||||
}
|
||||
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}");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
12
GoogleAPI.cs
12
GoogleAPI.cs
@@ -107,12 +107,12 @@ namespace AiQ_GUI
|
||||
}
|
||||
else
|
||||
{
|
||||
return "Last serial number not found";
|
||||
return $"Last serial number not found{Level.ERROR}";
|
||||
}
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
return $"ERROR: {ex.Message}";
|
||||
return $"ERROR: {ex.Message}{Level.ERROR}";
|
||||
}
|
||||
}
|
||||
|
||||
@@ -148,12 +148,12 @@ namespace AiQ_GUI
|
||||
}
|
||||
else
|
||||
{
|
||||
return "Serial number not found";
|
||||
return $"Serial number not found{Level.ERROR}";
|
||||
}
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
return $"ERROR: {ex.Message}";
|
||||
return $"ERROR: {ex.Message}{Level.ERROR}";
|
||||
}
|
||||
}
|
||||
|
||||
@@ -196,7 +196,7 @@ namespace AiQ_GUI
|
||||
}
|
||||
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)
|
||||
{
|
||||
return "Failed to update spreadsheet data, please check manually" + ex.Message;
|
||||
return $"Failed to update spreadsheet data, please check manually{Level.WARNING}" + ex.Message;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
10
Helper.cs
10
Helper.cs
@@ -83,26 +83,26 @@ namespace AiQ_GUI
|
||||
case 0:
|
||||
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;
|
||||
case 1:
|
||||
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;
|
||||
case 2:
|
||||
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;
|
||||
case 3:
|
||||
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;
|
||||
default:
|
||||
@@ -123,7 +123,7 @@ namespace AiQ_GUI
|
||||
}
|
||||
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;
|
||||
}
|
||||
|
||||
|
||||
4
LDS.cs
4
LDS.cs
@@ -30,7 +30,7 @@ namespace AiQ_GUI
|
||||
}
|
||||
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
|
||||
}
|
||||
}
|
||||
@@ -45,7 +45,7 @@ namespace AiQ_GUI
|
||||
}
|
||||
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}");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,4 +1,6 @@
|
||||
namespace AiQ_GUI
|
||||
using System.Diagnostics;
|
||||
|
||||
namespace AiQ_GUI
|
||||
{
|
||||
internal class Logging
|
||||
{
|
||||
|
||||
@@ -123,13 +123,13 @@ namespace AiQ_GUI
|
||||
int rowsAffected = cmd.ExecuteNonQuery();
|
||||
// Execute the command and get the number of rows affected
|
||||
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();
|
||||
}
|
||||
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;
|
||||
}
|
||||
}
|
||||
@@ -161,7 +161,7 @@ namespace AiQ_GUI
|
||||
conn.Close();
|
||||
|
||||
if (rows == 0)
|
||||
MainForm.Instance.AddToActionsList("No rows inserted into DiagsStats (unexpected).");
|
||||
MainForm.Instance.AddToActionsList($"No rows inserted into DiagsStats (unexpected).{Level.ERROR}");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -17,7 +17,7 @@ namespace AiQ_GUI
|
||||
}
|
||||
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
|
||||
{
|
||||
MainForm.Instance.AddToActionsList("Could not find spreadsheet :(");
|
||||
MainForm.Instance.AddToActionsList($"Could not find spreadsheet :( {Level.ERROR}");
|
||||
}
|
||||
return null;
|
||||
}
|
||||
@@ -40,7 +40,7 @@ namespace AiQ_GUI
|
||||
{
|
||||
if (!File.Exists(FilePath))
|
||||
{
|
||||
MainForm.Instance.AddToActionsList("Could not find spreadsheet :(");
|
||||
MainForm.Instance.AddToActionsList($"Could not find spreadsheet :( {Level.ERROR}");
|
||||
return -1;
|
||||
}
|
||||
|
||||
@@ -62,7 +62,7 @@ namespace AiQ_GUI
|
||||
{
|
||||
if (!File.Exists(FilePath))
|
||||
{
|
||||
MainForm.Instance.AddToActionsList("Could not find spreadsheet :(");
|
||||
MainForm.Instance.AddToActionsList($"Could not find spreadsheet :( {Level.ERROR}");
|
||||
return "Spreadsheet not found";
|
||||
}
|
||||
|
||||
@@ -114,7 +114,7 @@ namespace AiQ_GUI
|
||||
{
|
||||
if (!File.Exists(filePath))
|
||||
{
|
||||
MainForm.Instance.AddToActionsList("Could not find spreadsheet :(");
|
||||
MainForm.Instance.AddToActionsList($"Could not find spreadsheet :) {Level.ERROR}");
|
||||
return "Spreadsheet not found";
|
||||
}
|
||||
|
||||
@@ -150,7 +150,7 @@ namespace AiQ_GUI
|
||||
}
|
||||
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}";
|
||||
}
|
||||
}
|
||||
@@ -161,7 +161,7 @@ namespace AiQ_GUI
|
||||
{
|
||||
if (!File.Exists(FilePath))
|
||||
{
|
||||
MainForm.Instance.AddToActionsList("Could not find spreadsheet :(");
|
||||
MainForm.Instance.AddToActionsList($"Could not find spreadsheet :( {Level.ERROR}");
|
||||
return "Spreadsheet not found";
|
||||
}
|
||||
|
||||
@@ -202,8 +202,8 @@ namespace AiQ_GUI
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
MainForm.Instance.AddToActionsList("Error updating spreadsheet: " + ex.Message);
|
||||
return "Failed to update spreadsheet data, please check manually: " + ex.Message;
|
||||
MainForm.Instance.AddToActionsList($"Error updating spreadsheet: {Level.WARNING}" + 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))
|
||||
{
|
||||
MainForm.Instance.AddToActionsList("Could not find spreadsheet :(");
|
||||
return "Spreadsheet not found";
|
||||
MainForm.Instance.AddToActionsList($"Could not find spreadsheet :( {Level.ERROR}");
|
||||
return $"Spreadsheet not found{ Level.ERROR}"
|
||||
;
|
||||
}
|
||||
|
||||
using XLWorkbook workbook = new(FilePath);
|
||||
@@ -239,8 +240,8 @@ namespace AiQ_GUI
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
MainForm.Instance.AddToActionsList("Error updating Vaxtor spreadsheet: " + ex.Message);
|
||||
return "Failed to update spreadsheet data, please check manually: " + ex.Message;
|
||||
MainForm.Instance.AddToActionsList($"Error updating Vaxtor spreadsheet: {Level.WARNING}" + 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))
|
||||
{
|
||||
MainForm.Instance.AddToActionsList("Could not find RMA Control spreadsheet :(");
|
||||
MainForm.Instance.AddToActionsList($"Could not find RMA Control spreadsheet :({Level.ERROR}");
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -280,7 +281,7 @@ namespace AiQ_GUI
|
||||
}
|
||||
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
|
||||
@@ -292,7 +293,7 @@ namespace AiQ_GUI
|
||||
{
|
||||
if (!File.Exists(filePath))
|
||||
{
|
||||
MainForm.Instance.AddToActionsList("Could not find spreadsheet :(");
|
||||
MainForm.Instance.AddToActionsList($"Could not find spreadsheet :( {Level.ERROR}");
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -316,7 +317,7 @@ namespace AiQ_GUI
|
||||
}
|
||||
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;
|
||||
@@ -328,7 +329,7 @@ namespace AiQ_GUI
|
||||
{
|
||||
if (!File.Exists(filePath))
|
||||
{
|
||||
MainForm.Instance.AddToActionsList("Could not find spreadsheet :(");
|
||||
MainForm.Instance.AddToActionsList($"Could not find spreadsheet :({Level.ERROR}");
|
||||
return -1;
|
||||
}
|
||||
|
||||
@@ -343,7 +344,7 @@ namespace AiQ_GUI
|
||||
}
|
||||
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;
|
||||
}
|
||||
}
|
||||
|
||||
12
Network.cs
12
Network.cs
@@ -71,15 +71,15 @@ namespace AiQ_GUI
|
||||
}
|
||||
catch (TaskCanceledException ex)
|
||||
{
|
||||
return $"HTTP error calling {url}: {ex.Message}";
|
||||
return $"HTTP error calling {url}: {ex.Message}{Level.ERROR}";
|
||||
}
|
||||
catch (HttpRequestException ex)
|
||||
{
|
||||
return $"HTTP error calling {url}: {ex.Message}";
|
||||
return $"HTTP error calling {url}: {ex.Message}{Level.ERROR}";
|
||||
}
|
||||
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
|
||||
return reply.Status == IPStatus.Success;
|
||||
}
|
||||
catch (PingException ex) { MainForm.Instance.AddToActionsList($"PingException: Unable to ping {ipAddress}. Reason: {ex.Message}"); }
|
||||
catch (SocketException ex) { MainForm.Instance.AddToActionsList($"SocketException: Network error while pinging {ipAddress}. Reason: {ex.Message}"); }
|
||||
catch (Exception ex) { MainForm.Instance.AddToActionsList($"Unexpected error while pinging {ipAddress}: {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}{Level.ERROR}"); }
|
||||
catch (Exception ex) { MainForm.Instance.AddToActionsList($"Unexpected error while pinging {ipAddress}: {ex.Message}{Level.ERROR}"); }
|
||||
}
|
||||
|
||||
return false;
|
||||
|
||||
@@ -19,7 +19,7 @@ namespace AiQ_GUI
|
||||
}
|
||||
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();
|
||||
|
||||
MainForm.Instance.AddToActionsList("Switched user and logged in.");
|
||||
MainForm.Instance.AddToActionsList($"Switched user and logged in.{Level.Success}");
|
||||
}
|
||||
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);
|
||||
}
|
||||
|
||||
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)
|
||||
{
|
||||
MainForm.Instance.AddToActionsList("Failed to create ChromeDriver: " + ex.Message);
|
||||
MainForm.Instance.AddToActionsList($"Failed to create ChromeDriver: {Level.ERROR}" + ex.Message);
|
||||
throw;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -37,7 +37,7 @@ namespace AiQ_GUI
|
||||
catch (Exception ex)
|
||||
{
|
||||
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
|
||||
await Task.Delay(TimeSpan.FromSeconds(10), token);
|
||||
@@ -52,7 +52,7 @@ namespace AiQ_GUI
|
||||
}
|
||||
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;
|
||||
}
|
||||
|
||||
@@ -84,7 +84,7 @@ namespace AiQ_GUI
|
||||
// Retry ping until camera responds or cancelled
|
||||
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
|
||||
}
|
||||
|
||||
@@ -98,7 +98,7 @@ namespace AiQ_GUI
|
||||
}
|
||||
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)
|
||||
{
|
||||
SoakError($"ImageCheck failed: {ex.Message}", SoakLogFile, CamInfo.CheckBox);
|
||||
SoakError($"ImageCheck failed: {Level.ERROR}{Level.ERROR} {ex.Message}", SoakLogFile, CamInfo.CheckBox);
|
||||
}
|
||||
lastHour = currentHour;
|
||||
}
|
||||
@@ -131,7 +131,7 @@ namespace AiQ_GUI
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
SoakError($"ChangeRandomDropdown failed: {ex.Message}", SoakLogFile, CamInfo.CheckBox);
|
||||
SoakError($"ChangeRandomDropdown failed: {Level.WARNING} {ex.Message}", SoakLogFile, CamInfo.CheckBox);
|
||||
}
|
||||
|
||||
try
|
||||
@@ -184,13 +184,13 @@ namespace AiQ_GUI
|
||||
}
|
||||
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
|
||||
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
|
||||
{
|
||||
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);
|
||||
}
|
||||
else
|
||||
MainForm.Instance.AddToActionsList($"Failed to link or delete PDFs");
|
||||
MainForm.Instance.AddToActionsList($"Failed to link or delete PDFs {Level.ERROR}");
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
@@ -226,7 +226,7 @@ namespace AiQ_GUI
|
||||
if (ImageBright == null)
|
||||
{
|
||||
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;
|
||||
}
|
||||
|
||||
@@ -240,7 +240,7 @@ namespace AiQ_GUI
|
||||
if (ImageDark == null)
|
||||
{
|
||||
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;
|
||||
}
|
||||
|
||||
@@ -251,7 +251,7 @@ namespace AiQ_GUI
|
||||
if (Bright_Lum < Dark_Lum * 1.01)
|
||||
{
|
||||
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,
|
||||
CamInfo.CheckBox
|
||||
);
|
||||
|
||||
Reference in New Issue
Block a user