mirror of
https://github.com/jomjol/AI-on-the-edge-device.git
synced 2025-12-06 11:36:51 +03:00
* Fix for securing wlan.ini (#1509) * Fix for securing wlan.ini * Fixing error with ' instead of " * Changing to errorcode 403 * maybe strcmp instead of regular == Co-authored-by: Pär Hedberg <par.hedberg@nordicmedtest.se> * Update Web-Installer * solves #1530 (#1531) * Refactor JSON (#1518) * use correct log level * corrected logging * typo * refactored JSON generagion: removed unused parameters, consolidated into singel function, added "pre" * Wrapped 'rate' into double quotes, like all other JSON values Co-authored-by: CaCO3 <caco@ruinelli.ch> * Various corrections (#1519) * use correct log level * corrected logging * typo * add release to webinstaller * changed logs, added INFO log of raw, value, error * . Co-authored-by: CaCO3 <caco@ruinelli.ch> * Prevent auto restart on cam framebuffer init error (#1522) * use correct log level * revert autorestart on camera framebuffer init error * . Co-authored-by: CaCO3 <caco@ruinelli.ch> * #1524 - ensure the recognized digit is less than 10 (#1525) * fix kernel panic (vector out of range) in getReadoutRawString * fix key of caches * fix key of caches * fix key caches * fix cache keys * fix cache keys * move set variables to top * debug * fix key * testing * try fix changelog * test * Update Changelog.md for release * Revert "Update Changelog.md for release" This reverts commit4f51ec7962. * remove testing * fix release creation * testing * Update Changelog.md for release * test * Revert "Merge branch 'master' of https://github.com/haverland/AI-on-the-edge-device" This reverts commitf68695a4c0, reversing changes made toa096cf7182. * Revert "test" This reverts commita096cf7182. * revert testing * #1524 - ensure the result of ZeigerEvalHybridNeu is <10 * Fix late digit transition #1503 Co-authored-by: github-actions <github-actions@github.com> * fix frozen time in datafile on error (#1534) Co-authored-by: CaCO3 <caco@ruinelli.ch> * log NTP server name (#1497) * log NTP server name * . * . * replace calls to /wasserzaehler.html with calls to /value (#1469) Co-authored-by: CaCO3 <caco@ruinelli.ch> * Fix cookie usage, use correct http response codes, add 404 page (#1495) * replaced some HTTP response code with better matching codes * add custom 404 page, add log entry for debugging * fix cookie * replace non-necessary whitespace * . Co-authored-by: CaCO3 <caco@ruinelli.ch> * Don't autofail if NTP server can't be reached during initalization (#1498) This fixes an issue with a restricted network without internet access, where the hardcoded ntp server can't be reached and thus the esp resets, as it's not able to finish initalization. * Update Changelog.md * Update Changelog.md for release * Fix for securing wlan.ini (#1509) * Fix for securing wlan.ini * Fixing error with ' instead of " * Changing to errorcode 403 * maybe strcmp instead of regular == Co-authored-by: Pär Hedberg <par.hedberg@nordicmedtest.se> * Update Web-Installer * solves #1530 (#1531) * Refactor JSON (#1518) * use correct log level * corrected logging * typo * refactored JSON generagion: removed unused parameters, consolidated into singel function, added "pre" * Wrapped 'rate' into double quotes, like all other JSON values Co-authored-by: CaCO3 <caco@ruinelli.ch> * Various corrections (#1519) * use correct log level * corrected logging * typo * add release to webinstaller * changed logs, added INFO log of raw, value, error * . Co-authored-by: CaCO3 <caco@ruinelli.ch> * Prevent auto restart on cam framebuffer init error (#1522) * use correct log level * revert autorestart on camera framebuffer init error * . Co-authored-by: CaCO3 <caco@ruinelli.ch> * #1524 - ensure the recognized digit is less than 10 (#1525) * fix kernel panic (vector out of range) in getReadoutRawString * fix key of caches * fix key of caches * fix key caches * fix cache keys * fix cache keys * move set variables to top * debug * fix key * testing * try fix changelog * test * Update Changelog.md for release * Revert "Update Changelog.md for release" This reverts commit4f51ec7962. * remove testing * fix release creation * testing * Update Changelog.md for release * test * Revert "Merge branch 'master' of https://github.com/haverland/AI-on-the-edge-device" This reverts commitf68695a4c0, reversing changes made toa096cf7182. * Revert "test" This reverts commita096cf7182. * revert testing * #1524 - ensure the result of ZeigerEvalHybridNeu is <10 * Fix late digit transition #1503 Co-authored-by: github-actions <github-actions@github.com> * only use sntp_getservername() after init sntp * set default NTP server on dnew installations Co-authored-by: CaCO3 <caco@ruinelli.ch> Co-authored-by: Ralf Rachinger <git@ralfrachinger.de> Co-authored-by: jomjol <30766535+jomjol@users.noreply.github.com> Co-authored-by: github-actions <github-actions@github.com> Co-authored-by: parhedberg <par.hedberg@gmail.com> Co-authored-by: Pär Hedberg <par.hedberg@nordicmedtest.se> Co-authored-by: Christopher Fenner <9592452+CFenner@users.noreply.github.com> Co-authored-by: Frank Haverland <fspapaping@googlemail.com> * Renamed variables and added debug log (#1537) * add debug logs * renamed variables * renamed TAGs, added flow status logging * . * . Co-authored-by: CaCO3 <caco@ruinelli.ch> * replaced printf usage in LogFile.WriteToFile() * ENABLE_MQTT c++ macro definition (#1546) * macro * 2 * 2 * delete jomjol_mqtt from CMakeLists * mqtt macro * final * ENABLE_INFLUXDB c++ macro definition (#1547) * macro * 2 * 2 * delete jomjol_mqtt from CMakeLists * mqtt macro * final * ENABLE_INFLUXDB c++ macro definition * Update Changelog.md * Update Changelog.md * Rearange task to CPU (http, camera, mqtt) (#1557) * Streamlined MQTT interlock when not activated & interlock MQTT when WIFI is not connected (#1556) * streamlined mqtt interlock when disabled * Disconnect mqtt client before reboot * Interlock MQTT with WIFI * Update * loglevel to DEBUG * Update * mqtt msg id incremental * new ENABLE_MQTT includes * Loglevel to DEBUG * Loglevel * Update interface_mqtt.cpp * show uptime on overview page, moved labels from firmware to Web UI (#1543) * show uptime on overview page, moved labels from firmware to Web UI * show uptime on info page * also use formated time in log Co-authored-by: CaCO3 <caco@ruinelli.ch> * Continue boot on bad PSRAM (#1558) * add sensor status, show special index/setup page in case of a critical error * continue booting on PSRAM error * Update main.cpp added log messages * init PSRAM and add more log messages * cleanup of init checks * . * . * . Co-authored-by: CaCO3 <caco@ruinelli.ch> * add sensor status, show special index/setup page in case of a critical error (#1560) * add sensor status, show special index/setup page in case of a critical error * Added Reboot * . * added more buttons Co-authored-by: CaCO3 <caco@ruinelli.ch> Co-authored-by: jomjol <30766535+jomjol@users.noreply.github.com> * Update Webinstaller to v13.0.7 * remove html-from-11.3.1 in release (#1565) * fix kernel panic (vector out of range) in getReadoutRawString * fix key of caches * fix key of caches * fix key caches * fix cache keys * fix cache keys * move set variables to top * debug * fix key * testing * try fix changelog * test * Update Changelog.md for release * Revert "Update Changelog.md for release" This reverts commit4f51ec7962. * remove testing * fix release creation * testing * Update Changelog.md for release * test * Revert "Merge branch 'master' of https://github.com/haverland/AI-on-the-edge-device" This reverts commitf68695a4c0, reversing changes made toa096cf7182. * Revert "test" This reverts commita096cf7182. * revert testing * #1524 - ensure the result of ZeigerEvalHybridNeu is <10 * Fix late digit transition #1503 * only initial_esp32_setup and update.zip as artefacts * remove unneeded cache * rename step ota-v2 to ota * rename ota-v2 to ota Co-authored-by: github-actions <github-actions@github.com> * make the sidebar on the overviw page wider and show the round counter (#1570) Co-authored-by: CaCO3 <caco@ruinelli.ch> * Create reply-bot.yml * Update ClassFlowPostProcessing.cpp * Add bot (#1581) * Update reply-bot.yml * Create label-commenter-config.yml * added missing html change * extended instructions (#1583) Co-authored-by: CaCO3 <caco@ruinelli.ch> * Fix Rate Problem * removed redundant "Status:" * Bugfix Double Extract ZIP-Files * Update FeatureRequest.md (#1591) in case of position change between the measurments set this state to true, if there is no change set it back to false. In a defined time window this movement can lead into an alarm state / water leak.. haveing this state in the mqtt broker can trigger functions like closing the ater pipe walve and so on... * Update manifest.json * Delete .gitignore * Delete .gitmodules * Delete firmware.bin * Add files via upload * Block REST API calls till resource is ready (#1609) * Block REST API call till ressource is ready * Update * Update * Update * replace relative include of gethost.js with absolute one. This is needed as that file gets incuded on dynamically generated content which can be on different path levels (#1610) Co-authored-by: CaCO3 <caco@ruinelli.ch> * esp_spiram.h has been replaced by esp32/spiram.h (#1605) * esp_spiram.h has been replaced by esp32/spiram.h * Preparations for next Bugfix Release (#1615) * Merge branch 'rolling' (#1559) * Fix for securing wlan.ini (#1509) * Fix for securing wlan.ini * Fixing error with ' instead of " * Changing to errorcode 403 * maybe strcmp instead of regular == Co-authored-by: Pär Hedberg <par.hedberg@nordicmedtest.se> * Update Web-Installer * solves #1530 (#1531) * Refactor JSON (#1518) * use correct log level * corrected logging * typo * refactored JSON generagion: removed unused parameters, consolidated into singel function, added "pre" * Wrapped 'rate' into double quotes, like all other JSON values Co-authored-by: CaCO3 <caco@ruinelli.ch> * Various corrections (#1519) * use correct log level * corrected logging * typo * add release to webinstaller * changed logs, added INFO log of raw, value, error * . Co-authored-by: CaCO3 <caco@ruinelli.ch> * Prevent auto restart on cam framebuffer init error (#1522) * use correct log level * revert autorestart on camera framebuffer init error * . Co-authored-by: CaCO3 <caco@ruinelli.ch> * #1524 - ensure the recognized digit is less than 10 (#1525) * fix kernel panic (vector out of range) in getReadoutRawString * fix key of caches * fix key of caches * fix key caches * fix cache keys * fix cache keys * move set variables to top * debug * fix key * testing * try fix changelog * test * Update Changelog.md for release * Revert "Update Changelog.md for release" This reverts commit4f51ec7962. * remove testing * fix release creation * testing * Update Changelog.md for release * test * Revert "Merge branch 'master' of https://github.com/haverland/AI-on-the-edge-device" This reverts commitf68695a4c0, reversing changes made toa096cf7182. * Revert "test" This reverts commita096cf7182. * revert testing * #1524 - ensure the result of ZeigerEvalHybridNeu is <10 * Fix late digit transition #1503 Co-authored-by: github-actions <github-actions@github.com> * fix frozen time in datafile on error (#1534) Co-authored-by: CaCO3 <caco@ruinelli.ch> * log NTP server name (#1497) * log NTP server name * . * . * replace calls to /wasserzaehler.html with calls to /value (#1469) Co-authored-by: CaCO3 <caco@ruinelli.ch> * Fix cookie usage, use correct http response codes, add 404 page (#1495) * replaced some HTTP response code with better matching codes * add custom 404 page, add log entry for debugging * fix cookie * replace non-necessary whitespace * . Co-authored-by: CaCO3 <caco@ruinelli.ch> * Don't autofail if NTP server can't be reached during initalization (#1498) This fixes an issue with a restricted network without internet access, where the hardcoded ntp server can't be reached and thus the esp resets, as it's not able to finish initalization. * Update Changelog.md * Update Changelog.md for release * Fix for securing wlan.ini (#1509) * Fix for securing wlan.ini * Fixing error with ' instead of " * Changing to errorcode 403 * maybe strcmp instead of regular == Co-authored-by: Pär Hedberg <par.hedberg@nordicmedtest.se> * Update Web-Installer * solves #1530 (#1531) * Refactor JSON (#1518) * use correct log level * corrected logging * typo * refactored JSON generagion: removed unused parameters, consolidated into singel function, added "pre" * Wrapped 'rate' into double quotes, like all other JSON values Co-authored-by: CaCO3 <caco@ruinelli.ch> * Various corrections (#1519) * use correct log level * corrected logging * typo * add release to webinstaller * changed logs, added INFO log of raw, value, error * . Co-authored-by: CaCO3 <caco@ruinelli.ch> * Prevent auto restart on cam framebuffer init error (#1522) * use correct log level * revert autorestart on camera framebuffer init error * . Co-authored-by: CaCO3 <caco@ruinelli.ch> * #1524 - ensure the recognized digit is less than 10 (#1525) * fix kernel panic (vector out of range) in getReadoutRawString * fix key of caches * fix key of caches * fix key caches * fix cache keys * fix cache keys * move set variables to top * debug * fix key * testing * try fix changelog * test * Update Changelog.md for release * Revert "Update Changelog.md for release" This reverts commit4f51ec7962. * remove testing * fix release creation * testing * Update Changelog.md for release * test * Revert "Merge branch 'master' of https://github.com/haverland/AI-on-the-edge-device" This reverts commitf68695a4c0, reversing changes made toa096cf7182. * Revert "test" This reverts commita096cf7182. * revert testing * #1524 - ensure the result of ZeigerEvalHybridNeu is <10 * Fix late digit transition #1503 Co-authored-by: github-actions <github-actions@github.com> * only use sntp_getservername() after init sntp * set default NTP server on dnew installations Co-authored-by: CaCO3 <caco@ruinelli.ch> Co-authored-by: Ralf Rachinger <git@ralfrachinger.de> Co-authored-by: jomjol <30766535+jomjol@users.noreply.github.com> Co-authored-by: github-actions <github-actions@github.com> Co-authored-by: parhedberg <par.hedberg@gmail.com> Co-authored-by: Pär Hedberg <par.hedberg@nordicmedtest.se> Co-authored-by: Christopher Fenner <9592452+CFenner@users.noreply.github.com> Co-authored-by: Frank Haverland <fspapaping@googlemail.com> * Renamed variables and added debug log (#1537) * add debug logs * renamed variables * renamed TAGs, added flow status logging * . * . Co-authored-by: CaCO3 <caco@ruinelli.ch> * replaced printf usage in LogFile.WriteToFile() * ENABLE_MQTT c++ macro definition (#1546) * macro * 2 * 2 * delete jomjol_mqtt from CMakeLists * mqtt macro * final * ENABLE_INFLUXDB c++ macro definition (#1547) * macro * 2 * 2 * delete jomjol_mqtt from CMakeLists * mqtt macro * final * ENABLE_INFLUXDB c++ macro definition * Update Changelog.md Co-authored-by: parhedberg <par.hedberg@gmail.com> Co-authored-by: Pär Hedberg <par.hedberg@nordicmedtest.se> Co-authored-by: jomjol <30766535+jomjol@users.noreply.github.com> Co-authored-by: Christopher Fenner <9592452+CFenner@users.noreply.github.com> Co-authored-by: CaCO3 <caco@ruinelli.ch> Co-authored-by: Frank Haverland <fspapaping@googlemail.com> Co-authored-by: github-actions <github-actions@github.com> Co-authored-by: Ralf Rachinger <git@ralfrachinger.de> Co-authored-by: Nicolas Liaudat <nliaudat@users.noreply.github.com> * Update Changelog.md for release Co-authored-by: parhedberg <par.hedberg@gmail.com> Co-authored-by: Pär Hedberg <par.hedberg@nordicmedtest.se> Co-authored-by: jomjol <30766535+jomjol@users.noreply.github.com> Co-authored-by: Christopher Fenner <9592452+CFenner@users.noreply.github.com> Co-authored-by: CaCO3 <caco@ruinelli.ch> Co-authored-by: Frank Haverland <fspapaping@googlemail.com> Co-authored-by: github-actions <github-actions@github.com> Co-authored-by: Ralf Rachinger <git@ralfrachinger.de> Co-authored-by: Nicolas Liaudat <nliaudat@users.noreply.github.com> * new model version (#1619) * fix kernel panic (vector out of range) in getReadoutRawString * fix key of caches * fix key of caches * fix key caches * fix cache keys * fix cache keys * move set variables to top * debug * fix key * testing * try fix changelog * test * Update Changelog.md for release * Revert "Update Changelog.md for release" This reverts commit4f51ec7962. * remove testing * fix release creation * testing * Update Changelog.md for release * test * Revert "Merge branch 'master' of https://github.com/haverland/AI-on-the-edge-device" This reverts commitf68695a4c0, reversing changes made toa096cf7182. * Revert "test" This reverts commita096cf7182. * revert testing * #1524 - ensure the result of ZeigerEvalHybridNeu is <10 * Fix late digit transition #1503 * only initial_esp32_setup and update.zip as artefacts * remove unneeded cache * rename step ota-v2 to ota * rename ota-v2 to ota * new models - ana-class100 v1.5.4 - ana-cont-11.0.4 - dig-class100 v1.5.0 Co-authored-by: github-actions <github-actions@github.com> * Update Changelog.md (#1630) * Correct RenameNumber * Update Changelog.md * Fix reloading of data file (#1635) * Update data.html * fixed * show link to graph Co-authored-by: CaCO3 <caco@ruinelli.ch> Co-authored-by: parhedberg <par.hedberg@gmail.com> Co-authored-by: Pär Hedberg <par.hedberg@nordicmedtest.se> Co-authored-by: jomjol <30766535+jomjol@users.noreply.github.com> Co-authored-by: Christopher Fenner <9592452+CFenner@users.noreply.github.com> Co-authored-by: CaCO3 <caco@ruinelli.ch> Co-authored-by: Frank Haverland <fspapaping@googlemail.com> Co-authored-by: github-actions <github-actions@github.com> Co-authored-by: Ralf Rachinger <git@ralfrachinger.de> Co-authored-by: Nicolas Liaudat <nliaudat@users.noreply.github.com> Co-authored-by: Slider0007 <115730895+Slider0007@users.noreply.github.com> Co-authored-by: smartboart <38385805+smartboart@users.noreply.github.com>
872 lines
29 KiB
JavaScript
872 lines
29 KiB
JavaScript
function readconfig_Version(){
|
|
return "1.0.0 - 20200910";
|
|
}
|
|
|
|
var config_gesamt = "";
|
|
var config_split = [];
|
|
var param = [];
|
|
var category;
|
|
var ref = new Array(2);
|
|
var NUMBERS = new Array(0);
|
|
var REFERENCES = new Array(0);
|
|
|
|
|
|
function getNUMBERSList() {
|
|
_basepath = getbasepath();
|
|
var datalist = "";
|
|
|
|
var xhttp = new XMLHttpRequest();
|
|
xhttp.addEventListener('load', function(event) {
|
|
if (xhttp.status >= 200 && xhttp.status < 300) {
|
|
datalist = xhttp.responseText;
|
|
} else {
|
|
console.warn(request.statusText, request.responseText);
|
|
}
|
|
});
|
|
|
|
try {
|
|
url = _basepath + '/editflow?task=namenumbers';
|
|
xhttp.open("GET", url, false);
|
|
xhttp.send();
|
|
|
|
}
|
|
catch (error)
|
|
{
|
|
alert("Loading Hostname failed");
|
|
}
|
|
|
|
datalist = datalist.split("\t");
|
|
// datalist.pop();
|
|
|
|
return datalist;
|
|
}
|
|
|
|
|
|
function getDATAList() {
|
|
_basepath = getbasepath();
|
|
tflitelist = "";
|
|
|
|
var xhttp = new XMLHttpRequest();
|
|
xhttp.addEventListener('load', function(event) {
|
|
if (xhttp.status >= 200 && xhttp.status < 300) {
|
|
tflitelist = xhttp.responseText;
|
|
} else {
|
|
console.warn(request.statusText, request.responseText);
|
|
}
|
|
});
|
|
|
|
try {
|
|
url = _basepath + '/editflow?task=data';
|
|
xhttp.open("GET", url, false);
|
|
xhttp.send();
|
|
|
|
}
|
|
catch (error)
|
|
{
|
|
// alert("Loading Hostname failed");
|
|
}
|
|
|
|
tflitelist = tflitelist.split("\t");
|
|
tflitelist.pop();
|
|
|
|
return tflitelist;
|
|
}
|
|
|
|
|
|
function getTFLITEList() {
|
|
_basepath = getbasepath();
|
|
tflitelist = "";
|
|
|
|
var xhttp = new XMLHttpRequest();
|
|
xhttp.addEventListener('load', function(event) {
|
|
if (xhttp.status >= 200 && xhttp.status < 300) {
|
|
tflitelist = xhttp.responseText;
|
|
} else {
|
|
console.warn(request.statusText, request.responseText);
|
|
}
|
|
});
|
|
|
|
try {
|
|
url = _basepath + '/editflow?task=tflite';
|
|
xhttp.open("GET", url, false);
|
|
xhttp.send();
|
|
|
|
}
|
|
catch (error)
|
|
{
|
|
// alert("Loading Hostname failed");
|
|
}
|
|
|
|
tflitelist = tflitelist.split("\t");
|
|
tflitelist.pop();
|
|
|
|
return tflitelist;
|
|
}
|
|
|
|
|
|
function ParseConfig() {
|
|
config_split = config_gesamt.split("\n");
|
|
var aktline = 0;
|
|
|
|
param = new Object();
|
|
category = new Object();
|
|
|
|
var catname = "MakeImage";
|
|
category[catname] = new Object();
|
|
category[catname]["enabled"] = false;
|
|
category[catname]["found"] = false;
|
|
param[catname] = new Object();
|
|
ParamAddValue(param, catname, "LogImageLocation");
|
|
ParamAddValue(param, catname, "WaitBeforeTakingPicture");
|
|
ParamAddValue(param, catname, "LogfileRetentionInDays");
|
|
ParamAddValue(param, catname, "Brightness");
|
|
ParamAddValue(param, catname, "Contrast");
|
|
ParamAddValue(param, catname, "Saturation");
|
|
ParamAddValue(param, catname, "LEDIntensity");
|
|
ParamAddValue(param, catname, "ImageQuality");
|
|
ParamAddValue(param, catname, "ImageSize");
|
|
ParamAddValue(param, catname, "FixedExposure");
|
|
|
|
var catname = "Alignment";
|
|
category[catname] = new Object();
|
|
category[catname]["enabled"] = false;
|
|
category[catname]["found"] = false;
|
|
param[catname] = new Object();
|
|
ParamAddValue(param, catname, "InitialRotate");
|
|
ParamAddValue(param, catname, "InitialMirror");
|
|
ParamAddValue(param, catname, "SearchFieldX");
|
|
ParamAddValue(param, catname, "SearchFieldY");
|
|
ParamAddValue(param, catname, "AlignmentAlgo");
|
|
ParamAddValue(param, catname, "FlipImageSize");
|
|
|
|
var catname = "Digits";
|
|
category[catname] = new Object();
|
|
category[catname]["enabled"] = false;
|
|
category[catname]["found"] = false;
|
|
param[catname] = new Object();
|
|
ParamAddValue(param, catname, "Model");
|
|
ParamAddValue(param, catname, "CNNGoodThreshold", 1);
|
|
ParamAddValue(param, catname, "LogImageLocation");
|
|
ParamAddValue(param, catname, "LogfileRetentionInDays");
|
|
|
|
var catname = "Analog";
|
|
category[catname] = new Object();
|
|
category[catname]["enabled"] = false;
|
|
category[catname]["found"] = false;
|
|
param[catname] = new Object();
|
|
ParamAddValue(param, catname, "Model");
|
|
ParamAddValue(param, catname, "LogImageLocation");
|
|
ParamAddValue(param, catname, "LogfileRetentionInDays");
|
|
|
|
var catname = "PostProcessing";
|
|
category[catname] = new Object();
|
|
category[catname]["enabled"] = false;
|
|
category[catname]["found"] = false;
|
|
param[catname] = new Object();
|
|
ParamAddValue(param, catname, "DecimalShift", 1, true);
|
|
ParamAddValue(param, catname, "AnalogDigitalTransitionStart", 1, true);
|
|
ParamAddValue(param, catname, "PreValueUse");
|
|
ParamAddValue(param, catname, "PreValueAgeStartup");
|
|
ParamAddValue(param, catname, "AllowNegativeRates");
|
|
ParamAddValue(param, catname, "MaxRateValue", 1, true);
|
|
ParamAddValue(param, catname, "MaxRateType", 1, true);
|
|
ParamAddValue(param, catname, "ExtendedResolution", 1, true);
|
|
ParamAddValue(param, catname, "IgnoreLeadingNaN", 1, true);
|
|
ParamAddValue(param, catname, "ErrorMessage");
|
|
ParamAddValue(param, catname, "CheckDigitIncreaseConsistency");
|
|
|
|
var catname = "MQTT";
|
|
category[catname] = new Object();
|
|
category[catname]["enabled"] = false;
|
|
category[catname]["found"] = false;
|
|
param[catname] = new Object();
|
|
ParamAddValue(param, catname, "Uri");
|
|
ParamAddValue(param, catname, "MainTopic", 1, false);
|
|
ParamAddValue(param, catname, "Topic", 1, false);
|
|
ParamAddValue(param, catname, "ClientID");
|
|
ParamAddValue(param, catname, "user");
|
|
ParamAddValue(param, catname, "password");
|
|
ParamAddValue(param, catname, "SetRetainFlag");
|
|
ParamAddValue(param, catname, "HomeassistantDiscovery");
|
|
ParamAddValue(param, catname, "MeterType");
|
|
|
|
var catname = "InfluxDB";
|
|
category[catname] = new Object();
|
|
category[catname]["enabled"] = false;
|
|
category[catname]["found"] = false;
|
|
param[catname] = new Object();
|
|
ParamAddValue(param, catname, "Uri");
|
|
ParamAddValue(param, catname, "Database");
|
|
ParamAddValue(param, catname, "Measurement");
|
|
ParamAddValue(param, catname, "user");
|
|
ParamAddValue(param, catname, "password");
|
|
|
|
var catname = "GPIO";
|
|
category[catname] = new Object();
|
|
category[catname]["enabled"] = false;
|
|
category[catname]["found"] = false;
|
|
param[catname] = new Object();
|
|
ParamAddValue(param, catname, "IO0", 6, false, [null, null, /^[0-9]*$/, null, null, /^[a-zA-Z0-9_-]*$/]);
|
|
ParamAddValue(param, catname, "IO1", 6, false, [null, null, /^[0-9]*$/, null, null, /^[a-zA-Z0-9_-]*$/]);
|
|
ParamAddValue(param, catname, "IO3", 6, false, [null, null, /^[0-9]*$/, null, null, /^[a-zA-Z0-9_-]*$/]);
|
|
ParamAddValue(param, catname, "IO4", 6, false, [null, null, /^[0-9]*$/, null, null, /^[a-zA-Z0-9_-]*$/]);
|
|
ParamAddValue(param, catname, "IO12", 6, false, [null, null, /^[0-9]*$/, null, null, /^[a-zA-Z0-9_-]*$/]);
|
|
ParamAddValue(param, catname, "IO13", 6, false, [null, null, /^[0-9]*$/, null, null, /^[a-zA-Z0-9_-]*$/]);
|
|
ParamAddValue(param, catname, "LEDType");
|
|
ParamAddValue(param, catname, "LEDNumbers");
|
|
ParamAddValue(param, catname, "LEDColor", 3);
|
|
// Default Values, um abwärtskompatiblität zu gewährleisten
|
|
param[catname]["LEDType"]["value1"] = "WS2812";
|
|
param[catname]["LEDNumbers"]["value1"] = "2";
|
|
param[catname]["LEDColor"]["value1"] = "50";
|
|
param[catname]["LEDColor"]["value2"] = "50";
|
|
param[catname]["LEDColor"]["value3"] = "50";
|
|
|
|
|
|
var catname = "AutoTimer";
|
|
category[catname] = new Object();
|
|
category[catname]["enabled"] = false;
|
|
category[catname]["found"] = false;
|
|
param[catname] = new Object();
|
|
ParamAddValue(param, catname, "AutoStart");
|
|
ParamAddValue(param, catname, "Intervall");
|
|
|
|
var catname = "DataLogging";
|
|
category[catname] = new Object();
|
|
category[catname]["enabled"] = false;
|
|
category[catname]["found"] = false;
|
|
param[catname] = new Object();
|
|
ParamAddValue(param, catname, "DataLogActive");
|
|
ParamAddValue(param, catname, "DataLogRetentionInDays");
|
|
|
|
var catname = "Debug";
|
|
category[catname] = new Object();
|
|
category[catname]["enabled"] = false;
|
|
category[catname]["found"] = false;
|
|
param[catname] = new Object();
|
|
ParamAddValue(param, catname, "Logfile");
|
|
ParamAddValue(param, catname, "LogfileRetentionInDays");
|
|
|
|
var catname = "System";
|
|
category[catname] = new Object();
|
|
category[catname]["enabled"] = false;
|
|
category[catname]["found"] = false;
|
|
param[catname] = new Object();
|
|
ParamAddValue(param, catname, "TimeZone");
|
|
ParamAddValue(param, catname, "TimeServer");
|
|
ParamAddValue(param, catname, "AutoAdjustSummertime");
|
|
ParamAddValue(param, catname, "Hostname");
|
|
ParamAddValue(param, catname, "SetupMode");
|
|
|
|
|
|
while (aktline < config_split.length){
|
|
for (var cat in category) {
|
|
zw = cat.toUpperCase();
|
|
zw1 = "[" + zw + "]";
|
|
zw2 = ";[" + zw + "]";
|
|
if ((config_split[aktline].trim().toUpperCase() == zw1) || (config_split[aktline].trim().toUpperCase() == zw2)) {
|
|
if (config_split[aktline].trim().toUpperCase() == zw1) {
|
|
category[cat]["enabled"] = true;
|
|
}
|
|
category[cat]["found"] = true;
|
|
category[cat]["line"] = aktline;
|
|
aktline = ParseConfigParamAll(aktline, cat);
|
|
continue;
|
|
}
|
|
}
|
|
aktline++;
|
|
}
|
|
|
|
|
|
// Make the downward compatiblity with MQTT (Maintopic --> topic)
|
|
if (param["MQTT"]["Topic"]["found"] == true && param["MQTT"]["MainTopic"]["found"] == false)
|
|
{
|
|
param["MQTT"]["MainTopic"] = param["MQTT"]["Topic"]
|
|
}
|
|
delete param["MQTT"]["Topic"] // Dient nur der Downwardskompatibilität
|
|
|
|
|
|
if (param["Debug"]["Logfile"]["value1"] == "false" || param["Debug"]["Logfile"]["value1"] == "true")
|
|
{
|
|
param["Debug"]["Logfile"]["value1"] = "2";
|
|
}
|
|
|
|
|
|
// Make the downward compatiblity with MQTT (Maintopic --> topic)
|
|
if (category["DataLogging"]["found"] == false)
|
|
{
|
|
category["DataLogging"]["found"] = true;
|
|
category["DataLogging"]["enabled"] = true;
|
|
|
|
param["DataLogging"]["DataLogActive"]["found"] = true;
|
|
param["DataLogging"]["DataLogActive"]["enabled"] = true;
|
|
param["DataLogging"]["DataLogActive"]["value1"] = "true";
|
|
|
|
param["DataLogging"]["DataLogRetentionInDays"]["found"] = true;
|
|
param["DataLogging"]["DataLogRetentionInDays"]["enabled"] = true;
|
|
param["DataLogging"]["DataLogRetentionInDays"]["value1"] = "3";
|
|
}
|
|
|
|
if (category["DataLogging"]["enabled"] == false)
|
|
category["DataLogging"]["enabled"] = true
|
|
|
|
if (param["DataLogging"]["DataLogActive"]["enabled"] == false && param["DataLogging"]["DataLogActive"]["value1"] == "")
|
|
{
|
|
param["DataLogging"]["DataLogActive"]["found"] = true;
|
|
param["DataLogging"]["DataLogActive"]["enabled"] = true;
|
|
param["DataLogging"]["DataLogActive"]["value1"] = "true";
|
|
}
|
|
|
|
if (param["DataLogging"]["DataLogRetentionInDays"]["enabled"] == false && param["DataLogging"]["DataLogRetentionInDays"]["value1"] == "")
|
|
{
|
|
param["DataLogging"]["DataLogRetentionInDays"]["found"] = true;
|
|
param["DataLogging"]["DataLogRetentionInDays"]["enabled"] = true;
|
|
param["DataLogging"]["DataLogRetentionInDays"]["value1"] = "3";
|
|
}
|
|
|
|
}
|
|
|
|
function ParamAddValue(param, _cat, _param, _anzParam = 1, _isNUMBER = false, _checkRegExList = null){
|
|
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"] = _isNUMBER;
|
|
param[_cat][_param].checkRegExList = _checkRegExList;
|
|
};
|
|
|
|
function ParseConfigParamAll(_aktline, _catname){
|
|
++_aktline;
|
|
|
|
while ((_aktline < config_split.length)
|
|
&& !(config_split[_aktline][0] == "[")
|
|
&& !((config_split[_aktline][0] == ";") && (config_split[_aktline][1] == "["))) {
|
|
var _input = config_split[_aktline];
|
|
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;
|
|
}
|
|
return _aktline;
|
|
}
|
|
|
|
function ParamExtractValue(_param, _linesplit, _catname, _paramname, _aktline, _iscom, _anzvalue = 1){
|
|
if ((_linesplit[0].toUpperCase() == _paramname.toUpperCase()) && (_linesplit.length > _anzvalue))
|
|
{
|
|
_param[_catname][_paramname]["found"] = true;
|
|
_param[_catname][_paramname]["enabled"] = !_iscom;
|
|
_param[_catname][_paramname]["line"] = _aktline;
|
|
_param[_catname][_paramname]["anzpara"] = _anzvalue;
|
|
for (var j = 1; j <= _anzvalue; ++j) {
|
|
_param[_catname][_paramname]["value"+j] = _linesplit[j];
|
|
}
|
|
}
|
|
}
|
|
|
|
function ParamExtractValueAll(_param, _linesplit, _catname, _aktline, _iscom){
|
|
for (var paramname in _param[_catname]) {
|
|
_AktROI = "default";
|
|
_AktPara = _linesplit[0];
|
|
_pospunkt = _AktPara.indexOf (".");
|
|
if (_pospunkt > -1)
|
|
{
|
|
_AktROI = _AktPara.substring(0, _pospunkt);
|
|
_AktPara = _AktPara.substring(_pospunkt+1);
|
|
}
|
|
if (_AktPara.toUpperCase() == paramname.toUpperCase())
|
|
{
|
|
while (_linesplit.length <= _param[_catname][paramname]["anzParam"]) {
|
|
_linesplit.push("");
|
|
}
|
|
|
|
_param[_catname][paramname]["found"] = true;
|
|
_param[_catname][paramname]["enabled"] = !_iscom;
|
|
_param[_catname][paramname]["line"] = _aktline;
|
|
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")
|
|
{
|
|
for (_num in NUMBERS) // wert mit Default belegen
|
|
{
|
|
if (NUMBERS[_num][_catname][paramname]["found"] == false)
|
|
{
|
|
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];
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
function getConfigParameters() {
|
|
return param;
|
|
}
|
|
|
|
function WriteConfigININew()
|
|
{
|
|
// Cleanup empty NUMBERS
|
|
for (var j = 0; j < NUMBERS.length; ++j)
|
|
{
|
|
if ((NUMBERS[j]["digit"].length + NUMBERS[j]["analog"].length) == 0)
|
|
{
|
|
NUMBERS.splice(j, 1);
|
|
}
|
|
}
|
|
|
|
|
|
|
|
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)
|
|
{
|
|
text = NUMBERS[_num]["name"] + "." + name;
|
|
|
|
var text = text + " ="
|
|
|
|
for (var j = 1; j <= param[cat][name]["anzParam"]; ++j) {
|
|
if (!(typeof NUMBERS[_num][cat][name]["value"+j] == 'undefined'))
|
|
text = text + " " + NUMBERS[_num][cat][name]["value"+j];
|
|
}
|
|
if (!NUMBERS[_num][cat][name]["enabled"]) {
|
|
text = ";" + text;
|
|
}
|
|
config_split.push(text);
|
|
}
|
|
}
|
|
else
|
|
{
|
|
var text = name + " ="
|
|
|
|
for (var j = 1; j <= param[cat][name]["anzParam"]; ++j) {
|
|
if (!(typeof param[cat][name]["value"+j] == 'undefined'))
|
|
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"])
|
|
{
|
|
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"];
|
|
text = text + " " + NUMBERS[_roi]["digit"][_roiddet]["CCW"];
|
|
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"])
|
|
{
|
|
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"];
|
|
text = text + " " + NUMBERS[_roi]["analog"][_roiddet]["CCW"];
|
|
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 isCommented(input)
|
|
{
|
|
let isComment = false;
|
|
if (input.charAt(0) == ';') {
|
|
isComment = true;
|
|
input = input.substr(1, input.length-1);
|
|
};
|
|
return [isComment, input];
|
|
}
|
|
|
|
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 getConfig() {
|
|
return config_gesamt;
|
|
}
|
|
|
|
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]);
|
|
abc["CCW"] = "false";
|
|
if (linesplit.length >= 6)
|
|
abc["CCW"] = linesplit[5];
|
|
}
|
|
|
|
|
|
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){
|
|
if (typeof _ret[_cat] == 'undefined')
|
|
_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){
|
|
if ((_neu.indexOf(".") >= 0) || (_neu.indexOf(",") >= 0) || (_neu.indexOf(" ") >= 0) || (_neu.indexOf("\"") >= 0))
|
|
{
|
|
return "Name must not contain ',', '.', ' ' or '\"' - please change name";
|
|
}
|
|
|
|
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();
|
|
|
|
for (_cat in param)
|
|
for (_param in param[_cat])
|
|
if (param[_cat][_param]["Numbers"] == true)
|
|
{
|
|
if (typeof (_ret[_cat]) === "undefined")
|
|
{
|
|
_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);
|
|
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){
|
|
if ((_neu.includes("=")) || (_neu.includes(".")) || (_neu.includes(":")) ||
|
|
(_neu.includes(",")) || (_neu.includes(";")) || (_neu.includes(" ")) ||
|
|
(_neu.includes("\""))) {
|
|
return "Name must not contain any of the following characters: . : , ; = \" ' '";
|
|
}
|
|
|
|
|
|
|
|
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, _CCW){
|
|
_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;
|
|
_ret["CCW"] = _CCW;
|
|
|
|
NUMBERS[_indexnumber][_type].splice(_pos+1, 0, _ret);
|
|
|
|
return "";
|
|
}
|