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