Mirror/AI-on-the-edge-device
1
0
Fork 0
mirror of https://github.com/jomjol/AI-on-the-edge-device.git synced 2025-12-10 13:36:54 +03:00
Code Issues Packages Projects Releases Wiki Activity

Enhance busy notification (#2774)

Browse Source 
* on marker updating, show message and retry until round got completed

* same for contrast enhancement

---------

Co-authored-by: CaCO3 <caco@ruinelli.ch>
This commit is contained in:
CaCO3
2023-12-31 11:47:28 +01:00
committed by GitHub
parent 09fa94c95f
commit a11e19fb0c
2 changed files with 100 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

106
sd-card/html/edit_alignment.html
View File

@@ -55,6 +55,29 @@
width: 660px; width: 660px;
padding: 5px; padding: 5px;
} }
#overlay {
position: fixed;
display: none;
width: 100%;
height: 100%;
top: 0;
left: 0;
right: 0;
bottom: 0;
background-color: rgba(0,0,0,0.8);
z-index: 2;
}
#overlaytext{
position: absolute;
top: 50%;
left: 50%;
font-size: 150%;
color: white;
transform: translate(-50%,-50%);
-ms-transform: translate(-50%,-50%);
}
</style> </style>
<link href="firework.css?v=$COMMIT_HASH" rel="stylesheet"> <link href="firework.css?v=$COMMIT_HASH" rel="stylesheet">
<script type="text/javascript" src="jquery-3.6.0.min.js?v=$COMMIT_HASH"></script> <script type="text/javascript" src="jquery-3.6.0.min.js?v=$COMMIT_HASH"></script>
@@ -62,6 +85,9 @@
</head> </head>
<body style="font-family: arial; padding: 0px 10px;"> <body style="font-family: arial; padding: 0px 10px;">
<div id="overlay">
<div id="overlaytext">Device is busy with digitalization round. Waiting until it completes...</div>
</div>
<h2>Alignment Marker</h2> <h2>Alignment Marker</h2>
<details id="desc_details" style="font-size:16px"> <details id="desc_details" style="font-size:16px">
@@ -183,10 +209,42 @@ function EnhanceContrast(){
refInfo[aktindex]["dy"] = document.getElementById("refdy").value; refInfo[aktindex]["dy"] = document.getElementById("refdy").value;
enhanceCon = true; enhanceCon = true;
if (MakeContrastImageZW(refInfo[aktindex], enhanceCon, domainname)) {
UpdateReference(); document.getElementById("overlay").style.display = "block";
document.getElementById("enhancecontrast").disabled = true; document.getElementById("overlaytext").innerHTML = "Enhancing Image Contrast...";
function sleep(ms) {
return new Promise(resolve => setTimeout(resolve, ms));
} }
async function task() {
while (true) {
var ret = MakeContrastImageZW(refInfo[aktindex], enhanceCon, domainname);
if (ret) {
UpdateReference();
//document.getElementById("enhancecontrast").disabled = true;
document.getElementById("overlay").style.display = "none";
return;
}
else {
// Get status
var xhttp = new XMLHttpRequest();
try {
xhttp.open("GET", domainname + "/statusflow", false);
xhttp.send();
}
catch (error){}
document.getElementById("overlaytext").innerHTML = "Device is busy, waiting until the Digitalization Round got completed (this can take several minutes)...<br><br>Current step: " + xhttp.responseText;
console.log("Device is busy, waiting 5s then checking again...");
await sleep(5000);
}
}
}
setTimeout(function() { // Delay so the overlay gets shown
task();
}, 1);
} }
function UpdateReference(){ function UpdateReference(){
@@ -304,12 +362,44 @@ function dataURLtoBlob(dataurl) {
refInfo[aktindex]["x"] = document.getElementById("refx").value; refInfo[aktindex]["x"] = document.getElementById("refx").value;
refInfo[aktindex]["y"] = document.getElementById("refy").value; refInfo[aktindex]["y"] = document.getElementById("refy").value;
refInfo[aktindex]["dx"] = document.getElementById("refdx").value; refInfo[aktindex]["dx"] = document.getElementById("refdx").value;
refInfo[aktindex]["dy"] = document.getElementById("refdy").value; refInfo[aktindex]["dy"] = document.getElementById("refdy").value;
if (MakeRefZW(refInfo[aktindex], domainname)) {
UpdateReference(); document.getElementById("overlay").style.display = "block";
document.getElementById("enhancecontrast").disabled = false; document.getElementById("overlaytext").innerHTML = "Updating marker...";
document.getElementById("savemarker").disabled = false;
function sleep(ms) {
return new Promise(resolve => setTimeout(resolve, ms));
} }
async function task() {
while (true) {
var ret = MakeRefZW(refInfo[aktindex], domainname);
if (ret) {
UpdateReference();
document.getElementById("enhancecontrast").disabled = false;
document.getElementById("savemarker").disabled = false;
document.getElementById("overlay").style.display = "none";
return;
}
else {
// Get status
var xhttp = new XMLHttpRequest();
try {
xhttp.open("GET", domainname + "/statusflow", false);
xhttp.send();
}
catch (error){}
document.getElementById("overlaytext").innerHTML = "Device is busy, waiting until the Digitalization Round got completed (this can take several minutes)...<br><br>Current step: " + xhttp.responseText;
console.log("Device is busy, waiting 5s then checking again...");
await sleep(5000);
}
}
}
setTimeout(function() { // Delay so the overlay gets shown
task();
}, 1);
} }
function drawGrid(){ function drawGrid(){

12
sd-card/html/readconfigcommon.js
View File

@@ -259,17 +259,13 @@ function MakeContrastImageZW(zw, _enhance, _domainname){
xhttp.open("GET", url, false); xhttp.open("GET", url, false);
xhttp.send(); xhttp.send();
} }
catch (error) catch (error){}
{
// firework.launch('Deleting Config.ini failed!', 'danger', 30000);
}
if (xhttp.responseText == "CutImage Done") { if (xhttp.responseText == "CutImage Done") {
firework.launch('Image Contrast got enhanced', 'success', 5000); firework.launch('Image Contrast got enhanced', 'success', 5000);
return true; return true;
} }
else { else {
firework.launch("Device is busy, please try again when the Digitalization Round got completed!", 'warning', 10000);
return false; return false;
} }
} }
@@ -284,10 +280,7 @@ function MakeRefZW(zw, _domainname){
xhttp.open("GET", url, false); xhttp.open("GET", url, false);
xhttp.send(); xhttp.send();
} }
catch (error) catch (error){}
{
// firework.launch('Deleting Config.ini failed!', 'danger', 30000);
}
if (xhttp.responseText == "CutImage Done") { if (xhttp.responseText == "CutImage Done") {
_filetarget2 = zw["name"].replace("/config/", "/img_tmp/"); _filetarget2 = zw["name"].replace("/config/", "/img_tmp/");
@@ -297,7 +290,6 @@ function MakeRefZW(zw, _domainname){
return true; return true;
} }
else { else {
firework.launch("Device is busy, please try again when the Digitalization Round got completed!", 'warning', 10000);
return false; return false;
} }
} }