From 19ead426fb50f7122b783257c22faad808e92cf0 Mon Sep 17 00:00:00 2001 From: Martin Quarda Date: Fri, 4 Apr 2025 18:15:13 +0200 Subject: [PATCH] reoder to make it works --- SW/PC/Stopwatch/main.py | 10 +--------- SW/PC/Stopwatch/registrace.py | 37 +++++++++++++++++++---------------- 2 files changed, 21 insertions(+), 26 deletions(-) diff --git a/SW/PC/Stopwatch/main.py b/SW/PC/Stopwatch/main.py index e8697b8..73e21fd 100644 --- a/SW/PC/Stopwatch/main.py +++ b/SW/PC/Stopwatch/main.py @@ -23,11 +23,6 @@ activeCards = [] TIME = config['countdown_seconds'] -USB_IF = 0 # Interface -USB_TIMEOUT = 5 # Timeout in ms -USB_VENDOR = 0xffff # Vendor-ID: -USB_PRODUCT = 0x0035 # Product-ID - db = {} queue_to_send = [] @@ -102,9 +97,6 @@ def callbackOnCard(card_id): print(f'Card {card_id} not found in db') -UsbCardReader(callbackOnCard) - - class GridRow(): def __init__(self, parent, racer, index): global queue_to_send @@ -209,7 +201,7 @@ def on_activate(app): win = GridWindow(application=app) win.present() -UsbCardReader() +UsbCardReader(callbackOnCard) app = Gtk.Application(application_id='com.example.App') app.connect('activate', on_activate) diff --git a/SW/PC/Stopwatch/registrace.py b/SW/PC/Stopwatch/registrace.py index caf0d52..e008999 100644 --- a/SW/PC/Stopwatch/registrace.py +++ b/SW/PC/Stopwatch/registrace.py @@ -103,25 +103,8 @@ def register_racer(): updateRacers() -def reload_racers(): - global racers - response = session.get(config['host'] + '/api/racers') - - racers = response.json() - updateRacers() - - -reload_racers() - - -window = uic.loadUi("registrace.ui") -window.register_racer.clicked.connect(register_racer) -window.reload_racers.clicked.connect(reload_racers) -window.show() - model = QtGui.QStandardItemModel() -window.racers.setModel(model) def updateRacers(): model.clear() @@ -135,6 +118,17 @@ def updateRacers(): updateRacers() +def reload_racers(): + global racers + response = session.get(config['host'] + '/api/racers') + + racers = response.json() + updateRacers() + + +reload_racers() + + def findByCard(card_id): for racer in racers: if racer['card_id'] == card_id: @@ -171,6 +165,15 @@ def updateLastCard(card_id): }) racer['started'] = True + UsbCardReader(updateLastCard) + +window = uic.loadUi("registrace.ui") +window.racers.setModel(model) +window.register_racer.clicked.connect(register_racer) +window.reload_racers.clicked.connect(reload_racers) +window.show() + + app.exec()