From 95531998620ac644e7a9a003d4c967e851c68482 Mon Sep 17 00:00:00 2001 From: sasha80 Date: Tue, 6 May 2025 14:12:15 +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=9C=D0=BD=D0=B5=D0=BC=D0=BE=D1=81=D1=85?= =?UTF-8?q?=D0=B5=D0=BC=D0=B0=20=D0=BF=D1=80=D0=B8=D0=B1=D0=BE=D1=80=D0=B0?= =?UTF-8?q?=20=D0=A0=D0=A2=D0=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scenes/pribor-afsp/pribor-afsp-1.tscn | 16 ++- scenes/pribor-afsp/pribor-afsp-2.tscn | 10 +- scenes/pribor-rtr/pribor-rtr.tscn | 198 ++++++++++++++++++++++++-- 3 files changed, 204 insertions(+), 20 deletions(-) diff --git a/scenes/pribor-afsp/pribor-afsp-1.tscn b/scenes/pribor-afsp/pribor-afsp-1.tscn index 5ce1421d..4b516959 100644 --- a/scenes/pribor-afsp/pribor-afsp-1.tscn +++ b/scenes/pribor-afsp/pribor-afsp-1.tscn @@ -13,7 +13,11 @@ func _ready(): wait_time = ProjectSettings.get_setting('application/config/unit_ [node name="pribor_afsp" type="Control"] layout_mode = 3 anchors_preset = 0 -scale = Vector2(0.9, 0.9) +offset_left = 70.0 +offset_top = 30.0 +offset_right = 70.0 +offset_bottom = 30.0 +scale = Vector2(1, 0.9) script = ExtResource("1_151rh") [node name="lbl_header" type="Label" parent="."] @@ -25,10 +29,10 @@ text = "Контроль исправности прибора" horizontal_alignment = 1 vertical_alignment = 1 -[node name="request_rtr" type="HTTPRequest" parent="."] +[node name="request" type="HTTPRequest" parent="."] script = ExtResource("2_4vyhj") -[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") @@ -39,7 +43,7 @@ offset_top = 27.7778 offset_bottom = 1216.78 metadata/DeviceName = &"Устройство РР левого борта" -[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="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/pribor-afsp/pribor-afsp-2.tscn b/scenes/pribor-afsp/pribor-afsp-2.tscn index 44d117a3..333777e8 100644 --- a/scenes/pribor-afsp/pribor-afsp-2.tscn +++ b/scenes/pribor-afsp/pribor-afsp-2.tscn @@ -13,11 +13,11 @@ func _ready(): wait_time = ProjectSettings.get_setting('application/config/unit_ [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 -scale = Vector2(0.9, 0.9) +offset_left = 81.0 +offset_top = 108.0 +offset_right = 81.0 +offset_bottom = 108.0 +scale = Vector2(1, 0.9) script = ExtResource("1_tfses") [node name="lbl_header" type="Label" parent="."] diff --git a/scenes/pribor-rtr/pribor-rtr.tscn b/scenes/pribor-rtr/pribor-rtr.tscn index fa364448..adababff 100644 --- a/scenes/pribor-rtr/pribor-rtr.tscn +++ b/scenes/pribor-rtr/pribor-rtr.tscn @@ -1,23 +1,203 @@ -[gd_scene load_steps=2 format=3 uid="uid://5uv1idl3lqea"] +[gd_scene load_steps=4 format=3 uid="uid://5uv1idl3lqea"] [ext_resource type="Script" uid="uid://d0jwv5opi3mrk" path="res://scenes/pribor-rtr/pribor-rtr.gd" id="1_sqyma"] +[ext_resource type="PackedScene" uid="uid://p2suppildvq0" path="res://scenes/контроль/элемент-в.tscn" id="2_yb5ym"] +[ext_resource type="PackedScene" uid="uid://d3iqb5e4g81m5" path="res://scenes/контроль/элемент-г.tscn" id="3_xqaxm"] [node name="pribor_rtr" type="Control"] layout_mode = 3 anchors_preset = 0 -offset_left = 10.0 -offset_top = 78.0 -offset_right = 10.0 -offset_bottom = 78.0 -scale = Vector2(0.9, 0.9) +offset_left = 115.0 +offset_top = 150.0 +offset_right = 115.0 +offset_bottom = 150.0 script = ExtResource("1_sqyma") [node name="lbl_header" type="Label" parent="."] layout_mode = 0 -offset_top = -44.8889 -offset_right = 1044.0 -offset_bottom = -15.8889 +offset_right = 301.0 +offset_bottom = 26.0 theme_override_font_sizes/font_size = 22 text = "Контроль исправности прибора" horizontal_alignment = 1 vertical_alignment = 1 + +[node name="blok_bpo_a1" parent="." instance=ExtResource("3_xqaxm")] +layout_mode = 0 +offset_left = 40.0 +offset_top = 35.0 +offset_right = 260.0 +offset_bottom = 320.0 +show_state = false +fname = "Блок БПО" +rname = "А1" + +[node name="a1_kanal1" parent="." instance=ExtResource("2_yb5ym")] +layout_mode = 0 +offset_left = 50.0 +offset_top = 70.0 +offset_right = 100.0 +offset_bottom = 190.0 +show_rname = false +self_size = Vector2i(50, 120) +fname = "Канал 1" + +[node name="a1_kanal2" parent="." instance=ExtResource("2_yb5ym")] +layout_mode = 0 +offset_left = 100.0 +offset_top = 70.0 +offset_right = 150.0 +offset_bottom = 190.0 +show_rname = false +self_size = Vector2i(50, 120) +fname = "Канал 2" + +[node name="a1_kanal3" parent="." instance=ExtResource("2_yb5ym")] +layout_mode = 0 +offset_left = 150.0 +offset_top = 70.0 +offset_right = 200.0 +offset_bottom = 190.0 +show_rname = false +self_size = Vector2i(50, 120) +fname = "Канал 3" + +[node name="a1_kanal4" parent="." instance=ExtResource("2_yb5ym")] +layout_mode = 0 +offset_left = 200.0 +offset_top = 70.0 +offset_right = 250.0 +offset_bottom = 190.0 +show_rname = false +self_size = Vector2i(50, 120) +fname = "Канал 4" + +[node name="a1_kanal5" parent="." instance=ExtResource("2_yb5ym")] +layout_mode = 0 +offset_left = 50.0 +offset_top = 190.0 +offset_right = 100.0 +offset_bottom = 310.0 +show_rname = false +self_size = Vector2i(50, 120) +fname = "Канал 5" + +[node name="a1_kanal6" parent="." instance=ExtResource("2_yb5ym")] +layout_mode = 0 +offset_left = 100.0 +offset_top = 190.0 +offset_right = 150.0 +offset_bottom = 310.0 +show_rname = false +self_size = Vector2i(50, 120) +fname = "Канал 1" + +[node name="a1_kanal7" parent="." instance=ExtResource("2_yb5ym")] +layout_mode = 0 +offset_left = 150.0 +offset_top = 190.0 +offset_right = 200.0 +offset_bottom = 310.0 +show_rname = false +self_size = Vector2i(50, 120) +fname = "Канал 1" + +[node name="a1_kanal8" parent="." instance=ExtResource("2_yb5ym")] +layout_mode = 0 +offset_left = 200.0 +offset_top = 190.0 +offset_right = 250.0 +offset_bottom = 310.0 +show_rname = false +self_size = Vector2i(50, 120) +fname = "Канал 1" + +[node name="blok_bpo_a2" parent="." instance=ExtResource("3_xqaxm")] +layout_mode = 0 +offset_left = 40.0 +offset_top = 330.0 +offset_right = 260.0 +offset_bottom = 615.0 +show_state = false +fname = "Блок БПО" +rname = "А2" + +[node name="a2_kanal1" parent="." instance=ExtResource("2_yb5ym")] +layout_mode = 0 +offset_left = 50.0 +offset_top = 365.0 +offset_right = 100.0 +offset_bottom = 485.0 +show_rname = false +self_size = Vector2i(50, 120) +fname = "Канал 1" + +[node name="a2_kanal2" parent="." instance=ExtResource("2_yb5ym")] +layout_mode = 0 +offset_left = 100.0 +offset_top = 365.0 +offset_right = 150.0 +offset_bottom = 485.0 +show_rname = false +self_size = Vector2i(50, 120) +fname = "Канал 2" + +[node name="a2_kanal3" parent="." instance=ExtResource("2_yb5ym")] +layout_mode = 0 +offset_left = 150.0 +offset_top = 365.0 +offset_right = 200.0 +offset_bottom = 485.0 +show_rname = false +self_size = Vector2i(50, 120) +fname = "Канал 3" + +[node name="a2_kanal4" parent="." instance=ExtResource("2_yb5ym")] +layout_mode = 0 +offset_left = 200.0 +offset_top = 365.0 +offset_right = 250.0 +offset_bottom = 485.0 +show_rname = false +self_size = Vector2i(50, 120) +fname = "Канал 4" + +[node name="a2_kanal5" parent="." instance=ExtResource("2_yb5ym")] +layout_mode = 0 +offset_left = 50.0 +offset_top = 485.0 +offset_right = 100.0 +offset_bottom = 605.0 +show_rname = false +self_size = Vector2i(50, 120) +fname = "Канал 5" + +[node name="a2_kanal6" parent="." instance=ExtResource("2_yb5ym")] +layout_mode = 0 +offset_left = 100.0 +offset_top = 485.0 +offset_right = 150.0 +offset_bottom = 605.0 +show_rname = false +self_size = Vector2i(50, 120) +fname = "Канал 6" + +[node name="a2_kanal7" parent="." instance=ExtResource("2_yb5ym")] +layout_mode = 0 +offset_left = 150.0 +offset_top = 485.0 +offset_right = 200.0 +offset_bottom = 605.0 +show_rname = false +self_size = Vector2i(50, 120) +fname = "Канал 7" + +[node name="a2_kanal8" parent="." instance=ExtResource("2_yb5ym")] +layout_mode = 0 +offset_left = 200.0 +offset_top = 485.0 +offset_right = 250.0 +offset_bottom = 605.0 +show_rname = false +self_size = Vector2i(50, 120) +fname = "Канал 8"