From 58f0ce8e2d3af752f4c3cf4d8eaa69bcf4d3b16c Mon Sep 17 00:00:00 2001 From: UpstreamData Date: Wed, 26 Jan 2022 15:35:44 -0700 Subject: [PATCH] reformatted the board util slightly --- tools/bad_board_util/func/miners.py | 14 +++++++++++--- tools/bad_board_util/layout.py | 22 +++++++++++++--------- 2 files changed, 24 insertions(+), 12 deletions(-) diff --git a/tools/bad_board_util/func/miners.py b/tools/bad_board_util/func/miners.py index baa0a6d8..93fda12e 100644 --- a/tools/bad_board_util/func/miners.py +++ b/tools/bad_board_util/func/miners.py @@ -158,16 +158,19 @@ async def scan_and_get_data(network): row_colors.append((ip_table_index, "white", "red")) else: row_colors.append((ip_table_index, "white", "red")) + board_left_chips = "\n".join(split_chips(board_left, 3)) + board_center_chips = "\n".join(split_chips(board_center, 3)) + board_right_chips = "\n".join(split_chips(board_right, 3)) data = [ data_point["IP"], data_point["model"], len(board_left), - board_left, + board_left_chips, len(board_center), - board_center, + board_center_chips, len(board_right), - board_right + board_right_chips ] ip_table_data[ip_table_index] = data window["ip_table"].update(ip_table_data, row_colors=row_colors) @@ -176,6 +179,11 @@ async def scan_and_get_data(network): await update_ui_with_data("status", "") +def split_chips(string, number_of_splits): + k, m = divmod(len(string), number_of_splits) + return (string[i*k+min(i, m):(i+1)*k+min(i+1, m)] for i in range(number_of_splits)) + + async def get_formatted_data(ip: ipaddress.ip_address): miner = await miner_factory.get_miner(ip) model = await miner.get_model() diff --git a/tools/bad_board_util/layout.py b/tools/bad_board_util/layout.py index 15666e22..98eed343 100644 --- a/tools/bad_board_util/layout.py +++ b/tools/bad_board_util/layout.py @@ -4,22 +4,25 @@ icon_of_window = b'iVBORw0KGgoAAAANSUhEUgAAAF4AAABeCAYAAACq0qNuAAAAAXNSR0IArs4c6 layout = [ [sg.Text("", key="status", size=(9, 1)), - sg.ProgressBar(1000, key="progress", size=(104, 20), orientation='h'), - sg.Text("", key="progress_percent", size=(9, 1))], + sg.ProgressBar(1000, key="progress", size=(40, 20), orientation='h'), + sg.Text("", key="progress_percent", size=(9, 1)), + ], [sg.Text("", size=(100, 1))], [sg.Text('Network IP:', size=(9, 1)), - sg.InputText(key='miner_network', do_not_clear=True, size=(123, 1)), - sg.Button('Scan', key='scan')], + sg.InputText(key='miner_network', do_not_clear=True, size=(103, 1)), + sg.Button('Scan', key='scan'), + ], [sg.Text('IP List File:', size=(9, 1)), - sg.Input(key="file_iplist", do_not_clear=True, size=(123, 1)), + sg.Input(key="file_iplist", do_not_clear=True, size=(103, 1)), sg.FileBrowse(), sg.Button('Import', key="import_iplist"), - sg.Button('Export', key="export_iplist")], + sg.Button('Export', key="export_iplist"), + ], - [sg.Text("IP List:", pad=(0, 0)), + [sg.Text(" IP List:", pad=(0, 0)), sg.Text("", key="ip_count", pad=(0, 0), size=(3, 1)), sg.Button('ALL', key="select_all_ips"), sg.Button("REFRESH DATA", key='refresh_data'), @@ -39,14 +42,15 @@ layout = [ "R Count", "Right Board Chips" ], + row_height=45, auto_size_columns=False, max_col_width=15, justification="center", key="ip_table", - col_widths=[9, 7, 7, 40, 7, 40, 7, 40], + col_widths=[11, 7, 7, 30, 7, 30, 7, 30], background_color="white", text_color="black", - size=(125, 27), + size=(100, 8), expand_x=True, enable_click_events=True, )]