From d7e8e29f803462e8f8f8f244e2773c10da94f439 Mon Sep 17 00:00:00 2001 From: Artem30801 Date: Tue, 25 Jun 2019 18:35:39 +0300 Subject: [PATCH] Display fix --- Server/server.py | 2 +- Server/server_qt.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Server/server.py b/Server/server.py index 897d2b3..1ae4ca6 100644 --- a/Server/server.py +++ b/Server/server.py @@ -159,7 +159,7 @@ class Server: logging.info("Got connection from: {}".format(str(addr))) conn.setblocking(False) - if not any(client_addr == addr[0] for client_addr in Client.clients.keys()): + if not any([client_addr == addr[0] for client_addr in Client.clients.keys()]): client = Client(addr[0]) logging.info("New client") else: diff --git a/Server/server_qt.py b/Server/server_qt.py index 02060d5..9d8c5fb 100644 --- a/Server/server_qt.py +++ b/Server/server_qt.py @@ -112,15 +112,15 @@ class MainWindow(QtWidgets.QMainWindow): if col == 1: data = value elif col == 2: - data = "{} V.".format(round(float(value), 3)) + data = "{}".format(round(float(value), 3)) elif col == 3: batt_percent = ((float(value) - 3.2) / (4.2 - 3.2)) * 100 # TODO config - data = "{} %".format(round(batt_percent, 3)) + data = "{}".format(round(batt_percent, 3)) elif col == 4: data = str(value) elif col == 5: data = time.ctime(int(value)) - data2 = "{} sec.".format(round(int(value) - time.time(), 3)) + data2 = "{}".format(round(int(value) - time.time(), 3)) self.signals.update_data_signal.emit(row, col + 1, data2) else: print("No column matched for response")