diff --git a/sampler/FTSampler.py b/sampler/FTSampler.py index 00789f8..41d91e8 100644 --- a/sampler/FTSampler.py +++ b/sampler/FTSampler.py @@ -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)) diff --git a/server/templates/logger.html b/server/templates/logger.html index 2b2bcd4..add0006 100644 --- a/server/templates/logger.html +++ b/server/templates/logger.html @@ -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 @@
-
-
- Risultante B/(A-B) +
+ + + +
+
+ Risultante B/(A-B) +
+
+ + +
-