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-11 14:07:00 +03:00
Code Issues Packages Projects Releases Wiki Activity

Rolling 20210611

Browse Source
This commit is contained in:
jomjol
2021-06-11 07:31:06 +02:00
parent 8308f159ad
commit a202a6abdc
41 changed files with 2868 additions and 1206 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -61,7 +61,7 @@ select {
<option value="1" >Reference 1</option>
</select>
</td>
<td colspan="2">Storage Path/Name: <input type="text" name="name" id="name"></td>
<td colspan="2">Storage Path/Name: <input 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>
@@ -90,9 +90,8 @@ select {
</table>
<script type="text/javascript" src="./gethost.js"></script>
<script type="text/javascript" src="./readconfig.js"></script>
<script type="text/javascript" src="./readconfigcommon.js"></script>
<script type="text/javascript" src="./readconfigparam.js"></script>
<script language="JavaScript">
var canvas = document.getElementById('canvas'),
@@ -105,7 +104,8 @@ select {
enhanceCon = false,
param;
basepath = "http://192.168.178.26";
basepath = "";
basepath = "",
param;
function ChangeSelection(){
aktindex = parseInt(document.getElementById("index").value);
@@ -113,14 +113,9 @@ function ChangeSelection(){
}
function SaveToConfig(){
/*
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;
*/
UpdateConfigReference(refInfo, basepath);
WriteConfigININew();
UpdateConfigReference(basepath)
SaveConfigToServer(basepath);
}
function EnhanceContrast(){
@@ -133,10 +128,6 @@ function EnhanceContrast(){
enhanceCon = true;
MakeContrastImageZW(refInfo[aktindex], enhanceCon, basepath);
UpdateReference();
// var url = basepath + "/fileserver" + "/img_tmp/ref_zw.jpg?" + Date.now();
// document.getElementById("img_ref").src = url;
// var url = basepath + "/fileserver" + "/img_tmp/ref_zw_org.jpg?" + Date.now();
// document.getElementById("img_ref_org").src = url;
}
function UpdateReference(){
@@ -211,6 +202,7 @@ function dataURLtoBlob(dataurl) {
basepath = getbasepath();
loadConfig(basepath);
ParseConfig();
param = getConfigParameters();
canvas.addEventListener('mousedown', mouseDown, false);
canvas.addEventListener('mouseup', mouseUp, false);
@@ -355,6 +347,12 @@ function dataURLtoBlob(dataurl) {
}
}
function namechanged()
{
_name = document.getElementById("name").value;
refInfo[aktindex]["name"] = _name;
}
function valuemanualchanged(){
if (!drag) {
rect.w = document.getElementById("refdx").value;

219
sd-card/html/edit_analog.html
View File

@@ -69,6 +69,21 @@ th, td {
<div id="div1">
<p>
<table>
<tr>
<class id="Numbers_text" style="color:black;">Number: </class>
<select id="Numbers_value1" onchange="numberChanged()">
<option value="0" selected>default</option>
<option value="1" >NT</option>
<option value="2" >HT</option>
</select>
<input class="move" type="submit" id="renameNumber" name="renameNumber" onclick="renameNumber()" value="Rename">
<input class="move" type="submit" id="newNumber" name="newNumber" onclick="newNumber()" value="New">
<input class="move" type="submit" id="removeNumber" name="removeNumber" onclick="removeNumber()" value="Remove">
</tr>
</table>
</p>
<table>
<tr>
@@ -89,10 +104,12 @@ th, td {
<option value="1" >ROI 1</option>
</select>
</td>
<td>Name: <input type="text" name="name" id="name" onchange="onNameChange()" size="13"></td>
<td>
<input class="button" type="submit" id="renameROI" name="renameROI" onclick="renameROI()" value="Rename">
<td>
<input class="button" type="submit" id="moveNext" onclick="moveNext()" value="move Next">
<input class="button" type="submit" id="movePrevious" onclick="movePrevious()" value="move Previous">
<td>
<input class="move" type="submit" id="moveNext" onclick="moveNext()" value="move Next">
<input class="move" type="submit" id="movePrevious" onclick="movePrevious()" value="move Previous">
</td>
</tr>
<tr>
@@ -114,11 +131,10 @@ th, td {
</table>
<script type="text/javascript" src="./gethost.js"></script>
<script type="text/javascript" src="./readconfigcommon.js"></script>
<script type="text/javascript" src="./readconfig.js"></script>
<script type="text/javascript" src="./jquery-3.5.1.min.js"></script>
<script type="text/javascript" src="./gethost.js"></script>
<script type="text/javascript" src="./readconfigcommon.js"></script>
<script type="text/javascript" src="./readconfigparam.js"></script>
<script language="JavaScript">
var canvas = document.getElementById('canvas'),
ctx = canvas.getContext('2d'),
@@ -179,21 +195,22 @@ function deleteROI(){
}
function newROI(){
var zw = ROIInfo[ROIInfo.length-1];
ROIInfo.push(zw);
for (var i = ROIInfo.length-2; i > aktindex + 1; --i){
ROIInfo[i] = ROIInfo[i-1];
}
aktindex++;
ROIInfo[aktindex] = new Object;
ROIInfo[aktindex]["pos_ref"] = -1;
ROIInfo[aktindex]["name"] = "ROI" + aktindex;
ROIInfo[aktindex]["x"] = 1;
ROIInfo[aktindex]["y"] = 1;
ROIInfo[aktindex]["dx"] = ROIInfo[aktindex-1]["dx"];
ROIInfo[aktindex]["dy"] = ROIInfo[aktindex-1]["dy"];
ROIInfo[aktindex]["ar"] = ROIInfo[aktindex-1]["ar"];
UpdateROIs();
var sel = document.getElementById("Numbers_value1");
var _number= sel.options[sel.selectedIndex].text;
sel = document.getElementById("index");
var _roialt= sel.options[sel.selectedIndex].text;
var _roinew = prompt("Please enter name of new ROI", "name");
if (ROIInfo.length > 0)
erg = CreateROI(_number, "analog", sel.selectedIndex, _roinew, 1, 1, ROIInfo[aktindex]["dx"], ROIInfo[aktindex]["dy"]);
else
erg = CreateROI(_number, "analog", sel.selectedIndex, _roinew, 1, 1, 30, 30);
if (erg != "")
alert(erg);
else
UpdateROIs(_roinew);
}
function movePrevious(){
@@ -223,34 +240,66 @@ function ChangeSelection(){
}
function SaveToConfig(){
_enabled = document.getElementById("Category_Analog_enabled").checked;
SaveROIToConfig(ROIInfo, "[Analog]", basepath, _enabled);
UpdatePage();
_zwcat = getConfigCategory();
_zwcat["Analog"]["enabled"] = document.getElementById("Category_Analog_enabled").checked;
WriteConfigININew();
SaveConfigToServer(basepath);
}
function UpdateROIs(){
document.getElementById("Category_Analog_enabled").checked = true;
var sel = document.getElementById("Numbers_value1");
var _number = sel.options[sel.selectedIndex].text;
ROIInfo = getROIInfo("analog", _number);
_catzw = getConfigCategory();
if (_catzw["Analog"]["enabled"] == false)
{
document.getElementById("Category_Analog_enabled").checked = false;
EnDisableDigits();
alert("Analog ROIs are disabled - please enable (Check box top left).\n");
return;
}
if (ROIInfo.length == 0){
alert("There are no ROIs defined.\nPlease first define minimum one ROI in the config.ini by hand.\n");
document.getElementById("newROI").disabled = true;
alert("There are no ROIs defined.\nPlease first create a new ROI (\"New ROIs ...\").\n");
document.getElementById("newROI").disabled = false;
document.getElementById("deleteROI").disabled = true;
document.getElementById("index").disabled = true;
document.getElementById("saveroi").disabled = true;
document.getElementById("renameROI").disabled = true;
document.getElementById("moveNext").disabled = true;
document.getElementById("movePrevious").disabled = true;
return;
}
else
{
document.getElementById("newROI").disabled = false;
document.getElementById("deleteROI").disabled = false;
document.getElementById("renameROI").disabled = false;
document.getElementById("index").disabled = false;
document.getElementById("saveroi").disabled = false;
}
var _index = document.getElementById("index");
while (_index.length){
_index.remove(0);
}
if (aktindex > ROIInfo.length)
aktindex = ROIInfo.length;
for (var i = 0; i < ROIInfo.length; ++i){
var option = document.createElement("option");
option.text = "ROI " + (i + 1);
option.text = ROIInfo[i]["name"];
option.value = i;
_index.add(option);
_index.add(option);
if (typeof _sel !== 'undefined') {
if (option.text == _sel)
aktindex = i;
}
}
_index.selectedIndex = aktindex;
@@ -267,7 +316,6 @@ function UpdateROIs(){
document.getElementById("lockAR").checked = lockAR;
document.getElementById("name").value = ROIInfo[aktindex]["name"];
document.getElementById("refx").value = ROIInfo[aktindex]["x"];
document.getElementById("refy").value = ROIInfo[aktindex]["y"];
document.getElementById("refdx").value = ROIInfo[aktindex]["dx"];
@@ -277,26 +325,8 @@ function UpdateROIs(){
rect.w = ROIInfo[aktindex]["dx"];
rect.h = ROIInfo[aktindex]["dy"];
draw();
}
function ParseIni(_basepath) {
loadConfig(_basepath);
ParseConfig();
document.getElementById("Category_Analog_enabled").checked = true;
ROIInfo = getROIInfo("[Analog]");
if (!GetAnalogEnabled())
{
document.getElementById("Category_Analog_enabled").checked = false;
EnDisableAnalog();
alert("Analog ROIs are disabled - please enable (Check box top left).\n");
return;
}
UpdateROIs();
}
function loadCanvas(dataURL) {
var canvas = document.getElementById('canvas');
@@ -334,7 +364,10 @@ function ParseIni(_basepath) {
canvas.addEventListener('mouseup', mouseUp, false);
canvas.addEventListener('mousemove', mouseMove, false);
loadCanvas(basepath + "/fileserver/config/reference.jpg");
ParseIni(basepath);
loadConfig(basepath);
ParseConfig();
param = getConfigParameters();
UpdateNUMBERS();
drawImage();
draw();
}
@@ -349,6 +382,66 @@ function ParseIni(_basepath) {
// context.restore();
}
function UpdateNUMBERS(_sel){
zw = getNUMBERInfo();
index = 0;
var _index = document.getElementById("Numbers_value1");
while (_index.length){
_index.remove(0);
}
for (var i = 0; i < zw.length; ++i){
var option = document.createElement("option");
option.text = zw[i]["name"];
option.value = i;
_index.add(option);
if (typeof _sel !== 'undefined') {
if (zw[i]["name"] == _sel)
index = i
}
}
_index.selectedIndex = index;
UpdateROIs();
}
function renameNumber(){
var sel = document.getElementById("Numbers_value1");
var _delte= sel.options[sel.selectedIndex].text;
var _numbernew = prompt("Please enter new name", _delte);
erg = RenameNUMBER(_delte, _numbernew);
if (erg != "")
alert(erg);
else
UpdateNUMBERS(_numbernew);
}
function newNumber(){
var _numbernew = prompt("Please enter name of new number", "name");
erg = CreateNUMBER(_numbernew);
if (erg != "")
alert(erg);
else
UpdateNUMBERS(_numbernew);
}
function removeNumber(){
if (confirm("This will remove the number complete (analog and digital).\nIf you only want to remove the digital ROIs, please use \"Delete ROIs\".\nDo you want to proceed?")) {
var sel = document.getElementById("Numbers_value1");
var _delte= sel.options[sel.selectedIndex].text;
erg = DeleteNUMBER(_delte);
if (erg != "")
alert(erg);
UpdateNUMBERS();
}
}
function draw() {
var canvas = document.getElementById('canvas');
@@ -483,6 +576,30 @@ function ParseIni(_basepath) {
}
}
function renameROI(){
var sel = document.getElementById("Numbers_value1");
var _number= sel.options[sel.selectedIndex].text;
sel = document.getElementById("index");
var _roialt= sel.options[sel.selectedIndex].text;
var _roinew = prompt("Please enter new name", _roialt);
erg = RenameROI(_number, "analog", _roialt, _roinew);
if (erg != "")
alert(erg);
else
UpdateROIs(_roinew);
}
function numberChanged()
{
UpdateROIs();
}
init();
</script>

259
sd-card/html/edit_config_param.html
View File

@@ -362,20 +362,6 @@ textarea {
<tr>
<td colspan="4" style="padding-left: 20px;"><h4>PostProcessing</h4></td>
</tr>
<tr>
<td width="20px" style="padding-left: 40px;">
<input type="checkbox" id="PostProcessing_DecimalShift_enabled" value="1" onclick = 'InvertEnableItem("PostProcessing", "DecimalShift")' unchecked >
</td>
<td width="200px">
<class id="PostProcessing_DecimalShift_text" style="color:black;">DecimalShift</class>
</td>
<td>
<input type="number" id="PostProcessing_DecimalShift_value1" step="1">
</td>
<td style="font-size: 80%;">
shift the digit separator within the digital digits (positiv and negativ)
</td>
</tr>
<tr>
<td width="20px" style="padding-left: 40px;">
<input type="checkbox" id="PostProcessing_PreValueUse_enabled" value="1" onclick = 'InvertEnableItem("PostProcessing", "PreValueUse")' unchecked >
@@ -473,6 +459,34 @@ textarea {
</td>
</tr>
<tr>
<td style="padding-left: 40px;" colspan="4">
<br>
<b>Postprocessing Individual Paramters:
<select id="Numbers_value1" onchange="numberChanged()">
<option value="0" selected>default</option>
<option value="1" >NT</option>
<option value="2" >HT</option>
</select></b>
</td>
</tr>
<tr>
<td width="20px" style="padding-left: 40px;">
<input type="checkbox" id="PostProcessing_DecimalShift_enabled" value="1" onclick = 'InvertEnableItem("PostProcessing", "DecimalShift")' unchecked >
</td>
<td width="200px">
<class id="PostProcessing_DecimalShift_text" style="color:black;">DecimalShift</class>
</td>
<td>
<input type="number" id="PostProcessing_DecimalShift_value1" step="1">
</td>
<td style="font-size: 80%;">
shift the digit separator within the digital digits (positiv and negativ)
</td>
</tr>
<tr>
<td colspan="4" style="padding-left: 20px;"><h4><input type="checkbox" id="Category_MQTT_enabled" value="1" onclick = 'UpdateAfterCategoryCheck()' unchecked > MQTT</h4></td>
</tr>
@@ -730,6 +744,8 @@ textarea {
basepath = "http://192.168.178.22";
param;
category;
NUNBERSAkt = -1;
NUMBERS;
function LoadConfigNeu() {
@@ -749,12 +765,32 @@ function LoadConfigNeu() {
loadConfig(basepath);
ParseConfig();
param = getConfigParameters();
category = getConfigCategory();
category = getConfigCategory();
InitIndivParameter();
UpdateInput();
UpdateInputIndividual();
UpdateExpertModus();
document.getElementById("divall").style.display = '';
}
function InitIndivParameter()
{
NUMBERS = getNUMBERInfo();
var _index = document.getElementById("Numbers_value1");
while (_index.length)
_index.remove(0);
for (var i = 0; i < NUMBERS.length; ++i){
var option = document.createElement("option");
option.text = NUMBERS[i]["name"];
option.value = i;
_index.add(option);
}
_index.selectedIndex = 0;
}
function getParameterByName(name, url = window.location.href) {
name = name.replace(/[\[\]]/g, '\\$&');
@@ -765,43 +801,78 @@ function getParameterByName(name, url = window.location.href) {
return decodeURIComponent(results[2].replace(/\+/g, ' '));
}
function WriteParameter(_param, _category, _cat, _name, _optional, _select = false, _anzpara = 1){
if (_param[_cat][_name]["found"]){
if (_optional) {
document.getElementById(_cat+"_"+_name+"_enabled").checked = _param[_cat][_name]["enabled"];
for (var j = 1; j <= _anzpara; ++j) {
document.getElementById(_cat+"_"+_name+"_value"+j).disabled = !_param[_cat][_name]["enabled"];
}
}
document.getElementById(_cat+"_"+_name+"_text").style="color:black;"
if (_select) {
var textToFind = _param[_cat][_name]["value1"];
var dd = document.getElementById(_cat+"_"+_name+"_value1");
for (var i = 0; i < dd.options.length; i++) {
if (dd.options[i].text.toLowerCase() === textToFind.toLowerCase()) {
dd.selectedIndex = i;
break;
function WriteParameter(_param, _category, _cat, _name, _optional, _select = false, _anzpara = 1, _number = -1){
if (_number > -1)
{
if (NUMBERS[_number][_cat][_name]["found"]){
if (_optional) {
document.getElementById(_cat+"_"+_name+"_enabled").checked = _param[_cat][_name]["enabled"];
for (var j = 1; j <= _anzpara; ++j)
document.getElementById(_cat+"_"+_name+"_value"+j).disabled = NUMBERS[_number][_cat][_name]["enabled"];
}
document.getElementById(_cat+"_"+_name+"_text").style="color:black;"
if (_select) {
var textToFind;
textToFind = NUMBERS[_number][_cat][_name]["value1"];
var dd = document.getElementById(_cat+"_"+_name+"_value1");
for (var i = 0; i < dd.options.length; i++) {
if (dd.options[i].text.toLowerCase() === textToFind.toLowerCase()) {
dd.selectedIndex = i;
break;
}
}
}
else {
for (var j = 1; j <= _anzpara; ++j)
document.getElementById(_cat+"_"+_name+"_value"+j).value = NUMBERS[_number][_cat][_name]["value"+j];
}
}
else {
for (var j = 1; j <= _anzpara; ++j) {
document.getElementById(_cat+"_"+_name+"_value"+j).value = _param[_cat][_name]["value"+j];
if (_optional) {
document.getElementById(_cat+"_"+_name+"_enabled").disabled = true;
for (var j = 1; j <= _anzpara; ++j) {
document.getElementById(_cat+"_"+_name+"_value"+j).disabled = true;
}
}
document.getElementById(_cat+"_"+_name+"_text").style="color:lightgrey;"
}
}
else
{
if (_param[_cat][_name]["found"]){
if (_optional) {
document.getElementById(_cat+"_"+_name+"_enabled").checked = _param[_cat][_name]["enabled"];
for (var j = 1; j <= _anzpara; ++j)
document.getElementById(_cat+"_"+_name+"_value"+j).disabled = !_param[_cat][_name]["enabled"];
}
document.getElementById(_cat+"_"+_name+"_text").style="color:black;"
if (_select) {
var textToFind;
textToFind = _param[_cat][_name]["value1"];
var dd = document.getElementById(_cat+"_"+_name+"_value1");
for (var i = 0; i < dd.options.length; i++) {
if (dd.options[i].text.toLowerCase() === textToFind.toLowerCase()) {
dd.selectedIndex = i;
break;
}
}
}
else {
for (var j = 1; j <= _anzpara; ++j)
document.getElementById(_cat+"_"+_name+"_value"+j).value = _param[_cat][_name]["value"+j];
}
}
}
else {
if (_optional) {
document.getElementById(_cat+"_"+_name+"_enabled").disabled = true;
for (var j = 1; j <= _anzpara; ++j) {
document.getElementById(_cat+"_"+_name+"_value"+j).disabled = true;
}
else {
if (_optional) {
document.getElementById(_cat+"_"+_name+"_enabled").disabled = true;
for (var j = 1; j <= _anzpara; ++j) {
document.getElementById(_cat+"_"+_name+"_value"+j).disabled = true;
}
}
document.getElementById(_cat+"_"+_name+"_text").style="color:lightgrey;"
}
document.getElementById(_cat+"_"+_name+"_text").style="color:lightgrey;"
}
///////////////// am Ende, falls Kategorie als gesamtes nicht ausgewählt --> deaktivieren
if (_category[_cat]["enabled"] == false)
{
@@ -813,6 +884,7 @@ function WriteParameter(_param, _category, _cat, _name, _optional, _select = fal
}
document.getElementById(_cat+"_"+_name+"_text").style="color:lightgrey;"
}
EnDisableItem(_category[_cat]["enabled"], _param, _category, _cat, _name, _optional);
}
@@ -843,7 +915,7 @@ function InvertEnableItem(_cat, _param)
}
function EnDisableItem(_status, _param, _category, _cat, _name, _optional)
function EnDisableItem(_status, _param, _category, _cat, _name, _optional, _number = -1)
{
_status = _param[_cat][_name]["found"] && _category[_cat]["enabled"];
@@ -857,10 +929,18 @@ function EnDisableItem(_status, _param, _category, _cat, _name, _optional)
document.getElementById(_cat+"_"+_name+"_enabled").style=_color;
}
if (!_param[_cat][_name]["enabled"]) {
_status = false;
_color = "color:lightgrey;";
if (_number == -1){
if (!_param[_cat][_name]["enabled"]) {
_status = false;
_color = "color:lightgrey;";
}
}
else
if (!NUMBERS[_number][_cat][_name]["enabled"]) {
_status = false;
_color = "color:lightgrey;";
}
document.getElementById(_cat+"_"+_name+"_text").disabled = !_status;
document.getElementById(_cat+"_"+_name+"_text").style = _color;
@@ -877,21 +957,58 @@ function EnDisableItem(_status, _param, _category, _cat, _name, _optional)
}
function ReadParameter(_param, _cat, _name, _optional, _select = false){
if (_param[_cat][_name]["found"]){
if (_optional) {
_param[_cat][_name]["enabled"] = document.getElementById(_cat+"_"+_name+"_enabled").checked;
}
if (_select) {
var sel = document.getElementById(_cat+"_"+_name+"_value1");
_param[_cat][_name]["value1"] = sel.options[sel.selectedIndex].text;
}
else {
for (var j = 1; j <= _param[_cat][_name]["anzParam"]; ++j) {
_param[_cat][_name]["value"+j] = document.getElementById(_cat+"_"+_name+"_value"+j).value;
function ReadParameter(_param, _cat, _name, _optional, _select = false, _number = -1){
if (_number > -1)
{
if (_cat == "Digits")
_cat = "digit"
if (_cat == "Analog")
_cat = "analog"
if (NUMBERS[_number][_cat][_name]["found"]){
if (_optional) {
NUMBERS[_number][_cat][_name]["enabled"] = document.getElementById(_cat+"_"+_name+"_enabled").checked;
}
if (_select) {
var sel = document.getElementById(_cat+"_"+_name+"_value1");
NUMBERS[_number][_cat][_name]["value1"] = sel.options[sel.selectedIndex].text;
}
else {
for (var j = 1; j <= _param[_cat][_name]["anzParam"]; ++j) {
NUMBERS[_number][_cat][_name]["value"+j] = document.getElementById(_cat+"_"+_name+"_value"+j).value;
}
}
}
}
else
{
if (_param[_cat][_name]["found"]){
if (_optional) {
_param[_cat][_name]["enabled"] = document.getElementById(_cat+"_"+_name+"_enabled").checked;
}
if (_select) {
var sel = document.getElementById(_cat+"_"+_name+"_value1");
_param[_cat][_name]["value1"] = sel.options[sel.selectedIndex].text;
}
else {
for (var j = 1; j <= _param[_cat][_name]["anzParam"]; ++j) {
_param[_cat][_name]["value"+j] = document.getElementById(_cat+"_"+_name+"_value"+j).value;
}
}
}
}
}
function UpdateInputIndividual()
{
if (NUNBERSAkt != -1)
{
ReadParameter(param, "PostProcessing", "DecimalShift", true, false, NUNBERSAkt)
}
var sel = document.getElementById("Numbers_value1");
NUNBERSAkt = sel.selectedIndex;
WriteParameter(param, category, "PostProcessing", "DecimalShift", true, false, 1, NUNBERSAkt);
}
function UpdateInput() {
@@ -924,7 +1041,6 @@ function UpdateInput() {
WriteParameter(param, category, "Analog", "ExtendedResolution", true, true);
WriteParameter(param, category, "Analog", "ModelInputSize", false, false, 2);
WriteParameter(param, category, "PostProcessing", "DecimalShift", true);
WriteParameter(param, category, "PostProcessing", "PreValueUse", true, true);
WriteParameter(param, category, "PostProcessing", "PreValueAgeStartup", true);
WriteParameter(param, category, "PostProcessing", "AllowNegativeRates", true, true);
@@ -975,15 +1091,14 @@ function ReadParameterAll()
ReadParameter(param, "Digits", "Model", false);
ReadParameter(param, "Digits", "LogImageLocation", true);
ReadParameter(param, "Digits", "LogfileRetentionInDays", true);
ReadParameter(param, "Digits", "ModelInputSize", false, false, 2);
ReadParameter(param, "Digits", "ModelInputSize", false, false);
ReadParameter(param, "Analog", "Model", false);
ReadParameter(param, "Analog", "LogImageLocation", true);
ReadParameter(param, "Analog", "LogfileRetentionInDays", true);
ReadParameter(param, "Analog", "ExtendedResolution", true, true);
ReadParameter(param, "Analog", "ModelInputSize", false, false, 2);
ReadParameter(param, "Analog", "ModelInputSize", false, false);
ReadParameter(param, "PostProcessing", "DecimalShift", true);
ReadParameter(param, "PostProcessing", "PreValueUse", true, true);
ReadParameter(param, "PostProcessing", "PreValueAgeStartup", true);
ReadParameter(param, "PostProcessing", "AllowNegativeRates", true, true);
@@ -1009,6 +1124,8 @@ function ReadParameterAll()
ReadParameter(param, "System", "TimeZone", true);
ReadParameter(param, "System", "Hostname", true);
ReadParameter(param, "System", "TimeServer", true);
UpdateInputIndividual();
FormatDecimalValue(param, "PostProcessing", "MaxRateValue");
}
@@ -1031,6 +1148,7 @@ function UpdateAfterCategoryCheck() {
category["Analog"]["enabled"] = document.getElementById("Category_Analog_enabled").checked;
category["Digits"]["enabled"] = document.getElementById("Category_Digits_enabled").checked;
UpdateInput();
UpdateInputIndividual();
}
function UpdateExpertModus()
@@ -1055,9 +1173,13 @@ function UpdateExpertModus()
function saveTextAsFile()
{
if (confirm("Are you sure you want to update \"config.ini\"?")) {
var textToSave = WriteConfig();
FileDeleteOnServer("/config/config.ini", basepath);
FileSendContent(textToSave, "/config/config.ini", basepath);
ReadParameterAll();
WriteConfigININew();
SaveConfigToServer(basepath);
// var textToSave = WriteConfig();
// FileDeleteOnServer("/config/config.ini", basepath);
// FileSendContent(textToSave, "/config/config.ini", basepath);
}
}
@@ -1080,6 +1202,11 @@ function editConfigDirect() {
window.location.replace(stringota);
}
}
function numberChanged()
{
UpdateInputIndividual();
}
LoadConfigNeu();

221
sd-card/html/edit_digits.html
View File

@@ -59,6 +59,21 @@ th, td {
Edit Digits</h2>
<div id="div1">
<p>
<table>
<tr>
<class id="Numbers_text" style="color:black;">Number: </class>
<select id="Numbers_value1" onchange="numberChanged()">
<option value="0" selected>default</option>
<option value="1" >NT</option>
<option value="2" >HT</option>
</select>
<input class="move" type="submit" id="renameNumber" name="renameNumber" onclick="renameNumber()" value="Rename">
<input class="move" type="submit" id="newNumber" name="newNumber" onclick="newNumber()" value="New">
<input class="move" type="submit" id="removeNumber" name="removeNumber" onclick="removeNumber()" value="Remove">
</tr>
</table>
</p>
<table>
<tr>
@@ -67,6 +82,9 @@ th, td {
</table>
<table>
<tr>
<td><input class="button" type="submit" id="newROI" name="newROI" onclick="newROI()" value="New ROI (after current)"></td>
<td><input class="button" type="submit" id="deleteROI" name="deleteROI" onclick="deleteROI()" value="Delete ROI"></td>
@@ -79,7 +97,8 @@ th, td {
<option value="1" >ROI 1</option>
</select>
</td>
<td>Name: <input type="text" name="name" id="name" onchange="onNameChange()" size="13"></td>
<td>
<input class="button" type="submit" id="renameROI" name="renameROI" onclick="renameROI()" value="Rename">
<td>
<input class="move" type="submit" id="moveNext" onclick="moveNext()" value="move Next">
<input class="move" type="submit" id="movePrevious" onclick="movePrevious()" value="move Previous">
@@ -105,8 +124,9 @@ th, td {
</table>
<script type="text/javascript" src="./gethost.js"></script>
<script type="text/javascript" src="./readconfig.js"></script>
<script type="text/javascript" src="./readconfigcommon.js"></script>
<script type="text/javascript" src="./readconfigcommon.js"></script>
<script type="text/javascript" src="./readconfigparam.js"></script>
<script type="text/javascript" src="./jquery-3.5.1.min.js"></script>
<script language="JavaScript">
@@ -169,22 +189,23 @@ function deleteROI(){
UpdateROIs();
}
function newROI(){
var zw = ROIInfo[ROIInfo.length-1];
ROIInfo.push(zw);
for (var i = ROIInfo.length-2; i > aktindex + 1; --i){
ROIInfo[i] = ROIInfo[i-1];
}
aktindex++;
ROIInfo[aktindex] = new Object;
ROIInfo[aktindex]["pos_ref"] = -1;
ROIInfo[aktindex]["name"] = "ROI" + aktindex;
ROIInfo[aktindex]["x"] = 1;
ROIInfo[aktindex]["y"] = 1;
ROIInfo[aktindex]["dx"] = ROIInfo[aktindex-1]["dx"];
ROIInfo[aktindex]["dy"] = ROIInfo[aktindex-1]["dy"];
ROIInfo[aktindex]["ar"] = ROIInfo[aktindex-1]["ar"];
UpdateROIs();
function newROI() {
var sel = document.getElementById("Numbers_value1");
var _number= sel.options[sel.selectedIndex].text;
sel = document.getElementById("index");
var _roialt= sel.options[sel.selectedIndex].text;
var _roinew = prompt("Please enter name of new ROI", "name");
if (ROIInfo.length > 0)
erg = CreateROI(_number, "digit", sel.selectedIndex, _roinew, 1, 1, ROIInfo[aktindex]["dx"], ROIInfo[aktindex]["dy"]);
else
erg = CreateROI(_number, "digit", sel.selectedIndex, _roinew, 1, 1, 30, 51);
if (erg != "")
alert(erg);
else
UpdateROIs(_roinew);
}
function movePrevious(){
@@ -214,34 +235,66 @@ function ChangeSelection(){
}
function SaveToConfig(){
_enabled = document.getElementById("Category_Digits_enabled").checked;
SaveROIToConfig(ROIInfo, "[Digits]", basepath, _enabled);
UpdatePage();
_zwcat = getConfigCategory();
_zwcat["Digits"]["enabled"] = document.getElementById("Category_Digits_enabled").checked;
WriteConfigININew();
SaveConfigToServer(basepath);
}
function UpdateROIs(){
function UpdateROIs(_sel){
document.getElementById("Category_Digits_enabled").checked = true;
var sel = document.getElementById("Numbers_value1");
var _number = sel.options[sel.selectedIndex].text;
ROIInfo = getROIInfo("digit", _number);
_catzw = getConfigCategory();
if (_catzw["Digits"]["enabled"] == false)
{
document.getElementById("Category_Digits_enabled").checked = false;
EnDisableDigits();
alert("Digital ROIs are disabled - please enable (Check box top left).\n");
return;
}
if (ROIInfo.length == 0){
alert("There are no ROIs defined.\nPlease first define minimum one ROI in the config.ini by hand.\n");
document.getElementById("newROI").disabled = true;
alert("There are no ROIs defined.\nPlease first create a new ROI (\"New ROIs ...\").\n");
document.getElementById("newROI").disabled = false;
document.getElementById("deleteROI").disabled = true;
document.getElementById("index").disabled = true;
document.getElementById("saveroi").disabled = true;
document.getElementById("renameROI").disabled = true;
document.getElementById("moveNext").disabled = true;
document.getElementById("movePrevious").disabled = true;
return;
}
else
{
document.getElementById("newROI").disabled = false;
document.getElementById("deleteROI").disabled = false;
document.getElementById("renameROI").disabled = false;
document.getElementById("index").disabled = false;
document.getElementById("saveroi").disabled = false;
}
var _index = document.getElementById("index");
while (_index.length){
_index.remove(0);
}
if (aktindex > ROIInfo.length)
aktindex = ROIInfo.length;
for (var i = 0; i < ROIInfo.length; ++i){
var option = document.createElement("option");
option.text = "ROI " + (i + 1);
option.text = ROIInfo[i]["name"];
option.value = i;
_index.add(option);
_index.add(option);
if (typeof _sel !== 'undefined') {
if (option.text == _sel)
aktindex = i;
}
}
_index.selectedIndex = aktindex;
@@ -258,7 +311,6 @@ function UpdateROIs(){
document.getElementById("lockAR").checked = lockAR;
document.getElementById("name").value = ROIInfo[aktindex]["name"];
document.getElementById("refx").value = ROIInfo[aktindex]["x"];
document.getElementById("refy").value = ROIInfo[aktindex]["y"];
document.getElementById("refdx").value = ROIInfo[aktindex]["dx"];
@@ -269,26 +321,6 @@ function UpdateROIs(){
rect.h = ROIInfo[aktindex]["dy"];
draw();
}
function ParseIni(_basepath) {
loadConfig(_basepath);
ParseConfig();
document.getElementById("Category_Digits_enabled").checked = true;
ROIInfo = getROIInfo("[Digits]");
if (!GetDigitsEnabled())
{
document.getElementById("Category_Digits_enabled").checked = false;
EnDisableDigits();
alert("Digital ROIs are disabled - please enable (Check box top left).\n");
return;
}
UpdateROIs();
}
function loadCanvas(dataURL) {
var canvas = document.getElementById('canvas');
@@ -317,8 +349,6 @@ function ParseIni(_basepath) {
var left = box.left + scrollLeft - clientLeft;
return { top: Math.round(top), left: Math.round(left) };
}
function init() {
basepath = getbasepath();
@@ -326,10 +356,14 @@ function ParseIni(_basepath) {
canvas.addEventListener('mouseup', mouseUp, false);
canvas.addEventListener('mousemove', mouseMove, false);
loadCanvas(basepath + "/fileserver/config/reference.jpg");
ParseIni(basepath);
loadConfig(basepath);
ParseConfig();
param = getConfigParameters();
UpdateNUMBERS();
drawImage();
draw();
}
function drawImage(){
var canvas = document.getElementById('canvas');
var context = canvas.getContext('2d');
@@ -340,6 +374,66 @@ function ParseIni(_basepath) {
// context.restore();
}
function UpdateNUMBERS(_sel){
zw = getNUMBERInfo();
index = 0;
var _index = document.getElementById("Numbers_value1");
while (_index.length){
_index.remove(0);
}
for (var i = 0; i < zw.length; ++i){
var option = document.createElement("option");
option.text = zw[i]["name"];
option.value = i;
_index.add(option);
if (typeof _sel !== 'undefined') {
if (zw[i]["name"] == _sel)
index = i
}
}
_index.selectedIndex = index;
UpdateROIs();
}
function renameNumber(){
var sel = document.getElementById("Numbers_value1");
var _delte= sel.options[sel.selectedIndex].text;
var _numbernew = prompt("Please enter new name", _delte);
erg = RenameNUMBER(_delte, _numbernew);
if (erg != "")
alert(erg);
else
UpdateNUMBERS(_numbernew);
}
function newNumber(){
var _numbernew = prompt("Please enter name of new number", "name");
erg = CreateNUMBER(_numbernew);
if (erg != "")
alert(erg);
else
UpdateNUMBERS(_numbernew);
}
function removeNumber(){
if (confirm("This will remove the number complete (analog and digital).\nIf you only want to remove the digital ROIs, please use \"Delete ROIs\".\nDo you want to proceed?")) {
var sel = document.getElementById("Numbers_value1");
var _delte= sel.options[sel.selectedIndex].text;
erg = DeleteNUMBER(_delte);
if (erg != "")
alert(erg);
UpdateNUMBERS();
}
}
function draw() {
var canvas = document.getElementById('canvas');
@@ -468,8 +562,31 @@ function draw() {
}
}
function renameROI(){
var sel = document.getElementById("Numbers_value1");
var _number= sel.options[sel.selectedIndex].text;
sel = document.getElementById("index");
var _roialt= sel.options[sel.selectedIndex].text;
var _roinew = prompt("Please enter new name", _roialt);
erg = RenameROI(_number, "digit", _roialt, _roinew);
if (erg != "")
alert(erg);
else
UpdateROIs(_roinew);
}
function numberChanged()
{
UpdateROIs();
}
init();
</script>
</body>

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

@@ -86,7 +86,6 @@ table {
<script type="text/javascript" src="./gethost.js"></script>
<script type="text/javascript" src="./readconfig.js"></script>
<script type="text/javascript" src="./readconfigcommon.js"></script>
<script type="text/javascript" src="./readconfigparam.js"></script>

3
sd-card/html/gethost.js
View File

@@ -7,9 +7,10 @@ function getbasepath(){
var host = window.location.hostname;
if ((host == "127.0.0.1") || (host == "localhost"))
{
// host = "http://192.168.2.118"; // jomjol interner test
// host = "http://192.168.2.219"; // jomjol interner test
// host = "http://192.168.178.26"; // jomjol interner test
host = "http://192.168.178.22"; // jomjol interner Real
// host = "."; // jomjol interner localhost
}

17
sd-card/html/info.html
View File

@@ -24,8 +24,25 @@ div {
</head>
<body style="font-family: arial; padding: 0px 10px;">
<h3>Current</h3>
<table style="font-family: arial">
<tr>
<td>
Last restart:
</td>
<td>
<div id="gitbranch">
<object data="/starttime"></object>
</div>
</td>
</tr>
</table>
<table style="font-family: arial">
<h3>Host Info</h3>
<table style="font-family: arial">
<tr>
<td>

126
sd-card/html/prevalue_set.html
View File

@@ -36,33 +36,23 @@ input[type=number] {
</head>
<script src="/jquery-3.5.1.min.js"></script>
<script>
$ (document).ready(function() {
$("#prevalue").load("/setPreValue.html");
});
</script>
<script>
function setprevalue() {
var inputVal = document.getElementById("myInput").value;
inputVal = inputVal.replace(",", ".");
_value = "<object data=" + "/setPreValue.html?value=" + inputVal + " ></object>";
document.getElementById("result").innerHTML=_value;
// location.reload();
}
</script>
<body style="font-family: arial; padding: 0px 10px;">
<h3>Set the previous value for consistency check and substitution for NaN</h3>
<class id="Numbers_text" style="font-size: 120%; color:black;"><b>Choose Number: </b>
<select id="Numbers_value1" onchange="numberChanged()">
<option value="0" selected>default</option>
<option value="1" >NT</option>
<option value="2" >HT</option>
</select>
</class>
<table style="width:100%">
<tr>
<h2>Current Value:</h2><p>
<h3>Current Value:</h3><p>
<div id="prevalue"></div>
</tr>
<tr>
<h2>Set Value:</h2><p>
<h3>Set Value:</h3><p>
Input (Format = 123.456):<p>
PreValue:
<input type="number" id="myInput" name="myInput"
@@ -72,10 +62,100 @@ function setprevalue() {
<button class="button" type="button" onclick="setprevalue()">Set PreValue</button>
</tr>
<tr>
<h2>Result:</h2><p>
<h3>Result:</h3><p>
<div id="result" readonly></div>
</tr>
</table>
</body></html>
</body></html>
<script type="text/javascript" src="./gethost.js"></script>
<script type="text/javascript" src="./readconfigcommon.js"></script>
<script type="text/javascript" src="./readconfigparam.js"></script>
<script type="text/javascript">
var basepath = "http://192.168.178.22";
var NUMBERS;
function setprevalue() {
var inputVal = document.getElementById("myInput").value;
var sel = document.getElementById("Numbers_value1");
var _number = sel.options[sel.selectedIndex].text;
inputVal = inputVal.replace(",", ".");
var xhttp = new XMLHttpRequest();
try {
url = basepath + "/setPreValue.html?value=" + inputVal + "&numbers=" + _number;
xhttp.open("GET", url, false);
xhttp.send();
response = xhttp.responseText;
document.getElementById("result").innerHTML=response;
}
catch (error)
{
// alert("Deleting Config.ini failed");
}
}
function loadPrevalue(_basepath) {
var sel = document.getElementById("Numbers_value1");
var _number = sel.options[sel.selectedIndex].text;
var xhttp = new XMLHttpRequest();
try {
url = _basepath + '/setPreValue.html?numbers=' + _number;
xhttp.open("GET", url, false);
xhttp.send();
response = xhttp.responseText;
document.getElementById("prevalue").innerHTML=response;
}
catch (error)
{
// alert("Deleting Config.ini failed");
}
return true;
}
function numberChanged(){
loadPrevalue(basepath);
}
function UpdateNUMBERS(_sel){
zw = getNUMBERInfo();
index = 0;
var _index = document.getElementById("Numbers_value1");
while (_index.length){
_index.remove(0);
}
for (var i = 0; i < zw.length; ++i){
var option = document.createElement("option");
option.text = zw[i]["name"];
option.value = i;
_index.add(option);
if (typeof _sel !== 'undefined') {
if (zw[i]["name"] == _sel)
index = i
}
}
_index.selectedIndex = index;
loadPrevalue(basepath);
}
function init(){
basepath = getbasepath();
loadConfig(basepath);
ParseConfig();
UpdateNUMBERS();
loadPrevalue(basepath);
}
init();
</script>

427
sd-card/html/readconfig.js
View File

@@ -1,427 +0,0 @@
function readconfig_Version(){
return "1.0.0 - 20200910";
}
var config_gesamt;
var config_split;
var ref = new Array(2);
var digit = new Array(0);
var analog = new Array(0);
var initalrotate = new Object();
var analogEnabled = false;
var posAnalogHeader;
var digitsEnabled = false;
var posDigitsHeader;
function MakeRefZW(zw, _basepath){
_filetarget = zw["name"].replace("/config/", "/img_tmp/");
_filetarget = _filetarget.replace(".jpg", "_org.jpg");
url = _basepath + "/editflow.html?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)
{
// alert("Deleting Config.ini failed");
}
_filetarget2 = zw["name"].replace("/config/", "/img_tmp/");
// _filetarget2 = _filetarget2.replace(".jpg", "_org.jpg");
FileCopyOnServer(_filetarget, _filetarget2, _basepath);
}
function CopyReferenceToImgTmp(_basepath)
{
for (index = 0; index < 2; ++index)
{
_filenamevon = ref[index]["name"];
_filenamenach = _filenamevon.replace("/config/", "/img_tmp/");
FileDeleteOnServer(_filenamenach, _basepath);
FileCopyOnServer(_filenamevon, _filenamenach, _basepath);
_filenamevon = _filenamevon.replace(".jpg", "_org.jpg");
_filenamenach = _filenamenach.replace(".jpg", "_org.jpg");
FileDeleteOnServer(_filenamenach, _basepath);
FileCopyOnServer(_filenamevon, _filenamenach, _basepath);
}
}
function GetReferencesInfo(){
return ref;
}
function ParseConfigAlignment(_aktline){
var akt_ref = 0;
++_aktline;
while ((_aktline < config_split.length)
&& !(config_split[_aktline][0] == "[")
&& !((config_split[_aktline][0] == ";") && (config_split[_aktline][1] == "["))) {
var linesplit = ZerlegeZeile(config_split[_aktline]);
if ((linesplit[0].toUpperCase() == "INITIALMIRROR") && (linesplit.length > 1))
{
initalrotate["mirror"] = linesplit[1].toUpperCase().localeCompare("TRUE") == 0;
initalrotate["pos_config_mirror"] = _aktline;
}
if (((linesplit[0].toUpperCase() == "INITALROTATE") || (linesplit[0].toUpperCase() == "INITIALROTATE")) && (linesplit.length > 1))
{
initalrotate["angle"] = parseInt(linesplit[1]);
initalrotate["pos_config"] = _aktline;
}
if (linesplit.length == 3)
{
ref[akt_ref] = new Object();
ref[akt_ref]["pos_ref"] = _aktline;
ref[akt_ref]["name"] = linesplit[0];
ref[akt_ref]["x"] = linesplit[1];
ref[akt_ref]["y"] = linesplit[2];
akt_ref++;
}
++_aktline;
}
return _aktline;
}
function ParseConfigDigit(_aktline){
++_aktline;
digit.length = 0;
while ((_aktline < config_split.length)
&& !(config_split[_aktline][0] == "[")
&& !((config_split[_aktline][0] == ";") && (config_split[_aktline][1] == "["))) {
var linesplit = ZerlegeZeile(config_split[_aktline]);
if (linesplit.length >= 5)
{
zw = new Object();
zw["pos_ref"] = _aktline;
zw["name"] = linesplit[0];
zw["x"] = linesplit[1];
zw["y"] = linesplit[2];
zw["dx"] = linesplit[3];
zw["dy"] = linesplit[4];
zw["ar"] = parseFloat(linesplit[3]) / parseFloat(linesplit[4]);
digit.push(zw);
}
++_aktline;
}
return _aktline;
}
function GetAnalogEnabled() {
return analogEnabled;
}
function GetDigitsEnabled() {
return digitsEnabled;
}
function ParseConfigAnalog(_aktline){
++_aktline;
analog.length = 0;
while ((_aktline < config_split.length)
&& !(config_split[_aktline][0] == "[")
&& !((config_split[_aktline][0] == ";") && (config_split[_aktline][1] == "["))) {
var linesplit = ZerlegeZeile(config_split[_aktline]);
if (linesplit.length >= 5)
{
zw = new Object();
zw["pos_ref"] = _aktline;
zw["name"] = linesplit[0];
zw["x"] = linesplit[1];
zw["y"] = linesplit[2];
zw["dx"] = linesplit[3];
zw["dy"] = linesplit[4];
zw["ar"] = parseFloat(linesplit[3]) / parseFloat(linesplit[4]);
analog.push(zw);
}
++_aktline;
}
return _aktline;
}
function getROIInfo(_typeROI){
if (_typeROI == "[Digits]"){
targetROI = digit;
}
if (_typeROI == "[Analog]"){
targetROI = analog;
}
return targetROI.slice(); // Kopie senden, nicht orginal!!!
}
function SaveROIToConfig(_ROIInfo, _typeROI, _basepath, _enabled){
if (_enabled) {
text = _typeROI;
}
else {
text = ";" + _typeROI;
}
if (_typeROI == "[Digits]"){
config_split[posDigitsHeader] = text;
targetROI = digit;
}
if (_typeROI == "[Analog]"){
config_split[posAnalogHeader] = text;
targetROI = analog;
}
// Abstimmen Anzahl ROIs:
var _pos = targetROI[targetROI.length-1]["pos_ref"];
for (var i = targetROI.length; i < _ROIInfo.length; ++i){
var zw = config_split[config_split.length-1];
config_split.push(zw);
for (var j = config_split.length-2; j > _pos + 1; --j){
config_split[j] = config_split[j-1];
}
}
for (i = targetROI.length-1; i > _ROIInfo.length-1; --i){
var _zwpos = targetROI[i]["pos_ref"];
config_split.splice(_zwpos, 1);
}
var linewrite = 0;
for (i = 0; i < _ROIInfo.length; ++i){
if (i < targetROI.length){
linewrite = targetROI[i]["pos_ref"];
}
else {
linewrite++;
}
config_split[linewrite] = _ROIInfo[i]["name"] + " " + _ROIInfo[i]["x"] + " " + _ROIInfo[i]["y"] + " " + _ROIInfo[i]["dx"] + " " + _ROIInfo[i]["dy"];
}
SaveConfigToServer(_basepath);
}
function ParseConfig() {
config_split = config_gesamt.split("\n");
var aktline = 0;
while (aktline < config_split.length){
if ((config_split[aktline].trim().toUpperCase() == "[ALIGNMENT]") || (config_split[aktline].trim().toUpperCase() == ";[ALIGNMENT]")){
aktline = ParseConfigAlignment(aktline);
continue;
}
if ((config_split[aktline].trim().toUpperCase() == "[DIGITS]") || (config_split[aktline].trim().toUpperCase() == ";[DIGITS]")){
posDigitsHeader = aktline;
if (config_split[aktline][0] == "[") {
digitsEnabled = true;
}
aktline = ParseConfigDigit(aktline);
continue;
}
if ((config_split[aktline].trim().toUpperCase() == "[ANALOG]") || (config_split[aktline].trim().toUpperCase() == ";[ANALOG]")) {
posAnalogHeader = aktline;
if (config_split[aktline][0] == "[") {
analogEnabled = true;
}
aktline = ParseConfigAnalog(aktline);
continue;
}
aktline++;
}
}
function getPreRotate(){
return initalrotate["angle"];
}
function setPreRotate(_prerotate){
initalrotate["angle"] = _prerotate;
}
function getMirror(){
if (initalrotate.hasOwnProperty("mirror")) {
return initalrotate["mirror"];
}
return false;
}
function setMirror(_mirror){
initalrotate["mirror"] = _mirror;
}
function SaveCanvasToImage(_canvas, _filename, _delete = true, _basepath = ""){
var JPEG_QUALITY=0.8;
var dataUrl = _canvas.toDataURL('image/jpeg', JPEG_QUALITY);
var rtn = dataURLtoBlob(dataUrl);
if (_delete) {
FileDeleteOnServer(_filename, _basepath);
}
FileSendContent(rtn, _filename, _basepath);
}
function SaveConfigToServer(_basepath){
// leere Zeilen am Ende löschen
var zw = config_split.length - 1;
while (config_split[zw] == "") {
config_split.pop();
}
var config_gesamt = "";
for (var i = 0; i < config_split.length; ++i)
{
config_gesamt = config_gesamt + config_split[i] + "\n";
}
FileDeleteOnServer("/config/config.ini", _basepath);
FileSendContent(config_gesamt, "/config/config.ini", _basepath);
}
function UpdateConfigFileReferenceChange(_basepath){
for (var _index = 0; _index < ref.length; ++_index){
var zeile = ref[_index]["name"] + " " + ref[_index]["x"] + " " + ref[_index]["y"];
var _pos = ref[_index]["pos_ref"];
config_split[_pos] = zeile;
}
zeile = "InitialRotate = " + initalrotate["angle"];
var _pos = initalrotate["pos_config"];
config_split[_pos] = zeile;
var mirror = false;
if (initalrotate.hasOwnProperty("mirror")) {
mirror = initalrotate["mirror"];
}
var mirror_pos = -1;
if (initalrotate.hasOwnProperty("pos_config_mirror")) {
mirror_pos = initalrotate["pos_config_mirror"];
}
if (mirror_pos > -1) {
if (mirror) {
config_split[mirror_pos] = "InitialMirror = true";
}
else {
config_split[mirror_pos] = "InitialMirror = false";
}
}
else {
if (mirror) { // neue Zeile muss an der richtigen Stelle eingefügt werden - hier direct nach [Alignment]
var aktline = 0;
while (aktline < config_split.length){
if (config_split[aktline].trim() == "[Alignment]") {
break;
}
aktline++
}
// fuege neue Zeile in config_split ein
var zw = config_split[config_split.length-1];
config_split.push(zw);
for (var j = config_split.length-2; j > aktline + 1; --j){
config_split[j] = config_split[j-1];
}
config_split[aktline + 1] = "InitialMirror = True"
}
}
SaveConfigToServer(_basepath);
}
function UpdateConfigReference(zw, _basepath){
for (var index = 0; index < 2; ++index)
{
var zeile = zw[index]["name"] + " " + zw[index]["x"] + " " + zw[index]["y"];
var _pos = zw[index]["pos_ref"];
config_split[_pos] = zeile;
_filenamenach = ref[index]["name"];
_filenamevon = _filenamenach.replace("/config/", "/img_tmp/");
FileDeleteOnServer(_filenamenach, _basepath);
FileCopyOnServer(_filenamevon, _filenamenach, _basepath);
_filenamenach = _filenamenach.replace(".jpg", "_org.jpg");
_filenamevon = _filenamevon.replace(".jpg", "_org.jpg");
FileDeleteOnServer(_filenamenach, _basepath);
FileCopyOnServer(_filenamevon, _filenamenach, _basepath);
}
SaveConfigToServer(_basepath);
}
function MakeContrastImageZW(zw, _enhance, _basepath){
_filename = zw["name"].replace("/config/", "/img_tmp/");
url = _basepath + "/editflow.html?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)
{
// alert("Deleting Config.ini failed");
}
}
function GetReferenceSize(name){
img = new Image();
var xhttp = new XMLHttpRequest();
url = "http://192.168.178.22/fileserver" + name;
xhttp.open("GET", url, false);
xhttp.send();
var response = xhttp.responseText;
var binary = ""
for (var responseText = xhttp.responseText, responseTextLen = responseText.length, binary = "", i = 0; i < responseTextLen; ++i) {
binary += String.fromCharCode(responseText.charCodeAt(i) & 255)
}
img.src = 'data:image/jpeg;base64,'+ window.btoa(binary);
return [img.width, img.height];
}
function getConfig() {
return config_gesamt;
}
function dataURLtoBlob(dataurl) {
var arr = dataurl.split(','), mime = arr[0].match(/:(.*?);/)[1],
bstr = atob(arr[1]), n = bstr.length, u8arr = new Uint8Array(n);
while(n--){
u8arr[n] = bstr.charCodeAt(n);
}
return new Blob([u8arr], {type:mime});
}
function SaveReferenceImage(_id_canvas, _filename, _doDelete, _basepath = ""){
if (_doDelete){
FileDeleteOnServer(_filename, _basepath);
}
var canvas = document.getElementById(_id_canvas);
var JPEG_QUALITY=0.8;
var dataUrl = canvas.toDataURL('image/jpeg', JPEG_QUALITY);
var rtn = dataURLtoBlob(dataUrl);
if (!FileSendContent(rtn, _filename, _basepath)){
alert("Error on saving reference image (" + _filename + ")!\nPlease retry.");
location.reload();
};
}

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

@@ -20,65 +20,7 @@ function SaveConfigToServer(_basepath){
FileSendContent(config_gesamt, "/config/config.ini", _basepath);
}
function UpdateConfigFileReferenceChange(_basepath){
for (var _index = 0; _index < ref.length; ++_index){
var zeile = ref[_index]["name"] + " " + ref[_index]["x"] + " " + ref[_index]["y"];
var _pos = ref[_index]["pos_ref"];
config_split[_pos] = zeile;
}
zeile = "InitialRotate = " + initalrotate["angle"];
var _pos = initalrotate["pos_config"];
config_split[_pos] = zeile;
var mirror = false;
if (initalrotate.hasOwnProperty("mirror")) {
mirror = initalrotate["mirror"];
}
var mirror_pos = -1;
if (initalrotate.hasOwnProperty("pos_config_mirror")) {
mirror_pos = initalrotate["pos_config_mirror"];
}
if (mirror_pos > -1) {
if (mirror) {
config_split[mirror_pos] = "InitialMirror = true";
}
else {
config_split[mirror_pos] = "InitialMirror = false";
}
}
else {
if (mirror) { // neue Zeile muss an der richtigen Stelle eingefügt werden - hier direct nach [Alignment]
var aktline = 0;
while (aktline < config_split.length){
if (config_split[aktline].trim() == "[Alignment]") {
break;
}
aktline++
}
// fuege neue Zeile in config_split ein
var zw = config_split[config_split.length-1];
config_split.push(zw);
for (var j = config_split.length-2; j > aktline + 1; --j){
config_split[j] = config_split[j-1];
}
config_split[aktline + 1] = "InitialMirror = True"
}
}
SaveConfigToServer(_basepath);
}
function UpdateConfig(zw, _index, _enhance, _basepath){
var zeile = zw["name"] + " " + zw["x"] + " " + zw["y"];
var _pos = ref[_index]["pos_ref"];
config_split[_pos] = zeile;
SaveConfigToServer(_basepath);
var namezw = zw["name"];
FileCopyOnServer("/img_tmp/ref_zw.jpg", namezw, _basepath);
var namezw = zw["name"].replace(".jpg", "_org.jpg");
@@ -102,10 +44,10 @@ function createReader(file) {
function ZerlegeZeile(input)
function ZerlegeZeile(input, delimiter = " =,\t")
{
var Output = Array(0);
delimiter = " =,\r";
// delimiter = " =,\t";
input = trim(input, delimiter);
var pos = findDelimiterPos(input, delimiter);
@@ -261,4 +203,54 @@ function FileSendContent(_content, _filename, _basepath = ""){
// alert("Deleting Config.ini failed");
}
return okay;
}
}
function SaveCanvasToImage(_canvas, _filename, _delete = true, _basepath = ""){
var JPEG_QUALITY=0.8;
var dataUrl = _canvas.toDataURL('image/jpeg', JPEG_QUALITY);
var rtn = dataURLtoBlob(dataUrl);
if (_delete) {
FileDeleteOnServer(_filename, _basepath);
}
FileSendContent(rtn, _filename, _basepath);
}
function MakeContrastImageZW(zw, _enhance, _basepath){
_filename = zw["name"].replace("/config/", "/img_tmp/");
url = _basepath + "/editflow.html?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)
{
// alert("Deleting Config.ini failed");
}
}
function MakeRefZW(zw, _basepath){
_filetarget = zw["name"].replace("/config/", "/img_tmp/");
_filetarget = _filetarget.replace(".jpg", "_org.jpg");
url = _basepath + "/editflow.html?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)
{
// alert("Deleting Config.ini failed");
}
_filetarget2 = zw["name"].replace("/config/", "/img_tmp/");
// _filetarget2 = _filetarget2.replace(".jpg", "_org.jpg");
FileCopyOnServer(_filetarget, _filetarget2, _basepath);
}

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

@@ -7,6 +7,8 @@ var config_split;
var param;
var category;
var ref = new Array(2);
var NUMBERS = new Array(0);
var REFERENCES = new Array(0);
function ParseConfig() {
config_split = config_gesamt.split("\n");
@@ -68,7 +70,7 @@ function ParseConfig() {
category[catname]["enabled"] = false;
category[catname]["found"] = false;
param[catname] = new Object();
ParamAddValue(param, catname, "DecimalShift");
ParamAddValue(param, catname, "DecimalShift", 1, true);
ParamAddValue(param, catname, "PreValueUse");
ParamAddValue(param, catname, "PreValueAgeStartup");
ParamAddValue(param, catname, "AllowNegativeRates");
@@ -115,8 +117,9 @@ function ParseConfig() {
ParamAddValue(param, catname, "TimeServer");
ParamAddValue(param, catname, "AutoAdjustSummertime");
ParamAddValue(param, catname, "Hostname");
ParamAddValue(param, catname, "SetupMode");
ParamAddValue(param, catname, "SetupMode");
while (aktline < config_split.length){
for (var cat in category) {
zw = cat.toUpperCase();
@@ -136,16 +139,15 @@ function ParseConfig() {
}
}
function ParamAddValue(param, _cat, _param, _anzParam = 1){
function ParamAddValue(param, _cat, _param, _anzParam = 1, _isIndividual = false){
param[_cat][_param] = new Object();
param[_cat][_param]["found"] = false;
param[_cat][_param]["enabled"] = false;
param[_cat][_param]["line"] = -1;
param[_cat][_param]["anzParam"] = _anzParam;
param[_cat][_param]["Numbers"] = _isIndividual;
};
function ParseConfigParamAll(_aktline, _catname){
++_aktline;
@@ -156,6 +158,18 @@ function ParseConfigParamAll(_aktline, _catname){
let [isCom, input] = isCommented(_input);
var linesplit = ZerlegeZeile(input);
ParamExtractValueAll(param, linesplit, _catname, _aktline, isCom);
if (!isCom && (linesplit.length == 5) && (_catname == 'Digits'))
ExtractROIs(input, "digit");
if (!isCom && (linesplit.length == 5) && (_catname == 'Analog'))
ExtractROIs(input, "analog");
if (!isCom && (linesplit.length == 3) && (_catname == 'Alignment'))
{
_newref = new Object();
_newref["name"] = linesplit[0];
_newref["x"] = linesplit[1];
_newref["y"] = linesplit[2];
REFERENCES.push(_newref);
}
++_aktline;
}
@@ -182,9 +196,44 @@ function ParamExtractValueAll(_param, _linesplit, _catname, _aktline, _iscom){
_param[_catname][paramname]["found"] = true;
_param[_catname][paramname]["enabled"] = !_iscom;
_param[_catname][paramname]["line"] = _aktline;
for (var j = 1; j <= _param[_catname][paramname]["anzParam"]; ++j) {
_param[_catname][paramname]["value"+j] = _linesplit[j];
if (_param[_catname][paramname]["Numbers"] == true) // möglicher Multiusage
{
abc = getNUMBERS(_linesplit[0]);
abc[_catname][paramname] = new Object;
abc[_catname][paramname]["found"] = true;
abc[_catname][paramname]["enabled"] = !_iscom;
for (var j = 1; j <= _param[_catname][paramname]["anzParam"]; ++j) {
abc[_catname][paramname]["value"+j] = _linesplit[j];
}
if (abc["name"] == "default")
{
_param[_catname][paramname]["found"] = true;
_param[_catname][paramname]["enabled"] = !_iscom;
_param[_catname][paramname]["line"] = _aktline;
for (var j = 1; j <= _param[_catname][paramname]["anzParam"]; ++j) {
_param[_catname][paramname]["value"+j] = _linesplit[j];
}
for (_num in NUMBERS) // wert mit Default belegen
{
NUMBERS[_num][_catname][paramname]["found"] = true;
NUMBERS[_num][_catname][paramname]["enabled"] = !_iscom;
NUMBERS[_num][_catname][paramname]["line"] = _aktline;
for (var j = 1; j <= _param[_catname][paramname]["anzParam"]; ++j) {
NUMBERS[_num][_catname][paramname]["value"+j] = _linesplit[j];
}
}
}
}
else
{
_param[_catname][paramname]["found"] = true;
_param[_catname][paramname]["enabled"] = !_iscom;
_param[_catname][paramname]["line"] = _aktline;
for (var j = 1; j <= _param[_catname][paramname]["anzParam"]; ++j) {
_param[_catname][paramname]["value"+j] = _linesplit[j];
}
}
}
}
}
@@ -193,6 +242,112 @@ function getConfigParameters() {
return param;
}
function WriteConfigININew()
{
config_split = new Array(0);
for (var cat in param) {
text = "[" + cat + "]";
if (!category[cat]["enabled"]) {
text = ";" + text;
}
config_split.push(text);
for (var name in param[cat]) {
if (param[cat][name]["Numbers"])
{
for (_num in NUMBERS)
{
if (NUMBERS[_num][cat][name]["found"]) {
if (NUMBERS[_num]["name"] == "default")
text = name;
else
text = name + "." + NUMBERS[_num]["name"];
var text = text + " ="
for (var j = 1; j <= param[cat][name]["anzParam"]; ++j) {
text = text + " " + NUMBERS[_num][cat][name]["value"+j];
}
if (!NUMBERS[_num][cat][name]["enabled"]) {
text = ";" + text;
}
config_split.push(text);
}
}
}
else
{
if (param[cat][name]["found"]) {
var text = name + " ="
for (var j = 1; j <= param[cat][name]["anzParam"]; ++j) {
text = text + " " + param[cat][name]["value"+j];
}
if (!param[cat][name]["enabled"]) {
text = ";" + text;
}
config_split.push(text);
}
}
}
if (cat == "Digits")
{
for (var _roi in NUMBERS)
{
if (NUMBERS[_roi]["digit"].length > 0)
{
for (var _roiddet in NUMBERS[_roi]["digit"])
{
if (NUMBERS[_roi]["name"] == "default")
text = NUMBERS[_roi]["digit"][_roiddet]["name"];
else
text = NUMBERS[_roi]["name"] + "." + NUMBERS[_roi]["digit"][_roiddet]["name"];
text = text + " " + NUMBERS[_roi]["digit"][_roiddet]["x"];
text = text + " " + NUMBERS[_roi]["digit"][_roiddet]["y"];
text = text + " " + NUMBERS[_roi]["digit"][_roiddet]["dx"];
text = text + " " + NUMBERS[_roi]["digit"][_roiddet]["dy"];
config_split.push(text);
}
}
}
}
if (cat == "Analog")
{
for (var _roi in NUMBERS)
{
if (NUMBERS[_roi]["analog"].length > 0)
{
for (var _roiddet in NUMBERS[_roi]["analog"])
{
if (NUMBERS[_roi]["name"] == "default")
text = NUMBERS[_roi]["analog"][_roiddet]["name"];
else
text = NUMBERS[_roi]["name"] + "." + NUMBERS[_roi]["analog"][_roiddet]["name"];
text = text + " " + NUMBERS[_roi]["analog"][_roiddet]["x"];
text = text + " " + NUMBERS[_roi]["analog"][_roiddet]["y"];
text = text + " " + NUMBERS[_roi]["analog"][_roiddet]["dx"];
text = text + " " + NUMBERS[_roi]["analog"][_roiddet]["dy"];
config_split.push(text);
}
}
}
}
if (cat == "Alignment")
{
for (var _roi in REFERENCES)
{
text = REFERENCES[_roi]["name"];
text = text + " " + REFERENCES[_roi]["x"];
text = text + " " + REFERENCES[_roi]["y"];
config_split.push(text);
}
}
config_split.push("");
}
}
function setConfigParameters(_param, _category = "") {
for (var cat in _param) {
for (var name in _param[cat]) {
@@ -275,6 +430,255 @@ function getConfig() {
function getConfigCategory() {
return category;
}
function ExtractROIs(_aktline, _type){
var linesplit = ZerlegeZeile(_aktline);
abc = getNUMBERS(linesplit[0], _type);
abc["pos_ref"] = _aktline;
abc["x"] = linesplit[1];
abc["y"] = linesplit[2];
abc["dx"] = linesplit[3];
abc["dy"] = linesplit[4];
abc["ar"] = parseFloat(linesplit[3]) / parseFloat(linesplit[4]);
}
function getNUMBERS(_name, _type, _create = true)
{
_pospunkt = _name.indexOf (".");
if (_pospunkt > -1)
{
_digit = _name.substring(0, _pospunkt);
_roi = _name.substring(_pospunkt+1);
}
else
{
_digit = "default";
_roi = _name;
}
_ret = -1;
for (i = 0; i < NUMBERS.length; ++i)
{
if (NUMBERS[i]["name"] == _digit)
_ret = NUMBERS[i];
}
if (!_create) // nicht gefunden und soll auch nicht erzeugt werden, ggf. geht eine NULL zurück
return _ret;
if (_ret == -1)
{
_ret = new Object();
_ret["name"] = _digit;
_ret['digit'] = new Array();
_ret['analog'] = new Array();
for (_cat in param)
for (_param in param[_cat])
if (param[_cat][_param]["Numbers"] == true){
_ret[_cat] = new Object();
_ret[_cat][_param] = new Object();
_ret[_cat][_param]["found"] = false;
_ret[_cat][_param]["enabled"] = false;
_ret[_cat][_param]["anzParam"] = param[_cat][_param]["anzParam"];
}
NUMBERS.push(_ret);
}
if (typeof _type == 'undefined') // muss schon existieren !!! - also erst nach Digits / Analog aufrufen
return _ret;
neuroi = new Object();
neuroi["name"] = _roi;
_ret[_type].push(neuroi);
return neuroi;
}
function CopyReferenceToImgTmp(_basepath)
{
for (index = 0; index < 2; ++index)
{
_filenamevon = REFERENCES[index]["name"];
_filenamenach = _filenamevon.replace("/config/", "/img_tmp/");
FileDeleteOnServer(_filenamenach, _basepath);
FileCopyOnServer(_filenamevon, _filenamenach, _basepath);
_filenamevon = _filenamevon.replace(".jpg", "_org.jpg");
_filenamenach = _filenamenach.replace(".jpg", "_org.jpg");
FileDeleteOnServer(_filenamenach, _basepath);
FileCopyOnServer(_filenamevon, _filenamenach, _basepath);
}
}
function GetReferencesInfo(){
return REFERENCES;
}
function UpdateConfigReference(_basepath){
for (var index = 0; index < 2; ++index)
{
_filenamenach = REFERENCES[index]["name"];
_filenamevon = _filenamenach.replace("/config/", "/img_tmp/");
FileDeleteOnServer(_filenamenach, _basepath);
FileCopyOnServer(_filenamevon, _filenamenach, _basepath);
_filenamenach = _filenamenach.replace(".jpg", "_org.jpg");
_filenamevon = _filenamevon.replace(".jpg", "_org.jpg");
FileDeleteOnServer(_filenamenach, _basepath);
FileCopyOnServer(_filenamevon, _filenamenach, _basepath);
}
}
function getNUMBERInfo(){
return NUMBERS;
}
function RenameNUMBER(_alt, _neu){
index = -1;
found = false;
for (i = 0; i < NUMBERS.length; ++i) {
if (NUMBERS[i]["name"] == _alt)
index = i;
if (NUMBERS[i]["name"] == _neu)
found = true;
}
if (found)
return "Name is already existing - please use another name";
NUMBERS[index]["name"] = _neu;
return "";
}
function DeleteNUMBER(_delte){
if (NUMBERS.length == 1)
return "The last number cannot be deleted."
index = -1;
for (i = 0; i < NUMBERS.length; ++i) {
if (NUMBERS[i]["name"] == _delte)
index = i;
}
if (index > -1) {
NUMBERS.splice(index, 1);
}
return "";
}
function CreateNUMBER(_numbernew){
found = false;
for (i = 0; i < NUMBERS.length; ++i) {
if (NUMBERS[i]["name"] == _numbernew)
found = true;
}
if (found)
return "Name does already exist, please choose another one!";
_ret = new Object();
_ret["name"] = _numbernew;
_ret['digit'] = new Array();
_ret['analog'] = new Array();
NUMBERS.push(_ret);
return "";
}
function getROIInfo(_typeROI, _number){
index = 0;
for (var i = 0; i < NUMBERS.length; ++i)
if (NUMBERS[i]["name"] == _number)
index = i;
return NUMBERS[index][_typeROI];
}
function RenameROI(_number, _type, _alt, _neu){
index = -1;
found = false;
_indexnumber = -1;
for (j = 0; j < NUMBERS.length; ++j)
if (NUMBERS[j]["name"] == _number)
_indexnumber = j;
for (i = 0; i < NUMBERS[_indexnumber][_type].length; ++i) {
if (NUMBERS[_indexnumber][_type][i]["name"] == _alt)
index = i;
if (NUMBERS[_indexnumber][_type][i]["name"] == _neu)
found = true;
}
if (found)
return "Name is already existing - please use another name";
NUMBERS[_indexnumber][_type][index]["name"] = _neu;
return "";
}
function DeleteNUMBER(_delte){
if (NUMBERS.length == 1)
return "The last number cannot be deleted."
index = -1;
for (i = 0; i < NUMBERS.length; ++i) {
if (NUMBERS[i]["name"] == _delte)
index = i;
}
if (index > -1) {
NUMBERS.splice(index, 1);
}
return "";
}
function CreateROI(_number, _type, _pos, _roinew, _x, _y, _dx, _dy){
_indexnumber = -1;
for (j = 0; j < NUMBERS.length; ++j)
if (NUMBERS[j]["name"] == _number)
_indexnumber = j;
found = false;
for (i = 0; i < NUMBERS.length; ++i) {
if (NUMBERS[_indexnumber][_type]["name"] == _roinew)
found = true;
}
if (found)
return "ROI does already exist, please choose another name!";
_ret = new Object();
_ret["name"] = _roinew;
_ret["x"] = _x;
_ret["y"] = _y;
_ret["dx"] = _dx;
_ret["dy"] = _dy;
_ret["ar"] = _dx / _dy;
NUMBERS[_indexnumber][_type].splice(_pos+1, 0, _ret);
return "";
}

BIN
sd-card/html/sd-card - Verknüpfung.lnk
View File

Binary file not shown.

32
sd-card/html/test.html Normal file
View File

@@ -0,0 +1,32 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
</head>
<body style="font-family: arial">
testschrift
<div id="value"></div>
</html>
<script type="text/javascript" src="./gethost.js"></script>
<script type="text/javascript">
var basepath = "http://192.168.178.22";
function testinit(){
basepath = getbasepath();
url = basepath + '/wasserzaehler.html?all=true';
var xhttp = new XMLHttpRequest();
xhttp.onreadystatechange = function() {
if (this.readyState == 4 && this.status == 200) {
// Typical action to be performed when the document is ready:
document.getElementById("value").innerHTML = xhttp.responseText;
}
};
xhttp.open("GET", url, true);
xhttp.send();
}
testinit();
</script>
</body>

2
sd-card/html/version.txt
View File

@@ -1 +1 @@
6.8.0
8.0.0

168
sd-card/html/wasserzaehler_roi.html
View File

@@ -7,7 +7,7 @@
<style>
.tg {border-collapse:collapse;border-spacing:0;width:100%;color: darkslategray;border: inset;height:585px;}
.tg td{font-size:14px;padding:10px 5px;border-style:solid;border-width:1px;overflow:hidden;word-break:normal;}
.tg th{height: 55px;font-size:24px;font-weight:bold;text-align:left;padding:0px 5px;border-style:solid;border-width:1px;overflow:hidden;word-break:normal;background-color:#f0f0f0}
.tg th{height: 50px;font-size:24px;font-weight:bold;text-align:left;padding:0px 5px;border-style:solid;border-width:1px;overflow:hidden;word-break:normal;background-color:#f0f0f0}
.tg .tg-1{width:77%;font-size:20px;font-family:Arial, Helvetica, sans-serif !important;border: inset;}
.tg .tg-2{font-size:20px;font-family:Arial, Helvetica, sans-serif !important;border: inset;}
.tg .tg-3{height: 15px;font-size:14px;font-family:Arial, Helvetica, sans-serif !important;border: inset;}
@@ -15,27 +15,72 @@
</head>
<script src="/jquery-3.5.1.min.js"></script>
<body style="font-family: arial">
<script>
function addZero(i) {
<table class="tg">
<tr>
<td class="tg-1" rowspan="9"><div id="img"></div></td>
<th class="th">Value:</th>
</tr>
<tr>
<td class="tg-2">
<div id="value"></div>
</td>
</tr>
<tr>
<th class="th">Previous Value:</th>
</tr>
<tr>
<td class="tg-2">
<div id="prevalue"></div>
</td>
</tr>
<tr>
<th class="th">Raw Value:</th>
</tr>
<tr>
<td class="tg-2">
<div id="raw"></div>
</td>
</tr>
<tr>
<th class="th">Error:</th>
</tr>
<tr>
<td class="tg-2">
<div id="error"></div>
</td>
</tr>
<tr>
<td class="tg-3">
<div id="timestamp" ></div>
</td>
</tr>
</table>
</body>
</html>
<script src="/jquery-3.5.1.min.js"></script>
<script type="text/javascript" src="./gethost.js"></script>
<script type="text/javascript" src="./readconfigcommon.js"></script>
<script type="text/javascript">
function addZero(i) {
if (i < 10) {
i = "0" + i;
}
return i;
}
$ (document).ready(function() {
$(document).ready(function() {
var d = new Date();
var h = addZero(d.getHours());
var m = addZero(d.getMinutes());
var s = addZero(d.getSeconds());
$('#img').html('<img src="/img_tmp/alg_roi.jpg" style="max-height:555px; display:block; margin-left:auto; margin-right:auto;"></img>');
$("#raw").load("/wasserzaehler.html?rawvalue=true");
$("#corrected").load("/wasserzaehler.html");
$("#checked").load("/setPreValue.html");
$("#start").load("/starttime");
$('#timestamp').html("Last Page Refresh:" + (h + ":" + m + ":" + s));
refresh();
});
@@ -50,58 +95,63 @@
var s = addZero(d.getSeconds());
// reassign the url to be like alg_roi.jpg?timestamp=456784512 based on timestamp
$('#img').html('<img src="/img_tmp/alg_roi.jpg?timestamp='+ timestamp +'"max-height:555px; display:block; margin-left:auto; margin-right:auto;"></img>');
$("#raw").load("/wasserzaehler.html?rawvalue=true");
$("#corrected").load("/wasserzaehler.html");
$("#checked").load("/setPreValue.html");
$("#start").load("/starttime");
$('#timestamp').html("Last Page Refresh:" + (h + ":" + m + ":" + s));
init();
refresh();
}, 300000);
}
var basepath = "http://192.168.178.22";
function loadValue(_type, _div, _style) {
url = basepath + '/wasserzaehler.html?all=true&type=' + _type;
var xhttp = new XMLHttpRequest();
xhttp.onreadystatechange = function() {
if (this.readyState == 4 && this.status == 200) {
var _rsp = xhttp.responseText;
var _split = _rsp.split("\r");
if (typeof _style == undefined)
out = "<table>";
else
out = "<table style=\"" + _style + "\">";
if (_split.length == 1)
{
var _zer = ZerlegeZeile(_split[0], "\t")
if (_zer.length > 1)
out = _zer[1];
else
out = "";
}
else
{
for (var j = 0; j < _split.length; ++j)
{
var _zer = ZerlegeZeile(_split[j], "\t")
if (_zer.length == 1)
out = out + "<tr><td>" + _zer[0] + "</td><td> </td></tr>";
else
out = out + "<tr><td>" + _zer[0] + "</td><td>" + _zer[1] + "</td></tr>";
}
out = out + "</table>"
}
document.getElementById(_div).innerHTML = out;
}
};
xhttp.open("GET", url, true);
xhttp.send();
}
function init(){
basepath = getbasepath();
loadValue("value", "value");
loadValue("raw", "raw");
loadValue("prevalue", "prevalue");
loadValue("error", "error", "font-size:8px");
}
init();
</script>
<body style="font-family: arial">
<table class="tg">
<tr>
<td class="tg-1" rowspan="9"><div id="img"></div></td>
<th class="th">Raw Value:</th>
</tr>
<tr>
<td class="tg-2">
<div id="raw"></div>
</td>
</tr>
<tr>
<th class="th">Corrected Value:</th>
</tr>
<tr>
<td class="tg-2">
<div id="corrected"></div>
</td>
</tr>
<tr>
<th class="th">Checked Value:</th>
</tr>
<tr>
<td class="tg-2">
<div id="checked"></div>
</td>
</tr>
<tr>
<th class="th">Start Time:</th>
</tr>
<tr>
<td class="tg-2">
<div id="start"></div>
</td>
</tr>
<tr>
<td class="tg-3">
<div id="timestamp"></div>
</td>
</tr>
</table>
</body>
</html>