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

fix UI, aggiunte svg

Browse Source
This commit is contained in:
Marco Locatelli
2021-04-19 12:45:55 +02:00
parent 574cfed088
commit 160ea1fa15
10 changed files with 45 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
logger/FTLogger.py
+1 -1
View File
@@ -47,7 +47,7 @@ if redSrv0.get('SETTINGS:FOLDER:CURRENT') is None:
if redSrv0.get('SETTINGS:OUT:MIN:'+str(numCh)) is None:
redSrv0.set('SETTINGS:OUT:MIN:'+str(numCh),0)
#funzione salva time+data e otto valori letti su file (SE LOG è 1)
#funzione salva time+data e otto valori letti su file SE LOG è 1
def fileSave():
currentFolder = getRedisVal('SETTINGS:FOLDER:CURRENT')
workingDirectory = (DATA_path+currentFolder)
sampler/FTDInOut.py
+2 -2
View File
@@ -51,11 +51,11 @@ while (1):
redSrv0.set('RTDATA:SESSION:NAME', "")
if cancello.is_pressed:
# print("CANCELLO CHIUSO")
# CANCELLO CHIUSO
redSrv0.set('RTDATA:GATE_OPEN', 0)
else:
# print("CANCELLO APERTO")
# CANCELLO APERTO
redSrv0.set('RTDATA:GATE_OPEN', 1)
redSrv0.set('SETTINGS:LOG:STATUS', 0)
redSrv0.set('RTDATA:SESSION:NAME', "")
server/FTServer.py
+1 -1
View File
@@ -16,7 +16,7 @@ from gpiozero import LED
led = LED(26)
#assegno ipv4 statico
ipv4 = '10.10.10.210'
ipv4 = '10.74.82.210'
#definisco directory /data
dataDir='/home/pi/data/'
server/static/img/arrow-90deg-up.svg
+3
View File
@@ -0,0 +1,3 @@
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-arrow-90deg-up" viewBox="0 0 16 16">
<path fill-rule="evenodd" d="M4.854 1.146a.5.5 0 0 0-.708 0l-4 4a.5.5 0 1 0 .708.708L4 2.707V12.5A2.5 2.5 0 0 0 6.5 15h8a.5.5 0 0 0 0-1h-8A1.5 1.5 0 0 1 5 12.5V2.707l3.146 3.147a.5.5 0 1 0 .708-.708l-4-4z"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 349 B

server/static/img/download.svg
+4
View File
@@ -0,0 +1,4 @@
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-download" viewBox="0 0 16 16">
<path d="M.5 9.9a.5.5 0 0 1 .5.5v2.5a1 1 0 0 0 1 1h12a1 1 0 0 0 1-1v-2.5a.5.5 0 0 1 1 0v2.5a2 2 0 0 1-2 2H2a2 2 0 0 1-2-2v-2.5a.5.5 0 0 1 .5-.5z"/>
<path d="M7.646 11.854a.5.5 0 0 0 .708 0l3-3a.5.5 0 0 0-.708-.708L8.5 10.293V1.5a.5.5 0 0 0-1 0v8.793L5.354 8.146a.5.5 0 1 0-.708.708l3 3z"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 427 B

server/static/img/folder-plus.svg
+4
View File
@@ -0,0 +1,4 @@
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-folder-plus" viewBox="0 0 16 16">
<path d="m.5 3 .04.87a1.99 1.99 0 0 0-.342 1.311l.637 7A2 2 0 0 0 2.826 14H9v-1H2.826a1 1 0 0 1-.995-.91l-.637-7A1 1 0 0 1 2.19 4h11.62a1 1 0 0 1 .996 1.09L14.54 8h1.005l.256-2.819A2 2 0 0 0 13.81 3H9.828a2 2 0 0 1-1.414-.586l-.828-.828A2 2 0 0 0 6.172 1H2.5a2 2 0 0 0-2 2zm5.672-1a1 1 0 0 1 .707.293L7.586 3H2.19c-.24 0-.47.042-.683.12L1.5 2.98a1 1 0 0 1 1-.98h3.672z"/>
<path d="M13.5 10a.5.5 0 0 1 .5.5V12h1.5a.5.5 0 1 1 0 1H14v1.5a.5.5 0 1 1-1 0V13h-1.5a.5.5 0 0 1 0-1H13v-1.5a.5.5 0 0 1 .5-.5z"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 642 B

