From 14c85df2fa7062271d21d3c65ca0e622392f16b2 Mon Sep 17 00:00:00 2001 From: MaD_CaT Date: Mon, 19 May 2025 12:55:36 +0300 Subject: [PATCH 1/4] =?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=94=D0=BE=D0=B1=D0=B0=D0=B2?= =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=B0=20=D0=BF=D1=80=D0=BE=D0=B2=D0=B5=D1=80?= =?UTF-8?q?=D0=BA=D0=B0=20=D0=BA=D0=BB=D1=8E=D1=87=D0=B0=20id=20=D0=B2?= =?UTF-8?q?=D0=BE=D0=B7=D0=B4=D0=B5=D0=B9=D1=81=D1=82=D0=B2=D0=B8=D1=8F=20?= =?UTF-8?q?=D0=B2=20tcp5p28.gd?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scenes/работа/работа.tscn | 2 +- scripts/tcp5p28.gd | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/scenes/работа/работа.tscn b/scenes/работа/работа.tscn index 9a75da6..196c974 100644 --- a/scenes/работа/работа.tscn +++ b/scenes/работа/работа.tscn @@ -285,6 +285,6 @@ texture_pressed = ExtResource("13_ggrwd") [connection signal="drag_continue" from="." to="." method="_on_drag_continue"] [connection signal="toggled" from="btn_view" to="." method="on_button_view_toggled"] [connection signal="toggled" from="chk_auto" to="." method="on_value_changed"] -[connection signal="toggled" from="btn_activate" to="." method="on_btn_activate"] [connection signal="toggled" from="btn_activate" to="." method="on_btn_activate_toggled"] +[connection signal="toggled" from="btn_activate" to="." method="on_btn_activate"] [connection signal="toggled" from="btn_center" to="." method="on_btn_center_toggled"] diff --git a/scripts/tcp5p28.gd b/scripts/tcp5p28.gd index c1575b2..a054cc2 100644 --- a/scripts/tcp5p28.gd +++ b/scripts/tcp5p28.gd @@ -131,6 +131,9 @@ class TCP5P28 extends unit.Unit: var cu_data: PackedByteArray = [] cu_data.resize(4) for id in interfers.values(): + if not ecms.has(id): + push_error('не обнаружен ключ: %s, в словаре воздействий' %id) + continue var cu = ecms[id] cu_data.encode_u16(0, cu.ispp) var state: int From 92642a190115817230f63579edc3f5c0dffe7619 Mon Sep 17 00:00:00 2001 From: MaD_CaT Date: Fri, 23 May 2025 15:31:45 +0300 Subject: [PATCH 2/4] =?UTF-8?q?=D0=94=D0=BE=D1=80=D0=B0=D0=B1=D0=BE=D1=82?= =?UTF-8?q?=D0=BA=D0=B0.=20=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=BE=20=D0=BE=D1=82=D0=BE=D0=B1=D1=80=D0=B0=D0=B6=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D0=B2=D0=BD=D0=B5=D1=88=D0=BD=D0=B5=D0=B3?= =?UTF-8?q?=D0=BE=20=D1=83=D0=BF=D1=80=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D1=8F.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scenes/tabs-switch/tab-switch.gd | 6 ++++++ scenes/tabs-switch/tab-switch.tscn | 16 ++++++++++++++++ scenes/настройки/настройки.gd | 1 + 3 files changed, 23 insertions(+) diff --git a/scenes/tabs-switch/tab-switch.gd b/scenes/tabs-switch/tab-switch.gd index dc238c3..094ca3e 100644 --- a/scenes/tabs-switch/tab-switch.gd +++ b/scenes/tabs-switch/tab-switch.gd @@ -12,6 +12,7 @@ const TAB_TOSIGNAL_NAME = { func _enter_tree() -> void: network.logger_page = $Журнал signaller.connect('ems2_hide_pressed', on_ems2_hide_pressed) + ProjectSettings.connect('settings_changed', on_setting_changed) func on_ems2_hide_pressed(state): @@ -21,3 +22,8 @@ func on_ems2_hide_pressed(state): func _on_tab_changed(tab) -> void: if TAB_TOSIGNAL_NAME.has(tab): signaller.emit_signal(TAB_TOSIGNAL_NAME[tab]) + + +func on_setting_changed(): + var ext_cu = ProjectSettings.get_setting('application/config/external_cu', false) + get_parent().get_node('remote_control').visible = ext_cu diff --git a/scenes/tabs-switch/tab-switch.tscn b/scenes/tabs-switch/tab-switch.tscn index 4b41cae..acc3302 100644 --- a/scenes/tabs-switch/tab-switch.tscn +++ b/scenes/tabs-switch/tab-switch.tscn @@ -82,4 +82,20 @@ text = "Исправно" horizontal_alignment = 1 vertical_alignment = 1 +[node name="remote_control" type="Label" parent="."] +visible = false +layout_mode = 2 +offset_left = 1358.0 +offset_right = 1501.0 +offset_bottom = 27.0 +tooltip_text = "Готовность аппаратуры к работе" +mouse_filter = 0 +theme_override_colors/font_color = Color(0, 0, 0, 1) +theme_override_fonts/font = ExtResource("7_i7l8n") +theme_override_font_sizes/font_size = 14 +theme_override_styles/normal = SubResource("StyleBoxFlat_o1r22") +text = "Внешнее управление" +horizontal_alignment = 1 +vertical_alignment = 1 + [connection signal="tab_changed" from="tab_switch" to="tab_switch" method="_on_tab_changed"] diff --git a/scenes/настройки/настройки.gd b/scenes/настройки/настройки.gd index e73dfc4..e09195c 100644 --- a/scenes/настройки/настройки.gd +++ b/scenes/настройки/настройки.gd @@ -205,6 +205,7 @@ func setting_tab(): func button_settings(): var extern_cu_node = $scroll_set/table.get_node2(1, EXTERNAL_CU).get_children()[0] extern_cu_node.connect('pressed', on_external_cu_btn_pressed.bind(extern_cu_node)) + on_external_cu_btn_pressed(extern_cu_node) $scroll_set/table.set_row_text(SUPPRESS,(['Кнопка «Подавление»'])) $scroll_set/table.set_row_text(KEYBOARD,(['Виртуальная клавиатура'])) var vk_node = $scroll_set/table.get_node2(1, KEYBOARD).get_children()[0] From 2616fffbf0d267a0899539076bec16b3541ac048 Mon Sep 17 00:00:00 2001 From: MaD_CaT Date: Fri, 23 May 2025 15:33:56 +0300 Subject: [PATCH 3/4] Godot4.4 --- scenes/работа/работа.tscn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scenes/работа/работа.tscn b/scenes/работа/работа.tscn index 196c974..9a75da6 100644 --- a/scenes/работа/работа.tscn +++ b/scenes/работа/работа.tscn @@ -285,6 +285,6 @@ texture_pressed = ExtResource("13_ggrwd") [connection signal="drag_continue" from="." to="." method="_on_drag_continue"] [connection signal="toggled" from="btn_view" to="." method="on_button_view_toggled"] [connection signal="toggled" from="chk_auto" to="." method="on_value_changed"] -[connection signal="toggled" from="btn_activate" to="." method="on_btn_activate_toggled"] [connection signal="toggled" from="btn_activate" to="." method="on_btn_activate"] +[connection signal="toggled" from="btn_activate" to="." method="on_btn_activate_toggled"] [connection signal="toggled" from="btn_center" to="." method="on_btn_center_toggled"] From db3296c753b5a46ee583db6436270e15f89ba54c Mon Sep 17 00:00:00 2001 From: MaD_CaT Date: Mon, 26 May 2025 08:24:05 +0300 Subject: [PATCH 4/4] =?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=94=D0=BE=D0=B1=D0=B0=D0=B2?= =?UTF-8?q?=D0=BB=D0=B5=D0=BD=20tooltip=20=D0=B4=D0=BB=D1=8F=20=D0=BD?= =?UTF-8?q?=D0=B0=D0=B4=D0=BF=D0=B8=D1=81=D0=B8=20=D0=B2=D0=BD=D0=B5=D1=88?= =?UTF-8?q?=D0=BD=D0=B5=D0=B3=D0=BE=20=D1=83=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D1=8F.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scenes/tabs-switch/tab-switch.tscn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scenes/tabs-switch/tab-switch.tscn b/scenes/tabs-switch/tab-switch.tscn index acc3302..b534326 100644 --- a/scenes/tabs-switch/tab-switch.tscn +++ b/scenes/tabs-switch/tab-switch.tscn @@ -88,7 +88,7 @@ layout_mode = 2 offset_left = 1358.0 offset_right = 1501.0 offset_bottom = 27.0 -tooltip_text = "Готовность аппаратуры к работе" +tooltip_text = "Комплекс находится под внешним управлением" mouse_filter = 0 theme_override_colors/font_color = Color(0, 0, 0, 1) theme_override_fonts/font = ExtResource("7_i7l8n")