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-24 00:18:16 +03:00
Code Issues Packages Projects Releases Wiki Activity

Loading alignment page faster (#2868)

Browse Source 
Da es Probleme mit param_temp gab (mal ging es, mal nicht), habe ich extra Parameter angelegt (_rotate_temp, _mirror_temp, _isize_temp, _grayscale_temp, _negative_temp, _aec2_temp, _FixedExposure_temp, _zoom_temp, _zm_temp, _x_temp, _y_temp, _intensity_temp, _brightness_temp, _contrast_temp, _saturation_temp, _sharpness_temp, _ae_temp).
Bei den bisherigen Tests, hat alles so funktioniert wie es soll.
This commit is contained in:
michael
2024-02-14 16:24:29 +01:00
committed by GitHub
parent 141aea7fa7
commit 6b38e44d7f
7 changed files with 1330 additions and 1295 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -162,37 +162,63 @@
<script type="text/javascript" src="readconfigparam.js?v=$COMMIT_HASH"></script>
<script language="JavaScript">
var canvas = document.getElementById('canvas'),
ctx = canvas.getContext('2d'),
imageObj = new Image(),
rect = {},
drag = false,
aktindex = 0,
refInfo,
enhanceCon = false,
param;
domainname = getDomainname();
param;
var canvas = document.getElementById('canvas'),
ctx = canvas.getContext('2d'),
imageObj = new Image(),
rect = {},
drag = false,
aktindex = 0,
refInfo,
enhanceCon = false,
domainname = getDomainname(),
neueref1,
neueref2,
param;
function doReboot() {
if (confirm("Are you sure you want to reboot? Did you save your changes?")) {
var stringota = getDomainname() + "/reboot";
window.location = stringota;
window.location.href = stringota;
window.location.assign(stringota);
window.location.replace(stringota);
if (confirm("Are you sure you want to reboot? Did you save your changes?")) {
var stringota = getDomainname() + "/reboot";
window.location = stringota;
window.location.href = stringota;
window.location.assign(stringota);
window.location.replace(stringota);
}
}
function ChangeSelection(){
aktindex = parseInt(document.getElementById("index").value);
UpdateReference();
if (aktindex == 0 && neueref1 == 1) {
UpdateReference();
}
else if (aktindex == 1 && neueref2 == 1) {
UpdateReference();
}
else
{
LoadReference();
}
}
function SaveToConfig(){
if (confirm("Are you sure you want to save the new alignment marker configuration?")) {
WriteConfigININew();
UpdateConfigReference(domainname)
if (neueref1 == 1 && neueref2 == 1) {
UpdateConfigReferences(domainname);
}
else if (neueref1 == 1) {
var anzneueref = 1;
UpdateConfigReference(anzneueref, domainname);
}
else if (neueref2 == 1) {
var anzneueref = 2;
UpdateConfigReference(anzneueref, domainname);
}
//UpdateConfigReference(domainname)
SaveConfigToServer(domainname);
document.getElementById("savemarker").disabled = true;
document.getElementById("enhancecontrast").disabled = true;
@@ -208,7 +234,7 @@ function EnhanceContrast(){
refInfo[aktindex]["dx"] = document.getElementById("refdx").value;
refInfo[aktindex]["dy"] = document.getElementById("refdy").value;
enhanceCon = true;
var enhanceCon = true;
document.getElementById("overlay").style.display = "block";
document.getElementById("overlaytext").innerHTML = "Enhancing Image Contrast...";
@@ -219,11 +245,17 @@ function EnhanceContrast(){
async function task() {
while (true) {
var ret = MakeContrastImageZW(refInfo[aktindex], enhanceCon, domainname);
if (ret) {
var ret = MakeRefImageZW(refInfo[aktindex], enhanceCon, domainname);
if (ret) {
UpdateReference();
//document.getElementById("enhancecontrast").disabled = true;
document.getElementById("overlay").style.display = "none";
if (aktindex == 0) {
neueref1 = 1;
}
else if (aktindex == 1) {
neueref2 = 1;
}
return;
}
else {
@@ -276,260 +308,284 @@ function UpdateReference(){
}
function dataURLtoBlob(dataurl) {
var arr = dataurl.split(','), mime = arr[0].match(/:(.*?);/)[1],
bstr = atob(arr[1]), n = bstr.length, u8arr = new Uint8Array(n);
var arr = dataurl.split(',');
var mime = arr[0].match(/:(.*?);/)[1];
var bstr = atob(arr[1]);
var n = bstr.length;
var u8arr = new Uint8Array(n);
while(n--){
u8arr[n] = bstr.charCodeAt(n);
}
return new Blob([u8arr], {type:mime});
}
function loadCanvas(dataURL) {
var canvas = document.getElementById('canvas');
var context = canvas.getContext('2d');
function loadCanvas(dataURL) {
var canvas = document.getElementById('canvas');
var context = canvas.getContext('2d');
imageObj.onload = function() {
canvas.width = this.width;
canvas.height = this.height;
drawImage();
};
imageObj.onload = function() {
canvas.width = this.width;
canvas.height = this.height;
drawImage();
};
imageObj.src = dataURL;
}
imageObj.src = dataURL;
}
function getCoords(elem) { // crossbrowser version
var box = elem.getBoundingClientRect();
var body = document.body;
var docEl = document.documentElement;
var scrollTop = window.pageYOffset || docEl.scrollTop || body.scrollTop;
var scrollLeft = window.pageXOffset || docEl.scrollLeft || body.scrollLeft;
var clientTop = docEl.clientTop || body.clientTop || 0;
var clientLeft = docEl.clientLeft || body.clientLeft || 0;
var top = box.top + scrollTop - clientTop;
var left = box.left + scrollLeft - clientLeft;
return { top: Math.round(top), left: Math.round(left) };
}
/* hash #description open the details part of the page */
function openDescription() {
if(window.location.hash) {
var hash = window.location.hash.substring(1); //Puts hash in variable, and removes the # character
if(hash == 'description')
document.getElementById("desc_details").open = true;
}
}
function init() {
openDescription();
domainname = getDomainname();
loadConfig(domainname);
ParseConfig();
param = getConfigParameters();
document.getElementById("savemarker").disabled = true;
document.getElementById("enhancecontrast").disabled = true;
canvas.addEventListener('mousedown', mouseDown, false);
canvas.addEventListener('mouseup', mouseUp, false);
canvas.addEventListener('mousemove', mouseMove, false);
loadCanvas(domainname + "/fileserver/config/reference.jpg");
CopyReferenceToImgTmp(domainname);
refInfo = GetReferencesInfo();
UpdateReference();
drawImage();
}
function drawImage(){
var canvas = document.getElementById('canvas');
var context = canvas.getContext('2d');
context.clearRect(0,0,imageObj.width,imageObj.height);
context.save();
context.drawImage(imageObj, 0, 0);
// context.restore();
}
function CutOutReference(){
refInfo[aktindex]["x"] = document.getElementById("refx").value;
refInfo[aktindex]["y"] = document.getElementById("refy").value;
refInfo[aktindex]["dx"] = document.getElementById("refdx").value;
refInfo[aktindex]["dy"] = document.getElementById("refdy").value;
document.getElementById("overlay").style.display = "block";
document.getElementById("overlaytext").innerHTML = "Updating marker...";
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(){
var canvas = document.getElementById('canvas');
var ctx = canvas.getContext('2d');
w = canvas.width;
h = canvas.height;
ctx.save();
ctx.strokeStyle = '#00FF00';
for (i = h/2; i < h; i += 100)
{
ctx.moveTo(0, i);
ctx.lineTo(w, i);
ctx.stroke();
ctx.moveTo(0, h-i);
ctx.lineTo(w, h-i);
ctx.stroke();
}
for (i = w/2; i < w; i += 100)
{
ctx.moveTo(i, 0);
ctx.lineTo(i, h);
ctx.stroke();
ctx.moveTo(w-i, 0);
ctx.lineTo(w-i, h);
ctx.stroke(); }
// ctx.restore();
}
function draw() {
var canvas = document.getElementById('canvas');
var context = canvas.getContext('2d');
context.drawImage(imageObj, 0, 0);
lw = 4
context.lineWidth = lw;
context.strokeStyle = "#FF0000";
var x0 = parseInt(rect.startX) - parseInt(lw/2);
var y0 = parseInt(rect.startY) - parseInt(lw/2);
var dx = parseInt(rect.w) + parseInt(lw);
var dy = parseInt(rect.h) + parseInt(lw);
context.strokeRect(x0, y0, dx, dy);
}
function getCoords(elem) { // crossbrowser version
var box = elem.getBoundingClientRect();
var body = document.body;
var docEl = document.documentElement;
var scrollTop = window.pageYOffset || docEl.scrollTop || body.scrollTop;
var scrollLeft = window.pageXOffset || docEl.scrollLeft || body.scrollLeft;
var clientTop = docEl.clientTop || body.clientTop || 0;
var clientLeft = docEl.clientLeft || body.clientLeft || 0;
var top = box.top + scrollTop - clientTop;
var left = box.left + scrollLeft - clientLeft;
function getCoords(elem) { // crossbrowser version
var box = elem.getBoundingClientRect();
var body = document.body;
var docEl = document.documentElement;
var scrollTop = window.pageYOffset || docEl.scrollTop || body.scrollTop;
var scrollLeft = window.pageXOffset || docEl.scrollLeft || body.scrollLeft;
var clientTop = docEl.clientTop || body.clientTop || 0;
var clientLeft = docEl.clientLeft || body.clientLeft || 0;
var top = box.top + scrollTop - clientTop;
var left = box.left + scrollLeft - clientLeft;
return { top: Math.round(top), left: Math.round(left) };
}
/* hash #description open the details part of the page */
function openDescription() {
if(window.location.hash) {
var hash = window.location.hash.substring(1); //Puts hash in variable, and removes the # character
if(hash == 'description') {
document.getElementById("desc_details").open = true;
}
}
}
function mouseDown(e) {
zw = getCoords(this)
rect.startX = e.pageX - zw.left;
rect.startY = e.pageY - zw.top;
document.getElementById("refx").value = rect.startX;
document.getElementById("refy").value = rect.startY;
drag = true;
function LoadReference(){
document.getElementById("img_ref").onload = function () {
document.getElementById("refdx").value = this.width;
document.getElementById("refdy").value = this.height;
refInfo[aktindex]["dx"] = this.width;
refInfo[aktindex]["dy"] = this.height;
rect.w = document.getElementById("refdx").value;
rect.h = document.getElementById("refdy").value;
draw();
}
function mouseUp() {
drag = false;
if (rect.w < 0) {
rect.w = -rect.w
rect.startX-=rect.w
_filenameurl = refInfo[aktindex]["name"];
var url = domainname + "/fileserver" + _filenameurl + "?" + Date.now();
document.getElementById("img_ref").src = url;
_filenameurl = _filenameurl.replace(".jpg", "_org.jpg");
var url = domainname + "/fileserver" + _filenameurl + "?" + Date.now();
document.getElementById("img_ref_org").src = url;
document.getElementById("name").value = refInfo[aktindex]["name"];
document.getElementById("refx").value = refInfo[aktindex]["x"];
document.getElementById("refy").value = refInfo[aktindex]["y"];
rect.startX = document.getElementById("refx").value;
rect.startY = document.getElementById("refy").value;
draw();
}
function init() {
openDescription();
domainname = getDomainname();
loadConfig(domainname);
ParseConfig();
param = getConfigParameters();
document.getElementById("savemarker").disabled = true;
document.getElementById("enhancecontrast").disabled = true;
canvas.addEventListener('mousedown', mouseDown, false);
canvas.addEventListener('mouseup', mouseUp, false);
canvas.addEventListener('mousemove', mouseMove, false);
loadCanvas(domainname + "/fileserver/config/reference.jpg");
//CopyReferenceToImgTmp(domainname);
refInfo = GetReferencesInfo();
//UpdateReference();
LoadReference();
drawImage();
}
function drawImage(){
var canvas = document.getElementById('canvas');
var context = canvas.getContext('2d');
context.clearRect(0,0,imageObj.width,imageObj.height);
context.save();
context.drawImage(imageObj, 0, 0);
// context.restore();
}
function CutOutReference(){
refInfo[aktindex]["x"] = document.getElementById("refx").value;
refInfo[aktindex]["y"] = document.getElementById("refy").value;
refInfo[aktindex]["dx"] = document.getElementById("refdx").value;
refInfo[aktindex]["dy"] = document.getElementById("refdy").value;
var enhanceCon = false;
document.getElementById("overlay").style.display = "block";
document.getElementById("overlaytext").innerHTML = "Updating marker...";
function sleep(ms) {
return new Promise(resolve => setTimeout(resolve, ms));
}
async function task() {
while (true) {
var ret = MakeRefImageZW(refInfo[aktindex], enhanceCon, domainname);
if (ret) {
UpdateReference();
document.getElementById("enhancecontrast").disabled = false;
document.getElementById("savemarker").disabled = false;
document.getElementById("overlay").style.display = "none";
if (aktindex == 0) {
neueref1 = 1;
}
else if (aktindex == 1) {
neueref2 = 1;
}
return;
}
if (rect.h < 0) {
rect.h = -rect.h
rect.startY-=rect.h
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(){
var canvas = document.getElementById('canvas');
var ctx = canvas.getContext('2d');
var w = canvas.width;
var h = canvas.height;
ctx.save();
ctx.strokeStyle = '#00FF00';
for (i = h/2; i < h; i += 100) {
ctx.moveTo(0, i);
ctx.lineTo(w, i);
ctx.stroke();
ctx.moveTo(0, h-i);
ctx.lineTo(w, h-i);
ctx.stroke();
}
for (i = w/2; i < w; i += 100) {
ctx.moveTo(i, 0);
ctx.lineTo(i, h);
ctx.stroke();
ctx.moveTo(w-i, 0);
ctx.lineTo(w-i, h);
ctx.stroke();
}
// ctx.restore();
}
function draw() {
var canvas = document.getElementById('canvas');
var context = canvas.getContext('2d');
context.drawImage(imageObj, 0, 0);
var lw = 4
context.lineWidth = lw;
context.strokeStyle = "#FF0000";
var x0 = parseInt(rect.startX) - parseInt(lw/2);
var y0 = parseInt(rect.startY) - parseInt(lw/2);
var dx = parseInt(rect.w) + parseInt(lw);
var dy = parseInt(rect.h) + parseInt(lw);
context.strokeRect(x0, y0, dx, dy);
}
function mouseDown(e) {
var zw = getCoords(this)
rect.startX = e.pageX - zw.left;
rect.startY = e.pageY - zw.top;
document.getElementById("refx").value = rect.startX;
document.getElementById("refy").value = rect.startY;
drag = true;
}
function mouseUp() {
drag = false;
if (rect.w < 0) {
rect.w = -rect.w
rect.startX-=rect.w
}
if (rect.h < 0) {
rect.h = -rect.h
rect.startY-=rect.h
}
document.getElementById("refdx").value = rect.w;
document.getElementById("refdy").value = rect.h;
document.getElementById("refx").value = rect.startX;
document.getElementById("refy").value = rect.startY;
}
function mouseMove(e) {
if (drag) {
var zw = getCoords(this)
rect.w = (e.pageX - zw.left) - rect.startX;
rect.h = (e.pageY - zw.top) - rect.startY ;
document.getElementById("refdx").value = rect.w;
document.getElementById("refdy").value = rect.h;
document.getElementById("refx").value = rect.startX;
document.getElementById("refy").value = rect.startY;
draw();
}
else {
draw();
var canvas = document.getElementById('canvas');
var context = canvas.getContext('2d');
function mouseMove(e) {
if (drag) {
zw = getCoords(this)
rect.w = (e.pageX - zw.left) - rect.startX;
rect.h = (e.pageY - zw.top) - rect.startY ;
document.getElementById("refdx").value = rect.w;
document.getElementById("refdy").value = rect.h;
draw();
}
else {
draw();
var canvas = document.getElementById('canvas');
var context = canvas.getContext('2d');
zw = getCoords(this);
x = e.pageX - zw.left;
y = e.pageY - zw.top;
var zw = getCoords(this);
var x = e.pageX - zw.left;
var y = e.pageY - zw.top;
context.lineWidth = 2;
context.strokeStyle = "#00FF00";
context.beginPath();
context.moveTo(0,y);
context.lineTo(canvas.width, y);
context.moveTo(x, 0);
context.lineTo(x, canvas.height);
context.stroke();
}
context.lineWidth = 2;
context.strokeStyle = "#00FF00";
context.beginPath();
context.moveTo(0,y);
context.lineTo(canvas.width, y);
context.moveTo(x, 0);
context.lineTo(x, canvas.height);
context.stroke();
}
}
function namechanged()
{
_name = document.getElementById("name").value;
refInfo[aktindex]["name"] = _name;
function namechanged() {
_name = document.getElementById("name").value;
refInfo[aktindex]["name"] = _name;
}
function valuemanualchanged(){
if (!drag) {
rect.w = document.getElementById("refdx").value;
rect.h = document.getElementById("refdy").value;
rect.startX = document.getElementById("refx").value;
rect.startY = document.getElementById("refy").value;
draw();
}
function valuemanualchanged(){
if (!drag) {
rect.w = document.getElementById("refdx").value;
rect.h = document.getElementById("refdy").value;
rect.startX = document.getElementById("refx").value;
rect.startY = document.getElementById("refy").value;
draw();
}
}
}
init();
init();
</script>
</body>
</html>

276
sd-card/html/edit_config_param_template.html
View File

@@ -1794,50 +1794,52 @@
<script type="text/javascript" src="readconfigparam.js?v=$COMMIT_HASH"></script>
<script type="text/javascript">
var canvas = document.getElementById('canvas'),
domainname = getDomainname();
param;
category;
NUNBERSAkt = -1;
NUMBERS;
var canvas = document.getElementById('canvas'),
domainname = getDomainname(),
param,
category,
NUNBERSAkt = -1,
NUMBERS;
function LoadConfigNeu() {
domainname = getDomainname();
if (!loadConfig(domainname)) {
firework.launch('Configuration could not be loaded! Please reload the page!', 'danger', 30000);
return;
}
ParseConfig();
param = getConfigParameters();
category = getConfigCategory();
InitIndivParameter();
domainname = getDomainname();
if (!loadConfig(domainname)) {
firework.launch('Configuration could not be loaded! Please reload the page!', 'danger', 30000);
return;
}
ParseConfig();
param = getConfigParameters();
category = getConfigCategory();
InitIndivParameter();
UpdateInput();
var sel = document.getElementById("Numbers_value1");
UpdateInputIndividual(sel);
UpdateExpertModus();
document.getElementById("divall").style.display = '';
UpdateInput();
var sel = document.getElementById("Numbers_value1");
UpdateInputIndividual(sel);
UpdateExpertModus();
document.getElementById("divall").style.display = '';
}
function InitIndivParameter()
{
function InitIndivParameter() {
NUMBERS = getNUMBERInfo();
var _index = document.getElementById("Numbers_value1");
while (_index.length)
while (_index.length) {
_index.remove(0);
}
var _indexInflux = document.getElementById("NumbersInfluxDBv2_value1");
while (_indexInflux.length)
while (_indexInflux.length) {
_indexInflux.remove(0);
}
var _indexInfluxv1 = document.getElementById("NumbersInfluxDB_value1");
while (_indexInflux.length)
_indexInfluxv1.remove(0);
while (_indexInfluxv1.length) {
_indexInfluxv1.remove(0);
}
for (var i = 0; i < NUMBERS.length; ++i){
for (var i = 0; i < NUMBERS.length; ++i) {
var option = document.createElement("option");
option.text = NUMBERS[i]["name"];
option.value = i;
@@ -1852,8 +1854,8 @@ function InitIndivParameter()
optionInfluxv1.text = NUMBERS[i]["name"];
optionInfluxv1.value = i;
_indexInfluxv1.add(optionInfluxv1);
}
_index.selectedIndex = 0;
_indexInflux.selectedIndex = 0;
_indexInfluxv1.selectedIndex = 0;
@@ -1863,15 +1865,16 @@ function InitIndivParameter()
function getParameterByName(name, url = window.location.href) {
name = name.replace(/[\[\]]/g, '\\$&');
var regex = new RegExp('[?&]' + name + '(=([^&#]*)|&|#|$)'),
results = regex.exec(url);
results = regex.exec(url);
if (!results) return null;
if (!results[2]) return '';
if (!results) {return null;}
if (!results[2]) {return '';}
return decodeURIComponent(results[2].replace(/\+/g, ' '));
}
function WriteParameter(_param, _category, _cat, _name, _optional, _number = -1){
function WriteParameter(_param, _category, _cat, _name, _optional, _number = -1) {
let anzpara;
try {
anzpara = _param[_cat][_name].anzParam;
@@ -1882,8 +1885,9 @@ function WriteParameter(_param, _category, _cat, _name, _optional, _number = -1)
}
if (_number > -1) {
if ((NUMBERS[_number] == undefined) || (NUMBERS[_number][_cat] == undefined) || (NUMBERS[_number][_cat][_name] == undefined))
if ((NUMBERS[_number] == undefined) || (NUMBERS[_number][_cat] == undefined) || (NUMBERS[_number][_cat][_name] == undefined)) {
return;
}
if (_optional) {
document.getElementById(_cat+"_"+_name+"_enabled").checked = NUMBERS[_number][_cat][_name]["enabled"];
@@ -1891,6 +1895,7 @@ function WriteParameter(_param, _category, _cat, _name, _optional, _number = -1)
document.getElementById(_cat+"_"+_name+"_value"+j).disabled = !NUMBERS[_number][_cat][_name]["enabled"];
}
}
document.getElementById(_cat+"_"+_name+"_text").style.color = "black"
setEnabled(_cat+"_"+_name, true);
@@ -1898,8 +1903,9 @@ function WriteParameter(_param, _category, _cat, _name, _optional, _number = -1)
let element = document.getElementById(_cat+"_"+_name+"_value"+j);
if (element.tagName.toLowerCase() == "select") {
var textToFind = NUMBERS[_number][_cat][_name]["value"+j];
if (textToFind == undefined)
if (textToFind == undefined) {
continue;
}
_isFound = false;
element.selectedIndex = -1;
@@ -1910,8 +1916,7 @@ function WriteParameter(_param, _category, _cat, _name, _optional, _number = -1)
break;
}
}
if (!_isFound)
{
if (!_isFound) {
_zw_txt = "In the selected field the value '" + textToFind + "' in the parameter '";
_zw_txt = _zw_txt + _cat + "' in the field '" + _name + "' is invalid. PLEASE CHECK BEFORE SAVING!";
firework.launch(_zw_txt, 'warning', 10000);
@@ -1939,8 +1944,9 @@ function WriteParameter(_param, _category, _cat, _name, _optional, _number = -1)
let element = document.getElementById(_cat+"_"+_name+"_value"+j);
if (element.tagName.toLowerCase() == "select") {
var textToFind = _param[_cat][_name]["value"+j];
if (textToFind == undefined)
if (textToFind == undefined) {
continue;
}
_isFound = false;
element.selectedIndex = -1;
@@ -1951,8 +1957,7 @@ function WriteParameter(_param, _category, _cat, _name, _optional, _number = -1)
break;
}
}
if (!_isFound)
{
if (!_isFound) {
_zw_txt = "In the selected field the value '" + textToFind + "' in the section '";
_zw_txt = _zw_txt + _cat + "' in the field '" + _name + "' is invalid. PLEASE CHECK BEFORE SAVING!";
firework.launch(_zw_txt, 'warning', 10000);
@@ -1969,8 +1974,7 @@ function WriteParameter(_param, _category, _cat, _name, _optional, _number = -1)
}
///////////////// am Ende, falls Kategorie als gesamtes nicht ausgewählt --> deaktivieren
if (_category[_cat]["enabled"] == false)
{
if (_category[_cat]["enabled"] == false) {
if (_optional) {
document.getElementById(_cat+"_"+_name+"_enabled").disabled = true;
for (var j = 1; j <= anzpara; ++j) {
@@ -1985,12 +1989,12 @@ function WriteParameter(_param, _category, _cat, _name, _optional, _number = -1)
}
function InvertEnableItem(_cat, _param)
{
function InvertEnableItem(_cat, _param) {
_zw = _cat + "_" + _param + "_enabled";
_isOn = document.getElementById(_zw).checked;
_color = "rgb(122, 122, 122)";
if (_isOn) {
_color = "black";
}
@@ -2002,8 +2006,8 @@ function InvertEnableItem(_cat, _param)
setEnabled(_cat + "_" + _param, _isOn);
for (var j = 1; j <= param[_cat][_param]["anzParam"]; ++j) {
document.getElementById(_cat+"_"+_param+"_value"+j).disabled = !_isOn;
document.getElementById(_cat+"_"+_param+"_value"+j).style.color = _color;
document.getElementById(_cat+"_"+_param+"_value"+j).disabled = !_isOn;
document.getElementById(_cat+"_"+_param+"_value"+j).style.color = _color;
}
}
@@ -2018,19 +2022,22 @@ function setEnabled(className, enabled) {
for (i = 0; i < elements.length; i++) {
if (enabled) {
elements[i].classList.remove("disabled");
} else {
}
else {
elements[i].classList.add("disabled");
}
let inputs = elements[i].getElementsByTagName("input");
for (j = 0; j < inputs.length; j++) {
if (inputs[j].id.endsWith("_enabled"))
if (inputs[j].id.endsWith("_enabled")) {
continue;
}
inputs[j].style.color = _color;
if (enabled) {
inputs[j].removeAttribute("disabled");
} else {
}
else {
inputs[j].setAttribute("disabled", "disabled");
}
}
@@ -2043,15 +2050,15 @@ function setVisible(className, visible) {
for (i = 0; i < elements.length; i++) {
if (visible) {
elements[i].classList.remove("hidden");
} else {
}
else {
elements[i].classList.add("hidden");
}
}
}
function EnDisableItem(_status, _param, _category, _cat, _name, _optional, _number = -1)
{
function EnDisableItem(_status, _param, _category, _cat, _name, _optional, _number = -1) {
_status = _category[_cat]["enabled"];
_color = "rgb(122, 122, 122)";
@@ -2064,18 +2071,18 @@ function EnDisableItem(_status, _param, _category, _cat, _name, _optional, _numb
document.getElementById(_cat+"_"+_name+"_enabled").style.color = _color;
}
if (_number == -1){
if (_number == -1) {
if (!_param[_cat][_name]["enabled"]) {
_status = false;
_color = "rgb(122, 122, 122)";
}
}
else
else {
if (!NUMBERS[_number][_cat][_name]["enabled"]) {
_status = false;
_color = "rgb(122, 122, 122)";
}
_status = false;
_color = "rgb(122, 122, 122)";
}
}
document.getElementById(_cat+"_"+_name+"_text").disabled = !_status;
document.getElementById(_cat+"_"+_name+"_text").style.color = _color;
@@ -2083,22 +2090,25 @@ function EnDisableItem(_status, _param, _category, _cat, _name, _optional, _numb
setEnabled(_cat+"_"+_name, _status);
for (var j = 1; j <= _param[_cat][_name]["anzParam"]; ++j) {
document.getElementById(_cat+"_"+_name+"_value"+j).disabled = !_status;
document.getElementById(_cat+"_"+_name+"_value"+j).style.color = _color;
document.getElementById(_cat+"_"+_name+"_value"+j).disabled = !_status;
document.getElementById(_cat+"_"+_name+"_value"+j).style.color = _color;
}
}
function ReadParameter(_param, _cat, _name, _optional, _number = -1){
function ReadParameter(_param, _cat, _name, _optional, _number = -1) {
if (_number > -1) {
if (_cat == "Digits")
if (_cat == "Digits") {
_cat = "digit";
if (_cat == "Analog")
}
if (_cat == "Analog") {
_cat = "analog";
}
if ((NUMBERS[_number] == undefined) || (NUMBERS[_number][_cat] == undefined) || (NUMBERS[_number][_cat][_name] == undefined))
if ((NUMBERS[_number] == undefined) || (NUMBERS[_number][_cat] == undefined) || (NUMBERS[_number][_cat][_name] == undefined)) {
return;
}
if (_optional) {
NUMBERS[_number][_cat][_name]["enabled"] = document.getElementById(_cat+"_"+_name+"_enabled").checked;
@@ -2116,7 +2126,8 @@ function ReadParameter(_param, _cat, _name, _optional, _number = -1){
if ((NUMBERS[_number][_cat][_name].checkRegExList != null) && (NUMBERS[_number][_cat][_name].checkRegExList[j-1] != null)) {
if (!element.value.match(NUMBERS[_cat][_name].checkRegExList[j-1])) {
element.classList.add("invalid-input");
} else {
}
else {
element.classList.remove("invalid-input");
}
}
@@ -2142,7 +2153,8 @@ function ReadParameter(_param, _cat, _name, _optional, _number = -1){
if ((_param[_cat][_name].checkRegExList != null) && (_param[_cat][_name].checkRegExList[j-1] != null)) {
if (!element.value.match(_param[_cat][_name].checkRegExList[j-1])) {
element.classList.add("invalid-input");
} else {
}
else {
element.classList.remove("invalid-input");
}
}
@@ -2153,10 +2165,8 @@ function ReadParameter(_param, _cat, _name, _optional, _number = -1){
}
function UpdateInputIndividual(sel)
{
if (NUNBERSAkt != -1)
{
function UpdateInputIndividual(sel) {
if (NUNBERSAkt != -1) {
ReadParameter(param, "PostProcessing", "DecimalShift", true, NUNBERSAkt);
ReadParameter(param, "PostProcessing", "AnalogDigitalTransitionStart", true, NUNBERSAkt);
ReadParameter(param, "PostProcessing", "MaxRateValue", true, NUNBERSAkt);
@@ -2170,7 +2180,7 @@ function UpdateInputIndividual(sel)
ReadParameter(param, "InfluxDBv2", "Measurement", true, NUNBERSAkt);
}
// var sel = document.getElementById("Numbers_value1");
// var sel = document.getElementById("Numbers_value1");
NUNBERSAkt = sel.selectedIndex;
WriteParameter(param, category, "PostProcessing", "DecimalShift", true, NUNBERSAkt);
WriteParameter(param, category, "PostProcessing", "AnalogDigitalTransitionStart", true, NUNBERSAkt);
@@ -2242,7 +2252,7 @@ function UpdateInput() {
WriteParameter(param, category, "PostProcessing", "PreValueUse", false);
WriteParameter(param, category, "PostProcessing", "PreValueAgeStartup", true);
// WriteParameter(param, category, "PostProcessing", "AllowNegativeRates", true);
// WriteParameter(param, category, "PostProcessing", "AllowNegativeRates", true);
WriteParameter(param, category, "PostProcessing", "ErrorMessage", false);
WriteParameter(param, category, "PostProcessing", "CheckDigitIncreaseConsistency", false);
@@ -2254,23 +2264,23 @@ function UpdateInput() {
WriteParameter(param, category, "MQTT", "RetainMessages", false);
WriteParameter(param, category, "MQTT", "HomeassistantDiscovery", false);
WriteParameter(param, category, "MQTT", "MeterType", true);
WriteParameter(param, category, "MQTT", "CACert", true);
WriteParameter(param, category, "MQTT", "ClientCert", true);
WriteParameter(param, category, "MQTT", "ClientKey", true);
WriteParameter(param, category, "MQTT", "CACert", true);
WriteParameter(param, category, "MQTT", "ClientCert", true);
WriteParameter(param, category, "MQTT", "ClientKey", true);
WriteParameter(param, category, "InfluxDB", "Uri", true);
WriteParameter(param, category, "InfluxDB", "Database", true);
// WriteParameter(param, category, "InfluxDB", "Measurement", true);
// WriteParameter(param, category, "InfluxDB", "Measurement", true);
WriteParameter(param, category, "InfluxDB", "user", true);
WriteParameter(param, category, "InfluxDB", "password", true);
// WriteParameter(param, category, "InfluxDB", "Field", true);
// WriteParameter(param, category, "InfluxDB", "Field", true);
WriteParameter(param, category, "InfluxDBv2", "Uri", true);
WriteParameter(param, category, "InfluxDBv2", "Bucket", true);
// WriteParameter(param, category, "InfluxDBv2", "Measurement", true);
// WriteParameter(param, category, "InfluxDBv2", "Measurement", true);
WriteParameter(param, category, "InfluxDBv2", "Org", true);
WriteParameter(param, category, "InfluxDBv2", "Token", true);
// WriteParameter(param, category, "InfluxDBv2", "Field", true);
// WriteParameter(param, category, "InfluxDBv2", "Field", true);
WriteParameter(param, category, "GPIO", "IO0", true);
WriteParameter(param, category, "GPIO", "IO1", true);
@@ -2301,41 +2311,44 @@ function UpdateInput() {
}
function WriteModelFiles()
{
function WriteModelFiles() {
list_tflite = getTFLITEList();
var _indexDig = document.getElementById("Digits_Model_value1");
var _indexAna = document.getElementById("Analog_Model_value1");
while (_indexDig.length)
while (_indexDig.length) {
_indexDig.remove(0);
while (_indexAna.length)
}
while (_indexAna.length) {
_indexAna.remove(0);
}
for (var i = 0; i < list_tflite.length; ++i){
for (var i = 0; i < list_tflite.length; ++i) {
var optionDig = document.createElement("option");
var optionAna = document.createElement("option");
var text = list_tflite[i].replace("/config/", "");
if (list_tflite[i].includes("/dig")) { // Its a digital file, only show in the digital list box
optionDig.text = text;
optionDig.value = list_tflite[i];
_indexDig.add(optionDig);
optionDig.text = text;
optionDig.value = list_tflite[i];
_indexDig.add(optionDig);
}
else if (list_tflite[i].includes("/ana")) { // Its a digital file, only show in the analog list box
optionAna.text = text;
optionAna.value = list_tflite[i];
_indexAna.add(optionAna);
optionAna.text = text;
optionAna.value = list_tflite[i];
_indexAna.add(optionAna);
}
else { // all other files, show in both list boxes
optionDig.text = text;
optionDig.value = list_tflite[i];
_indexDig.add(optionDig);
optionDig.text = text;
optionDig.value = list_tflite[i];
_indexDig.add(optionDig);
optionAna.text = text;
optionAna.value = list_tflite[i];
_indexAna.add(optionAna);
optionAna.text = text;
optionAna.value = list_tflite[i];
_indexAna.add(optionAna);
}
}
@@ -2344,8 +2357,7 @@ function WriteModelFiles()
}
function ReadParameterAll()
{
function ReadParameterAll() {
category["Analog"]["enabled"] = document.getElementById("Category_Analog_enabled").checked;
category["Digits"]["enabled"] = document.getElementById("Category_Digits_enabled").checked;
category["MQTT"]["enabled"] = document.getElementById("Category_MQTT_enabled").checked;
@@ -2403,9 +2415,9 @@ function ReadParameterAll()
ReadParameter(param, "MQTT", "RetainMessages", false);
ReadParameter(param, "MQTT", "HomeassistantDiscovery", false);
ReadParameter(param, "MQTT", "MeterType", true);
ReadParameter(param, "MQTT", "CACert", true);
ReadParameter(param, "MQTT", "ClientCert", true);
ReadParameter(param, "MQTT", "ClientKey", true);
ReadParameter(param, "MQTT", "CACert", true);
ReadParameter(param, "MQTT", "ClientCert", true);
ReadParameter(param, "MQTT", "ClientKey", true);
ReadParameter(param, "InfluxDB", "Uri", true);
ReadParameter(param, "InfluxDB", "Database", true);
@@ -2418,7 +2430,7 @@ function ReadParameterAll()
ReadParameter(param, "InfluxDBv2", "Measurement", true);
ReadParameter(param, "InfluxDBv2", "Org", true);
ReadParameter(param, "InfluxDBv2", "Token", true);
// ReadParameter(param, "InfluxDB", "Field", true);
// ReadParameter(param, "InfluxDB", "Field", true);
ReadParameter(param, "GPIO", "IO0", true);
ReadParameter(param, "GPIO", "IO1", true);
@@ -2455,7 +2467,7 @@ function ReadParameterAll()
var sel = document.getElementById("Numbers_value1");
UpdateInputIndividual(sel);
// FormatDecimalValue(param, "PostProcessing", "MaxRateValue");
// FormatDecimalValue(param, "PostProcessing", "MaxRateValue");
}
@@ -2483,44 +2495,43 @@ function UpdateAfterCategoryCheck() {
}
function UpdateExpertModus()
{
// var _style = 'display:none;';
function UpdateExpertModus() {
// var _style = 'display:none;';
var _style_pur = 'none';
var _hidden = true;
if (document.getElementById("ExpertModus_enabled").checked) {
// _style = '';
// _style = '';
_style_pur = '';
_hidden = false;
document.getElementById("Edit_Config_Direct").style.display = "";
firework.launch("Expert view activated. Please use carefully", 'warning', 5000);
}
else
{
else {
document.getElementById("Edit_Config_Direct").style.display = "none";
}
const expert = document.querySelectorAll(".expert");
for (var i = 0; i < expert.length; i++) {
expert[i].style.display = _style_pur;
// document.getElementById(expert[i].id).style = _style;
// document.getElementById(expert[i].id).style = _style;
}
// Enable / Disable die Optionen in den Menues für die Auswahl. Falls kein Expertenmodus soll nur ein Wert (built-in-led oder externan-flash-ws281x) möglich sein
Array.from(document.querySelector("#GPIO_IO4_value1").options).forEach(function(option_element) {
if (option_element.value != "built-in-led")
if (option_element.value != "built-in-led") {
option_element.hidden = _hidden;
}
});
Array.from(document.querySelector("#GPIO_IO12_value1").options).forEach(function(option_element) {
if (option_element.value != "external-flash-ws281x")
if (option_element.value != "external-flash-ws281x") {
option_element.hidden = _hidden;
}
});
}
function saveTextAsFile()
{
function saveTextAsFile() {
ReadParameterAll();
if (document.getElementsByClassName("invalid-input").length > 0) {
firework.launch("Settings cannot be saved. Please check your entries!", 'danger', 30000);
@@ -2559,58 +2570,61 @@ function editConfigDirect() {
}
function numberChanged()
{
function numberChanged() {
var sel = document.getElementById("Numbers_value1");
_neu = sel.selectedIndex;
UpdateInputIndividual(sel);
var _selInflux = document.getElementById("NumbersInfluxDBv2_value1");
if (_selInflux.selectedIndex != _neu)
if (_selInflux.selectedIndex != _neu) {
_selInflux.selectedIndex = _neu
}
}
function numberInfluxDBv2Changed()
{
function numberInfluxDBv2Changed() {
var sel = document.getElementById("NumbersInfluxDBv2_value1");
_neu = sel.selectedIndex;
UpdateInputIndividual(sel);
var _sel2 = document.getElementById("Numbers_value1");
if (_sel2.selectedIndex != _neu)
if (_sel2.selectedIndex != _neu) {
_sel2.selectedIndex = _neu
}
var _sel3 = document.getElementById("NumbersInfluxDB_value1");
if (_sel3.selectedIndex != _neu)
if (_sel3.selectedIndex != _neu) {
_sel3.selectedIndex = _neu
}
}
function numberInfluxDBChanged()
{
function numberInfluxDBChanged() {
var sel = document.getElementById("NumbersInfluxDB_value1");
_neu = sel.selectedIndex;
UpdateInputIndividual(sel);
var _sel2 = document.getElementById("Numbers_value1");
if (_sel2.selectedIndex != _neu)
if (_sel2.selectedIndex != _neu) {
_sel2.selectedIndex = _neu
}
var _sel3 = document.getElementById("NumbersInfluxDBv2_value1");
if (_sel3.selectedIndex != _neu)
if (_sel3.selectedIndex != _neu) {
_sel3.selectedIndex = _neu
}
}
/* hash #description open the details part of the page */
function openDescription()
{
/* hash #description open the details part of the page */
function openDescription() {
if(window.location.hash) {
var hash = window.location.hash.substring(1); //Puts hash in variable, and removes the # character
if(hash == 'description')
if(hash == 'description') {
document.getElementById("desc_details").open = true;
document.getElementById("reboot").style.display = "none";
document.getElementById("reboot_text").style.display = "none";
document.getElementById("reboot").style.display = "none";
document.getElementById("reboot_text").style.display = "none";
}
}
}

877
sd-card/html/edit_reference.html
View File

File diff suppressed because it is too large Load Diff

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

@@ -39,13 +39,11 @@ function createReader(file) {
}
function ZerlegeZeile(input, delimiter = " =\t\r")
{
var Output = Array(0);
// delimiter = " =,\t";
/* The input can have multiple formats:
* - key = value
* - key = value1 value2 value3 ...
@@ -82,7 +80,6 @@ function ZerlegeZeile(input, delimiter = " =\t\r")
}
return Output;
}
@@ -110,7 +107,6 @@ function findDelimiterPos(input, delimiter)
return pos;
}
function trim(istring, adddelimiter)
{
@@ -247,19 +243,21 @@ function SaveCanvasToImage(_canvas, _filename, _delete = true, _domainname = "")
}
function MakeContrastImageZW(zw, _enhance, _domainname){
_filename = zw["name"].replace("/config/", "/img_tmp/");
url = _domainname + "/editflow?task=cutref&in=/config/reference.jpg&out=" + _filename + "&x=" + zw["x"] + "&y=" + zw["y"] + "&dx=" + zw["dx"] + "&dy=" + zw["dy"];
function MakeRefImageZW(zw, _enhance, _domainname){
var _filename = zw["name"].replace("/config/", "/img_tmp/");
var url = _domainname + "/editflow?task=cutref&in=/config/reference.jpg&out=" + _filename + "&x=" + zw["x"] + "&y=" + zw["y"] + "&dx=" + zw["dx"] + "&dy=" + zw["dy"];
if (_enhance == true){
url = url + "&enhance=true";
}
var xhttp = new XMLHttpRequest();
try {
xhttp.open("GET", url, false);
xhttp.send();
}
catch (error){}
} catch (error){}
if (xhttp.responseText == "CutImage Done") {
firework.launch('Image Contrast got enhanced', 'success', 5000);
@@ -269,28 +267,3 @@ function MakeContrastImageZW(zw, _enhance, _domainname){
return false;
}
}
function MakeRefZW(zw, _domainname){
_filetarget = zw["name"].replace("/config/", "/img_tmp/");
_filetarget = _filetarget.replace(".jpg", "_org.jpg");
url = _domainname + "/editflow?task=cutref&in=/config/reference.jpg&out="+_filetarget+"&x=" + zw["x"] + "&y=" + zw["y"] + "&dx=" + zw["dx"] + "&dy=" + zw["dy"];
var xhttp = new XMLHttpRequest();
try {
xhttp.open("GET", url, false);
xhttp.send();
}
catch (error){}
if (xhttp.responseText == "CutImage Done") {
_filetarget2 = zw["name"].replace("/config/", "/img_tmp/");
// _filetarget2 = _filetarget2.replace(".jpg", "_org.jpg");
FileCopyOnServer(_filetarget, _filetarget2, _domainname);
firework.launch('Marker got updated', 'success', 5000);
return true;
}
else {
return false;
}
}

33
sd-card/html/readconfigparam.js
View File

@@ -467,8 +467,6 @@ function WriteConfigININew()
}
}
config_split = new Array(0);
for (var cat in param) {
@@ -565,7 +563,6 @@ function WriteConfigININew()
}
function isCommented(input)
{
let isComment = false;
@@ -602,7 +599,6 @@ function getConfigCategory() {
}
function ExtractROIs(_aktline, _type){
var linesplit = ZerlegeZeile(_aktline);
abc = getNUMBERS(linesplit[0], _type);
@@ -678,7 +674,6 @@ function getNUMBERS(_name, _type, _create = true)
}
function CopyReferenceToImgTmp(_domainname)
{
for (index = 0; index < 2; ++index)
@@ -700,7 +695,7 @@ function GetReferencesInfo(){
}
function UpdateConfigReference(_domainname){
function UpdateConfigReferences(_domainname){
for (var index = 0; index < 2; ++index)
{
_filenamenach = REFERENCES[index]["name"];
@@ -712,11 +707,35 @@ function UpdateConfigReference(_domainname){
_filenamevon = _filenamevon.replace(".jpg", "_org.jpg");
FileDeleteOnServer(_filenamenach, _domainname);
FileCopyOnServer(_filenamevon, _filenamenach, _domainname);
}
}
function UpdateConfigReference(_anzneueref, _domainname){
var index = 0;
if (_anzneueref == 1) {
index = 0;
}
else if (_anzneueref == 2) {
index = 1;
}
_filenamenach = REFERENCES[index]["name"];
_filenamevon = _filenamenach.replace("/config/", "/img_tmp/");
FileDeleteOnServer(_filenamenach, _domainname);
FileCopyOnServer(_filenamevon, _filenamenach, _domainname);
_filenamenach = _filenamenach.replace(".jpg", "_org.jpg");
_filenamevon = _filenamevon.replace(".jpg", "_org.jpg");
FileDeleteOnServer(_filenamenach, _domainname);
FileCopyOnServer(_filenamevon, _filenamenach, _domainname);
}
function getNUMBERInfo(){
return NUMBERS;
}