Рефактор.

This commit is contained in:
sasha80
2025-08-04 14:51:03 +03:00
parent 6252dd1051
commit b521a1fed5
12 changed files with 173 additions and 180 deletions

View File

@@ -14,7 +14,7 @@ func fill_files_table(tbl: table, folder: String, rows_types: Array):
return
var files: = []
var exclude_names: = ['.', '..']
dir.list_dir_begin() # TODOGODOT4 fill missing arguments https://github.com/godotengine/godot/pull/40547
dir.list_dir_begin() # TODO: GODOT4 fill missing arguments https://github.com/godotengine/godot/pull/40547
while true:
var file: = dir.get_next()
if file == '':
@@ -32,7 +32,7 @@ func fill_files_table(tbl: table, folder: String, rows_types: Array):
var mt = Time.get_datetime_dict_from_unix_time(ut)
var file_row = [file, '%d' % sz, '%d-%02d-%02d %02d:%02d' % [mt.year, mt.month, mt.day, mt.hour, mt.minute]]
tbl.add_row(rows_types)
var i_row = tbl.get_rows_count() - 1
var i_row: int = tbl.get_rows_count() - 1
tbl.set_row_text(i_row, file_row)
tbl.set_node_meta(0, i_row, 'file_path', glob_path)
dir.list_dir_end()

View File

@@ -61,22 +61,22 @@ class SocketTCP extends TCPServer:
var poll_sockets: Array[Socket]
var tcp_sockets: Array
var tcp_sockets: Array[Array]
var units: Dictionary[StringName, unit.Unit]
var units_udp: Dictionary[StringName, unit.Unit]
var units_udprx: Dictionary[StringName, unit.Unit]
var units_tcp: Dictionary[StringName, unit.Unit]
var units_serial: Dictionary[StringName, unit.Unit]
var units_modbus: Dictionary[StringName, unit.Unit]
var serials: Dictionary # Последовательные порты
var mbcs: Dictionary # Клиенты modbus.
var serials: Dictionary[StringName, Serial] # Последовательные порты
var mbcs: Dictionary[StringName, unit.Unit] # Клиенты modbus
var dst_ports: Dictionary[StringName, int]
var dst_addrs: Dictionary[StringName, StringName]
var unit_keys: Dictionary
var unit_keys: Dictionary[int, StringName]
var sock_unicast: Socket
var sock_capsrpb: Socket
var logger_page: Node
var send_sockets: Dictionary # Таблица <имяустройста>: <сокет> для отправки сообщений
var send_sockets: Dictionary[StringName, Socket] # Таблица <имяустройста>: <сокет> для отправки сообщений
var addr_port_to_unit_name: Dictionary[StringName, StringName]
@@ -197,8 +197,8 @@ func _ready() -> void:
if logger_page:
for key in units:
var u = units[key]
u.connect('line_changed', Callable(logger_page, 'on_line_changed').bind(key))
u.connect('command_fail', Callable(logger_page, 'on_command_fail').bind(key))
u.connect('line_changed', Callable(logger_page, 'on_line_changed'))
u.connect('command_fail', Callable(logger_page, 'on_command_fail'))
for key in settings.UnitProfiles:
var item = settings.UnitProfiles[key]

View File

@@ -107,8 +107,3 @@ func get_settings_file_path():
return ProjectSettings.get_setting(
'application/config/settings_path',
'user://settings.json')
## Возвращает ключ устройства.
func get_unit_key(unit_name: String) -> StringName:
return StringName(unit_name)