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

Analog ROI: Fix wrong multiplier view - only analog ROI, no digit ROI (#2440)

Browse Source 
* Fix multiplier view with only analog ROIs

* Refactor multiplier view for digit ROI
This commit is contained in:
Slider0007
2023-06-01 20:46:34 +02:00
committed by GitHub
parent 34835dca84
commit 7ebf68411f
2 changed files with 65 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -385,34 +385,55 @@ function SaveToConfig(){
} }
function ShowMultiplier(){ function ShowMultiplier()
{
var decimalShift = 0; var decimalShift = 0;
var multiplier = multiplier_decshift = aktindex+1-Number(decimalShift); var multiplier;
var fixedDecimals = fixedDecimals_decshift = aktindex+1; var multiplier_decshift;
var fixedDecimals;
var fixedDecimals_decshift;
var NumberInfo = getNUMBERInfo(); var NumberInfo = getNUMBERInfo();
var CategoryInfo = getConfigCategory();
var sel = document.getElementById("Numbers_value1"); var sel = document.getElementById("Numbers_value1");
var _number= sel.options[sel.selectedIndex].text; var _number= sel.options[sel.selectedIndex].text;
var NumbersIndex = 0; document.getElementById("decimalShift").value = 0;
for (var i = 0; i < NumberInfo.length; ++i) for (var i = 0; i < NumberInfo.length; ++i) {
if (NumberInfo[i]["name"] == _number) if (NumberInfo[i]["name"] == _number) {
NumbersIndex = i; if (NumberInfo[i]["PostProcessing"]["DecimalShift"]["enabled"]) {
decimalShift = NumberInfo[i]["PostProcessing"]["DecimalShift"]["value1"];
if (NumberInfo[NumbersIndex]["PostProcessing"]["DecimalShift"]["enabled"]) { document.getElementById("decimalShift").value=decimalShift;
decimalShift = NumberInfo[NumbersIndex]["PostProcessing"]["DecimalShift"]["value1"]; }
document.getElementById("decimalShift").value=decimalShift; }
multiplier_decshift = aktindex+1-Number(decimalShift);
fixedDecimals_decshift = fixedDecimals_decshift-Number(decimalShift); // set to fixed decimals to avoid rounding issues
if (fixedDecimals_decshift < 0)
fixedDecimals_decshift = 0;
} }
else {
document.getElementById("decimalShift").value=0; if (CategoryInfo["Analog"]["enabled"] == true && CategoryInfo["Digits"]["enabled"] == true) { // Digit + Analog
multiplier = fixedDecimals = aktindex + 1;
multiplier_decshift = fixedDecimals_decshift = multiplier - Number(decimalShift);
if (multiplier < 0)
fixedDecimals = 0;
if (multiplier_decshift < 0)
fixedDecimals_decshift = 0;
document.getElementById("multiplier").value="x" + Number(10 ** (-1*multiplier)).toFixed(fixedDecimals);
document.getElementById("multiplier_decshift").value="x" + Number(10 ** (-1*multiplier_decshift)).toFixed(fixedDecimals_decshift);
}
else if (CategoryInfo["Analog"]["enabled"] == true && CategoryInfo["Digits"]["enabled"] == false) { // Only Analog
multiplier = ROIInfo.length - 1 - aktindex;
multiplier_decshift = fixedDecimals_decshift = multiplier + Number(decimalShift);
if (multiplier_decshift > 0)
fixedDecimals_decshift = 0;
if (fixedDecimals_decshift < 0) {
fixedDecimals_decshift = -1 * fixedDecimals_decshift;
}
document.getElementById("multiplier").value="x" + Number(10 ** multiplier).toFixed(0);
document.getElementById("multiplier_decshift").value="x" + Number(10 ** multiplier_decshift).toFixed(fixedDecimals_decshift);
} }
document.getElementById("multiplier").value="x" + Number(10 ** (-1*multiplier)).toFixed(fixedDecimals);
document.getElementById("multiplier_decshift").value="x" + Number(10 ** (-1*multiplier_decshift)).toFixed(fixedDecimals_decshift);
} }

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

@@ -392,43 +392,38 @@ function SaveToConfig(){
} }
function ShowMultiplier(){ function ShowMultiplier()
{
var decimalShift = 0; var decimalShift = 0;
var negShift = false; var multiplier;
var multiplier = multiplier_decshift = ROIInfo.length-1-aktindex; var multiplier_decshift;
var fixedDecimals_decshift = ROIInfo.length-1-aktindex; var fixedDecimals_decshift;
var NumberInfo = getNUMBERInfo(); var NumberInfo = getNUMBERInfo();
var sel = document.getElementById("Numbers_value1"); var sel = document.getElementById("Numbers_value1");
var _number= sel.options[sel.selectedIndex].text; var _number= sel.options[sel.selectedIndex].text;
var NumbersIndex = 0; document.getElementById("decimalShift").value = 0;
for (var i = 0; i < NumberInfo.length; ++i) for (var i = 0; i < NumberInfo.length; ++i) {
if (NumberInfo[i]["name"] == _number) if (NumberInfo[i]["name"] == _number) {
NumbersIndex = i; if (NumberInfo[i]["PostProcessing"]["DecimalShift"]["enabled"]) {
decimalShift = NumberInfo[i]["PostProcessing"]["DecimalShift"]["value1"];
if (NumberInfo[NumbersIndex]["PostProcessing"]["DecimalShift"]["enabled"]) { document.getElementById("decimalShift").value = decimalShift;
decimalShift = NumberInfo[NumbersIndex]["PostProcessing"]["DecimalShift"]["value1"]; }
document.getElementById("decimalShift").value=decimalShift;
multiplier_decshift = multiplier_decshift+Number(decimalShift);
fixedDecimals_decshift = fixedDecimals_decshift+Number(decimalShift); // set to fixed decimals to avoid rounding issues
if (fixedDecimals_decshift < 0) {
negShift = true
fixedDecimals_decshift = -1*fixedDecimals_decshift;
} }
} }
else {
document.getElementById("decimalShift").value=0; multiplier = ROIInfo.length - 1 - aktindex;
multiplier_decshift = fixedDecimals_decshift = multiplier + Number(decimalShift);
if (multiplier_decshift > 0)
fixedDecimals_decshift = 0;
if (fixedDecimals_decshift < 0) {
fixedDecimals_decshift = -1*fixedDecimals_decshift;
} }
if (!negShift) { document.getElementById("multiplier").value="x" + Number(10 ** multiplier).toFixed(0);
document.getElementById("multiplier").value="x" + Number(10 ** multiplier).toFixed(0); document.getElementById("multiplier_decshift").value="x" + Number(10 ** multiplier_decshift).toFixed(fixedDecimals_decshift);
document.getElementById("multiplier_decshift").value="x" + Number(10 ** multiplier_decshift).toFixed(0);
}
else {
document.getElementById("multiplier").value="x" + Number(10 ** multiplier).toFixed(0);
document.getElementById("multiplier_decshift").value="x" + Number(10 ** multiplier_decshift).toFixed(fixedDecimals_decshift);
}
} }