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

1.3.0, nuova gestione con vettori dei dati

Browse Source
This commit is contained in:
Marco Locatelli
2021-06-18 16:44:30 +02:00
parent 3a302fae04
commit eff044934c
5 changed files with 124 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/FTServer.py
+4 -2
View File
@@ -17,6 +17,7 @@ import logging
FTL.FTLog.Write(" FTServer started")
#silenzio i logger
logging.getLogger('werkzeug').disabled = True
os.environ['WERKZEUG_RUN_MAIN'] = 'true'
@@ -123,7 +124,8 @@ def api_channels_all():
'SelPowerChannel' : getRedisVal('SETTINGS:POWER:CH'),
'SelProcessing' : getRedisVal('SETTINGS:SMOOTHING:FUNCTION'),
'ResultValue' : getRedisVal('RTDATA:VALUE:SMOOTHED'),
'RealValue' : getRedisVal('RTDATA:VALUE:REAL')
'RealValue' : getRedisVal('RTDATA:VALUE:REAL'),
'Crono' : getRedisVal('SETTINGS:LOG:CRONO')
}
# restituisce in formato json i dati letti da redis
return jsonify(channelsData)
@@ -497,5 +499,5 @@ def FTShutdown():
#dichiaro host ipv4 (ottenuto sopra utilizzando il modulo socket)
if __name__ == "__main__":
FTL.FTLog.Write(" FTServer starting Flask Host!")
FTL.FTLog.Write(" FTServer starting Flask Hosting!")
flaskApp.run(host=ipv4, port=80, debug=True)
server/templates/about.html
+1 -1
View File
@@ -29,7 +29,7 @@
<br>
Software di lettura e scrittura per canali analogici e digitali
<br>
V 1.2.1
V 1.3.0
</div>
</div>
</main>
server/templates/logger.html
+36 -23
View File
@@ -44,6 +44,7 @@
$("#CurrentFolder").html(result.CurrentWorkFolder);
$("#ResultValue").html(result.ResultValue);
$("#RealValue").html(result.RealValue);
$("#Crono").html(result.Crono);
if(result.GateOpen == "0")
{
@@ -304,9 +305,9 @@
</div>
<div class="row my-2">
<div class="col-12 col-xl-6">
<div class="row my-2">
<div class="row mb-2">
<div class="col-6 pr-0">
<div class="card text-center">
<div class="card text-center mr-1">
<div class="card-header">
<strong>Canale A: <span id="SelChannelA"></span></strong>
</div>
@@ -314,15 +315,15 @@
<div id="divChA"></div>
<div class="row">
<div class="col-12">
<span class="h3" id="OutputA"></span>
<span class="h3" id="UniMisuA"></span>
<span class="h4" id="OutputA"></span>
<span class="h4" id="UniMisuA"></span>
</div>
</div>
</div>
</div>
</div>
<div class="col-6 pl-0">
<div class="card text-center">
<div class="card text-center ml-1">
<div class="card-header">
<strong>Canale B: <span id="SelChannelB"></span></strong>
</div>
@@ -330,41 +331,53 @@
<div id="divChB"></div>
<div class="row">
<div class="col-12">
<span class="h3" id="OutputB"></span>
<span class="h3" id="UniMisuB"></span>
<span class="h4" id="OutputB"></span>
<span class="h4" id="UniMisuB"></span>
</div>
</div>
</div>
</div>
</div>
</div>
<div class="card text-center">
<div class="card-header">
<strong>Risultante = k*[B/(A-B)]+offset </strong>
</div>
<div class="card-body">
<div class="row">
<div class="col-6">
<strong>Istant: </strong><span class="h4" id="RealValue"></span>
<span class="h4" id="CalcMeasure1"></span>
</div>
<div class="col-6">
<strong>Media: </strong><span class="h4" id="ResultValue"></span>
<span class="h4" id="CalcMeasure2"></span>
<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>
<div class="col-3"></div>
</div>
</div>
<div class="card-body">
<div class="row">
<div class="col-1"></div>
<div class="col-5">
<strong>Istant: </strong><span class="h5" id="RealValue"></span>
<span class="h5" id="CalcMeasure1"></span>
</div>
<div class="col-5">
<strong>Media: </strong><span class="h5" id="ResultValue"></span>
<span class="h5" id="CalcMeasure2"></span>
</div>
<div class="col-1"></div>
</div>
</div>
</div>
</div>
</div>
<div class="col-12 col-xl-6">
<div class="card my-2">
<div id="Div7" class="card-header">
<div class="row">
<div class="col-6">
<div class="col-5">
<button id="btnStart" type="button" class="btn btn-success btn-block" style="font-size: 110%" onclick="startLog()">
<img src="../static/img/play-fill.svg" height="24" width="24">&nbsp; Inizia Scrittura</button>
</div>
<div class="col-6">
<div class="col-2 badge badge-dark text-light text-center">
<em><span class="h5" id="Crono"></span></em>
</div>
<div class="col-5">
<button id="btnStop" type="button" class="btn btn-danger btn-block" style="font-size: 110%" onclick="stopLog()">
<img src="../static/img/stop-fill.svg" height="24" width="24">&nbsp; Ferma Scrittura</button>
</div>