j/fdr1gui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update bench_id to bench_name

Browse Source 
fix bench_name label size
This commit is contained in:
Jonathan Roth 2025-04-27 20:02:33 +02:00
parent 64065348ad
commit f357560895
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
BlockStackApp.py
View File

@ -70,9 +70,9 @@ class BlockStackApp(QWidget):
serial_number = self.extract_serial_number(response) serial_number = self.extract_serial_number(response)
if serial_number: if serial_number:
print(f"Found bench on port {port}") 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: if bench_id:
bench_list.append((port, bench_id, serial_number)) bench_list.append((port, bench_id, bench_name, serial_number))
else: else:
print(f"Second check port {port}") print(f"Second check port {port}")
response = ser.read_all().decode('utf-8').strip() response = ser.read_all().decode('utf-8').strip()
@ -82,7 +82,7 @@ class BlockStackApp(QWidget):
serial_number = self.extract_serial_number(response) serial_number = self.extract_serial_number(response)
if serial_number: if serial_number:
print(f"Found bench on port {port}") 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: if bench_id:
bench_list.append((port, bench_id, serial_number)) bench_list.append((port, bench_id, serial_number))
else: else:
@ -95,10 +95,10 @@ class BlockStackApp(QWidget):
self.blocks = {} 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}" 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.layout.addWidget(self.worker.block)
self.worker.change_color_signal.connect(self.change_button_color) self.worker.change_color_signal.connect(self.change_button_color)
@ -118,7 +118,7 @@ class BlockStackApp(QWidget):
response = requests.get(url) response = requests.get(url)
if response.status_code == 200: if response.status_code == 200:
data = response.json() data = response.json()
return data.get("id") return data.get("id"), data.get("name")
except requests.RequestException as e: except requests.RequestException as e:
print(f"Error making request to API: {e}") print(f"Error making request to API: {e}")
return None return None

10
UpdateWorker.py
View File

@ -24,11 +24,11 @@ class UpdateWorker(QThread):
apitimer_signal = pyqtSignal() apitimer_signal = pyqtSignal()
change_color_signal = pyqtSignal(str, str, str) 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__() super().__init__()
print(f"id{bench_id}:\tport {port}") print(f"id{bench_id}:\tport {port}")
print(f"id{bench_id}:\tserial {serial_number}") 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.main_app = main_app # Store the reference to the BlockStackApp instance
self.serial_number = serial_number self.serial_number = serial_number
self.bench_id = bench_id self.bench_id = bench_id
@ -289,12 +289,12 @@ class UpdateWorker(QThread):
self.line3.set_data([], []) self.line3.set_data([], [])
self.canvas.draw() 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_widget = QWidget()
block_layout = QHBoxLayout() block_layout = QHBoxLayout()
block_layout.setAlignment(Qt.AlignLeft | Qt.AlignTop) block_layout.setAlignment(Qt.AlignLeft | Qt.AlignTop)
LABEL_SIZE = QSize(250, 20) LABEL_SIZE = QSize(250, 25)
BUTTON_SIZE = QSize(100, 25) BUTTON_SIZE = QSize(100, 25)
VALUE_SIZE = QSize(80, 25) VALUE_SIZE = QSize(80, 25)
VALUEL_SIZE = QSize(25, 25) VALUEL_SIZE = QSize(25, 25)
@ -314,7 +314,7 @@ class UpdateWorker(QThread):
data_label = QLabel("No API data") data_label = QLabel("No API data")
data_label.setTextFormat(Qt.RichText) data_label.setTextFormat(Qt.RichText)
data_label.setAlignment(Qt.AlignLeft | Qt.AlignTop) 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.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.setAlignment(Qt.AlignCenter)
bench_label.setFixedSize(LABEL_SIZE) bench_label.setFixedSize(LABEL_SIZE)