From f3575608956dcee100a9efdaa19c53df53e31a29 Mon Sep 17 00:00:00 2001 From: Jonathan Roth Date: Sun, 27 Apr 2025 20:02:33 +0200 Subject: [PATCH] update bench_id to bench_name fix bench_name label size --- BlockStackApp.py | 12 ++++++------ UpdateWorker.py | 10 +++++----- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/BlockStackApp.py b/BlockStackApp.py index 2c7abe5..f360e4d 100644 --- a/BlockStackApp.py +++ b/BlockStackApp.py @@ -70,9 +70,9 @@ class BlockStackApp(QWidget): serial_number = self.extract_serial_number(response) if serial_number: print(f"Found bench on port {port}") - bench_id = self.get_bench_id(serial_number) + bench_id, bench_name = self.get_bench_id(serial_number) if bench_id: - bench_list.append((port, bench_id, serial_number)) + bench_list.append((port, bench_id, bench_name, serial_number)) else: print(f"Second check port {port}") response = ser.read_all().decode('utf-8').strip() @@ -82,7 +82,7 @@ class BlockStackApp(QWidget): serial_number = self.extract_serial_number(response) if serial_number: print(f"Found bench on port {port}") - bench_id = self.get_bench_id(serial_number) + bench_id, bench_name = self.get_bench_id(serial_number) if bench_id: bench_list.append((port, bench_id, serial_number)) else: @@ -95,10 +95,10 @@ class BlockStackApp(QWidget): self.blocks = {} - for port, bench_id, serial_number in bench_list: + for port, bench_id, bench_name, serial_number in bench_list: block_id = f"{bench_id}" - self.worker = UpdateWorker(serial_number, bench_id, port, block_id, self) + self.worker = UpdateWorker(serial_number, bench_id, bench_name, port, block_id, self) self.layout.addWidget(self.worker.block) self.worker.change_color_signal.connect(self.change_button_color) @@ -118,7 +118,7 @@ class BlockStackApp(QWidget): response = requests.get(url) if response.status_code == 200: data = response.json() - return data.get("id") + return data.get("id"), data.get("name") except requests.RequestException as e: print(f"Error making request to API: {e}") return None diff --git a/UpdateWorker.py b/UpdateWorker.py index 7b2ae51..f861996 100644 --- a/UpdateWorker.py +++ b/UpdateWorker.py @@ -24,11 +24,11 @@ class UpdateWorker(QThread): apitimer_signal = pyqtSignal() change_color_signal = pyqtSignal(str, str, str) - def __init__(self, serial_number, bench_id, port, block_id, main_app): + def __init__(self, serial_number, bench_id, bench_name, port, block_id, main_app): super().__init__() print(f"id{bench_id}:\tport {port}") print(f"id{bench_id}:\tserial {serial_number}") - self.block = self.add_block(serial_number, bench_id, port, block_id, main_app) + self.block = self.add_block(serial_number, bench_id, bench_name, port, block_id, main_app) self.main_app = main_app # Store the reference to the BlockStackApp instance self.serial_number = serial_number self.bench_id = bench_id @@ -289,12 +289,12 @@ class UpdateWorker(QThread): self.line3.set_data([], []) self.canvas.draw() - def add_block(self, serial_number, bench_id, port, block_id, main_app): + def add_block(self, serial_number, bench_id, bench_name, port, block_id, main_app): block_widget = QWidget() block_layout = QHBoxLayout() block_layout.setAlignment(Qt.AlignLeft | Qt.AlignTop) - LABEL_SIZE = QSize(250, 20) + LABEL_SIZE = QSize(250, 25) BUTTON_SIZE = QSize(100, 25) VALUE_SIZE = QSize(80, 25) VALUEL_SIZE = QSize(25, 25) @@ -314,7 +314,7 @@ class UpdateWorker(QThread): data_label = QLabel("No API data") data_label.setTextFormat(Qt.RichText) data_label.setAlignment(Qt.AlignLeft | Qt.AlignTop) - bench_label = QLabel(f"Bench ID: {bench_id}") + bench_label = QLabel(f"Bench Name: {bench_name}") bench_label.setToolTip(f"Serial number: {serial_number}\nCPU: Microchip PIC18F4431 @ 32 MHz\nPort: {port}\nBandwidth: 1 MBps\nPosition maxspd: 638 mm/s\nDiameter freq: ≈10.5 Hz") bench_label.setAlignment(Qt.AlignCenter) bench_label.setFixedSize(LABEL_SIZE)