Compare commits
13 Commits
c18514802c
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
| 791cee91d2 | |||
| 00b225a3db | |||
| e94a1f1f5c | |||
| a91c3b846f | |||
| 42a4778555 | |||
| 3d71ab7e9b | |||
| 78c440ab76 | |||
| dd8e87258f | |||
| 1c89cf2847 | |||
| f95e958ffb | |||
| 95fb5d6ab8 | |||
| b59d023887 | |||
| a2f86625be |
43
AiQ_GUI.Designer.cs
generated
43
AiQ_GUI.Designer.cs
generated
@@ -144,6 +144,8 @@ namespace AiQ_GUI
|
||||
BtnZoom8000 = new Button();
|
||||
BtnZoomWide = new Button();
|
||||
TabSettings = new TabPage();
|
||||
BtnUploadWonwooSetIR = new Button();
|
||||
BtnUploadWonwooSetOV = new Button();
|
||||
BtnAdminStart = new Button();
|
||||
BtnFirewall = new Button();
|
||||
TabImages = new TabPage();
|
||||
@@ -270,7 +272,7 @@ namespace AiQ_GUI
|
||||
CbBxUserName.Font = new Font("Segoe UI Semibold", 10F, FontStyle.Bold);
|
||||
CbBxUserName.ForeColor = SystemColors.Control;
|
||||
CbBxUserName.FormattingEnabled = true;
|
||||
CbBxUserName.Items.AddRange(new object[] { "Guest", "Clive", "Conor", "Charlie", "Henry", "Sam C", "Sam L", "Simon", "Toby", "Tom" });
|
||||
CbBxUserName.Items.AddRange(new object[] { "Guest", "Clive", "Conor", "Charlie", "Henry", "Sam C", "Sam L", "Simon", "Sophie", "Toby", "Tom" });
|
||||
CbBxUserName.Location = new Point(10, 262);
|
||||
CbBxUserName.Margin = new Padding(4, 3, 4, 3);
|
||||
CbBxUserName.MaxDropDownItems = 20;
|
||||
@@ -587,6 +589,7 @@ namespace AiQ_GUI
|
||||
BtnTest.TabIndex = 189;
|
||||
BtnTest.Text = "Test";
|
||||
BtnTest.UseVisualStyleBackColor = false;
|
||||
BtnTest.Visible = false;
|
||||
BtnTest.Click += BtnTest_Click;
|
||||
//
|
||||
// PicBxIRF2
|
||||
@@ -1835,6 +1838,8 @@ namespace AiQ_GUI
|
||||
// TabSettings
|
||||
//
|
||||
TabSettings.BackColor = Color.FromArgb(39, 37, 55);
|
||||
TabSettings.Controls.Add(BtnUploadWonwooSetIR);
|
||||
TabSettings.Controls.Add(BtnUploadWonwooSetOV);
|
||||
TabSettings.Controls.Add(BtnAdminStart);
|
||||
TabSettings.Controls.Add(BtnFirewall);
|
||||
TabSettings.Controls.Add(PanelSettings);
|
||||
@@ -1845,6 +1850,40 @@ namespace AiQ_GUI
|
||||
TabSettings.TabIndex = 3;
|
||||
TabSettings.Text = "Settings";
|
||||
//
|
||||
// BtnUploadWonwooSetIR
|
||||
//
|
||||
BtnUploadWonwooSetIR.BackColor = Color.FromArgb(70, 65, 80);
|
||||
BtnUploadWonwooSetIR.FlatAppearance.BorderColor = Color.FromArgb(70, 65, 80);
|
||||
BtnUploadWonwooSetIR.FlatAppearance.BorderSize = 0;
|
||||
BtnUploadWonwooSetIR.FlatStyle = FlatStyle.Flat;
|
||||
BtnUploadWonwooSetIR.Font = new Font("Segoe UI Semibold", 10F, FontStyle.Bold);
|
||||
BtnUploadWonwooSetIR.ForeColor = SystemColors.Control;
|
||||
BtnUploadWonwooSetIR.Location = new Point(210, 304);
|
||||
BtnUploadWonwooSetIR.Margin = new Padding(4, 3, 4, 3);
|
||||
BtnUploadWonwooSetIR.Name = "BtnUploadWonwooSetIR";
|
||||
BtnUploadWonwooSetIR.Size = new Size(180, 49);
|
||||
BtnUploadWonwooSetIR.TabIndex = 244;
|
||||
BtnUploadWonwooSetIR.Text = "Upload Wonwoo Settings IR";
|
||||
BtnUploadWonwooSetIR.UseVisualStyleBackColor = false;
|
||||
BtnUploadWonwooSetIR.Click += UploadWonwooSetIR_Click;
|
||||
//
|
||||
// BtnUploadWonwooSetOV
|
||||
//
|
||||
BtnUploadWonwooSetOV.BackColor = Color.FromArgb(70, 65, 80);
|
||||
BtnUploadWonwooSetOV.FlatAppearance.BorderColor = Color.FromArgb(70, 65, 80);
|
||||
BtnUploadWonwooSetOV.FlatAppearance.BorderSize = 0;
|
||||
BtnUploadWonwooSetOV.FlatStyle = FlatStyle.Flat;
|
||||
BtnUploadWonwooSetOV.Font = new Font("Segoe UI Semibold", 10F, FontStyle.Bold);
|
||||
BtnUploadWonwooSetOV.ForeColor = SystemColors.Control;
|
||||
BtnUploadWonwooSetOV.Location = new Point(19, 304);
|
||||
BtnUploadWonwooSetOV.Margin = new Padding(4, 3, 4, 3);
|
||||
BtnUploadWonwooSetOV.Name = "BtnUploadWonwooSetOV";
|
||||
BtnUploadWonwooSetOV.Size = new Size(181, 49);
|
||||
BtnUploadWonwooSetOV.TabIndex = 243;
|
||||
BtnUploadWonwooSetOV.Text = "Upload Wonwoo Settings OV";
|
||||
BtnUploadWonwooSetOV.UseVisualStyleBackColor = false;
|
||||
BtnUploadWonwooSetOV.Click += UploadWonwooSetOV_Click;
|
||||
//
|
||||
// BtnAdminStart
|
||||
//
|
||||
BtnAdminStart.BackColor = Color.FromArgb(70, 65, 80);
|
||||
@@ -2210,5 +2249,7 @@ namespace AiQ_GUI
|
||||
private Button BtnAdminStart;
|
||||
private Button SetGodModeAll;
|
||||
private Button BtnFactoryDefault;
|
||||
private Button BtnUploadWonwooSetOV;
|
||||
private Button BtnUploadWonwooSetIR;
|
||||
}
|
||||
}
|
||||
|
||||
126
AiQ_GUI.cs
126
AiQ_GUI.cs
@@ -19,6 +19,8 @@ namespace AiQ_GUI
|
||||
private List<CancellationTokenSource> soakCtsList = [];
|
||||
private List<Task> soakTasks = [];
|
||||
|
||||
public const string GoogleDrivePath = @"G:\Shared drives\MAV Production GUI's\AiQ\GUI's\";
|
||||
|
||||
// Colours
|
||||
public static readonly Color BtnColour = Color.FromArgb(70, 65, 80);
|
||||
public static readonly Color TxBxColour = Color.FromArgb(53, 51, 64);
|
||||
@@ -103,7 +105,7 @@ namespace AiQ_GUI
|
||||
CbBxIris.SelectedIndex = lds.Iris;
|
||||
CbBxGain.SelectedIndex = lds.Gain;
|
||||
|
||||
if (lds.User == "Bradley")
|
||||
if (lds.User == "Bradley" || lds.User == "Sophie")
|
||||
BtnTest.Visible = true;
|
||||
|
||||
TxBxCheckValid(TxBxPsuIP); // Set save button color if valid
|
||||
@@ -199,6 +201,7 @@ namespace AiQ_GUI
|
||||
if (!LEDreply.Contains("Power levels set successfully"))
|
||||
AddToActionsList($"LED level could not be set: {LEDreply}");
|
||||
}
|
||||
await FlexiAPI.SetVaxtorMinMaxPlate(CamOnTest.IP);
|
||||
|
||||
DateTime PCTime = DateTime.Now; // Grab PC time as close to the API as possible to pass onto PDF later
|
||||
|
||||
@@ -218,10 +221,7 @@ namespace AiQ_GUI
|
||||
// If there are any actions identified then fail the test.
|
||||
// If any labels are red then fail. Only labels in panel so can foreach on labels not controls
|
||||
if (RhTxBxActions.Text.Length > 2 || PnlLbls.Controls.OfType<Label>().Any(c => c.ForeColor == Color.Red) == true)
|
||||
await TestFailed(BtnStartTest, "Failed due to action box text and/or red label");// If approved then pass otherwise GUI would have restarted before getting to TestPassed.
|
||||
{
|
||||
await TestFailed(BtnStartTest, "Diagnostic Failure");// If approved then pass otherwise GUI would have restarted before getting to TestPassed.
|
||||
}
|
||||
|
||||
await TestPassed(PCTime);
|
||||
}
|
||||
@@ -273,8 +273,8 @@ namespace AiQ_GUI
|
||||
await AllocateSerial();
|
||||
else if (GoogleAPI.UpdateSpreadSheetRePreTest(CameraAccessInfo.SpreadsheetID, Vers) != "OK") // If rerun might be different values so update SS
|
||||
AddToActionsList("Failed to write to spreadsheet, please check manually");
|
||||
// else if (Excel.UpdateSpreadSheetPreTest(CameraAccessInfo.SpreadsheetID, Vers, CamOnTest.GetCamDesc(), CamOnTest.Model) != "OK")
|
||||
// AddToActionsList("Failed to write to spreadsheet, please check manually");
|
||||
// else if (Excel.UpdateSpreadSheetPreTest(CameraAccessInfo.SpreadsheetID, Vers, CamOnTest.GetCamDesc(), CamOnTest.Model) != "OK")
|
||||
// AddToActionsList("Failed to write to spreadsheet, please check manually");
|
||||
}
|
||||
else // No serial or model so allocate one
|
||||
await AllocateSerial();
|
||||
@@ -306,7 +306,7 @@ namespace AiQ_GUI
|
||||
{
|
||||
// Turn off God mode
|
||||
string[,] GOD_JSON = { { "propGodMode", "false" } };
|
||||
string IntConf = await FlexiAPI.HTTP_Update("Internal Config", CamOnTest.IP, GOD_JSON);
|
||||
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");
|
||||
|
||||
@@ -352,6 +352,7 @@ namespace AiQ_GUI
|
||||
// Indicators to the user the test has failed
|
||||
Btn.BackColor = Color.Maroon;
|
||||
Btn.Text = "Test Failed";
|
||||
|
||||
if (!(CamOnTest.RMANum != 0)) // Yap to check if it is not a RMA
|
||||
{
|
||||
Access.Stats(["Final Tests Failed", ErrMssg], CamOnTest.Model);
|
||||
@@ -370,7 +371,6 @@ namespace AiQ_GUI
|
||||
|
||||
Access.StatsDiags(RedLbls, RhTxBxActions.Text, CamOnTest.Model); // Log to Access database
|
||||
|
||||
|
||||
if (await DisplayQuestion("Test failed, appeal?" + Environment.NewLine + "See Actions textbox for details."))
|
||||
{
|
||||
if (CbBxUserName.Text == "Bradley")
|
||||
@@ -387,9 +387,6 @@ namespace AiQ_GUI
|
||||
// Joins the actions box to any red labels to use as a full failed text
|
||||
Logging.LogErrorMessage(FullFailureValues);
|
||||
|
||||
|
||||
Logging.LogErrorMessage(FullFailureValues);
|
||||
|
||||
IList<IList<object>> values = GoogleAPI.service.Spreadsheets.Values.Get(GoogleAPI.spreadsheetId_ModelInfo, "'Approval'!A1:A").Execute().Values;
|
||||
|
||||
if (values?.Count > 0)
|
||||
@@ -402,15 +399,14 @@ namespace AiQ_GUI
|
||||
List<object> oblistCD = [CamOnTest.Model, FullFailureValues];
|
||||
GoogleAPI.WriteToSS(oblistCD, "'Approval'!C" + nextRow + ":D" + nextRow, GoogleAPI.spreadsheetId_ModelInfo);
|
||||
|
||||
//await Teams.SendMssg(Convert.ToString(nextRow), CbBxUserName.Text);
|
||||
GoogleAPI.EmailApproval(Convert.ToString(nextRow), CbBxUserName.Text);
|
||||
await Teams.SendMssg(Convert.ToString(nextRow), CbBxUserName.Text);
|
||||
//GoogleAPI.EmailApproval(Convert.ToString(nextRow), CbBxUserName.Text);
|
||||
|
||||
string Approved = "";
|
||||
|
||||
while (Approved != "TRUE")
|
||||
{
|
||||
await Task.Delay(1000);
|
||||
|
||||
values = GoogleAPI.service.Spreadsheets.Values.Get(GoogleAPI.spreadsheetId_ModelInfo, "'Approval'!B" + nextRow).Execute().Values;
|
||||
|
||||
if (values?.Count > 0)
|
||||
@@ -442,14 +438,11 @@ namespace AiQ_GUI
|
||||
PnlQuestion.Visible = true;
|
||||
BtnNo.Visible = false;
|
||||
Logging.LogMessage("Pre Test Passed");
|
||||
|
||||
if (CamOnTest.RMANum == 0) // Yap to check if it is not a RMA
|
||||
{
|
||||
Access.Stats("Pre Tests Passed", CamOnTest.Model);
|
||||
}
|
||||
else
|
||||
{
|
||||
Access.Stats("RMA Pre Tests Passed", CamOnTest.Model);
|
||||
}
|
||||
|
||||
if (await DisplayQuestion("Test passed, restart?"))
|
||||
Helper.RestartApp();
|
||||
@@ -464,13 +457,9 @@ namespace AiQ_GUI
|
||||
Logging.LogMessage("Pre Test Failed");
|
||||
|
||||
if (CamOnTest.RMANum == 0) // Yap to check if it is not a RMA
|
||||
{
|
||||
Access.Stats(["Pre Tests Failed", ErrMssg], CamOnTest.Model);
|
||||
}
|
||||
else
|
||||
{
|
||||
Access.Stats("RMA Pre Tests Failed", CamOnTest.Model);
|
||||
}
|
||||
|
||||
string RedLbls = string.Join(Environment.NewLine, PnlLbls.Controls
|
||||
.OfType<Label>()
|
||||
@@ -782,7 +771,7 @@ namespace AiQ_GUI
|
||||
private async void BtnFindCams_Click(object sender, EventArgs e)
|
||||
{
|
||||
CbBxFoundCams.Text = "Searching";
|
||||
BtnFindCams.Enabled = BtnSetAll211.Enabled = BtnSoak.Enabled = BtnSet211.Enabled = BtnSetGodMode.Enabled = BtnUploadBlob.Enabled = SetGodModeAll.Enabled = BtnFactoryDefault.Enabled = false;
|
||||
BtnFindCams.Enabled = BtnSetAll211.Enabled = BtnSoak.Enabled = BtnSet211.Enabled = BtnSetGodMode.Enabled = BtnUploadBlob.Enabled = SetGodModeAll.Enabled = BtnFactoryDefault.Enabled = BtnUploadWonwooSetIR.Enabled = BtnUploadWonwooSetOV.Enabled = false;
|
||||
BtnSetGodMode.BackColor = BtnUploadBlob.BackColor = BtnFactoryDefault.BackColor = BtnSetAll211.BackColor = BtnColour;
|
||||
CbBxFoundCams.Items.Clear();
|
||||
soakCameraList.Clear();
|
||||
@@ -898,7 +887,7 @@ namespace AiQ_GUI
|
||||
else
|
||||
{
|
||||
CbBxFoundCams.BackColor = Color.Red;
|
||||
BtnSecret.Enabled = BtnOpenWebpage.Enabled = BtnSet211.Enabled = BtnSetGodMode.Enabled = false;
|
||||
BtnSecret.Enabled = BtnOpenWebpage.Enabled = BtnSet211.Enabled = BtnSetGodMode.Enabled = BtnUploadWonwooSetIR.Enabled = BtnUploadWonwooSetOV.Enabled = false;
|
||||
}
|
||||
|
||||
TestStartConditions();
|
||||
@@ -937,7 +926,7 @@ namespace AiQ_GUI
|
||||
|
||||
try
|
||||
{
|
||||
await FlexiAPI.HTTP_Update("Internal Config", CamOnTest.IP, GOD_JSON);
|
||||
await FlexiAPI.HTTP_Update("GLOBAL--FlexiApplication", CamOnTest.IP, GOD_JSON);
|
||||
BtnSetGodMode.Text = newGodModeValue == "true" ? "Set God Mode Off" : "Set God Mode On";
|
||||
BtnSetGodMode.BackColor = Color.Green;
|
||||
}
|
||||
@@ -983,7 +972,7 @@ namespace AiQ_GUI
|
||||
if (CbBxFoundCams.BackColor != BtnColour || CbBxFoundCams.Text.Contains("Found"))
|
||||
TSC = SetInvalid("Select camera IP address.");
|
||||
else
|
||||
BtnOpenWebpage.Enabled = BtnSet211.Enabled = BtnSetGodMode.Enabled = BtnZoom8000.Enabled = BtnZoomWide.Enabled = true; // Allow user to go to camera webpage & change DHCP/211
|
||||
BtnOpenWebpage.Enabled = BtnSet211.Enabled = BtnSetGodMode.Enabled = BtnZoom8000.Enabled = BtnZoomWide.Enabled = BtnUploadWonwooSetIR.Enabled = BtnUploadWonwooSetOV.Enabled = true; // Allow user to go to camera webpage & change DHCP/211
|
||||
|
||||
// Name chosen
|
||||
if (CbBxUserName.Text == "Select Operator to Begin Test" || CbBxUserName.Text.Length < 2)
|
||||
@@ -1183,7 +1172,7 @@ namespace AiQ_GUI
|
||||
try
|
||||
{
|
||||
Network.Initialize("developer", SCL.DevPass); // Ensure network is initialized to the right camera
|
||||
string RESP = await FlexiAPI.HTTP_Update("Internal Config", SCL.IP, GOD_JSON);
|
||||
string RESP = await FlexiAPI.HTTP_Update("GLOBAL--FlexiApplication", SCL.IP, GOD_JSON);
|
||||
Instance.AddToActionsList($"Setting God mode for camera {SCL.IP} to {newGodModeValue}", false);
|
||||
}
|
||||
catch (Exception ex)
|
||||
@@ -1500,6 +1489,16 @@ namespace AiQ_GUI
|
||||
Process.Start(psi);
|
||||
}
|
||||
|
||||
private async void UploadWonwooSetOV_Click(object sender, EventArgs e)
|
||||
{
|
||||
await FlexiAPI.UploadWonwooSet(CbBxFoundCams.Text, false); // false = Colour
|
||||
}
|
||||
|
||||
private async void UploadWonwooSetIR_Click(object sender, EventArgs e)
|
||||
{
|
||||
await FlexiAPI.UploadWonwooSet(CbBxFoundCams.Text, true); // true = Infrared
|
||||
}
|
||||
|
||||
private void TxBxSerialPrint_Click(object sender, EventArgs e)
|
||||
{
|
||||
if (TxBxSerialPrint.Text == "K – – – – – – –") // If at default then remove the dashes ready for user to put in number
|
||||
@@ -1576,7 +1575,7 @@ namespace AiQ_GUI
|
||||
CancellationTokenSource cts = new();
|
||||
soakCtsList.Add(cts);
|
||||
soakTasks.Add(SoakTest.StartSoak(SCL, cts.Token));
|
||||
await Task.Delay(5000);
|
||||
await Task.Delay(10000);
|
||||
}
|
||||
}
|
||||
else
|
||||
@@ -1587,14 +1586,44 @@ namespace AiQ_GUI
|
||||
cts.Cancel();
|
||||
soakCtsList.Clear();
|
||||
soakTasks.Clear();
|
||||
int i = soakCameraList.Count + 1; // Add 1 for 211 itself staying in the list
|
||||
|
||||
foreach (Camera SCL in soakCameraList) // Reset all cameras that were being soaked to default module settings
|
||||
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" } };
|
||||
foreach (Camera SCL in soakCameraList.Where(c => c.IsChecked)) // only checked cameras
|
||||
{
|
||||
if (!SCL.IsChecked)
|
||||
continue;
|
||||
try
|
||||
{
|
||||
AddToActionsList($"Setting 211 & God Mode off for camera {SCL.IP}", false);
|
||||
Network.Initialize("developer", SCL.DevPass); // Ensure network is initialized to the right camera
|
||||
await CameraModules.FactoryResetModules(SCL.IP); // Reset camera modules
|
||||
|
||||
Network.Initialize("developer", SCL.DevPass); // Ensure network is initialized to the right camera, cannot be done in soak test finally becuase of this.
|
||||
await CameraModules.FactoryResetModules(SCL.IP);
|
||||
string GOD = await FlexiAPI.HTTP_Update("GLOBAL--FlexiApplication", SCL.IP, GOD_JSON);
|
||||
if (GOD.Contains("Error"))
|
||||
throw new Exception("Could not set God mode off");
|
||||
|
||||
// Update GLOBAL--NetworkConfig with fixed IP and turn off DHCP
|
||||
await FlexiAPI.HTTP_Update("GLOBAL--NetworkConfig", SCL.IP, Network_JSON);
|
||||
i--; // Decriment count becuase they will stack into 211
|
||||
}
|
||||
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
|
||||
}
|
||||
}
|
||||
|
||||
await Task.Delay(5000); // Wait for 5 seconds to allow the camera to restart
|
||||
IList<string> FoundCams = await Network.SearchForCams(); // Have to check via broadcast becuase Ping sometimes fails across subnets
|
||||
|
||||
if ((FoundCams.Count == i && FoundCams.Contains("192.168.1.211")) || FoundCams.Count == 1)
|
||||
{
|
||||
AddToActionsList("All cameras successfully changed to 211.", false);
|
||||
}
|
||||
else
|
||||
{
|
||||
AddToActionsList($"Some cameras failed: Found {FoundCams.Count}, expected {i}.", true);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1680,7 +1709,7 @@ namespace AiQ_GUI
|
||||
{
|
||||
string apiUrl = $"http://{cam.IP}/upload/software-update/2";
|
||||
Network.Initialize("developer", cam.DevPass);
|
||||
|
||||
await Task.Delay(1000); // Gives extra time to allow for Network to initialize
|
||||
AddToActionsList($"Uploading to {cam.IP}...", false);
|
||||
string result = await FlexiAPI.SendBlobFileUpload(apiUrl, fileToUpload, fileName);
|
||||
|
||||
@@ -1721,36 +1750,9 @@ namespace AiQ_GUI
|
||||
//StatsExcel excelExporter = new();
|
||||
//excelExporter.ExportDatabaseToExcel();
|
||||
|
||||
|
||||
//FakeCamera fakeCamera = new FakeCamera(80); // Create an instance of FakeCamera
|
||||
|
||||
////CamOnTest.IP = CbBxFoundCams.Text;
|
||||
//_ = fakeCamera.StartAsync(CAMTYPE.GOOD).ContinueWith(task =>
|
||||
//{
|
||||
// //Network.Initialize("developer", "Pass123");
|
||||
|
||||
// if (task.IsFaulted)
|
||||
// {
|
||||
// AddToActionsList("Error starting FakeCamera: " + task.Exception?.Message);
|
||||
// }
|
||||
// else
|
||||
// {
|
||||
// AddToActionsList($"FakeCamera started successfully. IP: {fakeCamera}", false);
|
||||
// }
|
||||
//});
|
||||
|
||||
//await Task.Delay(3000); // Wait for server to start
|
||||
//CbBxFoundCams.Text = "localhost"; // Should force update in creds an network reinit
|
||||
//CmBoFoundCams_TextChanged(sender, e);
|
||||
//CbBxCameraType.SelectedIndex = CbBxCameraType.Items.Count - 1; // Selects AB12CD as model number
|
||||
|
||||
//await Task.Delay(3000); // Wait for server to start
|
||||
|
||||
//BtnPreTest_Click(sender, e);
|
||||
|
||||
|
||||
Teams.SendMssg("10", "Test User");
|
||||
|
||||
string ans = await FlexiAPI.HTTP_Fetch("GLOBAL--Device", "192.168.0.71");
|
||||
AddToActionsList(ans);
|
||||
// /api/config-ids - For getting all available config IDs
|
||||
|
||||
stopWatchTest.Stop();
|
||||
AddToActionsList("RunTime " + stopWatchTest.Elapsed.ToString(@"hh\:mm\:ss\.ff"));
|
||||
|
||||
@@ -123,6 +123,9 @@
|
||||
<metadata name="ToolTipClipboard.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>159, 17</value>
|
||||
</metadata>
|
||||
<metadata name="ToolTipAvailable.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>17, 17</value>
|
||||
</metadata>
|
||||
<metadata name="TimerDDC.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>690, 19</value>
|
||||
</metadata>
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
<Product>AiQ GUI</Product>
|
||||
<Authors>MAV Systems Ltd</Authors>
|
||||
<PackageId>AiQ GUI</PackageId>
|
||||
<Version>4.0.0</Version>
|
||||
<Version>4.4.0</Version>
|
||||
<Description>A GUI to control and test the AiQ</Description>
|
||||
<Copyright>MAV Systems Ltd 2025</Copyright>
|
||||
<PackageIcon>MAV - Plain - Blue.png</PackageIcon>
|
||||
@@ -30,10 +30,20 @@
|
||||
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
|
||||
<Optimize>True</Optimize>
|
||||
<DefineConstants>$(DefineConstants);_PUBLISH_CHROMEDRIVER</DefineConstants>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'">
|
||||
<Optimize>True</Optimize>
|
||||
<DefineConstants>$(DefineConstants);_PUBLISH_CHROMEDRIVER</DefineConstants>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
|
||||
<DefineConstants>$(DefineConstants);_PUBLISH_CHROMEDRIVER</DefineConstants>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'">
|
||||
<DefineConstants>$(DefineConstants);_PUBLISH_CHROMEDRIVER</DefineConstants>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
@@ -51,9 +61,9 @@
|
||||
<PackageReference Include="PDFsharp-MigraDoc-gdi" Version="6.2.2" />
|
||||
<PackageReference Include="Selenium.Support" Version="4.38.0" />
|
||||
<PackageReference Include="Selenium.WebDriver" Version="4.38.0" />
|
||||
<PackageReference Include="Selenium.WebDriver.ChromeDriver" Version="141.0.7390.12200" />
|
||||
<PackageReference Include="SSH.NET" Version="2025.0.0" />
|
||||
<PackageReference Include="System.Data.OleDb" Version="9.0.10" />
|
||||
<PackageReference Include="Selenium.WebDriver.ChromeDriver" Version="142.0.7444.6100" />
|
||||
<PackageReference Include="SSH.NET" Version="2025.1.0" />
|
||||
<PackageReference Include="System.Data.OleDb" Version="10.0.0" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
||||
@@ -36,9 +36,9 @@ namespace AiQ_GUI
|
||||
{
|
||||
string JSONdata = BuildJsonUpdate(jsonArrayData, ID);
|
||||
JSONdata = JSONdata.Replace("\"14\"", "14").Replace("\"30\"", "30"); // Fixes & encoding issue
|
||||
MainForm.Instance.AddToActionsList(JSONdata);
|
||||
string url = $"http://{IPAddress}/api/update-config";
|
||||
return await Network.SendHttpRequest(url, HttpMethod.Post, 2, JSONdata);
|
||||
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
@@ -81,7 +81,7 @@ namespace AiQ_GUI
|
||||
// Always Infrared as LED's are controlled from infrared page
|
||||
// Level can be word eg. SAFE or hex eg. 0x0E
|
||||
string suffix = $"/Infrared/led-controls?power={LEVEL}";
|
||||
return await APIHTTPRequest(suffix, IPAddress);
|
||||
return await APIHTTPRequest(suffix, IPAddress, 5);
|
||||
}
|
||||
|
||||
public static async Task<string> SendBlobFileUpload(string url, string filePath, string fileName)
|
||||
@@ -162,6 +162,36 @@ namespace AiQ_GUI
|
||||
}
|
||||
}
|
||||
|
||||
public static async Task<bool> SetVaxtorMinMaxPlate(string IP)
|
||||
{
|
||||
try
|
||||
{
|
||||
// Build JSON array for Vaxtor min/max plate configuration
|
||||
string[,] Vaxtor_JSON = { { "propMinCharHeight", "14" }, { "propMaxCharHeight", "40" }, { "propMinGlobalConfidence", "30" } };
|
||||
string response = await HTTP_Update("RaptorOCR".Trim(), IP, Vaxtor_JSON);
|
||||
|
||||
// Treat "operation was canceled" as a successful apply
|
||||
if (response.Contains("The operation was canceled", StringComparison.OrdinalIgnoreCase))
|
||||
{
|
||||
Logging.LogMessage("SetVaxtorMinMaxPlate: Camera applied config but closed connection early (safe to ignore).");
|
||||
return true;
|
||||
}
|
||||
|
||||
if (response.Contains("error", StringComparison.OrdinalIgnoreCase))
|
||||
{
|
||||
MainForm.Instance.DisplayQuestion($"SetVaxtorMinMaxPlate: failed - Please set manually");
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
MainForm.Instance.AddToActionsList($"Could not set Vaxtor Plate height and min confidence: {ex.Message}");
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
public static async Task<bool> SetZoomLockOn(string IP)
|
||||
{
|
||||
// Set Zoomlock on and if it fails ask user to set it manually
|
||||
@@ -207,8 +237,7 @@ namespace AiQ_GUI
|
||||
}
|
||||
|
||||
// Check no value is -1 (no plate found) or if the positions are identical (one plate found). If it is then try again 3 times
|
||||
if (new[] { trim.infraredX, trim.infraredY, trim.colourX, trim.colourY }.Any(value => value == -1)
|
||||
|| (trim.infraredX == trim.colourX && trim.infraredY == trim.colourY))
|
||||
if (new[] { trim.infraredX, trim.infraredY, trim.colourX, trim.colourY }.Any(value => value == -1) || (trim.infraredX == trim.colourX && trim.infraredY == trim.colourY))
|
||||
{
|
||||
if (RetryCount >= 3)
|
||||
{
|
||||
@@ -217,7 +246,7 @@ namespace AiQ_GUI
|
||||
}
|
||||
|
||||
await Task.Delay(5000); // Give 5 second delay for it to see a plate
|
||||
await SetTrim(IPAddress, LblTxt, RetryCount++);
|
||||
await SetTrim(IPAddress, LblTxt, RetryCount + 1);
|
||||
}
|
||||
|
||||
int offset = 105;
|
||||
@@ -248,7 +277,7 @@ namespace AiQ_GUI
|
||||
return;
|
||||
}
|
||||
await Task.Delay(5000); // Give 5 second delay for it to see a plate
|
||||
await SetTrim(IPAddress, LblTxt, RetryCount++);
|
||||
await SetTrim(IPAddress, LblTxt, RetryCount + 1);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -325,11 +354,86 @@ namespace AiQ_GUI
|
||||
}
|
||||
|
||||
// Change network settings to DHCP and restart camera for it to take effect
|
||||
public async static Task ChangeNetworkToDHCP(string IPAddress)
|
||||
public async static Task<bool> ChangeNetworkToDHCP(string IPAddress)
|
||||
{
|
||||
string[,] TEST_JSON = { { "propDHCP", "true" } }; // Update GLOBAL--NetworkConfig with fixed IP and turn off DHCP
|
||||
await HTTP_Update("GLOBAL--NetworkConfig", IPAddress, TEST_JSON);
|
||||
// TODO - Check if this worked, if not return false
|
||||
string[,] TEST_JSON = { { "propDHCP", "true" } };
|
||||
await HTTP_Update("GLOBAL--NetworkConfig", IPAddress, TEST_JSON); // Don't care about response because it will fail as it has changed IP.
|
||||
|
||||
await Task.Delay(5000); // Wait for 5 seconds to allow the camera to restart
|
||||
IList<string> FoundCams = await Network.SearchForCams();
|
||||
|
||||
if (FoundCams.Contains("192.168.1.211"))
|
||||
{
|
||||
MainForm.Instance.AddToActionsList("Could not set camera to DHCP please check camera.");
|
||||
return false;
|
||||
}
|
||||
|
||||
MainForm.Instance.AddToActionsList("Camera successfully set to DHCP.");
|
||||
return true;
|
||||
}
|
||||
|
||||
public static async Task UploadWonwooSet(string ipAddress, bool isIR)
|
||||
{
|
||||
string fileToUpload = null;
|
||||
|
||||
using OpenFileDialog openFileDialog1 = new()
|
||||
{
|
||||
InitialDirectory = MainForm.GoogleDrivePath,
|
||||
Filter = "CSV files (*.csv)|*.csv",
|
||||
FilterIndex = 0
|
||||
};
|
||||
|
||||
if (openFileDialog1.ShowDialog() == DialogResult.OK)
|
||||
fileToUpload = openFileDialog1.FileName;
|
||||
else
|
||||
{
|
||||
MainForm.Instance.AddToActionsList("File selection cancelled.", false);
|
||||
return;
|
||||
}
|
||||
|
||||
//Filename validation
|
||||
string filename = Path.GetFileName(fileToUpload).ToUpper();
|
||||
|
||||
if ((isIR && !filename.Contains("IR")) || (!isIR && !filename.Contains("OV")))
|
||||
{
|
||||
MainForm.Instance.AddToActionsList($"Incorrect file selected. Expected {(isIR ? "IR" : "OV")} file", false);
|
||||
return;
|
||||
}
|
||||
|
||||
string[] lines = File.ReadAllLines(fileToUpload);
|
||||
|
||||
for (int i = 1; i < lines.Length; i++)
|
||||
{
|
||||
string[] parts = lines[i].Split(',').Select(p => p.Trim()).ToArray();
|
||||
|
||||
if (parts.Length < 3)
|
||||
{
|
||||
MainForm.Instance.AddToActionsList($"Invalid row format at line {i + 1}", false);
|
||||
continue;
|
||||
}
|
||||
|
||||
string name = parts[0];
|
||||
string command = parts[1];
|
||||
string expectedResponse = parts[2];
|
||||
|
||||
// VISCA format check
|
||||
if (!RegexCache.VISCAAPIRegex().IsMatch(command))
|
||||
{
|
||||
MainForm.Instance.AddToActionsList($"{name}: Invalid VISCA command ({command})", false);
|
||||
continue; // do not send it if bad
|
||||
}
|
||||
|
||||
string result = await APIHTTPVISCA(ipAddress, command, isIR);
|
||||
|
||||
if (result.Contains(expectedResponse))
|
||||
MainForm.Instance.AddToActionsList($"{name}: Success ({(isIR ? "IR" : "Colour")})", true);
|
||||
else
|
||||
MainForm.Instance.AddToActionsList($"{name}: Unexpected response ({result})", false);
|
||||
|
||||
await Task.Delay(150);
|
||||
}
|
||||
|
||||
MainForm.Instance.AddToActionsList($"Upload complete ({(isIR ? "IR" : "Colour")}).", true);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -406,5 +510,13 @@ namespace AiQ_GUI
|
||||
public class Property
|
||||
{
|
||||
public string Value { get; set; } = string.Empty;
|
||||
public string datatype { get; set; }
|
||||
}
|
||||
public class VaxtorConfig
|
||||
{
|
||||
public string id { get; set; }
|
||||
public long configHash { get; set; }
|
||||
public Property propMinCharHeight { get; set; }
|
||||
public Property propMinGlobalConfidence { get; set; }
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"cameraName": "AiQ-ANPR-Camera",
|
||||
"version": "1.6.4",
|
||||
"revision": "bf16134",
|
||||
"version": "1.7.1",
|
||||
"revision": "4b63df5",
|
||||
"serialNumber": "K1005001",
|
||||
"modelNumber": "AB12CD",
|
||||
"MAC": "3C:6D:66:0A:BA:18",
|
||||
|
||||
@@ -293,7 +293,7 @@ namespace AiQ_GUI
|
||||
{
|
||||
await HTTPReplySetup(context, "Update successful.", 200, "text/plain");
|
||||
}
|
||||
else if (fo.Id == "Internal Config")
|
||||
else if (fo.Id == "GLOBAL--FlexiApplication")
|
||||
{
|
||||
string SerialNumber = "";
|
||||
string ModelNumber = "";
|
||||
|
||||
@@ -297,7 +297,7 @@ namespace AiQ_GUI
|
||||
}
|
||||
|
||||
// Build the MIME message with attachment
|
||||
using MailMessage mail = new MailMessage();
|
||||
using MailMessage mail = new();
|
||||
mail.From = new MailAddress("me");
|
||||
mail.To.Add("richard.porter@mav-systems.com");
|
||||
mail.To.Add("bradley.relyea@mav-systems.com");
|
||||
|
||||
2
LDS.cs
2
LDS.cs
@@ -35,7 +35,9 @@ namespace AiQ_GUI
|
||||
}
|
||||
catch // If file can't deserialise
|
||||
{
|
||||
MainForm.Instance.AddToActionsList("Error loading Local Data Store");
|
||||
return null; // Return null to indicate failure
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -14,154 +14,189 @@ namespace AiQ_GUI
|
||||
{
|
||||
MainForm.Instance.AddToActionsList("=== ExportDatabaseToExcel START ===");
|
||||
|
||||
using (OleDbConnection conn = new(Access.connString))
|
||||
using OleDbConnection conn = new(Access.connString);
|
||||
conn.Open();
|
||||
MainForm.Instance.AddToActionsList("Connected to Access database.");
|
||||
DateTime now = DateTime.Now;
|
||||
|
||||
// Read LastStatsRun from UniversalData (if any)
|
||||
DateTime? lastStatsRun = null;
|
||||
try
|
||||
{
|
||||
conn.Open();
|
||||
MainForm.Instance.AddToActionsList("Connected to Access database.");
|
||||
DateTime now = DateTime.Now;
|
||||
|
||||
// ==================== MAIN STATS EXPORT ====================
|
||||
string selectColumns = @"
|
||||
ModelNumber,
|
||||
[Total Tests Run],
|
||||
[Pre Tests Passed],
|
||||
[Pre Tests Failed],
|
||||
[Final Tests Passed],
|
||||
[Final Tests Failed],
|
||||
[RMA Total Tests Run],
|
||||
[RMA Pre Tests Passed],
|
||||
[RMA Pre Tests Failed],
|
||||
[RMA Final Tests Passed],
|
||||
[RMA Final Tests Failed],
|
||||
[Diagnostic Failure],
|
||||
[Failed To Set Model Or Serial Number],
|
||||
[Camera Not In Test Tube],
|
||||
[Could Not Zoom Modules To 8000],
|
||||
[Could Not Zoom Modules To Full Wide],
|
||||
[Please Get RMA Number From Operations Team Before Continuing],
|
||||
[Please Get A Valid Vaxtor Product Key Before Continuing],
|
||||
[Visual Test Fail - Sleeve Not Aligned],
|
||||
[Visual Test Fail - Not All Front Screws Fitted],
|
||||
[Visual Test Fail - Not All Rear Screws Fitted],
|
||||
[Visual Test Fail - Unit rattles]";
|
||||
|
||||
string query = $@"SELECT {selectColumns} FROM AiQ";
|
||||
|
||||
OleDbDataAdapter adapter = new(query, conn);
|
||||
DataTable dataTable = new();
|
||||
adapter.Fill(dataTable);
|
||||
|
||||
if (dataTable.Rows.Count == 0)
|
||||
using (OleDbCommand cmdPeriod = new OleDbCommand("SELECT LastStatsRun FROM UniversalData", conn))
|
||||
{
|
||||
MainForm.Instance.AddToActionsList("No data found in AiQ table.");
|
||||
return;
|
||||
object res = cmdPeriod.ExecuteScalar();
|
||||
if (res != null && res != DBNull.Value)
|
||||
lastStatsRun = (DateTime)res;
|
||||
}
|
||||
MainForm.Instance.AddToActionsList($"Fetched LastStatsRun: {(lastStatsRun.HasValue ? lastStatsRun.Value.ToString("yyyy-MM-dd HH:mm:ss") : "none")}");
|
||||
}
|
||||
catch (Exception periodEx)
|
||||
{
|
||||
MainForm.Instance.AddToActionsList($"Warning: could not read LastStatsRun. Details: {periodEx.Message}");
|
||||
}
|
||||
|
||||
string monthName = now.ToString("MMMM");
|
||||
string sheetName = $"{monthName} Stats";
|
||||
// ==================== MAIN STATS EXPORT ====================
|
||||
string selectColumns = @"
|
||||
ModelNumber,
|
||||
[Total Tests Run],
|
||||
[Pre Tests Passed],
|
||||
[Pre Tests Failed],
|
||||
[Final Tests Passed],
|
||||
[Final Tests Failed],
|
||||
[RMA Total Tests Run],
|
||||
[RMA Pre Tests Passed],
|
||||
[RMA Pre Tests Failed],
|
||||
[RMA Final Tests Passed],
|
||||
[RMA Final Tests Failed],
|
||||
[Diagnostic Failure],
|
||||
[Failed To Set Model Or Serial Number],
|
||||
[Camera Not In Test Tube],
|
||||
[Could Not Zoom Modules To 8000],
|
||||
[Could Not Zoom Modules To Full Wide],
|
||||
[Please Get RMA Number From Operations Team Before Continuing],
|
||||
[Please Get A Valid Vaxtor Product Key Before Continuing],
|
||||
[Visual Test Fail - Sleeve Not Aligned],
|
||||
[Visual Test Fail - Not All Front Screws Fitted],
|
||||
[Visual Test Fail - Not All Rear Screws Fitted],
|
||||
[Visual Test Fail - Unit rattles]";
|
||||
|
||||
MainForm.Instance.AddToActionsList($"Adding sheet: {sheetName}");
|
||||
string query = $@"
|
||||
SELECT
|
||||
{selectColumns}
|
||||
FROM AiQ";
|
||||
|
||||
XLWorkbook workbook;
|
||||
if (File.Exists(exportPath))
|
||||
{
|
||||
workbook = new XLWorkbook(exportPath);
|
||||
MainForm.Instance.AddToActionsList("Opened existing workbook.");
|
||||
}
|
||||
else
|
||||
{
|
||||
workbook = new XLWorkbook();
|
||||
MainForm.Instance.AddToActionsList("Created new workbook (file not found).");
|
||||
}
|
||||
OleDbDataAdapter adapter = new(query, conn);
|
||||
DataTable dataTable = new();
|
||||
adapter.Fill(dataTable);
|
||||
|
||||
if (workbook.Worksheets.Contains(sheetName))
|
||||
{
|
||||
workbook.Worksheet(sheetName).Delete();
|
||||
MainForm.Instance.AddToActionsList($"Deleted old sheet: {sheetName}");
|
||||
}
|
||||
if (dataTable.Rows.Count == 0)
|
||||
{
|
||||
MainForm.Instance.AddToActionsList("No data found in AiQ table.");
|
||||
return;
|
||||
}
|
||||
|
||||
IXLWorksheet ws = workbook.Worksheets.Add(sheetName);
|
||||
ws.Cell(1, 1).InsertTable(dataTable, "AiQ_Stats", true);
|
||||
ws.Columns().AdjustToContents();
|
||||
string monthName = now.ToString("MMMM");
|
||||
string sheetName = $"{monthName} Stats";
|
||||
|
||||
ws.Cell(1, dataTable.Columns.Count + 2).Value = "Exported:";
|
||||
ws.Cell(2, dataTable.Columns.Count + 2).Value = now.ToString("yyyy-MM-dd HH:mm:ss");
|
||||
MainForm.Instance.AddToActionsList($"Adding sheet: {sheetName}");
|
||||
|
||||
// ==================== DIAGS STATS EXPORT (CURRENT MONTH ONLY) ====================
|
||||
MainForm.Instance.AddToActionsList("Exporting DiagsStats for current month...");
|
||||
XLWorkbook workbook;
|
||||
if (File.Exists(exportPath))
|
||||
{
|
||||
workbook = new XLWorkbook(exportPath);
|
||||
MainForm.Instance.AddToActionsList("Opened existing workbook.");
|
||||
}
|
||||
else
|
||||
{
|
||||
workbook = new XLWorkbook();
|
||||
MainForm.Instance.AddToActionsList("Created new workbook (file not found).");
|
||||
}
|
||||
|
||||
DateTime monthStart = new(now.Year, now.Month, 1);
|
||||
DateTime nextMonth = monthStart.AddMonths(1);
|
||||
if (workbook.Worksheets.Contains(sheetName))
|
||||
{
|
||||
workbook.Worksheet(sheetName).Delete();
|
||||
MainForm.Instance.AddToActionsList($"Deleted old sheet: {sheetName}");
|
||||
}
|
||||
|
||||
string diagsQuery = @"
|
||||
IXLWorksheet ws = workbook.Worksheets.Add(sheetName);
|
||||
ws.Cell(1, 1).InsertTable(dataTable, "AiQ_Stats", true);
|
||||
ws.Columns().AdjustToContents();
|
||||
|
||||
// Write Data Period label and computed period string to the right of the table
|
||||
int infoCol = dataTable.Columns.Count + 2;
|
||||
ws.Cell(1, infoCol).Value = "Data Period";
|
||||
|
||||
string periodText;
|
||||
if (lastStatsRun.HasValue)
|
||||
{
|
||||
periodText = $"{lastStatsRun.Value:yyyy-MM-dd HH:mm:ss} - {now:yyyy-MM-dd HH:mm:ss}";
|
||||
}
|
||||
else
|
||||
{
|
||||
periodText = $"Up to {now:yyyy-MM-dd HH:mm:ss}";
|
||||
}
|
||||
|
||||
ws.Cell(2, infoCol).Value = periodText;
|
||||
|
||||
// ==================== DIAGS STATS EXPORT (CURRENT MONTH ONLY) ====================
|
||||
MainForm.Instance.AddToActionsList("Exporting DiagsStats for current month...");
|
||||
|
||||
DateTime monthStart = new(now.Year, now.Month, 1);
|
||||
DateTime nextMonth = monthStart.AddMonths(1);
|
||||
|
||||
string diagsQuery = @"
|
||||
SELECT
|
||||
[Date],
|
||||
[Model],
|
||||
[Red Diags Labels],
|
||||
[RhTxBxActions Contents]
|
||||
[RhTxBxActions Contents],
|
||||
[IsRma],
|
||||
[RMA]
|
||||
FROM DiagsStats
|
||||
WHERE [Date] >= ? AND [Date] < ?";
|
||||
|
||||
OleDbDataAdapter diagsAdapter = new(diagsQuery, conn);
|
||||
diagsAdapter.SelectCommand.Parameters.Add(new OleDbParameter { OleDbType = OleDbType.Date, Value = monthStart });
|
||||
diagsAdapter.SelectCommand.Parameters.Add(new OleDbParameter { OleDbType = OleDbType.Date, Value = nextMonth });
|
||||
using (OleDbCommand diagsCmd = new OleDbCommand(diagsQuery, conn))
|
||||
{
|
||||
diagsCmd.Parameters.Add(new OleDbParameter { OleDbType = OleDbType.Date, Value = monthStart });
|
||||
diagsCmd.Parameters.Add(new OleDbParameter { OleDbType = OleDbType.Date, Value = nextMonth });
|
||||
|
||||
DataTable diagsTable = new();
|
||||
diagsAdapter.Fill(diagsTable);
|
||||
|
||||
if (diagsTable.Rows.Count > 0)
|
||||
using (OleDbDataAdapter diagsAdapter = new OleDbDataAdapter(diagsCmd))
|
||||
{
|
||||
int startRow = ws.LastRowUsed().RowNumber() + 3;
|
||||
DataTable diagsTable = new();
|
||||
diagsAdapter.Fill(diagsTable);
|
||||
|
||||
ws.Cell(startRow, 1).Value = "Diags Stats (Current Month)";
|
||||
ws.Cell(startRow, 1).Style.Font.Bold = true;
|
||||
ws.Cell(startRow, 1).Style.Font.FontSize = 12;
|
||||
if (diagsTable.Rows.Count > 0)
|
||||
{
|
||||
int startRow = (ws.LastRowUsed()?.RowNumber() ?? 0) + 3;
|
||||
|
||||
ws.Cell(startRow + 1, 1).InsertTable(diagsTable, "Diags_Stats", true);
|
||||
ws.Columns().AdjustToContents();
|
||||
ws.Cell(startRow, 1).Value = "Diags Stats (Current Month)";
|
||||
ws.Cell(startRow, 1).Style.Font.Bold = true;
|
||||
ws.Cell(startRow, 1).Style.Font.FontSize = 12;
|
||||
|
||||
MainForm.Instance.AddToActionsList($"Added DiagsStats ({diagsTable.Rows.Count} rows) starting at row {startRow}.");
|
||||
}
|
||||
else
|
||||
{
|
||||
MainForm.Instance.AddToActionsList("No DiagsStats data found for current month.");
|
||||
ws.Cell(startRow + 1, 1).InsertTable(diagsTable, "Diags_Stats", true);
|
||||
ws.Columns().AdjustToContents();
|
||||
|
||||
MainForm.Instance.AddToActionsList($"Added DiagsStats ({diagsTable.Rows.Count} rows) starting at row {startRow}.");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// ==================== SAVE MAIN SHEET ====================
|
||||
workbook.SaveAs(exportPath);
|
||||
MainForm.Instance.AddToActionsList($"Added {sheetName} to workbook: {exportPath}");
|
||||
// ==================== SAVE MAIN SHEET ====================
|
||||
workbook.SaveAs(exportPath);
|
||||
MainForm.Instance.AddToActionsList($"Added {sheetName} to workbook: {exportPath}");
|
||||
|
||||
workbook.Dispose();
|
||||
workbook.Dispose();
|
||||
|
||||
// ==================== BACKUP TABLE (ALWAYS, BEFORE RESET) ====================
|
||||
string ts = now.ToString("yyyyMMdd_HHmmss");
|
||||
string backupTableName = $"Ztats_{ts}";
|
||||
// ==================== BACKUP TABLE (ALWAYS, BEFORE RESET) ====================
|
||||
string ts = now.ToString("yyyyMMdd_HHmmss");
|
||||
string backupTableName = $"Ztats_{ts}";
|
||||
|
||||
if (backupTableName.Length > 64)
|
||||
backupTableName = backupTableName.Substring(0, 64);
|
||||
if (backupTableName.Length > 64)
|
||||
backupTableName = backupTableName.Substring(0, 64);
|
||||
|
||||
string backupSql = $@"
|
||||
string backupSql = $@"
|
||||
SELECT
|
||||
{selectColumns}
|
||||
INTO [{backupTableName}]
|
||||
FROM AiQ";
|
||||
|
||||
try
|
||||
try
|
||||
{
|
||||
using (OleDbCommand cmdBackup = new(backupSql, conn))
|
||||
{
|
||||
using (OleDbCommand cmdBackup = new(backupSql, conn))
|
||||
{
|
||||
cmdBackup.ExecuteNonQuery();
|
||||
}
|
||||
MainForm.Instance.AddToActionsList($"Created backup table: [{backupTableName}]");
|
||||
}
|
||||
catch (Exception backupEx)
|
||||
{
|
||||
MainForm.Instance.AddToActionsList($"ERROR creating backup table [{backupTableName}]. Aborting reset to protect data. Details: {backupEx.Message}");
|
||||
MainForm.Instance.AddToActionsList("=== ExportDatabaseToExcel END (backup failed, no reset) ===");
|
||||
return;
|
||||
cmdBackup.ExecuteNonQuery();
|
||||
}
|
||||
MainForm.Instance.AddToActionsList($"Created backup table: [{backupTableName}]");
|
||||
}
|
||||
catch (Exception backupEx)
|
||||
{
|
||||
MainForm.Instance.AddToActionsList($"ERROR creating backup table [{backupTableName}]. Aborting reset to protect data. Details: {backupEx.Message}");
|
||||
MainForm.Instance.AddToActionsList("=== ExportDatabaseToExcel END (backup failed, no reset) ===");
|
||||
return;
|
||||
}
|
||||
|
||||
using OleDbTransaction tx = conn.BeginTransaction();
|
||||
using (OleDbTransaction tx = conn.BeginTransaction())
|
||||
{
|
||||
try
|
||||
{
|
||||
string resetSql = @"
|
||||
|
||||
@@ -7,9 +7,9 @@ namespace AiQ_GUI
|
||||
{
|
||||
const string webhookUrl = "https://default71bd136a1c65418fb59e927135629c.ac.environment.api.powerplatform.com:443/powerautomate/automations/direct/workflows/b27c5192e83f4f48b20c1b115985b0b3/triggers/manual/paths/invoke/?api-version=1&sp=%2Ftriggers%2Fmanual%2Frun&sv=1.0&sig=1-eCbYXms6xInRKHwz3tgAcdQ9x7CSjl3Yzw2V_1MlA";
|
||||
|
||||
public static async Task SendMssg(string ApprovalRow, string User) // Sometimes You will need to reauthenticate the workflow
|
||||
public static async Task SendMssg(string ApprovalRow, string User) // Sometimes You will need to reauthenticate the workflow
|
||||
{
|
||||
using HttpClient client = new HttpClient();
|
||||
using HttpClient client = new();
|
||||
|
||||
string link = $"https://docs.google.com/spreadsheets/d/1bCcCr4OYqfjmydt6UqtmN4FQETezXmZRSStJdCCcqZM/edit#gid=1931079354&range=A{ApprovalRow}"; // Has to be parsed like this as teams doesnt hyperlink otherwise
|
||||
|
||||
@@ -21,7 +21,7 @@ namespace AiQ_GUI
|
||||
};
|
||||
|
||||
string json = JsonConvert.SerializeObject(payload);
|
||||
StringContent content = new StringContent(json, Encoding.UTF8, "application/json");
|
||||
StringContent content = new(json, Encoding.UTF8, "application/json");
|
||||
|
||||
HttpResponseMessage response = await client.PostAsync(webhookUrl, content);
|
||||
}
|
||||
|
||||
22
Network.cs
22
Network.cs
@@ -10,7 +10,7 @@ namespace AiQ_GUI
|
||||
public static HttpClient? SingleHTTPClient;
|
||||
public static HttpClient Client => SingleHTTPClient ?? throw new InvalidOperationException("Client not initialized.");
|
||||
|
||||
public static void Initialize(string username, string password)
|
||||
public async static void Initialize(string username, string password)
|
||||
{
|
||||
HttpClientHandler handler = new()
|
||||
{
|
||||
@@ -23,6 +23,21 @@ namespace AiQ_GUI
|
||||
{
|
||||
Timeout = TimeSpan.FromSeconds(20)
|
||||
};
|
||||
|
||||
bool UP = false;
|
||||
int i = 0;
|
||||
|
||||
while (!UP)
|
||||
{
|
||||
UP = await PingIP("10.10.10.137");
|
||||
await Task.Delay(500);
|
||||
if (i >= 5)
|
||||
{
|
||||
//MainForm.Instance.AddToActionsList($"Could not initialise new network with USER: {username} & PSWD: {password}");
|
||||
return; // Try 5 times max
|
||||
}
|
||||
i++;
|
||||
}
|
||||
}
|
||||
|
||||
// Handles get and post to the camera API
|
||||
@@ -74,6 +89,7 @@ namespace AiQ_GUI
|
||||
{
|
||||
const int sendPort = 6666;
|
||||
const int receivePort = 6667;
|
||||
const int discoveryTimeoutMs = 1000;
|
||||
IList<string> FoundCams = [];
|
||||
|
||||
byte[] discoveryPacket = [0x50, 0x4f, 0x4c, 0x4c, 0xaf, 0xb0, 0xb3, 0xb3, 0xb6, 0x01, 0xa8, 0xc0, 0x0b, 0x1a, 0x00, 0x00];
|
||||
@@ -88,9 +104,9 @@ namespace AiQ_GUI
|
||||
}
|
||||
|
||||
using UdpClient receiver = new(receivePort); // Listen for replies on fixed port
|
||||
receiver.Client.ReceiveTimeout = 750;
|
||||
receiver.Client.ReceiveTimeout = discoveryTimeoutMs;
|
||||
|
||||
DateTime timeout = DateTime.Now.AddMilliseconds(750);
|
||||
DateTime timeout = DateTime.Now.AddMilliseconds(discoveryTimeoutMs);
|
||||
try
|
||||
{
|
||||
while (DateTime.Now < timeout)
|
||||
|
||||
@@ -39,6 +39,47 @@ namespace AiQ_GUI
|
||||
return elementID;
|
||||
}
|
||||
|
||||
public static void SwitchUser(ChromeDriver driver)
|
||||
{
|
||||
try
|
||||
{
|
||||
WebDriverWait wait = new(driver, TimeSpan.FromSeconds(10));
|
||||
|
||||
// Click "Switch User"
|
||||
IWebElement switchBtn = wait.Until(d =>
|
||||
d.FindElement(By.XPath("//*[contains(text(),'Switch User')]"))
|
||||
);
|
||||
switchBtn.Click();
|
||||
|
||||
// Username
|
||||
IWebElement userBox = wait.Until(d => d.FindElement(By.Id("username")));
|
||||
userBox.Clear();
|
||||
userBox.SendKeys("admin");
|
||||
|
||||
// Password
|
||||
IWebElement passBox = wait.Until(d => d.FindElement(By.Id("password")));
|
||||
passBox.Clear();
|
||||
passBox.SendKeys("admin");
|
||||
|
||||
// Login button
|
||||
IWebElement loginBtn = wait.Until(d =>
|
||||
d.FindElement(By.XPath("//button[contains(normalize-space(text()), 'Login')]"))
|
||||
);
|
||||
|
||||
// Wait until it's clickable manually (no SeleniumExtras)
|
||||
wait.Until(d => loginBtn.Displayed && loginBtn.Enabled);
|
||||
|
||||
loginBtn.Click();
|
||||
|
||||
MainForm.Instance.AddToActionsList("Switched user and logged in.");
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
MainForm.Instance.AddToActionsList("SwitchUser failed: " + ex.Message);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// Attempts to click the web element with the specified ID; refreshes the page and retries once if the initial attempt fails
|
||||
public static void ClickElementByID(string elementID, ChromeDriver driver, bool tryagain = true)
|
||||
{
|
||||
@@ -65,16 +106,39 @@ namespace AiQ_GUI
|
||||
// Initialises and opens a ChromeDriver with specific options
|
||||
public static ChromeDriver OpenDriver()
|
||||
{
|
||||
ChromeDriverService chromeDriverService = ChromeDriverService.CreateDefaultService();
|
||||
chromeDriverService.HideCommandPromptWindow = true;
|
||||
ChromeOptions options = new();
|
||||
options.AddArguments("--app=data:,", "--window-size=960,1040", "--window-position=0,0");
|
||||
options.AddExcludedArgument("enable-automation");
|
||||
options.AddAdditionalChromeOption("useAutomationExtension", false);
|
||||
string tempProfile = null;
|
||||
|
||||
ChromeDriver driver = new(chromeDriverService, options);
|
||||
driver.Manage().Timeouts().PageLoad = TimeSpan.FromSeconds(5);
|
||||
return driver;
|
||||
try
|
||||
{
|
||||
ChromeOptions options = new();
|
||||
options.AddArguments("--app=data:,",
|
||||
"--window-size=960,1040",
|
||||
"--window-position=0,0",
|
||||
"--no-sandbox",
|
||||
"--incognito",
|
||||
"--no-first-run",
|
||||
"--no-default-browser-check",
|
||||
"--disable-features=BrowserAddPersonFeature,InterestFeedContentSuggestions");
|
||||
|
||||
// Use a unique temporary profile to avoid conflicts
|
||||
tempProfile = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString());
|
||||
options.AddArguments($"--user-data-dir={tempProfile}");
|
||||
|
||||
// manual driver path
|
||||
string driverPath = @"C:\ProgramData\MAV\AiQ_GUI";
|
||||
ChromeDriverService service = ChromeDriverService.CreateDefaultService(driverPath);
|
||||
service.HideCommandPromptWindow = true;
|
||||
|
||||
ChromeDriver driver = new(service, options);
|
||||
driver.Manage().Timeouts().PageLoad = TimeSpan.FromSeconds(5);
|
||||
|
||||
return driver;
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
MainForm.Instance.AddToActionsList("Failed to create ChromeDriver: " + ex.Message);
|
||||
throw;
|
||||
}
|
||||
}
|
||||
|
||||
// Changes the value of a dropdown element by ID, logs the action, and verifies the result using flashline feedback
|
||||
|
||||
@@ -18,6 +18,7 @@ namespace AiQ_GUI
|
||||
try
|
||||
{
|
||||
driver = Selenium.OpenDriver();
|
||||
await Task.Delay(1000); // Small delay to ensure driver is ready
|
||||
|
||||
// Keep retrying until connected or cancelled
|
||||
bool connected = false;
|
||||
@@ -27,6 +28,7 @@ namespace AiQ_GUI
|
||||
{
|
||||
// Attempt initial connection and navigation to setup tab
|
||||
Selenium.GoToUrl($"http://{CamInfo.IP}", driver);
|
||||
Selenium.SwitchUser(driver);
|
||||
Selenium.ClickElementByID("tabSetup", driver);
|
||||
connected = true;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user