mirror of
https://github.com/jomjol/AI-on-the-edge-device.git
synced 2025-12-07 20:16:55 +03:00
ca01f5a38f
* Create dig-cont_0640_s3_q.tflite * Update edit_reference.html (#2924) Zoom-Einstellungen ausblenden, wenn zoom deaktiviert ist * Update edit_config_template.html (#2925) Zoom-Einstellungen ausblenden, wenn zoom deaktiviert ist + Kameraeinstellungen nicht nur in der config.ini speichern, sondern auch setzen * The parameter "negative" is processed on the MCU * Renamed menu entry Alignment -> References * renamed model file to make naming consistent * Fix test (#2933) * always reset change absolute (#2956) * Create dig-class11_1701_s2.tflite * Update tflite * Update tflite * Camera settings (#3029) * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Fix minor typo and harmonize spaces (#3030) * Update edit_digits.html * Update edit_analog.html * Update overview.html * Update edit_reference.html --------- Co-authored-by: jomjol <30766535+jomjol@users.noreply.github.com> * Source code formatting, ClassFlowPostProcessing.cpp * fix edit_config_template.html Unfortunately, I didn't take out some entries from other experiments because I overlooked/forgot them^^ * fix readconfigparam.js Unfortunately, I didn't take out some entries from other experiments because I overlooked/forgot them^^ * fix edit_config_template.html TakeImage_CamZoomMode_value1 was replaced by TakeImage_CamZoomSize_value1, but not deleted. This caused problems when saving the camera settings. * Update info.html function loadWLANSSID() was present three times * Update overview.html CamFrameSize is no longer needed/used for zoom * Update reply-bot.yaml * homeassistant service discovery: derive node_id when using nested topics (#3088) * derive correct node_id for homeassistant service discovery in nested topics (fixes #1792) * explicit use of std::string * move nodeId creation to separate function add unit-tests * add documentation about node_id generation for Home Assistant MQTT Service Discovery * add Prometheus/OpenMetrics exporter (#3081) * add prometheus endpoint * refine metrics implementation * move metrics generator to ClassFlowControll * add more metrics align prefix * add more metrics clean up * refine documentation * revert dependencies change * sanitize labels * create separate module for openmetrics * move openmetrics to separate folder * clean up * add basic unit-tests * work with const numbers add replaceAll for string replacement avoid opening std namespace adapt unit-tests * Update code/main/server_main.cpp --------- Co-authored-by: CaCO3 <caco3@ruinelli.ch> * Typo * update platformIO to 6.7.0 (ESP IDF 5.2.1) (#3098) * update to platformio/espressif32 @ 6.7.0 * remove unused getReadout() as it throws errors (error: 'virtual std::string ClassFlow::getReadout()' was hidden). --------- Co-authored-by: CaCO3 <caco@ruinelli.ch> * Update reply-bot.yaml (#3107) * Fix actions-label-commenter * Update Helper.cpp * Update Helper.h * Update Helper.cpp * Update readconfigparam.js fix for: In the selected field the value '1' in the section 'TakeImage' in the field 'CamGainceiling' is invalid. PLEASE CHECK BEFORE SAVING! * proposal for renaming and documentation (#3115) * Update server_camera.cpp Fix building with -D DEBUG_DETAIL_ON better alternative to: https://github.com/jomjol/AI-on-the-edge-device/pull/3160 * Update ClassFlowPostProcessing.cpp * Update ClassFlowAlignment.cpp * Fix building with `-D DEBUG_DETAIL_ON` (#3160) Building with `-D DEBUG_DETAIL_ON` has been broken since #3029. Co-authored-by: CaCO3 <caco3@ruinelli.ch> * Handle empty prevalue.ini gracefully (#3162) Fixes #2149. * Bugfix for boot loop (#3175) * Add files via upload * Add files via upload * Add files via upload * Delete param-docs/parameter-pages/TakeImage/Aec2.md has been replaced by CamAec2.md * Delete param-docs/parameter-pages/TakeImage/AutoExposureLevel.md has been replaced by CamAeLevel.md * Delete param-docs/parameter-pages/TakeImage/Brightness.md has been replaced by CamBrightness.md * Delete param-docs/parameter-pages/TakeImage/Contrast.md has been replaced by CamContrast.md * Delete param-docs/parameter-pages/TakeImage/Grayscale.md has been replaced by CamSpecialEffect.md * Delete param-docs/parameter-pages/TakeImage/Negative.md has been replaced by CamSpecialEffect.md * Delete param-docs/parameter-pages/TakeImage/Saturation.md has been replaced by CamSaturation.md * Delete param-docs/parameter-pages/TakeImage/Sharpness.md has been replaced by CamSharpness.md * Delete param-docs/parameter-pages/TakeImage/ImageQuality.md has been replaced by CamQuality.md * Delete param-docs/parameter-pages/TakeImage/Zoom.md has been replaced by CamZoom.md * Delete param-docs/parameter-pages/TakeImage/ZoomMode.md has been replaced by CamZoomSize.md * Delete param-docs/parameter-pages/TakeImage/ZoomOffsetX.md has been replaced by CamZoomOffsetX.md * Delete param-docs/parameter-pages/TakeImage/ZoomOffsetY.md has been replaced by CamZoomOffsetY.md * Delete param-docs/parameter-pages/TakeImage/ImageSize.md has been replaced by CamZoomSize.md * Delete param-docs/parameter-pages/TakeImage/FixedExposure.md has been replaced by CamAec.md * Delete param-docs/parameter-pages/Alignment/FlipImageSize.md has been replaced by CamVflip.md * Delete param-docs/parameter-pages/Alignment/InitialMirror.md has been replaced by CamHmirror.md * CamParameter documentation update https://github.com/jomjol/AI-on-the-edge-device/issues/3185 * typo * add Webhook #3148 (#3163) * WIP add Webhook * fix config html for webhook add tooltips for webhook * webhook: fix not enabling webhook * send webhook as json * Update ApiKey.md * webhook: fix only sending last "Number" * webhook JSON is now closer to the data log in CSV format * webhook: drop timeStampTimeUTC and switch from timeStamp to lastvalue like lokal csv to fix no timestamp on error --------- Co-authored-by: CaCO3 <caco3@ruinelli.ch> * Bugfix for time stamp (#3180) * Update ClassFlowPostProcessing.cpp * Update ClassFlowDefineTypes.h * Update ClassFlowPostProcessing.cpp * Update ClassFlowPostProcessing.cpp * Update ClassFlowPostProcessing.cpp * Update ClassFlowPostProcessing.cpp * Update interface_webhook.cpp * Update readconfigcommon.js fix for: The same message("Image Contrast got enhanced") came up with "Update Marker" and "Enhance Image Contrast". * fix svg favicon The svg one got added in33893eb566but does not work on Firefox * Update platformIO to 6.8.1 (Contains ESP IDF 5.3) (#3196) * Update platformIO to 6.8.1 (ESP IDF 5.3) * removed now redundant typedef * updated IDF manifest hash * Add files via upload so it should work now * Update server_main.cpp --------- Co-authored-by: CaCO3 <caco@ruinelli.ch> Co-authored-by: michael <Heinrich-Tuning@web.de> * Update MainFlowControl.cpp * Add support for OV5640 camera (#3063) * Add support for OV5640 camera * clean up sharpness handling * limit sharpness range to -2 and +2 * refactor * Fix OV3660 sharpness handling * refactor sharpness handling * fix OV3660 zoom mode * reinstate aspect ratio via imageSize * Changed OV5640 full frame size to match datasheet * various fixes * add denoise config and general clean up * fix line endings to LF * Support enabling red blue swap via web interface * update jpeg quality limits * remove color swap config; color swap workaround dependent on vflip * fix missing commit * fix gain ceiling * Update cam vflip param page * fix typo: camdenoise, not camsdenoise * fix compile errors * Update MainFlowControl.cpp * Add rate threshold parameter (#3195) * still needs to be tested https://github.com/jomjol/AI-on-the-edge-device/issues/3143 * Update ClassFlowPostProcessing.cpp code formatting * Update ClassFlowDefineTypes.h code formatting * Update ClassFlowPostProcessing.h code formatting * Update edit_config_template.html * fix * Update config.ini * Update edit_config_template.html * Updated param doc * Rename parameters * Update edit_config_template.html * Update NUMBER.ChangeRateThreshold.md * Update NUMBER.ChangeRateThreshold.md --------- Co-authored-by: CaCO3 <caco3@ruinelli.ch> * Update main.cpp * Update config.ini Adjusted camera settings to make the image brighter. * Update readconfigparam.js Adjusted camera settings to make the image brighter. * add optional ImageUpload for Webhook (#3174) * WIP add Webhook * fix config html for webhook add tooltips for webhook * webhook: fix not enabling webhook * send webhook as json * Update ApiKey.md * webhook: fix only sending last "Number" * webhook JSON is now closer to the data log in CSV format * webhook: add img upload * webhoop added config for imgupload * webhook html fixes * webhook: drop timeStampTimeUTC and switch from timeStamp to lastvalue like lokal csv to fix no timestamp on error * add checkbox for Webhook_UploadImg * Update sd-card/html/edit_config_template.html * Update edit_config_template.html * Update edit_config_template.html * Update edit_config_template.html * added a long timestamp to both webhook requests --------- Co-authored-by: CaCO3 <caco3@ruinelli.ch> * Add files via upload (#3207) * Update ClassFlowPostProcessing.cpp deleted some unnecessary double entries RateType renamed to MaxRateType * Update ClassFlowDefineTypes.h RateType renamed to MaxRateType * Update text on recognition page * Update digital CNN * add a Delay between the WiFi reconnections (#3068) * add a Delay between the WiFi reconnections * log the delay between the WiFi reconnections move the delay after the log * cleanup * cleanup * cleanup * Update edit_alignment.html * cleanup * cleanup * Update platformIO to 6.9.0 (Contains ESP IDF 5.3.1) * Handle crash on corrupted model (#3220) * Upgrade esp-tflite-micro to 1.3.1 * Added log message to hint in case it crashes on loading a corrupted model --------- Co-authored-by: CaCO3 <caco@ruinelli.ch> * new dig-class100-173-s2-q on 23.800 images (#3257) * new dig-class100-173-s2-q on 23.800 images * platformio/espressif32 @ 6.8.1 for esp32cam-dev * Revert "platformio/espressif32 @ 6.8.1 for esp32cam-dev" This reverts commitcc9297d483. * not using platformio 6.1.16 * Revert "not using platformio 6.1.16" This reverts commitef18e4fae7. * moved number edit box styles into new file edit_style.css (#3262) changed input[type=number] from 60px to 3em, to show 3 digits with current font size. * added note about only TLS 1.2 is supported (#3213) * Renamed digital to digit (#3219) * renamed Digital to Digit * added param migration * Update .github/label-commenter-config.yaml * renamed AnalogDigitTransition* to AnalogToDigitTransition* --------- Co-authored-by: CaCO3 <caco@ruinelli.ch> * Update Changelog.md * Update Changelog.md --------- Co-authored-by: jomjol <30766535+jomjol@users.noreply.github.com> Co-authored-by: michael <Heinrich-Tuning@web.de> Co-authored-by: Frank Haverland <fspapaping@googlemail.com> Co-authored-by: kub3let <95883234+kub3let@users.noreply.github.com> Co-authored-by: Marco H <myxor@users.noreply.github.com> Co-authored-by: Henry Thasler <henrythasler@users.noreply.github.com> Co-authored-by: CaCO3 <caco@ruinelli.ch> Co-authored-by: Sebastian Lövdahl <slovdahl@hibox.fi> Co-authored-by: Raphael Hehl <raphael@rhehl.de> Co-authored-by: jasaw <jasaw@dius.com.au> Co-authored-by: Francesco Carnielli <hex7c0@gmail.com> Co-authored-by: kalwados <kalwados@gmx.de>
661 lines
25 KiB
HTML
661 lines
25 KiB
HTML
<!DOCTYPE html>
|
|
<html lang="en" xml:lang="en">
|
|
|
|
<head>
|
|
<meta charset="UTF-8" />
|
|
<title>Alignment markers</title>
|
|
|
|
<style>
|
|
h1 {font-size: 2em;}
|
|
h2 {font-size: 1.5em; margin-block-start: 0.0em; margin-block-end: 0.2em;}
|
|
h3 {font-size: 1.2em;}
|
|
p {font-size: 1em;}
|
|
|
|
input[type=number] {
|
|
width: 60px;
|
|
margin-right: 10px;
|
|
padding: 3px 5px;
|
|
display: inline-block;
|
|
border: 1px solid #ccc;
|
|
font-size: 16px;
|
|
}
|
|
|
|
input[type=text] {
|
|
padding: 3px 5px;
|
|
display: inline-block;
|
|
border: 1px solid #ccc;
|
|
font-size: 16px;
|
|
}
|
|
|
|
input:out-of-range {
|
|
background-color: rgba(255, 0, 0, 0.25);
|
|
border: 1px solid red;
|
|
}
|
|
|
|
select {
|
|
padding: 3px 5px;
|
|
display: inline-block;
|
|
border: 1px solid #ccc;
|
|
font-size: 16px;
|
|
margin-right: 10px;
|
|
min-width: 100px;
|
|
vertical-align: middle;
|
|
}
|
|
|
|
.button {
|
|
padding: 5px 10px;
|
|
width: 205px;
|
|
font-size: 16px;
|
|
}
|
|
|
|
th, td {
|
|
padding: 5px 5px 5px 0px;
|
|
}
|
|
|
|
table {
|
|
width: 660px;
|
|
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>
|
|
|
|
<link href="firework.css?v=$COMMIT_HASH" rel="stylesheet">
|
|
|
|
<script type="text/javascript" src="common.js?v=$COMMIT_HASH"></script>
|
|
<script type="text/javascript" src="jquery-3.6.0.min.js?v=$COMMIT_HASH"></script>
|
|
<script type="text/javascript" src="firework.js?v=$COMMIT_HASH"></script>
|
|
|
|
</head>
|
|
|
|
<body style="font-family: arial; padding: 0px 10px;">
|
|
<div id="overlay">
|
|
<div id="overlaytext"></div>
|
|
</div>
|
|
|
|
<h2>Alignment Markers</h2>
|
|
<details id="desc_details" style="font-size:16px">
|
|
<summary><b>CLICK HERE</b> for usage description. More infos in documentation:
|
|
<a href=https://jomjol.github.io/AI-on-the-edge-device-docs/Alignment/ target=_blank>Alignment</a>
|
|
</summary>
|
|
<p>
|
|
Two alignment markers with clear contour and proper contrast are needed to identify unique "fix points" on the image.
|
|
The marker area should be not be part of the variable area of ROI evaluation. Please find more information in documenation:
|
|
<a href=https://jomjol.github.io/AI-on-the-edge-device-docs/Alignment/ target=_blank>Alignment</a>
|
|
</p>
|
|
<p>
|
|
Select an alignment marker area using drag and dop feature by mouse operation or by manually entering the coordinates and sizes in the fields below the image.
|
|
After you selected a suitable first alignment marker area, push the <b>"Update Marker"</b> button. Switch to second alignment marker with <b>"Marker"</b>
|
|
and repeat the procedure.
|
|
</p>
|
|
<p>
|
|
After definition of both alignment marker is completed don't forget to save with the <b>"Save New Marker"</b> button!<br>
|
|
<b>NOTE:</b> There is no need to perform a reboot after every saving or step. It's sufficient to reboot after all configuration steps
|
|
(reference image, alignment, ROI configuration) are completed to activate new configuration.
|
|
</p>
|
|
</details>
|
|
<hr />
|
|
|
|
<table>
|
|
<colgroup>
|
|
<col span="1" style="width: 33.3%;">
|
|
<col span="1" style="width: 33.3%;">
|
|
<col span="1" style="width: 33.3%;">
|
|
</colgroup>
|
|
|
|
<tr>
|
|
<td>Marker:
|
|
<select id="index" name="reference" onchange="ChangeSelection()">
|
|
<option value="0" selected>Marker 1</option>
|
|
<option value="1" >Marker 2</option>
|
|
</select>
|
|
</td>
|
|
<td colspan="2" style="padding-left: 22px; color: grey;">Filename: <output type="text" name="name" id="name" onchange="namechanged()"></td>
|
|
</tr>
|
|
|
|
<tr>
|
|
<td style="padding-top: 10px">x: <input type="number" name="refx" id="refx" step=1 onchange="valuemanualchanged()"></td>
|
|
<td style="padding-top: 10px">dx: <input type="number" name="refdx" id="refdx" step=1 onchange="valuemanualchanged()"></td>
|
|
<td rowspan="2" style="padding-top: 10px;"><button style="color:black;" type="button" class="button" id="updatemarker" onclick="CutOutReference()">Update Marker</button></td>
|
|
</tr>
|
|
|
|
<tr>
|
|
<td>y: <input type="number" name="refy" id="refy" step=1 onchange="valuemanualchanged()"></td>
|
|
<td>dy: <input type="number" name="refdy" id="refdy" step=1 onchange="valuemanualchanged()"></td>
|
|
</tr>
|
|
|
|
<tr>
|
|
<td style="vertical-align: bottom;">Selected Image Area:</td>
|
|
<td style="vertical-align: bottom;">Resulting Marker:</td>
|
|
<td><button style="color:black;" type="button" class="button" id="enhancecontrast" onclick="EnhanceContrast()">Enhance Image Contrast</button></td>
|
|
</tr>
|
|
|
|
<tr>
|
|
<td style="height:70px; vertical-align: top;"><img id="img_ref_org" src = ""></td> <!--/img_tmp/ref_zw_org.jpg-->
|
|
<td style="height:70px; vertical-align: top;"><img id="img_ref" src = ""></td> <!--/img_tmp/ref_zw.jpg-->
|
|
</tr>
|
|
|
|
<tr>
|
|
<td style="vertical-align:bottom;"><b>Reference Image:</b></td>
|
|
<td></td>
|
|
<td>
|
|
<button style="font-weight:bold; color:black;" type="submit" class="button" id="savemarker" onclick="SaveToConfig()">Save New Marker</button>
|
|
</td>
|
|
</tr>
|
|
|
|
<tr>
|
|
<td colspan="3"><canvas id="canvas" crossorigin></canvas></td>
|
|
</tr>
|
|
</table>
|
|
|
|
<script type="text/javascript" src="readconfigparam.js?v=$COMMIT_HASH"></script>
|
|
<script type="text/javascript" src="readconfigcommon.js?v=$COMMIT_HASH"></script>
|
|
|
|
<script type="text/javascript">
|
|
var canvas = document.getElementById('canvas'),
|
|
ctx = canvas.getContext('2d'),
|
|
imageObj = new Image(),
|
|
rect = {},
|
|
drag = false,
|
|
aktindex = 0,
|
|
refInfo,
|
|
enhanceCon = false,
|
|
domainname = getDomainname(),
|
|
neueref1,
|
|
neueref2,
|
|
cofcat,
|
|
param;
|
|
|
|
function doReboot() {
|
|
if (confirm("Are you sure you want to reboot? Did you save your changes?")) {
|
|
var stringota = domainname + "/reboot";
|
|
window.location = stringota;
|
|
window.location.href = stringota;
|
|
window.location.assign(stringota);
|
|
window.location.replace(stringota);
|
|
}
|
|
}
|
|
|
|
function ChangeSelection(){
|
|
aktindex = parseInt(document.getElementById("index").value);
|
|
|
|
if (aktindex == 0 && neueref1 == 1) {
|
|
UpdateReference();
|
|
}
|
|
else if (aktindex == 1 && neueref2 == 1) {
|
|
UpdateReference();
|
|
}
|
|
else {
|
|
LoadReference();
|
|
}
|
|
}
|
|
|
|
function SaveToConfig() {
|
|
document.getElementById("overlay").style.display = "block";
|
|
document.getElementById("overlaytext").innerHTML = "Save Alignment Marker...";
|
|
|
|
if (confirm("Are you sure you want to save the new alignment marker configuration?")) {
|
|
function sleep(ms) {
|
|
return new Promise(resolve => setTimeout(resolve, ms));
|
|
}
|
|
|
|
async function task() {
|
|
while (true) {
|
|
WriteConfigININew();
|
|
|
|
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);
|
|
}
|
|
|
|
SaveConfigToServer(domainname);
|
|
|
|
document.getElementById("updatemarker").disabled = false;
|
|
// document.getElementById("savemarker").disabled = true;
|
|
// document.getElementById("enhancecontrast").disabled = true;
|
|
|
|
EnDisableItem(false, "savemarker", true);
|
|
EnDisableItem(false, "enhancecontrast", true);
|
|
|
|
document.getElementById("overlay").style.display = "none";
|
|
firework.launch('Alignment marker saved. They will get applied after next reboot', 'success', 5000);
|
|
return;
|
|
}
|
|
}
|
|
|
|
setTimeout(function () {
|
|
// Delay so the overlay gets shown
|
|
task();
|
|
}, 1);
|
|
}
|
|
else {
|
|
document.getElementById("overlay").style.display = "none";
|
|
}
|
|
}
|
|
|
|
function EnhanceContrast() {
|
|
document.getElementById("overlay").style.display = "block";
|
|
document.getElementById("overlaytext").innerHTML = "Enhancing Image Contrast...";
|
|
|
|
refInfo[aktindex]["name"] = document.getElementById("name").value;
|
|
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 = true;
|
|
var durchlaufe = 0;
|
|
|
|
function sleep(ms) {
|
|
return new Promise(resolve => setTimeout(resolve, ms));
|
|
}
|
|
|
|
async function task() {
|
|
while (true) {
|
|
if (durchlaufe > 10) {
|
|
document.getElementById("overlay").style.display = "none";
|
|
firework.launch('Enhancing Image Contrast aborted, timeout!', 'danger', 5000);
|
|
return;
|
|
}
|
|
|
|
var ret = MakeRefImageZW(refInfo[aktindex], enhanceCon, domainname);
|
|
|
|
if (ret) {
|
|
UpdateReference();
|
|
document.getElementById("overlay").style.display = "none";
|
|
|
|
if (aktindex == 0) {
|
|
neueref1 = 1;
|
|
}
|
|
else if (aktindex == 1) {
|
|
neueref2 = 1;
|
|
}
|
|
return;
|
|
}
|
|
else {
|
|
// Get status
|
|
var xhttp = new XMLHttpRequest();
|
|
durchlaufe = durchlaufe + 1;
|
|
|
|
try {
|
|
xhttp.open("GET", domainname + "/statusflow", false);
|
|
xhttp.send();
|
|
}
|
|
catch (error){}
|
|
|
|
document.getElementById("overlaytext").innerHTML = "Device is busy, waiting until the Digitization 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(){
|
|
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();
|
|
}
|
|
|
|
var _filenameurl = refInfo[aktindex]["name"].replace("/config/", "/img_tmp/");
|
|
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 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.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 = false;
|
|
}
|
|
}
|
|
}
|
|
|
|
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();
|
|
}
|
|
|
|
var _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();
|
|
|
|
document.getElementById("updatemarker").disabled = false;
|
|
// document.getElementById("savemarker").disabled = true;
|
|
// document.getElementById("enhancecontrast").disabled = true;
|
|
|
|
EnDisableItem(false, "savemarker", true);
|
|
EnDisableItem(false, "enhancecontrast", true);
|
|
|
|
if (!loadConfig(domainname)) {
|
|
firework.launch('Configuration could not be loaded! Please reload the page!', 'danger', 30000);
|
|
return;
|
|
}
|
|
|
|
ParseConfig();
|
|
param = getConfigParameters();
|
|
cofcat = getConfigCategory();
|
|
|
|
canvas.addEventListener('mousedown', mouseDown, false);
|
|
canvas.addEventListener('mouseup', mouseUp, false);
|
|
canvas.addEventListener('mousemove', mouseMove, false);
|
|
loadCanvas(domainname + "/fileserver/config/reference.jpg");
|
|
|
|
refInfo = GetReferencesInfo();
|
|
|
|
LoadReference();
|
|
drawImage();
|
|
draw();
|
|
}
|
|
|
|
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(){
|
|
document.getElementById("overlay").style.display = "block";
|
|
document.getElementById("overlaytext").innerHTML = "Updating marker...";
|
|
|
|
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;
|
|
var durchlaufe = 0;
|
|
|
|
function sleep(ms) {
|
|
return new Promise(resolve => setTimeout(resolve, ms));
|
|
}
|
|
|
|
async function task() {
|
|
while (true) {
|
|
if (durchlaufe > 10) {
|
|
document.getElementById("overlay").style.display = "none";
|
|
firework.launch('Updating marker aborted, timeout!', 'danger', 5000);
|
|
return;
|
|
}
|
|
|
|
var ret = MakeRefImageZW(refInfo[aktindex], enhanceCon, domainname);
|
|
|
|
if (ret) {
|
|
UpdateReference();
|
|
|
|
document.getElementById("updatemarker").disabled = false;
|
|
// document.getElementById("savemarker").disabled = false;
|
|
// document.getElementById("enhancecontrast").disabled = false;
|
|
|
|
EnDisableItem(true, "savemarker", true);
|
|
EnDisableItem(true, "enhancecontrast", true);
|
|
|
|
document.getElementById("overlay").style.display = "none";
|
|
|
|
if (aktindex == 0) {
|
|
neueref1 = 1;
|
|
}
|
|
else if (aktindex == 1) {
|
|
neueref2 = 1;
|
|
}
|
|
return;
|
|
}
|
|
else {
|
|
// Get status
|
|
var xhttp = new XMLHttpRequest();
|
|
durchlaufe = durchlaufe + 1;
|
|
|
|
try {
|
|
xhttp.open("GET", domainname + "/statusflow", false);
|
|
xhttp.send();
|
|
}
|
|
catch (error){}
|
|
|
|
document.getElementById("overlaytext").innerHTML = "Device is busy, waiting until the Digitization 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 EnDisableItem(_status, _name, _optional) {
|
|
_color = "rgb(122, 122, 122)";
|
|
|
|
if (_status) {
|
|
_color = "black";
|
|
}
|
|
|
|
if (_optional) {
|
|
document.getElementById(_name).disabled = !_status;
|
|
document.getElementById(_name).style.color = _color;
|
|
}
|
|
|
|
document.getElementById(_name).style.color = _color;
|
|
}
|
|
|
|
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;
|
|
draw();
|
|
}
|
|
else {
|
|
draw();
|
|
var canvas = document.getElementById('canvas');
|
|
var context = canvas.getContext('2d');
|
|
|
|
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();
|
|
}
|
|
}
|
|
|
|
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();
|
|
}
|
|
}
|
|
|
|
init();
|
|
</script>
|
|
</body>
|
|
</html>
|