From c45842266a9bd28550954127554c07b24db4f4be Mon Sep 17 00:00:00 2001 From: MaD_CaT Date: Fri, 5 Dec 2025 10:18:21 +0300 Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=BD=D0=B0=D0=B7=D0=B2=D0=B0=D0=BD?= =?UTF-8?q?=D0=B8=D1=8F=20=D1=81=D1=82=D0=BE=D0=BB=D0=B1=D1=86=D0=B0=20?= =?UTF-8?q?=D0=B2=20=D1=81=D0=BF=D0=B8=D1=81=D0=BA=D0=B0=D1=85=20=D1=86?= =?UTF-8?q?=D0=B5=D0=BB=D0=B5=D0=B9,=20=D0=BA=D0=BE=D1=80=D1=80=D0=B5?= =?UTF-8?q?=D0=BA=D1=82=D0=B8=D1=80=D0=BE=D0=B2=D0=BA=D0=B0=20=D0=BA=D1=83?= =?UTF-8?q?=D1=80=D1=81=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scenes/frame-threats/scroll-threats.gd | 2 +- scenes/tabs-switch/lbl_ready.gd | 14 +++++++------- scenes/tilemap/tilemap.gd | 2 +- scripts/prd.gd | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/scenes/frame-threats/scroll-threats.gd b/scenes/frame-threats/scroll-threats.gd index be9dc979..c224021b 100644 --- a/scenes/frame-threats/scroll-threats.gd +++ b/scenes/frame-threats/scroll-threats.gd @@ -10,7 +10,7 @@ const EmitLed = preload('res://scenes/frame-threats/emit-led.tscn') ## const TABLE_HEADER = [ TableHeader, TableHeader, TableHeader, TableHeader , TableHeader ] ## Описание ряда заголовка. const TABLE_ROW = [ CellLineEdit, CellLineEdit, CellLineEdit, CellLineEdit, EmitLed ] ## Описание ряда. const TABLE_COLUMN_PARAM = ['id', 'aoa', 'freq', 'proto', 'emit' ] ## Параметры цели отображаемые в таблице. -const TABLE_HEADERS_TEXT = ['№', 'Пеленг', 'Частота, МГц', 'Протокол', 'Помеха' ] ## Заголовки таблицы. +const TABLE_HEADERS_TEXT = ['Номер', 'Пеленг', 'Частота, МГц', 'Протокол', 'Помеха' ] ## Заголовки таблицы. const TABLE_COLUMN_SIZE = [ 65, 70, 110, 140, 65] ## Ширины колонок. const TABLE_TEXT_ROWS = 4 diff --git a/scenes/tabs-switch/lbl_ready.gd b/scenes/tabs-switch/lbl_ready.gd index eda1f797..f486a2d5 100644 --- a/scenes/tabs-switch/lbl_ready.gd +++ b/scenes/tabs-switch/lbl_ready.gd @@ -119,7 +119,7 @@ func _on_uf_status_receive(unit_uf: Object) -> void: var EMS_B_1 = ((unit_uf.status[0] >> 1) & 1) and ((unit_uf.status[0] >> 4) & 1) var EMS_B_2 = ((unit_uf.status[0] >> 2) & 1) and ((unit_uf.status[0] >> 5) & 1) var IP27B = ((unit_uf.status[2] >> 6) & 1) - + var new_uf_status = KEMS_B and EMS_B_1 and EMS_B_2 and IP27B if status_uf != new_uf_status: status_uf = new_uf_status @@ -171,7 +171,7 @@ func _update_display() -> void: func _get_tooltip_text() -> String: var tooltip := "" - + match overall_prd_state: PRD_STATE.NONE: tooltip = "Нет связи с приборами комплекса" @@ -181,28 +181,28 @@ func _get_tooltip_text() -> String: tooltip = "Обнаружены неисправности в комплексе" _: tooltip = "Неизвестное состояние" - + # Добавляем информацию о статусе УФ, если есть онлайн устройства if overall_prd_state != PRD_STATE.NONE: tooltip += "\n\n" tooltip += "Статус УФ (УАРЭП-ЭМС): " tooltip += "Исправен" if status_uf else "Неисправен" - + # Добавляем детальную информацию о ПРД устройствах tooltip += "\n\nДетальный статус ПРД:" var online_count := 0 var operational_count := 0 - + for device_name in device_observers: var observer = device_observers[device_name] if observer.status[DEVICE_STATUS.ONLINE]: online_count += 1 if observer.status[DEVICE_STATUS.STATUS]: operational_count += 1 - + tooltip += "\nПРД онлайн: %d/%d" % [online_count, device_observers.size()] tooltip += "\nПРД исправны: %d/%d" % [operational_count, online_count] - + return tooltip diff --git a/scenes/tilemap/tilemap.gd b/scenes/tilemap/tilemap.gd index 228d0ab4..f013c667 100644 --- a/scenes/tilemap/tilemap.gd +++ b/scenes/tilemap/tilemap.gd @@ -717,7 +717,7 @@ func set_coordinates(lon: float, lat: float, course: float) -> void: add_mark_from_lon_lat(ship_id, lon, lat, ship_instance, 0.0) else: _marks[ship_id].position = lonlat_to_world(lon, lat) - ship_instance.rotation_degrees = fmod(270.0 + course, 360.0) + ship_instance.rotation_degrees = fmod(course, 360.0) queue_redraw() diff --git a/scripts/prd.gd b/scripts/prd.gd index 79bc0446..b908451f 100644 --- a/scripts/prd.gd +++ b/scripts/prd.gd @@ -153,7 +153,7 @@ class Fs: val = tools.set_bits(u.isa_ports[um_port], um_code_tx, 0x0007) data_arr.append(um_port) data_arr.append(val) - + # Установка готовности модуля ФС к излучению func set_ready(): ready = isg and caps_online and yau_07_online @@ -357,7 +357,7 @@ class PRD: for fs in fs_dic.values(): fs.caps_online = caps_online fs.set_ready() - + func _ready() -> void: check_dir() for prd_name in PRD_NAMES: @@ -498,7 +498,7 @@ func on_navi_data_received(data: Dictionary): func on_caps_line_changed(unit_caps): for pribor_prd in prd_dict.values(): pribor_prd.set_fs_caps_online(unit_caps.online) - signaller.emit_signal('fs_update_state', fs_dict) + signaller.emit_signal('fs_update_state', fs_dict) func on_yau07_line_changed(unit_yau07, prd_pribor):