Kaydet (Commit) 1f0767c0 authored tarafından Hakan Dündar's avatar Hakan Dündar

Minor improvements (GUI, translations, etc.)

üst 020ee886
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-07-17 12:35+0300\n"
"POT-Creation-Date: 2022-07-18 11:19+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......@@ -18,7 +18,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
#: src/Cpu.py:113 ui/CpuMenus.ui:35 ui/CpuTab.ui:549
#: ui/ProcessesDetailsWindow.ui:766
#: ui/ProcessesDetailsWindow.ui:765
msgid "CPU Usage (Average)"
msgstr ""
......@@ -38,7 +38,7 @@ msgstr ""
#: src/Disk.py:259 src/DiskDetails.py:91 src/SettingsGUI.py:51
#: ui/DiskDetailsWindow.ui:7 ui/DiskDetailsWindow.ui:45 ui/DiskMenus.ui:23
#: ui/DiskMenus.ui:365 ui/DiskTab.ui:590 ui/MainWindow.ui:323
#: ui/PerformanceSummaryHeaderBarGrid.ui:68 ui/ProcessesDetailsWindow.ui:1758
#: ui/PerformanceSummaryHeaderBarGrid.ui:68 ui/ProcessesDetailsWindow.ui:1768
#: ui/ProcessesMenuCustomizations.ui:530 ui/ProcessesMenuCustomizations.ui:608
msgid "Disk"
msgstr ""
......@@ -48,13 +48,13 @@ msgid "Swap"
msgstr ""
#: src/Disk.py:387 src/Gpu.py:244 src/Gpu.py:247 src/Network.py:265
#: src/Network.py:305 src/Services.py:168 src/ServicesDetails.py:128
#: src/UsersDetails.py:216
#: src/Network.py:305 src/Services.py:168 src/ServicesDetails.py:132
#: src/UsersDetails.py:221
msgid "Yes"
msgstr ""
#: src/Disk.py:389 src/Gpu.py:249 src/Network.py:267 src/Services.py:168
#: src/ServicesDetails.py:128 src/UsersDetails.py:218
#: src/ServicesDetails.py:132 src/UsersDetails.py:223
msgid "No"
msgstr ""
......@@ -84,14 +84,14 @@ msgid "CPU core selection affects only frequency and cache memory information."
msgstr ""
#: src/MainGUI.py:565 src/Memory.py:180 src/Performance.py:1091
#: src/Performance.py:1585 ui/MemoryMenus.ui:131 ui/MemoryTab.ui:28
#: src/Performance.py:1421 ui/MemoryMenus.ui:131 ui/MemoryTab.ui:28
#: ui/PerformanceSummaryHeaderBarGrid.ui:53
msgid "RAM"
msgstr ""
#: src/MainGUI.py:565 src/Memory.py:207 src/Performance.py:1585
#: src/MainGUI.py:565 src/Memory.py:207 src/Performance.py:1421
#: ui/MemorySwapDetailsWindow.ui:7 ui/MemoryTab.ui:504
#: ui/ProcessesDetailsWindow.ui:1141
#: ui/ProcessesDetailsWindow.ui:1149
msgid "Swap Memory"
msgstr ""
......@@ -175,8 +175,8 @@ msgstr ""
#: src/Performance.py:1082 src/Processes.py:190 src/SettingsGUI.py:51
#: src/Users.py:139 ui/CpuMenus.ui:23 ui/CpuMenus.ui:155 ui/CpuTab.ui:453
#: ui/MainWindow.ui:229 ui/PerformanceSummaryHeaderBarGrid.ui:18
#: ui/ProcessesDetailsWindow.ui:120 ui/ProcessesDetailsWindow.ui:1045
#: ui/ProcessesDetailsWindow.ui:1065 ui/ProcessesMenuCustomizations.ui:207
#: ui/ProcessesDetailsWindow.ui:120 ui/ProcessesDetailsWindow.ui:1044
#: ui/ProcessesDetailsWindow.ui:1064 ui/ProcessesMenuCustomizations.ui:207
#: ui/ProcessesMenuCustomizations.ui:498 ui/UsersDetailsWindow.ui:175
#: ui/UsersMenuCustomizations.ui:157
msgid "CPU"
......@@ -191,14 +191,14 @@ msgstr ""
#: src/Performance.py:1262 src/Processes.py:196 ui/DiskMenus.ui:121
#: ui/DiskTab.ui:69 ui/DiskTab.ui:524 ui/ProcessesDetailsWindow.ui:146
#: ui/ProcessesDetailsWindow.ui:1394 ui/ProcessesDetailsWindow.ui:1689
#: ui/ProcessesDetailsWindow.ui:1405 ui/ProcessesDetailsWindow.ui:1699
#: ui/ProcessesMenuCustomizations.ui:319
msgid "Read Speed"
msgstr ""
#: src/Performance.py:1271 src/Processes.py:197 ui/DiskMenus.ui:134
#: ui/DiskTab.ui:81 ui/DiskTab.ui:547 ui/ProcessesDetailsWindow.ui:671
#: ui/ProcessesDetailsWindow.ui:1407 ui/ProcessesDetailsWindow.ui:1712
#: ui/ProcessesDetailsWindow.ui:1418 ui/ProcessesDetailsWindow.ui:1722
#: ui/ProcessesMenuCustomizations.ui:333
msgid "Write Speed"
msgstr ""
......@@ -218,7 +218,7 @@ msgstr ""
msgid "PID"
msgstr ""
#: src/Processes.py:188 src/Users.py:129 src/UsersDetails.py:122
#: src/Processes.py:188 src/Users.py:129 src/UsersDetails.py:126
#: ui/ProcessesDetailsWindow.ui:94 ui/ProcessesMenuCustomizations.ui:179
#: ui/UsersDetailsWindow.ui:7 ui/UsersDetailsWindow.ui:45
#: ui/UsersMenuCustomizations.ui:57
......@@ -231,33 +231,33 @@ msgid "Status"
msgstr ""
#: src/Processes.py:191 src/Services.py:142 ui/ProcessesDetailsWindow.ui:133
#: ui/ProcessesDetailsWindow.ui:1089 ui/ProcessesDetailsWindow.ui:1312
#: ui/ProcessesDetailsWindow.ui:1097 ui/ProcessesDetailsWindow.ui:1319
#: ui/ProcessesMenuCustomizations.ui:221 ui/ServicesDetailsWindow.ui:238
#: ui/ServicesMenuCustomizations.ui:143
msgid "Memory (RSS)"
msgstr ""
#: src/Processes.py:192 ui/ProcessesDetailsWindow.ui:1102
#: src/Processes.py:192 ui/ProcessesDetailsWindow.ui:1110
#: ui/ProcessesMenuCustomizations.ui:235
msgid "Memory (VMS)"
msgstr ""
#: src/Processes.py:193 ui/ProcessesDetailsWindow.ui:1115
#: src/Processes.py:193 ui/ProcessesDetailsWindow.ui:1123
#: ui/ProcessesMenuCustomizations.ui:305
msgid "Memory (Shared)"
msgstr ""
#: src/Processes.py:194 ui/DiskTab.ui:176 ui/ProcessesDetailsWindow.ui:1420
#: src/Processes.py:194 ui/DiskTab.ui:176 ui/ProcessesDetailsWindow.ui:1431
#: ui/ProcessesMenuCustomizations.ui:347
msgid "Read Data"
msgstr ""
#: src/Processes.py:195 ui/DiskTab.ui:189 ui/ProcessesDetailsWindow.ui:1433
#: src/Processes.py:195 ui/DiskTab.ui:189 ui/ProcessesDetailsWindow.ui:1444
#: ui/ProcessesMenuCustomizations.ui:361
msgid "Write Data"
msgstr ""
#: src/Processes.py:199 ui/ProcessesDetailsWindow.ui:1032
#: src/Processes.py:199 ui/ProcessesDetailsWindow.ui:1031
#: ui/ProcessesMenuCustomizations.ui:263
msgid "Threads"
msgstr ""
......@@ -279,17 +279,17 @@ msgstr ""
msgid "GID"
msgstr ""
#: src/Processes.py:203 ui/ProcessesDetailsWindow.ui:1949
#: src/Processes.py:203 ui/ProcessesDetailsWindow.ui:1972
#: ui/ProcessesMenuCustomizations.ui:291 ui/ServicesDetailsWindow.ui:75
msgid "Path"
msgstr ""
#: src/Processes.py:204 ui/ProcessesDetailsWindow.ui:1808
#: src/Processes.py:204 ui/ProcessesDetailsWindow.ui:1827
#: ui/ProcessesMenuCustomizations.ui:403
msgid "Command Line"
msgstr ""
#: src/Processes.py:230 src/Services.py:167 src/ServicesDetails.py:127
#: src/Processes.py:230 src/Services.py:167 src/ServicesDetails.py:131
msgid "Running"
msgstr ""
......@@ -323,7 +323,7 @@ msgstr ""
msgid "Process Details"
msgstr ""
#: src/ProcessesDetails.py:409
#: src/ProcessesDetails.py:407
msgid "This process is not running anymore."
msgstr ""
......@@ -385,55 +385,55 @@ msgstr ""
msgid "Description"
msgstr ""
#: src/Services.py:167 src/ServicesDetails.py:127
#: src/Services.py:167 src/ServicesDetails.py:131
msgid "Enabled"
msgstr ""
#: src/Services.py:167 src/ServicesDetails.py:127
#: src/Services.py:167 src/ServicesDetails.py:131
msgid "Disabled"
msgstr ""
#: src/Services.py:167 src/ServicesDetails.py:127
#: src/Services.py:167 src/ServicesDetails.py:131
msgid "Masked"
msgstr ""
#: src/Services.py:167 src/ServicesDetails.py:127
#: src/Services.py:167 src/ServicesDetails.py:131
msgid "Unmasked"
msgstr ""
#: src/Services.py:167 src/ServicesDetails.py:127
#: src/Services.py:167 src/ServicesDetails.py:131
msgid "Static"
msgstr ""
#: src/Services.py:167 src/ServicesDetails.py:127
#: src/Services.py:167 src/ServicesDetails.py:131
msgid "Generated"
msgstr ""
#: src/Services.py:167 src/ServicesDetails.py:127
#: src/Services.py:167 src/ServicesDetails.py:131
msgid "Enabled-runtime"
msgstr ""
#: src/Services.py:167 src/ServicesDetails.py:127
#: src/Services.py:167 src/ServicesDetails.py:131
msgid "Indirect"
msgstr ""
#: src/Services.py:167 src/ServicesDetails.py:127
#: src/Services.py:167 src/ServicesDetails.py:131
msgid "Active"
msgstr ""
#: src/Services.py:167 src/ServicesDetails.py:127
#: src/Services.py:167 src/ServicesDetails.py:131
msgid "Inactive"
msgstr ""
#: src/Services.py:167 src/ServicesDetails.py:127
#: src/Services.py:167 src/ServicesDetails.py:131
msgid "Loaded"
msgstr ""
#: src/Services.py:167 src/ServicesDetails.py:127
#: src/Services.py:167 src/ServicesDetails.py:131
msgid "Dead"
msgstr ""
#: src/Services.py:167 src/ServicesDetails.py:127
#: src/Services.py:167 src/ServicesDetails.py:131
msgid "Exited"
msgstr ""
......@@ -460,7 +460,7 @@ msgid "System"
msgstr ""
#: src/SettingsGUI.py:51 ui/MainWindow.ui:276 ui/MemoryMenus.ui:23
#: ui/MemoryMenus.ui:145 ui/MemoryTab.ui:595 ui/ProcessesDetailsWindow.ui:1361
#: ui/MemoryMenus.ui:145 ui/MemoryTab.ui:595 ui/ProcessesDetailsWindow.ui:1372
#: ui/ProcessesMenuCustomizations.ui:509 ui/ProcessesMenuCustomizations.ui:597
msgid "Memory"
msgstr ""
......@@ -782,7 +782,7 @@ msgstr ""
msgid "Cancel"
msgstr ""
#: ui/ProcessesDetailsWindow.ui:172 ui/ProcessesDetailsWindow.ui:1782
#: ui/ProcessesDetailsWindow.ui:172 ui/ProcessesDetailsWindow.ui:1801
msgid "Exe"
msgstr ""
......@@ -796,39 +796,39 @@ msgid ""
"(Not recursively)"
msgstr ""
#: ui/ProcessesDetailsWindow.ui:980
#: ui/ProcessesDetailsWindow.ui:979
msgid "Context Switches"
msgstr ""
#: ui/ProcessesDetailsWindow.ui:993
#: ui/ProcessesDetailsWindow.ui:992
msgid "CPU Times"
msgstr ""
#: ui/ProcessesDetailsWindow.ui:1006
#: ui/ProcessesDetailsWindow.ui:1005
msgid "Used CPU Core(s)"
msgstr ""
#: ui/ProcessesDetailsWindow.ui:1019
#: ui/ProcessesDetailsWindow.ui:1018
msgid "Threads (TID)"
msgstr ""
#: ui/ProcessesDetailsWindow.ui:1128
#: ui/ProcessesDetailsWindow.ui:1136
msgid "Memory (USS)"
msgstr ""
#: ui/ProcessesDetailsWindow.ui:1446
#: ui/ProcessesDetailsWindow.ui:1457
msgid "Read Count"
msgstr ""
#: ui/ProcessesDetailsWindow.ui:1459
#: ui/ProcessesDetailsWindow.ui:1470
msgid "Write Count"
msgstr ""
#: ui/ProcessesDetailsWindow.ui:1795
#: ui/ProcessesDetailsWindow.ui:1814
msgid "Current Working Directory"
msgstr ""
#: ui/ProcessesDetailsWindow.ui:1821
#: ui/ProcessesDetailsWindow.ui:1840
msgid "Opened Files"
msgstr ""
......
......@@ -1376,170 +1376,6 @@ class Performance:
# Get widget ID in order to detect GUI module (CPU, Memory, etc. tabs, process detail window, etc.) for drawing details.
widget_id = Gtk.Buildable.get_name(widget)
# Check if drawing will be for CPU tab.
if widget_id == "drawingarea2101w":
# Get chart colors.
chart_line_color = Config.chart_line_color_cpu_percent
# Get if drawing will be for the current device (CPU core, disk, network card, etc.) or all devices, get performance data to be drawn and device list.
draw_per_device = 0
from ProcessesDetails import ProcessesDetails
if ProcessesDetails.drawingarea2101w == widget:
pass
performance_data1 = [ProcessesDetails.process_cpu_usage_list]
device_name_list = [""]
selected_device_number = None
# Get which performance data will be drawn.
draw_performance_data1 = 1
draw_performance_data2 = 0
# Get chart y limit values in order to show maximum values of the charts as 100.
chart_y_limit_list = []
for device_name in device_name_list:
chart_y_limit_list.append(100)
# Check if drawing will be for Memory tab.
if widget_id == "drawingarea2102w":
# Get chart colors.
chart_line_color = Config.chart_line_color_memory_percent
# Get if drawing will be for the current device (CPU core, disk, network card, etc.) or all devices, get performance data to be drawn and device list.
draw_per_device = 0
from ProcessesDetails import ProcessesDetails
if ProcessesDetails.drawingarea2101w == widget:
pass
performance_data1 = [ProcessesDetails.process_ram_usage_list]
device_name_list = [""]
selected_device_number = None
# Get which performance data will be drawn.
draw_performance_data1 = 1
draw_performance_data2 = 0
"""# Get chart y limit values in order to show maximum values of the charts as 100.
chart_y_limit_list = []
for device_name in device_name_list:
chart_y_limit_list.append(100)"""
# Maximum performance data value is multiplied by 1.1 in order to scale chart when performance data is increased or decreased for preventing the line being out of the chart border.
chart_y_limit_list = []
for i, device_name in enumerate(device_name_list):
#chart_y_limit = 1.1 * ((max(max(performance_data1[i]), max(performance_data2[i]))) + 0.0000001)
#if draw_performance_data1 == 1 and draw_performance_data2 == 0:
chart_y_limit = 1.1 * (max(performance_data1[i]) + 0.0000001)
#if draw_performance_data1 == 0 and draw_performance_data2 == 1:
# chart_y_limit = 1.1 * (max(performance_data2[i]) + 0.0000001)
chart_y_limit_list.append(chart_y_limit)
# Get chart y limit value in order to show maximum value of the chart as multiples of 1, 10, 100.
#from Disk import Disk
processes_memory_data_precision = Config.processes_memory_data_precision
processes_memory_data_unit = Config.processes_memory_data_unit
# Get biggest chart_y_limit value in the chart_y_limit_list to show it on a label if all performance data is drawn for all devices.
# Get chart_y_limit value if multiple charts (devices) are drawn.
if selected_device_number != None:
chart_y_limit = chart_y_limit_list[selected_device_number]
# Get chart_y_limit value if single chart (device) is drawn.
else:
chart_y_limit = max(chart_y_limit_list)
try:
chart_y_limit_str = f'{ProcessesDetails.performance_data_unit_converter_func("data", "none", chart_y_limit, processes_memory_data_unit, processes_memory_data_precision)}'
# try-except is used in order to prevent errors if first initial function is not finished and "performance_data_unit_converter_func" is not run.
except AttributeError:
return
chart_y_limit_split = chart_y_limit_str.split(" ")
chart_y_limit_float = float(chart_y_limit_split[0])
number_of_digits = len(str(int(chart_y_limit_float)))
multiple = 10 ** (number_of_digits - 1)
# "0.0001" is used in order to take decimal part of the numbers into account. For example, 1.9999 (2-0.0001). This number is enough because maximum precision of the performance data is "3" (1.234 MiB/s).
number_to_get_next_multiple = chart_y_limit_float + (multiple - 0.0001)
next_multiple = int(number_to_get_next_multiple - (number_to_get_next_multiple % multiple))
ProcessesDetails.label2139w.set_text(f'{next_multiple} {chart_y_limit_split[1]}')
# "0.0000001"'s are used in order to avoid errors if values are tried to be divided by "0".
# Update chart_y_limit_list if multiple charts (devices) are drawn.
if selected_device_number != None:
chart_y_limit_list[selected_device_number] = (chart_y_limit * next_multiple / (chart_y_limit_float + 0.0000001) + 0.0000001)
# Update chart_y_limit_list if single chart (device) is drawn.
else:
chart_y_limit_list[chart_y_limit_list.index(chart_y_limit)] = (chart_y_limit * next_multiple / (chart_y_limit_float + 0.0000001) + 0.0000001)
# Check if drawing will be for Disk tab.
if widget_id == "drawingarea2103w":
# Get chart colors.
chart_line_color = Config.chart_line_color_disk_speed_usage
# Get if drawing will be for the current device (CPU core, disk, network card, etc.) or all devices, get performance data to be drawn and device list.
draw_per_device = 0
from ProcessesDetails import ProcessesDetails
if ProcessesDetails.drawingarea2101w == widget:
pass
performance_data1 = [ProcessesDetails.process_disk_read_speed_list]
performance_data2 = [ProcessesDetails.process_disk_write_speed_list]
device_name_list = [""]
selected_device_number = None
# Get which performance data will be drawn.
draw_performance_data1 = 1
draw_performance_data2 = 1
# Maximum performance data value is multiplied by 1.1 in order to scale chart when performance data is increased or decreased for preventing the line being out of the chart border.
chart_y_limit_list = []
for i, device_name in enumerate(device_name_list):
chart_y_limit = 1.1 * ((max(max(performance_data1[i]), max(performance_data2[i]))) + 0.0000001)
if draw_performance_data1 == 1 and draw_performance_data2 == 0:
chart_y_limit = 1.1 * (max(performance_data1[i]) + 0.0000001)
if draw_performance_data1 == 0 and draw_performance_data2 == 1:
chart_y_limit = 1.1 * (max(performance_data2[i]) + 0.0000001)
chart_y_limit_list.append(chart_y_limit)
# Get chart y limit value in order to show maximum value of the chart as multiples of 1, 10, 100.
#from Disk import Disk
processes_disk_data_precision = Config.processes_disk_data_precision
processes_disk_data_unit = Config.processes_disk_data_unit
processes_disk_speed_bit = Config.processes_disk_speed_bit
# Get biggest chart_y_limit value in the chart_y_limit_list to show it on a label if all performance data is drawn for all devices.
# Get chart_y_limit value if multiple charts (devices) are drawn.
if selected_device_number != None:
chart_y_limit = chart_y_limit_list[selected_device_number]
# Get chart_y_limit value if single chart (device) is drawn.
else:
chart_y_limit = max(chart_y_limit_list)
try:
chart_y_limit_str = f'{ProcessesDetails.performance_data_unit_converter_func("speed", processes_disk_speed_bit, chart_y_limit, processes_disk_data_unit, processes_disk_data_precision)}/s'
# try-except is used in order to prevent errors if first initial function is not finished and "performance_data_unit_converter_func" is not run.
except AttributeError:
return
chart_y_limit_split = chart_y_limit_str.split(" ")
chart_y_limit_float = float(chart_y_limit_split[0])
number_of_digits = len(str(int(chart_y_limit_float)))
multiple = 10 ** (number_of_digits - 1)
# "0.0001" is used in order to take decimal part of the numbers into account. For example, 1.9999 (2-0.0001). This number is enough because maximum precision of the performance data is "3" (1.234 MiB/s).
number_to_get_next_multiple = chart_y_limit_float + (multiple - 0.0001)
next_multiple = int(number_to_get_next_multiple - (number_to_get_next_multiple % multiple))
ProcessesDetails.label2140w.set_text(f'{next_multiple} {chart_y_limit_split[1]}')
# "0.0000001"'s are used in order to avoid errors if values are tried to be divided by "0".
# Update chart_y_limit_list if multiple charts (devices) are drawn.
if selected_device_number != None:
chart_y_limit_list[selected_device_number] = (chart_y_limit * next_multiple / (chart_y_limit_float + 0.0000001) + 0.0000001)
# Update chart_y_limit_list if single chart (device) is drawn.
else:
chart_y_limit_list[chart_y_limit_list.index(chart_y_limit)] = (chart_y_limit * next_multiple / (chart_y_limit_float + 0.0000001) + 0.0000001)
# Check if drawing will be for CPU tab.
if widget_id == "drawingarea1101":
......@@ -1777,6 +1613,159 @@ class Performance:
for device_name in device_name_list:
chart_y_limit_list.append(100)
# Check if drawing will be for Process Details window CPU tab.
elif widget_id == "drawingarea2101w":
# Get chart colors.
chart_line_color = Config.chart_line_color_cpu_percent
# Get if drawing will be for the current device (CPU core, disk, network card, etc.) or all devices, get performance data to be drawn and device list.
draw_per_device = 0
from ProcessesDetails import ProcessesDetails
if ProcessesDetails.drawingarea2101w == widget:
pass
performance_data1 = [ProcessesDetails.process_cpu_usage_list]
device_name_list = [""]
selected_device_number = None
# Get which performance data will be drawn.
draw_performance_data1 = 1
draw_performance_data2 = 0
# Get chart y limit values in order to show maximum values of the charts as 100.
chart_y_limit_list = []
for device_name in device_name_list:
chart_y_limit_list.append(100)
# Check if drawing will be for Process Details window Memory tab.
elif widget_id == "drawingarea2102w":
# Get chart colors.
chart_line_color = Config.chart_line_color_memory_percent
# Get if drawing will be for the current device (CPU core, disk, network card, etc.) or all devices, get performance data to be drawn and device list.
draw_per_device = 0
from ProcessesDetails import ProcessesDetails
if ProcessesDetails.drawingarea2101w == widget:
pass
performance_data1 = [ProcessesDetails.process_ram_usage_list]
device_name_list = [""]
selected_device_number = None
# Get which performance data will be drawn.
draw_performance_data1 = 1
draw_performance_data2 = 0
"""# Get chart y limit values in order to show maximum values of the charts as 100.
chart_y_limit_list = []
for device_name in device_name_list:
chart_y_limit_list.append(100)"""
# Maximum performance data value is multiplied by 1.1 in order to scale chart when performance data is increased or decreased for preventing the line being out of the chart border.
chart_y_limit_list = []
for i, device_name in enumerate(device_name_list):
#chart_y_limit = 1.1 * ((max(max(performance_data1[i]), max(performance_data2[i]))) + 0.0000001)
#if draw_performance_data1 == 1 and draw_performance_data2 == 0:
chart_y_limit = 1.1 * (max(performance_data1[i]) + 0.0000001)
#if draw_performance_data1 == 0 and draw_performance_data2 == 1:
# chart_y_limit = 1.1 * (max(performance_data2[i]) + 0.0000001)
chart_y_limit_list.append(chart_y_limit)
# Get chart y limit value in order to show maximum value of the chart as multiples of 1, 10, 100.
#from Disk import Disk
processes_memory_data_precision = Config.processes_memory_data_precision
processes_memory_data_unit = Config.processes_memory_data_unit
# Get biggest chart_y_limit value in the chart_y_limit_list to show it on a label if all performance data is drawn for all devices.
# Get chart_y_limit value if multiple charts (devices) are drawn.
if selected_device_number != None:
chart_y_limit = chart_y_limit_list[selected_device_number]
# Get chart_y_limit value if single chart (device) is drawn.
else:
chart_y_limit = max(chart_y_limit_list)
try:
chart_y_limit_str = f'{ProcessesDetails.performance_data_unit_converter_func("data", "none", chart_y_limit, processes_memory_data_unit, processes_memory_data_precision)}'
# try-except is used in order to prevent errors if first initial function is not finished and "performance_data_unit_converter_func" is not run.
except AttributeError:
return
chart_y_limit_split = chart_y_limit_str.split(" ")
chart_y_limit_float = float(chart_y_limit_split[0])
number_of_digits = len(str(int(chart_y_limit_float)))
multiple = 10 ** (number_of_digits - 1)
# "0.0001" is used in order to take decimal part of the numbers into account. For example, 1.9999 (2-0.0001). This number is enough because maximum precision of the performance data is "3" (1.234 MiB/s).
number_to_get_next_multiple = chart_y_limit_float + (multiple - 0.0001)
next_multiple = int(number_to_get_next_multiple - (number_to_get_next_multiple % multiple))
ProcessesDetails.label2139w.set_text(f'{next_multiple} {chart_y_limit_split[1]}')
# "0.0000001"'s are used in order to avoid errors if values are tried to be divided by "0".
# Update chart_y_limit_list if multiple charts (devices) are drawn.
if selected_device_number != None:
chart_y_limit_list[selected_device_number] = (chart_y_limit * next_multiple / (chart_y_limit_float + 0.0000001) + 0.0000001)
# Update chart_y_limit_list if single chart (device) is drawn.
else:
chart_y_limit_list[chart_y_limit_list.index(chart_y_limit)] = (chart_y_limit * next_multiple / (chart_y_limit_float + 0.0000001) + 0.0000001)
# Check if drawing will be for Process Details window Disk tab.
elif widget_id == "drawingarea2103w":
# Get chart colors.
chart_line_color = Config.chart_line_color_disk_speed_usage
# Get if drawing will be for the current device (CPU core, disk, network card, etc.) or all devices, get performance data to be drawn and device list.
draw_per_device = 0
from ProcessesDetails import ProcessesDetails
if ProcessesDetails.drawingarea2101w == widget:
pass
performance_data1 = [ProcessesDetails.process_disk_read_speed_list]
performance_data2 = [ProcessesDetails.process_disk_write_speed_list]
device_name_list = [""]
selected_device_number = None
# Get which performance data will be drawn.
draw_performance_data1 = 1
draw_performance_data2 = 1
# Maximum performance data value is multiplied by 1.1 in order to scale chart when performance data is increased or decreased for preventing the line being out of the chart border.
chart_y_limit_list = []
for i, device_name in enumerate(device_name_list):
chart_y_limit = 1.1 * ((max(max(performance_data1[i]), max(performance_data2[i]))) + 0.0000001)
if draw_performance_data1 == 1 and draw_performance_data2 == 0:
chart_y_limit = 1.1 * (max(performance_data1[i]) + 0.0000001)
if draw_performance_data1 == 0 and draw_performance_data2 == 1:
chart_y_limit = 1.1 * (max(performance_data2[i]) + 0.0000001)
chart_y_limit_list.append(chart_y_limit)
# Get chart y limit value in order to show maximum value of the chart as multiples of 1, 10, 100.
#from Disk import Disk
processes_disk_data_precision = Config.processes_disk_data_precision
processes_disk_data_unit = Config.processes_disk_data_unit
processes_disk_speed_bit = Config.processes_disk_speed_bit
# Get biggest chart_y_limit value in the chart_y_limit_list to show it on a label if all performance data is drawn for all devices.
# Get chart_y_limit value if multiple charts (devices) are drawn.
if selected_device_number != None:
chart_y_limit = chart_y_limit_list[selected_device_number]
# Get chart_y_limit value if single chart (device) is drawn.
else:
chart_y_limit = max(chart_y_limit_list)
try:
chart_y_limit_str = f'{ProcessesDetails.performance_data_unit_converter_func("speed", processes_disk_speed_bit, chart_y_limit, processes_disk_data_unit, processes_disk_data_precision)}/s'
# try-except is used in order to prevent errors if first initial function is not finished and "performance_data_unit_converter_func" is not run.
except AttributeError:
return
chart_y_limit_split = chart_y_limit_str.split(" ")
chart_y_limit_float = float(chart_y_limit_split[0])
number_of_digits = len(str(int(chart_y_limit_float)))
multiple = 10 ** (number_of_digits - 1)
# "0.0001" is used in order to take decimal part of the numbers into account. For example, 1.9999 (2-0.0001). This number is enough because maximum precision of the performance data is "3" (1.234 MiB/s).
number_to_get_next_multiple = chart_y_limit_float + (multiple - 0.0001)
next_multiple = int(number_to_get_next_multiple - (number_to_get_next_multiple % multiple))
ProcessesDetails.label2140w.set_text(f'{next_multiple} {chart_y_limit_split[1]}')
# "0.0000001"'s are used in order to avoid errors if values are tried to be divided by "0".
# Update chart_y_limit_list if multiple charts (devices) are drawn.
if selected_device_number != None:
chart_y_limit_list[selected_device_number] = (chart_y_limit * next_multiple / (chart_y_limit_float + 0.0000001) + 0.0000001)
# Update chart_y_limit_list if single chart (device) is drawn.
else:
chart_y_limit_list[chart_y_limit_list.index(chart_y_limit)] = (chart_y_limit * next_multiple / (chart_y_limit_float + 0.0000001) + 0.0000001)
# Start drawing the performance data.
# Get chart data history.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment