reformatted the board util slightly

This commit is contained in:
UpstreamData
2022-01-26 15:35:44 -07:00
parent 3178083533
commit 58f0ce8e2d
2 changed files with 24 additions and 12 deletions

View File

@@ -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()

View File

@@ -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,
)]