Egalware/AnaLogger
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ancora fix denominatore

Browse Source
This commit is contained in:
Samuele Locatelli
2023-07-03 15:16:39 +02:00
parent 4789d1c604
commit 7918cd75aa
2 changed files with 25 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sampler/FTSampler.py
+4 -1
View File
@@ -189,10 +189,13 @@ def calculateValue():
# check val min di 1 x denom EWMA...
if(eFact < 1):
eFact = 1
# fix valore minimo denominatore
den = abs(float(v1)-float(v2))
if(den < 0.05):
den = 0.05
redSrv0.set('RTDATA:WARNING:DENOMZERO', 1)
else:
redSrv0.set('RTDATA:WARNING:DENOMZERO', 0)
# calcolo il valore risultante RealTime pulito (senza correzioni)
XVal = (float(v2)/float(den))
redSrv0.set('RTDATA:VALUE:RAW',round(XVal,decimalsCount))
server/templates/logger.html
+21 -4
View File
@@ -97,6 +97,15 @@
$("#ExeWarning").show();
}
// controllo i due warning del denominatore
$("#DenomWarning01").hide();
$("#DenomWarning02").hide();
if (result.DisplayDenomAlert == "1") {
$("#DenomWarning01").show();
$("#DenomWarning02").show();
}
//scarico unità di misura dei canali mostrati
$("#UniMisuA").html(result.UniMeasure[result.ChA]);
$("#UniMisuB").html(result.UniMeasure[result.ChB]);
@@ -350,11 +359,19 @@
<div class="card text-center">
<div class="card-header text-center">
<div class="row">
<div class="col-3"></div>
<div class="col-6">
<strong>Risultante B/(A-B) </strong>
<div class="col-3">
<span class="badge badge-warning" id="DenomWarning01">
<img src="../static/img/exclamation-triangle-fill.svg" height="10" widht="10"></img>
</span>
</div>
<div class="col-6">
<strong>Risultante B/(A-B)</strong>
</div>
<div class="col-3">
<span class="badge badge-warning" id="DenomWarning02">
<img src="../static/img/exclamation-triangle-fill.svg" height="10" widht="10"></img>
</span>
</div>
<div class="col-3"></div>
</div>
</div>
<div class="card-body">