From 8e88eaf515386c0e08a0173f3ff818ff2a577c6d Mon Sep 17 00:00:00 2001 From: sasha80 Date: Wed, 21 Aug 2024 10:24:23 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A7=D0=B8=D1=81=D1=82=D0=BA=D0=B0.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- addons/godot-logger/scripts/logger.gd | 2 +- scenes/frame-ecm-list/frm-ecm-list.tscn | 4 ++++ scenes/pribor-rtr/pribor-rtr.gd | 2 +- scenes/настройки/настройки.tscn | 10 +++++----- scenes/работа/работа.gd | 1 - scenes/работа/работа.tscn | 8 ++++++-- scenes/эмс/эмс.tscn | 2 ++ 7 files changed, 19 insertions(+), 10 deletions(-) diff --git a/addons/godot-logger/scripts/logger.gd b/addons/godot-logger/scripts/logger.gd index 2a09e02..8110466 100644 --- a/addons/godot-logger/scripts/logger.gd +++ b/addons/godot-logger/scripts/logger.gd @@ -206,7 +206,7 @@ func message(level: int, text: String) -> void: _file.call_deferred('flush') if _default_output_enabled: - print(format_stdout(msg)) + print_debug(format_stdout(msg)) func _open_file() -> void: diff --git a/scenes/frame-ecm-list/frm-ecm-list.tscn b/scenes/frame-ecm-list/frm-ecm-list.tscn index 4c89832..fceb9ed 100644 --- a/scenes/frame-ecm-list/frm-ecm-list.tscn +++ b/scenes/frame-ecm-list/frm-ecm-list.tscn @@ -55,6 +55,7 @@ layout_mode = 2 size_flags_horizontal = 3 size_flags_vertical = 3 tooltip_text = "Включает принудительную помеху" +strips_rotation = 15.0 text = "СРН" metadata/rfi_name = "ozp1" @@ -63,6 +64,7 @@ editor_description = "Кнопка для принудительного вкл layout_mode = 2 size_flags_horizontal = 3 size_flags_vertical = 3 +strips_rotation = 15.0 text = "СПРС" metadata/rfi_name = "ozp1" @@ -71,6 +73,7 @@ layout_mode = 2 size_flags_horizontal = 3 size_flags_vertical = 3 tooltip_text = "Кнопка для принудительного включения группы секторов в режим КУПД" +strips_rotation = 15.0 text = "КУПД" metadata/rfi_name = "ozp1" @@ -78,5 +81,6 @@ metadata/rfi_name = "ozp1" layout_mode = 2 size_flags_horizontal = 3 size_flags_vertical = 3 +strips_rotation = 15.0 text = "Отключить все" metadata/rfi_name = "" diff --git a/scenes/pribor-rtr/pribor-rtr.gd b/scenes/pribor-rtr/pribor-rtr.gd index 71952df..e7b10fc 100644 --- a/scenes/pribor-rtr/pribor-rtr.gd +++ b/scenes/pribor-rtr/pribor-rtr.gd @@ -130,4 +130,4 @@ func _on_item_pressed(block_a: Control): print_debug(block_a) for n in metas: var v = block_a.get_meta(n) - print('%s:%s' % [n, v]) + print_debug('%s:%s' % [n, v]) diff --git a/scenes/настройки/настройки.tscn b/scenes/настройки/настройки.tscn index a5f0eec..e65b5d4 100644 --- a/scenes/настройки/настройки.tscn +++ b/scenes/настройки/настройки.tscn @@ -244,9 +244,9 @@ text = "Управление элементами в режиме с огран [node name="Label2" type="Label" parent="."] layout_mode = 0 -offset_left = 16.0 +offset_left = 20.0 offset_top = 20.0 -offset_right = 476.0 +offset_right = 445.0 offset_bottom = 50.0 text = "Текущий режим доступа: полный" vertical_alignment = 1 @@ -295,13 +295,13 @@ text = "Кнопка «Подавление». layout_mode = 2 size_flags_horizontal = 6 size_flags_vertical = 6 -button_pressed = true +disabled = true [node name="lbl_commit" type="Label" parent="."] layout_mode = 0 -offset_left = 480.0 +offset_left = 500.0 offset_top = 20.0 -offset_right = 1040.0 +offset_right = 1060.0 offset_bottom = 50.0 text = "Текущая версия ПО УАРЭП:" vertical_alignment = 1 diff --git a/scenes/работа/работа.gd b/scenes/работа/работа.gd index 852bc9e..59ee497 100644 --- a/scenes/работа/работа.gd +++ b/scenes/работа/работа.gd @@ -162,7 +162,6 @@ func get_all_nodes(root): func on_enter_tree() -> void: call_deferred('_on_btn_scale_pressed') call_deferred('on_button_strobe_pressed') - $tilemap.position = $canvas.get_strob_center() ## Производит отображение цели на диаграмму. diff --git a/scenes/работа/работа.tscn b/scenes/работа/работа.tscn index 8c7d6a0..9540a75 100644 --- a/scenes/работа/работа.tscn +++ b/scenes/работа/работа.tscn @@ -49,7 +49,6 @@ offset_left = 1114.0 offset_top = 7.0 offset_right = 1594.0 offset_bottom = 1170.0 -metadata/_edit_lock_ = true [node name="grd_btns" parent="." instance=ExtResource("5_2jnbs")] layout_mode = 0 @@ -108,17 +107,19 @@ offset_right = 111.0 offset_bottom = 953.0 size_flags_horizontal = 3 size_flags_vertical = 3 +strips_rotation = 25.0 text = "Вид" toggle_mode = true [node name="btn_activate" parent="." instance=ExtResource("8_k0iv2")] layout_mode = 2 -offset_left = 954.0 +offset_left = 906.0 offset_top = 1060.0 offset_right = 1106.0 offset_bottom = 1112.0 size_flags_horizontal = 3 size_flags_vertical = 3 +strips_rotation = 15.0 text = "Подавление" toggle_mode = true @@ -169,6 +170,7 @@ layout_mode = 2 size_flags_horizontal = 3 size_flags_vertical = 3 tooltip_text = "Кнопка для выбора сектора при помощи клика мышкой" +strips_rotation = 25.0 text = "Строб" toggle_mode = true metadata/state = 0 @@ -178,6 +180,7 @@ layout_mode = 2 size_flags_horizontal = 3 size_flags_vertical = 3 tooltip_text = "Кнопка для выбора сектора при помощи клика мышкой" +strips_rotation = 25.0 text = "Цель" toggle_mode = true metadata/state = 1 @@ -187,6 +190,7 @@ layout_mode = 2 size_flags_horizontal = 3 size_flags_vertical = 3 tooltip_text = "Кнопка для выбора сектора при помощи клика мышкой" +strips_rotation = 25.0 text = "Сектор" toggle_mode = true metadata/state = 2 diff --git a/scenes/эмс/эмс.tscn b/scenes/эмс/эмс.tscn index 489af88..5be27bc 100644 --- a/scenes/эмс/эмс.tscn +++ b/scenes/эмс/эмс.tscn @@ -29,6 +29,7 @@ offset_left = 1446.0 offset_top = 55.0 offset_right = 1583.0 offset_bottom = 85.0 +strips_rotation = 10.0 text = "Прочитать" [node name="btn_flash_write" parent="." instance=ExtResource("2_eju8r")] @@ -37,6 +38,7 @@ offset_left = 1446.0 offset_top = 99.0 offset_right = 1583.0 offset_bottom = 129.0 +strips_rotation = 10.0 text = "Записать" [node name="btn_new" type="Button" parent="."]