server/static/img/folder-x.svg
+4
View File
@@ -0,0 +1,4 @@
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-folder-x" viewBox="0 0 16 16">
<path d="M.54 3.87.5 3a2 2 0 0 1 2-2h3.672a2 2 0 0 1 1.414.586l.828.828A2 2 0 0 0 9.828 3h3.982a2 2 0 0 1 1.992 2.181L15.546 8H14.54l.265-2.91A1 1 0 0 0 13.81 4H2.19a1 1 0 0 0-.996 1.09l.637 7a1 1 0 0 0 .995.91H9v1H2.826a2 2 0 0 1-1.991-1.819l-.637-7a1.99 1.99 0 0 1 .342-1.31zm6.339-1.577A1 1 0 0 0 6.172 2H2.5a1 1 0 0 0-1 .981l.006.139C1.72 3.042 1.95 3 2.19 3h5.396l-.707-.707z"/>
<path d="M11.854 10.146a.5.5 0 0 0-.707.708L12.293 12l-1.146 1.146a.5.5 0 0 0 .707.708L13 12.707l1.146 1.147a.5.5 0 0 0 .708-.708L13.707 12l1.147-1.146a.5.5 0 0 0-.707-.708L13 11.293l-1.146-1.147z"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 721 B

server/static/img/play-fill.svg
+3
View File
@@ -0,0 +1,3 @@
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-play-fill" viewBox="0 0 16 16">
<path d="m11.596 8.697-6.363 3.692c-.54.313-1.233-.066-1.233-.697V4.308c0-.63.692-1.01 1.233-.696l6.363 3.692a.802.802 0 0 1 0 1.393z"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 273 B

server/static/img/stop-fill.svg
+3
View File
@@ -0,0 +1,3 @@
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-stop-fill" viewBox="0 0 16 16">
<path d="M5 3.5h6A1.5 1.5 0 0 1 12.5 5v6a1.5 1.5 0 0 1-1.5 1.5H5A1.5 1.5 0 0 1 3.5 11V5A1.5 1.5 0 0 1 5 3.5z"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 248 B

server/templates/logger.html
+20 -12
View File
@@ -168,6 +168,7 @@
,url: "/api/v1/data/export"
,data: ""
})
confirm("Cartella attuale copiata su USB drive.")
// fix table
dataRefresh();
};
@@ -321,15 +322,19 @@
</div>
</div>
<div class="col-12 col-xl-6">
<div id="Div7" class="table-secondary text-center py-2 m-2 row"> <!--Div7 ovvero pulsanti Start e Stop-->
<div class="col-6">
<button id="btnStart" type="button" class="btn btn-success btn-block" onclick="startLog()">Start Log</button>
</div>
<div class="col-6">
<button id="btnStop" type="button" class="btn btn-warning btn-block" onclick="stopLog()">Stop Log</button>
</div>
</div>
<div class="card my-2">
<div class="card-header">
<div id="Div7" class="row">
<div class="col-6">
<button id="btnStart" type="button" class="btn btn-success btn-block" onclick="startLog()">
<img src="../static/img/play-fill.svg" height="24" width="24">&nbsp; Start Log</button>
</div>
<div class="col-6">
<button id="btnStop" type="button" class="btn btn-danger btn-block" onclick="stopLog()">
<img src="../static/img/stop-fill.svg" height="24" width="24">&nbsp; Stop Log</button>
</div>
</div>
</div>
<div class="card-header">
<div class="row" id="Div8"> <!--Div8 ovvero cartella attuale e sessione attuale-->
<div class="col-6"><strong>Cartella attuale: &nbsp;</strong> <h5><span id="CurrentFolder"></span></h5></div>
@@ -341,20 +346,23 @@
<div class="input-group my-2">
<span class="input-group-text col-5">Seleziona o Crea Cartella: &nbsp;</span>
<input type="text" class="form-control col-5" id="NewFolder" name="NewFolder"></input>
<input type="submit" value="INVIO" class="btn btn-success col-2"></input>
<button type="submit" class="btn btn-success col-2"><img src="../static/img/folder-plus.svg" height="24" width="24"></button>
</div>
</form>
</div>
<div id="Div10"> <!--Div10 ovvero 3 pulsanti logger-->
<div class="row mt-2">
<div class="col-4">
<button type="button" style="font-size: 80%" class="btn btn-info btn-block" onclick="goBack()">Torna Indietro</button>
<button type="button" style="font-size: 100%" class="btn btn-info btn-block" onclick="goBack()">
<img src="../static/img/arrow-90deg-up.svg" height="24" width="24"> &nbsp; Indietro</button>
</div>
<div class="col-4">
<button type="button" style="font-size: 80%" class="btn btn-primary btn-block" onclick="exportData()">Esporta Cartella</button>
<button type="button" style="font-size: 100%" class="btn btn-primary btn-block" onclick="exportData()">
<img src="../static/img/download.svg" height="24" width="24"> &nbsp; Esporta</button>
</div>
<div class="col-4">
<button type="button" style="font-size: 80%" class="btn btn-danger btn-block" onclick="deleteData()">Cancella Cartella</button>
<button type="button" style="font-size: 100%" class="btn btn-warning btn-block" onclick="deleteData()">
<img src="../static/img/folder-x.svg" height="24" width="24"> &nbsp; Cancella</button>
</div>
</div>
</div>