From dffd99d922c96cf51a56b1ed2e105f65f9b2e4bc Mon Sep 17 00:00:00 2001 From: sasha80 Date: Tue, 6 May 2025 08:54:19 +0300 Subject: [PATCH] =?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=92=20=D0=BF=D1=80=D0=BE=D1=86=D0=B5=D1=81?= =?UTF-8?q?=D1=81=D0=B5.=20=D0=A0=D0=B0=D0=B7=D0=B4=D0=B5=D0=BB=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20=D0=BF=D1=80=D0=B8=D0=B1=D0=BE=D1=80=20=D0=A0?= =?UTF-8?q?=D0=A2=D0=A0=20=D0=BD=D0=B0=20=D0=B4=D0=B2=D0=B0=20=D0=90=D0=A4?= =?UTF-8?q?=D0=A1=D0=9F.=20=D0=90=D0=A4=D0=A1=D0=9F=20=D0=BF=D1=80=D0=BE?= =?UTF-8?q?=D0=B4=D1=83=D0=B1=D0=BB=D0=B8=D1=80=D0=BE=D0=B2=D0=B0=D0=BD=20?= =?UTF-8?q?-=20=D0=B2=20=D0=BE=D0=B4=D0=BD=D0=BE=D0=BC=20=D0=BE=D1=81?= =?UTF-8?q?=D1=82=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=20=D0=BB=D0=B5=D0=B2=D1=8B?= =?UTF-8?q?=D0=B9=20=D0=B1=D0=BE=D1=80=D1=82,=20=D0=B0=20=D0=B2=20=D0=B4?= =?UTF-8?q?=D1=80=D1=83=D0=B3=D0=BE=D0=BC=20=D0=BF=D1=80=D0=B0=D0=B2=D1=8B?= =?UTF-8?q?=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scenes/pribor-afsp/pribor-afsp-1.tscn | 49 ++++------------------ scenes/pribor-afsp/pribor-afsp-2.tscn | 58 ++++++++------------------- scenes/работа/работа.tscn | 2 +- 3 files changed, 25 insertions(+), 84 deletions(-) diff --git a/scenes/pribor-afsp/pribor-afsp-1.tscn b/scenes/pribor-afsp/pribor-afsp-1.tscn index a99a4e93..f00722fb 100644 --- a/scenes/pribor-afsp/pribor-afsp-1.tscn +++ b/scenes/pribor-afsp/pribor-afsp-1.tscn @@ -10,21 +10,19 @@ script/source = "extends Timer func _ready(): wait_time = ProjectSettings.get_setting('application/config/unit_rr_request_period') " -[node name="pribor_rtr" type="Control"] +[node name="pribor_afsp" type="Control"] layout_mode = 3 anchors_preset = 0 -offset_left = 10.0 -offset_top = 78.0 -offset_right = 10.0 -offset_bottom = 78.0 +offset_top = 40.0 +offset_bottom = 40.0 scale = Vector2(0.9, 0.9) script = ExtResource("1_151rh") [node name="lbl_header" type="Label" parent="."] layout_mode = 0 -offset_top = -44.8889 -offset_right = 1044.0 -offset_bottom = -15.8889 +offset_top = -44.0 +offset_right = 517.0 +offset_bottom = -16.0 theme_override_font_sizes/font_size = 22 text = "Контроль исправности прибора" horizontal_alignment = 1 @@ -38,42 +36,11 @@ wait_time = 4.168 autostart = true script = SubResource("GDScript_yhnwg") -[node name="left" parent="." instance=ExtResource("3_d7iti")] +[node name="bort" parent="." instance=ExtResource("3_d7iti")] scale = Vector2(0.9, 0.9) metadata/DeviceName = &"Устройство РР левого борта" -[node name="right" parent="." instance=ExtResource("3_d7iti")] -offset_left = 522.0 -offset_right = 1102.0 -scale = Vector2(0.9, 0.9) -metadata/DeviceName = &"Устройство РР правого борта" - -[node name="lbl_left" type="Label" parent="."] -self_modulate = Color(1, 1, 1, 0.627451) -layout_mode = 0 -offset_left = 217.0 -offset_top = -18.6666 -offset_right = 306.0 -offset_bottom = 3.33341 -theme_override_font_sizes/font_size = 17 -text = "левый борт" -horizontal_alignment = 1 -vertical_alignment = 1 - -[node name="lbl_right" type="Label" parent="."] -self_modulate = Color(1, 1, 1, 0.627451) -layout_mode = 0 -offset_left = 739.0 -offset_top = -18.6666 -offset_right = 833.0 -offset_bottom = 3.33341 -theme_override_font_sizes/font_size = 17 -text = "правый борт" -horizontal_alignment = 1 -vertical_alignment = 1 - [connection signal="child_entered_tree" from="request_rtr" to="request_rtr" method="_on_child_entered_tree"] [connection signal="request_completed" from="request_rtr" to="." method="_on_request_rtr_request_completed"] [connection signal="timeout" from="request_rtr/timer" to="request_rtr" method="_on_request_timer"] -[connection signal="pressed" from="left" to="." method="_on_item_pressed"] -[connection signal="pressed" from="right" to="." method="_on_item_pressed"] +[connection signal="pressed" from="bort" to="." method="_on_item_pressed"] diff --git a/scenes/pribor-afsp/pribor-afsp-2.tscn b/scenes/pribor-afsp/pribor-afsp-2.tscn index 5522d6fa..9cf652c9 100644 --- a/scenes/pribor-afsp/pribor-afsp-2.tscn +++ b/scenes/pribor-afsp/pribor-afsp-2.tscn @@ -10,7 +10,7 @@ script/source = "extends Timer func _ready(): wait_time = ProjectSettings.get_setting('application/config/unit_rr_request_period') " -[node name="pribor_rtr" type="Control"] +[node name="pribor_afsp" type="Control"] layout_mode = 3 anchors_preset = 0 offset_left = 10.0 @@ -22,58 +22,32 @@ script = ExtResource("1_tfses") [node name="lbl_header" type="Label" parent="."] layout_mode = 0 -offset_top = -44.8889 -offset_right = 1044.0 -offset_bottom = -15.8889 +offset_left = -10.7777 +offset_top = -86.6667 +offset_right = 505.222 +offset_bottom = -57.6667 theme_override_font_sizes/font_size = 22 text = "Контроль исправности прибора" horizontal_alignment = 1 vertical_alignment = 1 -[node name="request_rtr" type="HTTPRequest" parent="."] +[node name="request" type="HTTPRequest" parent="."] script = ExtResource("2_miwrd") -[node name="timer" type="Timer" parent="request_rtr"] +[node name="timer" type="Timer" parent="request"] wait_time = 4.168 autostart = true script = SubResource("GDScript_yhnwg") -[node name="left" parent="." instance=ExtResource("3_xpxb5")] -scale = Vector2(0.9, 0.9) -metadata/DeviceName = &"Устройство РР левого борта" - -[node name="right" parent="." instance=ExtResource("3_xpxb5")] -offset_left = 522.0 -offset_right = 1102.0 +[node name="bort" parent="." instance=ExtResource("3_xpxb5")] +offset_left = -11.1111 +offset_top = -39.4444 +offset_right = 568.889 +offset_bottom = 1190.56 scale = Vector2(0.9, 0.9) metadata/DeviceName = &"Устройство РР правого борта" -[node name="lbl_left" type="Label" parent="."] -self_modulate = Color(1, 1, 1, 0.627451) -layout_mode = 0 -offset_left = 217.0 -offset_top = -18.6666 -offset_right = 306.0 -offset_bottom = 3.33341 -theme_override_font_sizes/font_size = 17 -text = "левый борт" -horizontal_alignment = 1 -vertical_alignment = 1 - -[node name="lbl_right" type="Label" parent="."] -self_modulate = Color(1, 1, 1, 0.627451) -layout_mode = 0 -offset_left = 739.0 -offset_top = -18.6666 -offset_right = 833.0 -offset_bottom = 3.33341 -theme_override_font_sizes/font_size = 17 -text = "правый борт" -horizontal_alignment = 1 -vertical_alignment = 1 - -[connection signal="child_entered_tree" from="request_rtr" to="request_rtr" method="_on_child_entered_tree"] -[connection signal="request_completed" from="request_rtr" to="." method="_on_request_rtr_request_completed"] -[connection signal="timeout" from="request_rtr/timer" to="request_rtr" method="_on_request_timer"] -[connection signal="pressed" from="left" to="." method="_on_item_pressed"] -[connection signal="pressed" from="right" to="." method="_on_item_pressed"] +[connection signal="child_entered_tree" from="request" to="request" method="_on_child_entered_tree"] +[connection signal="request_completed" from="request" to="." method="_on_request_rtr_request_completed"] +[connection signal="timeout" from="request/timer" to="request" method="_on_request_timer"] +[connection signal="pressed" from="bort" to="." method="_on_item_pressed"] diff --git a/scenes/работа/работа.tscn b/scenes/работа/работа.tscn index 9a75da68..196c9743 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"]