diff --git a/addons/godot-logger/plugin.gd b/addons/godot-logger/plugin.gd index 2f1e72f..e26e3e1 100644 --- a/addons/godot-logger/plugin.gd +++ b/addons/godot-logger/plugin.gd @@ -13,11 +13,11 @@ const LOGGER_OUTPUT_SCRIPT = "res://addons/godot-logger/scripts/logger_output.gd const LOGGER_OUTPUT_ICON = "res://addons/godot-logger/icons/logger.svg" -func _def_settings(name: String, default: Variant) -> void: - if not ProjectSettings.has_setting(name): - ProjectSettings.set_setting(name, default) +func _def_settings(pname: String, default: Variant) -> void: + if not ProjectSettings.has_setting(pname): + ProjectSettings.set_setting(pname, default) - ProjectSettings.set_initial_value(name, default) + ProjectSettings.set_initial_value(pname, default) func _enter_tree() -> void: diff --git a/project.godot b/project.godot index 0dfc20b..338e4eb 100644 --- a/project.godot +++ b/project.godot @@ -22,18 +22,18 @@ config/icon="res://data/icon.png" [autoload] -Log="*res://addons/godot-logger/scripts/logger.gd" +log="*res://addons/godot-logger/scripts/logger.gd" tools="*res://scripts/tools.gd" signaller="*res://scripts/signaller.gd" repsettings="*res://scripts/repsettings.gd" -REPNetwork="*res://scripts/repnetwork.gd" +repnetwork="*res://scripts/repnetwork.gd" yau07="*res://scripts/yau07.gd" capsrpb="*res://scripts/capsrpb.gd" -Table="*res://table/table.gd" -Threats="*res://scripts/threats.gd" -YemsDevs="*res://scripts/yems-devs.gd" -Yemsboards="*res://scripts/yemsboards.gd" -YemsConsts="*res://scripts/yems-consts.gd" +table="*res://table/table.gd" +threats="*res://scripts/threats.gd" +yemsdevs="*res://scripts/yems-devs.gd" +yemsboards="*res://scripts/yemsboards.gd" +yemsconsts="*res://scripts/yems-consts.gd" interfer="*res://scripts/interfer.gd" hotkeys="*res://scripts/hotkeys.gd" @@ -95,6 +95,7 @@ common/enable_object_picking=false [rendering] renderer/rendering_method="gl_compatibility" +renderer/rendering_method.web="mobile" gl_compatibility/item_buffer_size=8192 shader_compiler/shader_cache/strip_debug=true textures/default_filters/anisotropic_filtering_level=0 diff --git a/scenes/canvas.tscn b/scenes/canvas.tscn index e4e0eb8..8dcb94e 100644 --- a/scenes/canvas.tscn +++ b/scenes/canvas.tscn @@ -8,7 +8,7 @@ [sub_resource type="PlaceholderTexture2D" id="PlaceholderTexture2D_2bft1"] size = Vector2(1600, 1200) -[sub_resource type="ShaderMaterial" id="ShaderMaterial_ddhy2"] +[sub_resource type="ShaderMaterial" id="ShaderMaterial_iqsw2"] resource_local_to_scene = true shader = ExtResource("4_gb4a1") shader_parameter/color = Color(1, 1, 1, 0.168627) @@ -26,6 +26,6 @@ centered = false script = ExtResource("2_vkwmy") [node name="строб" parent="." instance=ExtResource("3_uhdvc")] -material = SubResource("ShaderMaterial_ddhy2") +material = SubResource("ShaderMaterial_iqsw2") position = Vector2(560, 560) scale = Vector2(1100, 1100) diff --git a/scenes/file-table.gd b/scenes/file-table.gd index c6c2536..d2012c5 100644 --- a/scenes/file-table.gd +++ b/scenes/file-table.gd @@ -1,4 +1,4 @@ -extends Table +extends table var FILES_EXCLUDE_NAMES = ['.', '..'] @@ -8,7 +8,7 @@ var FILES_HEADERS_ALIGNMENT = [ HORIZONTAL_ALIGNMENT_CENTER, HORIZONTAL_ALIGNM var FILES_ROWS_ALIGNMENT = [ HORIZONTAL_ALIGNMENT_LEFT, HORIZONTAL_ALIGNMENT_RIGHT, HORIZONTAL_ALIGNMENT_CENTER ] -func fill_files_table(tbl: Table, folder: String, rows_types: Array): +func fill_files_table(tbl: table, folder: String, rows_types: Array): var dir: = DirAccess.open(folder) if dir == null: return diff --git a/scenes/scroll-params.gd b/scenes/scroll-params.gd index 1fe3f45..64df90c 100644 --- a/scenes/scroll-params.gd +++ b/scenes/scroll-params.gd @@ -23,7 +23,7 @@ const TABLE_PARAMS = { 'rkrp': [5, 'Рекомендуемая помеха'] } -## Обрабатывает сигнал [signal Threats.threat_selected] +## Обрабатывает сигнал [signal threats.threat_selected] func on_threat_selected(th): $table.set_meta('id', th.id) on_threat_update(th) @@ -42,11 +42,11 @@ func init_table(): func _ready() -> void: signaller.connect('threat_selected', Callable(self, 'on_threat_selected')) - Threats.connect('threat_update', Callable(self, 'on_threat_update')) + threats.connect('threat_update', Callable(self, 'on_threat_update')) call_deferred('init_table') -## Обрабатывает сигнал [signal Threats.threat_update]. +## Обрабатывает сигнал [signal threats.threat_update]. ## Обновляет отображение только для выбранной цели. func on_threat_update(th): if th.id != $table.get_meta('id'): return diff --git a/scenes/scroll-threats.gd b/scenes/scroll-threats.gd index dbb1b2a..45d5791 100644 --- a/scenes/scroll-threats.gd +++ b/scenes/scroll-threats.gd @@ -31,9 +31,9 @@ func init_table(): func _ready() -> void: var table_index: = Dictionary() - Threats.connect('threat_new', Callable(self, 'on_threat_new').bind(table_index)) - Threats.connect('threat_lost', Callable(self, 'on_threat_lost').bind(table_index)) - Threats.connect('threat_update', Callable(self, 'on_threat_update').bind(table_index)) + threats.connect('threat_new', Callable(self, 'on_threat_new').bind(table_index)) + threats.connect('threat_lost', Callable(self, 'on_threat_lost').bind(table_index)) + threats.connect('threat_update', Callable(self, 'on_threat_update').bind(table_index)) $table.connect('row_pressed', Callable(self, 'on_row_pressed')) call_deferred('init_table') diff --git a/scenes/tab-switch.gd b/scenes/tab-switch.gd index 9f6ed34..c78202c 100644 --- a/scenes/tab-switch.gd +++ b/scenes/tab-switch.gd @@ -1,3 +1,3 @@ extends TabContainer -func _enter_tree() -> void: REPNetwork.logger_page = $Журнал +func _enter_tree() -> void: repnetwork.logger_page = $Журнал diff --git a/scenes/журнал.gd b/scenes/журнал.gd index 4731747..9b60e42 100644 --- a/scenes/журнал.gd +++ b/scenes/журнал.gd @@ -1,30 +1,30 @@ extends Panel -func on_line_changed(unit, addr): Log.message(Logger.INFO, 'Состояние связи: %s %s' % [unit, addr]) -func on_command_fail(unit, addr): Log.message(Logger.ERROR, 'Ошибка: команда не выполнена: %s %s' % [unit, addr]) -func on_threats_changed(th: Object, msg: String): Log.message(Logger.INFO, '%s: %s' % [msg, th.to_string()]) -func on_parse_error(unit, msg: String): Log.message(Logger.ERROR, '%s: %s' % [unit.to_string(), msg]) +func on_line_changed(unit, addr): log.message(Logger.INFO, 'Состояние связи: %s %s' % [unit, addr]) +func on_command_fail(unit, addr): log.message(Logger.ERROR, 'Ошибка: команда не выполнена: %s %s' % [unit, addr]) +func on_threats_changed(th: Object, msg: String): log.message(Logger.INFO, '%s: %s' % [msg, th.to_string()]) +func on_parse_error(unit, msg: String): log.message(Logger.ERROR, '%s: %s' % [unit.to_string(), msg]) func _enter_tree(): var flts: Array = [] for item in $filtrs.get_children(): flts.append(item) - Log.set_filtrs(flts) + log.set_filtrs(flts) func _ready() -> void: - Log.info('Модуль журнала работы готов') - Log.info('Аргументы коммандной строки: \"%s\"' % OS.get_cmdline_args()) - Log.info('Операционная система: %s' % [OS.get_distribution_name()]) - Threats.connect('threat_new', Callable(self, 'on_threats_changed').bind('Цель обнаружена')) - Threats.connect('threat_lost', Callable(self, 'on_threats_changed').bind('Цель потеряна')) + log.info('Модуль журнала работы готов') + log.info('Аргументы коммандной строки: \"%s\"' % OS.get_cmdline_args()) + log.info('Операционная система: %s' % [OS.get_distribution_name()]) + threats.connect('threat_new', Callable(self, 'on_threats_changed').bind('Цель обнаружена')) + threats.connect('threat_lost', Callable(self, 'on_threats_changed').bind('Цель потеряна')) func _on_clear_button_down() -> void: $content.clear() - Log.info('Cодержание журнала очищено оператором') + log.info('Cодержание журнала очищено оператором') func _on_btn_save_button_down() -> void: @@ -44,9 +44,9 @@ func _on_dlg_file_confirmed() -> void: func _on_dlg_file_file_selected(path): - Log.save_file(path) + log.save_file(path) func _on_check_box_pressed(): $content.clear() - Log.add_msgs() + log.add_msgs() diff --git a/scenes/работа.gd b/scenes/работа.gd index 3f81d90..24a0cad 100644 --- a/scenes/работа.gd +++ b/scenes/работа.gd @@ -59,14 +59,14 @@ func _ready(): drag_fsm = DragFSM.OFF var nodes: Array = get_tree().get_nodes_in_group('группа-режим-помехи') nodes.any(func(btn): btn.button_connect('pressed', Callable(self, 'on_button_pressed').bind(btn, nodes))) - Threats.connect('threat_new', Callable(self, 'on_threat_new')) - Threats.connect('threat_lost', Callable(self, 'on_threat_lost')) - Threats.connect('threats_resized', Callable(self, 'on_threats_resized')) - Threats.connect('threat_update', Callable(self, 'on_threat_update')) + threats.connect('threat_new', Callable(self, 'on_threat_new')) + threats.connect('threat_lost', Callable(self, 'on_threat_lost')) + threats.connect('threats_resized', Callable(self, 'on_threats_resized')) + threats.connect('threat_update', Callable(self, 'on_threat_update')) ## Производит отображение цели на диаграмму -func map_threat_to_bip(th: Threats.Threat, bip: Sprite2D): +func map_threat_to_bip(th: threats.Threat, bip: Sprite2D): bip.position = tools.pos_calc( th.freq, th.aoa, diff --git a/scenes/ЭМС.gd b/scenes/эмс.gd similarity index 98% rename from scenes/ЭМС.gd rename to scenes/эмс.gd index 30d0923..1c14344 100644 --- a/scenes/ЭМС.gd +++ b/scenes/эмс.gd @@ -40,8 +40,8 @@ func init_boards(): $btn_connect.set_position(Vector2(posx+590,posy-25)) $btn_disconnect.set_position(Vector2(posx+587,posy + 675)) - g_boards['КЭМС'] = Yemsboards.EmsBoard.new('КЭМС', 0x130, YemsConsts.INPUT_ROWS, YemsConsts.OUTPUT_ROWS) - g_boards['П5-28'] = Yemsboards.EmsBoard.new('П5-28', 0x140, YemsConsts.INPUT_ROWS1, YemsConsts.OUTPUT_ROWS1) + g_boards['КЭМС'] = yemsboards.EmsBoard.new('КЭМС', 0x130, yemsconsts.INPUT_ROWS, yemsconsts.OUTPUT_ROWS) + g_boards['П5-28'] = yemsboards.EmsBoard.new('П5-28', 0x140, yemsconsts.INPUT_ROWS1, yemsconsts.OUTPUT_ROWS1) init_tbl_in() $scrollin/tbl_in.pin_header($scrollin, self) init_tbl_out() @@ -119,7 +119,7 @@ func init_tbl_in(): $scrollin/tbl_in.add_row(row_type) var row_index : int = $scrollin/tbl_in.get_rows_count() - 1 var params : Array = item[1] - var in_dev: YemsDevs.InDev = YemsDevs.InDev.new(item[0], params, row_index) + var in_dev: yemsdevs.InDev = yemsdevs.InDev.new(item[0], params, row_index) in_dev.board = board for i in range(len(row_type)): if i < len(params): @@ -201,7 +201,7 @@ func init_tbl_out(): $scrollout/tbl_out.add_row([CellLineEdit, CellLineEdit, CellLineEdit, CellLineEdit, CellState, CellLineEdit]) var row_index : int = $scrollout/tbl_out.get_rows_count() - 1 var params : Array = item[1] - var out_dev = YemsDevs.OutDev.new(item[0], params, row_index) + var out_dev = yemsdevs.OutDev.new(item[0], params, row_index) out_dev.board = board for i in range(len(header_text)): var cell = $scrollout/tbl_out.get_node2(i, row_index) diff --git a/scenes/ЭМС.tscn b/scenes/эмс.tscn similarity index 98% rename from scenes/ЭМС.tscn rename to scenes/эмс.tscn index 792d366..444fca6 100644 --- a/scenes/ЭМС.tscn +++ b/scenes/эмс.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=9 format=3 uid="uid://dab6loryocc73"] -[ext_resource type="Script" path="res://scenes/ЭМС.gd" id="1_mk57x"] +[ext_resource type="Script" path="res://scenes/эмс.gd" id="1_mk57x"] [ext_resource type="PackedScene" uid="uid://da7w3vkhadfwe" path="res://scenes/button-flat.tscn" id="2_eju8r"] [ext_resource type="Texture2D" uid="uid://dd60btbqnpiqw" path="res://data/document-new-0.png" id="3_w7rqa"] [ext_resource type="Texture2D" uid="uid://coqg6wsftvtxr" path="res://data/document-save-0.png" id="4_gyaoq"] diff --git a/scripts/repnetwork.gd b/scripts/repnetwork.gd index fe395e6..3e49396 100644 --- a/scripts/repnetwork.gd +++ b/scripts/repnetwork.gd @@ -25,13 +25,13 @@ func create_socket(nm) -> Socket: var sock: = Socket.new() sock.set_broadcast_enabled(broad) var rc = Error.OK if not bind else sock.bind(port, addr) - var errlevel = Log.INFO if rc == Error.OK else Log.ERROR - Log.message(errlevel, '%s: сокет:%s:%d привязанный:%s %s' % [nm, addr, port, ['нет', 'да'][int(bind)], error_string(rc)]) + var errlevel = log.INFO if rc == Error.OK else log.ERROR + log.message(errlevel, '%s: сокет:%s:%d привязанный:%s %s' % [nm, addr, port, ['нет', 'да'][int(bind)], error_string(rc)]) return sock func _ready() -> void: - Log.info('Сетевой модуль готов') + log.info('Сетевой модуль готов') poll_sockets.append(create_socket('уарэп-яу07-частный')) poll_sockets.append(create_socket('уарэп-яу07-общий')) poll_sockets.append(create_socket('уарэп-капсрпб-пол')) @@ -49,7 +49,7 @@ func _ready() -> void: unit.connect('line_changed', Callable(logger_page, 'on_line_changed').bind(unit_key)) unit.connect('command_fail', Callable(logger_page, 'on_command_fail').bind(unit_key)) - for key in units: Log.info('%s %s:%d' % [units[key].name, key[0], key[1]]) + for key in units: log.info('%s %s:%d' % [units[key].name, key[0], key[1]]) func poll_receive(sock: Socket, tick: int) -> bool: diff --git a/scripts/repsettings.gd b/scripts/repsettings.gd index 1566757..21979bb 100644 --- a/scripts/repsettings.gd +++ b/scripts/repsettings.gd @@ -37,7 +37,7 @@ extends Node } -func _ready() -> void: Log.info('Модуль настроек готов') +func _ready() -> void: log.info('Модуль настроек готов') ## Возвращает ключ устройства diff --git a/scripts/threats.gd b/scripts/threats.gd index e966e8f..5bafd72 100644 --- a/scripts/threats.gd +++ b/scripts/threats.gd @@ -43,10 +43,10 @@ signal threats_resized(th: Dictionary) func _ready() -> void: - Log.info('Модуль обработки целей готов') + log.info('Модуль обработки целей готов') var threats = {} ## Список целей. Индекс - <номер цели> var unit_key = repsettings.get_unit_key('уарэп-капсрпб-отп') - var unit = REPNetwork.units[unit_key] + var unit = repnetwork.units[unit_key] var timer_check_lost: = Timer.new() add_child(timer_check_lost) unit.connect('data_received', Callable(self, 'on_data_capsrpb_received').bind(threats))