From f3f593a597c203433ab6fa332052d7a5e3f96261 Mon Sep 17 00:00:00 2001 From: kira-a-k Date: Mon, 17 Nov 2025 23:10:15 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=BE=D0=B4=D0=BD=D1=8F=D1=82=D0=B8?= =?UTF-8?q?=D0=B5=20=D1=81=D1=86=D0=B5=D0=BD=20=D0=BA=D0=BE=D0=BD=D1=82?= =?UTF-8?q?=D1=80=D0=BE=D0=BB=D1=8F=20=D0=BF=D1=80=D0=B8=D0=B1=D0=BE=D1=80?= =?UTF-8?q?=D0=BE=D0=B2.=20Line=20separator=20-=20LF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scenes/pribor-afsp/pribor-afsp-1.tscn | 2 + scenes/pribor-afsp/pribor-afsp-2.tscn | 8 +- scenes/pribor-afsp/pribor-bpo.tscn | 60 +++---- scenes/pribor-prd-k/pribor-prd-k.tscn | 215 +++++++++++++------------- scenes/pribor-prd-n/pribor-prd-n.tscn | 185 +++++++++++----------- scenes/pribor-prd-v/pribor-prd-v.tscn | 194 ++++++++++++----------- scenes/pribor-uf/pribor-uf.tscn | 30 ++-- scenes/pribor-uyep/pribor-uyep.tscn | 32 ++-- scenes/контроль/кнопка-прибора.gd | 6 +- scenes/контроль/контроль.tscn | 57 +++---- scenes/работа/работа.tscn | 2 +- scripts/pribor-prd.gd | 31 ++-- 12 files changed, 434 insertions(+), 388 deletions(-) diff --git a/scenes/pribor-afsp/pribor-afsp-1.tscn b/scenes/pribor-afsp/pribor-afsp-1.tscn index 867517f..1e3e72c 100644 --- a/scenes/pribor-afsp/pribor-afsp-1.tscn +++ b/scenes/pribor-afsp/pribor-afsp-1.tscn @@ -30,7 +30,9 @@ autostart = true [node name="bort" parent="." instance=ExtResource("3_d7iti")] layout_mode = 0 +offset_left = 24.0 offset_top = 27.7778 +offset_right = 604.0 offset_bottom = 1216.78 metadata/DeviceName = &"Устройство РР левого борта" diff --git a/scenes/pribor-afsp/pribor-afsp-2.tscn b/scenes/pribor-afsp/pribor-afsp-2.tscn index 51ff32d..687a573 100644 --- a/scenes/pribor-afsp/pribor-afsp-2.tscn +++ b/scenes/pribor-afsp/pribor-afsp-2.tscn @@ -7,9 +7,9 @@ [node name="pribor_afsp" type="Control"] layout_mode = 3 anchors_preset = 0 -offset_left = 81.0 +offset_left = 82.0 offset_top = 108.0 -offset_right = 81.0 +offset_right = 82.0 offset_bottom = 108.0 scale = Vector2(1, 0.9) script = ExtResource("1_tfses") @@ -30,9 +30,9 @@ autostart = true [node name="bort" parent="." instance=ExtResource("3_xpxb5")] layout_mode = 0 -offset_left = -11.0 +offset_left = 12.0 offset_top = -59.0 -offset_right = 569.0 +offset_right = 592.0 offset_bottom = 1130.0 metadata/DeviceName = &"Устройство РР правого борта" diff --git a/scenes/pribor-afsp/pribor-bpo.tscn b/scenes/pribor-afsp/pribor-bpo.tscn index 36d5db0..06d13c7 100644 --- a/scenes/pribor-afsp/pribor-bpo.tscn +++ b/scenes/pribor-afsp/pribor-bpo.tscn @@ -9,9 +9,9 @@ layout_mode = 3 anchors_preset = 0 offset_left = 115.0 -offset_top = 150.0 +offset_top = 148.0 offset_right = 115.0 -offset_bottom = 150.0 +offset_bottom = 148.0 script = ExtResource("1_bhc4e") prefix_path = "DeviceDescription[DeviceName]" this_bpo1_name = "Устройство БПО левого борта" @@ -24,10 +24,10 @@ settings_path_to_wait_time = "Период опроса состояния БП [node name="mod_pit_g1" parent="." instance=ExtResource("2_jp6m0")] layout_mode = 2 -offset_left = 40.0 -offset_top = 535.0 -offset_right = 560.0 -offset_bottom = 605.0 +offset_left = 9.0 +offset_top = 377.0 +offset_right = 529.0 +offset_bottom = 447.0 size_flags_horizontal = 7 size_flags_vertical = 7 fname = "Модуль электропитания" @@ -35,20 +35,20 @@ rname = "G1" [node name="blok_bpo_a1" parent="." instance=ExtResource("2_jp6m0")] layout_mode = 0 -offset_left = 40.0 -offset_top = 135.0 -offset_right = 560.0 -offset_bottom = 330.0 +offset_left = 9.0 +offset_top = -23.0 +offset_right = 529.0 +offset_bottom = 172.0 show_state = false fname = "Блок БПО левого борта" rname = "А1" [node name="grid_bpo_a1" type="GridContainer" parent="."] layout_mode = 0 -offset_left = 50.0 -offset_top = 175.0 -offset_right = 498.0 -offset_bottom = 320.0 +offset_left = 19.0 +offset_top = 17.0 +offset_right = 467.0 +offset_bottom = 162.0 columns = 4 [node name="kanal1" parent="grid_bpo_a1" groups=["потребитель-питания"] instance=ExtResource("2_jp6m0")] @@ -108,30 +108,30 @@ fname = "Канал 8" metadata/state = "SelfTest[0].SystemList[0].DevList[7]['TestPassed']" [node name="yas_bpo_a1" parent="." groups=["потребитель-питания"] instance=ExtResource("3_jcpjs")] -offset_left = 500.0 -offset_top = 175.0 -offset_right = 550.0 -offset_bottom = 320.0 +offset_left = 469.0 +offset_top = 17.0 +offset_right = 519.0 +offset_bottom = 162.0 show_rname = false self_size = Vector2i(50, 145) fname = "Яч. связи" [node name="blok_bpo_a2" parent="." instance=ExtResource("2_jp6m0")] layout_mode = 0 -offset_left = 40.0 -offset_top = 335.0 -offset_right = 560.0 -offset_bottom = 530.0 +offset_left = 9.0 +offset_top = 177.0 +offset_right = 529.0 +offset_bottom = 372.0 show_state = false fname = "Блок БПО правого борта" rname = "А2" [node name="grid_bpo_a2" type="GridContainer" parent="."] layout_mode = 0 -offset_left = 50.0 -offset_top = 375.0 -offset_right = 498.0 -offset_bottom = 520.0 +offset_left = 19.0 +offset_top = 217.0 +offset_right = 467.0 +offset_bottom = 362.0 columns = 4 [node name="kanal1" parent="grid_bpo_a2" groups=["потребитель-питания", "управляется-по-шине-2"] instance=ExtResource("2_jp6m0")] @@ -191,10 +191,10 @@ fname = "Канал 8" metadata/state = "SelfTest[0].SystemList[0].DevList[7]['TestPassed']" [node name="yas_bpo_a2" parent="." groups=["потребитель-питания"] instance=ExtResource("3_jcpjs")] -offset_left = 500.0 -offset_top = 375.0 -offset_right = 550.0 -offset_bottom = 520.0 +offset_left = 469.0 +offset_top = 217.0 +offset_right = 519.0 +offset_bottom = 362.0 show_rname = false self_size = Vector2i(50, 145) fname = "Яч. связи" diff --git a/scenes/pribor-prd-k/pribor-prd-k.tscn b/scenes/pribor-prd-k/pribor-prd-k.tscn index 2a448dd..515fe07 100644 --- a/scenes/pribor-prd-k/pribor-prd-k.tscn +++ b/scenes/pribor-prd-k/pribor-prd-k.tscn @@ -46,55 +46,55 @@ script = ExtResource("1_tpdyp") [node name="kasseta_u5" parent="." instance=ExtResource("2_tb85r")] layout_mode = 0 -offset_left = 175.0 -offset_top = 242.0 -offset_right = 485.0 -offset_bottom = 432.0 +offset_left = 214.0 +offset_top = 96.0 +offset_right = 524.0 +offset_bottom = 286.0 [node name="maa2000_A22" parent="." groups=["power_supply"] instance=ExtResource("1_8dmgr")] layout_mode = 0 -offset_left = 485.0 -offset_top = 907.0 -offset_right = 652.0 -offset_bottom = 949.0 +offset_left = 524.0 +offset_top = 761.0 +offset_right = 691.0 +offset_bottom = 803.0 fname = "MAA2000" rname = "A28" metadata/ip = "maa2000_1" [node name="dou6_A7" parent="." groups=["default_reset"] instance=ExtResource("1_8dmgr")] layout_mode = 0 -offset_left = 8.0 -offset_top = 862.0 -offset_right = 175.0 -offset_bottom = 907.0 +offset_left = 47.0 +offset_top = 716.0 +offset_right = 214.0 +offset_bottom = 761.0 fname = "ДОУ-6" rname = "A7" [node name="maa2000_A23" parent="." groups=["power_supply"] instance=ExtResource("1_8dmgr")] layout_mode = 0 -offset_left = 8.0 -offset_top = 907.0 -offset_right = 175.0 -offset_bottom = 949.0 +offset_left = 47.0 +offset_top = 761.0 +offset_right = 214.0 +offset_bottom = 803.0 fname = "MAA2000" rname = "A27" metadata/ip = "maa2000_2" [node name="dou7_A8" parent="." groups=["default_reset"] instance=ExtResource("1_8dmgr")] layout_mode = 0 -offset_left = 8.0 -offset_top = 812.0 -offset_right = 175.0 -offset_bottom = 860.0 +offset_left = 47.0 +offset_top = 666.0 +offset_right = 214.0 +offset_bottom = 714.0 fname = "ДОУ-7" rname = "A8" [node name="ref_ZZ3" type="NinePatchRect" parent="."] layout_mode = 0 -offset_left = 175.0 -offset_top = 812.0 -offset_right = 485.0 -offset_bottom = 949.0 +offset_left = 214.0 +offset_top = 666.0 +offset_right = 524.0 +offset_bottom = 803.0 texture = ExtResource("2_14h25") patch_margin_left = 16 patch_margin_top = 16 @@ -115,10 +115,10 @@ vertical_alignment = 1 [node name="um1535_A10" parent="." groups=["power_amplifier"] instance=ExtResource("5_c7lv8")] layout_mode = 0 -offset_left = 485.0 -offset_top = 242.0 -offset_right = 652.0 -offset_bottom = 337.0 +offset_left = 524.0 +offset_top = 96.0 +offset_right = 691.0 +offset_bottom = 191.0 value0 = [0.0, 0.0, 0.0, 0.0, 0.0, 0.0] fname = "УМ1535Б" rname = "A10" @@ -128,10 +128,10 @@ metadata/um = "um_1" [node name="um1535_A11" parent="." groups=["power_amplifier"] instance=ExtResource("5_c7lv8")] layout_mode = 0 -offset_left = 485.0 -offset_top = 337.0 -offset_right = 652.0 -offset_bottom = 432.0 +offset_left = 524.0 +offset_top = 191.0 +offset_right = 691.0 +offset_bottom = 286.0 fname = "УМ1535Б" rname = "A11" value0_info = "Мощность" @@ -140,10 +140,10 @@ metadata/um = "um_2" [node name="um1535_A12" parent="." groups=["power_amplifier"] instance=ExtResource("5_c7lv8")] layout_mode = 0 -offset_left = 485.0 -offset_top = 432.0 -offset_right = 652.0 -offset_bottom = 527.0 +offset_left = 524.0 +offset_top = 286.0 +offset_right = 691.0 +offset_bottom = 381.0 fname = "УМ1535Б" rname = "A12" value0_info = "Мощность" @@ -152,10 +152,10 @@ metadata/um = "um_3" [node name="um1535_A13" parent="." groups=["power_amplifier"] instance=ExtResource("5_c7lv8")] layout_mode = 0 -offset_left = 485.0 -offset_top = 527.0 -offset_right = 652.0 -offset_bottom = 622.0 +offset_left = 524.0 +offset_top = 381.0 +offset_right = 691.0 +offset_bottom = 476.0 fname = "УМ1535Б" rname = "A13" value0_info = "Мощность" @@ -164,10 +164,10 @@ metadata/um = "um_4" [node name="um1535_A14" parent="." groups=["power_amplifier"] instance=ExtResource("5_c7lv8")] layout_mode = 0 -offset_left = 485.0 -offset_top = 622.0 -offset_right = 652.0 -offset_bottom = 717.0 +offset_left = 524.0 +offset_top = 476.0 +offset_right = 691.0 +offset_bottom = 571.0 fname = "УМ1535Б" rname = "A14" value0_info = "Мощность" @@ -176,10 +176,10 @@ metadata/um = "um_5" [node name="um1535_A15" parent="." groups=["power_amplifier"] instance=ExtResource("5_c7lv8")] layout_mode = 0 -offset_left = 485.0 -offset_top = 717.0 -offset_right = 652.0 -offset_bottom = 812.0 +offset_left = 524.0 +offset_top = 571.0 +offset_right = 691.0 +offset_bottom = 666.0 fname = "УМ1535Б" rname = "A15" value0_info = "Мощность" @@ -188,10 +188,10 @@ metadata/um = "um_6" [node name="блок-к" parent="." groups=["power_amplifier"] instance=ExtResource("6_wd1vi")] layout_mode = 0 -offset_left = 485.0 -offset_top = 812.0 -offset_right = 652.0 -offset_bottom = 907.0 +offset_left = 524.0 +offset_top = 666.0 +offset_right = 691.0 +offset_bottom = 761.0 fname = "УТМ80" rname = "A9" value0_info = "Мощность" @@ -200,10 +200,10 @@ metadata/um = "um_8" [node name="rm1620m_A16" parent="." groups=["power_amplifier"] instance=ExtResource("5_c7lv8")] layout_mode = 0 -offset_left = 8.0 -offset_top = 242.0 -offset_right = 175.0 -offset_bottom = 337.0 +offset_left = 47.0 +offset_top = 96.0 +offset_right = 214.0 +offset_bottom = 191.0 fname = "РМ16-20М" rname = "A16" value0_info = "Мощность" @@ -212,10 +212,10 @@ metadata/um = "um_9" [node name="rm1620m_A17" parent="." groups=["power_amplifier"] instance=ExtResource("5_c7lv8")] layout_mode = 0 -offset_left = 8.0 -offset_top = 337.0 -offset_right = 173.0 -offset_bottom = 432.0 +offset_left = 47.0 +offset_top = 191.0 +offset_right = 212.0 +offset_bottom = 286.0 fname = "РМ16-20М" rname = "A17" value0_info = "Мощность" @@ -224,10 +224,10 @@ metadata/um = "um_10" [node name="rm1620m_A18" parent="." groups=["power_amplifier"] instance=ExtResource("5_c7lv8")] layout_mode = 0 -offset_left = 8.0 -offset_top = 432.0 -offset_right = 175.0 -offset_bottom = 527.0 +offset_left = 47.0 +offset_top = 286.0 +offset_right = 214.0 +offset_bottom = 381.0 fname = "РМ16-20М" rname = "A18" value0_info = "Мощность" @@ -236,10 +236,10 @@ metadata/um = "um_11" [node name="rm1620m_A19" parent="." groups=["power_amplifier"] instance=ExtResource("5_c7lv8")] layout_mode = 0 -offset_left = 8.0 -offset_top = 527.0 -offset_right = 175.0 -offset_bottom = 622.0 +offset_left = 47.0 +offset_top = 381.0 +offset_right = 214.0 +offset_bottom = 476.0 fname = "РМ16-20М" rname = "A19" value0_info = "Мощность" @@ -248,10 +248,10 @@ metadata/um = "um_12" [node name="rm1620m_A20" parent="." groups=["power_amplifier"] instance=ExtResource("5_c7lv8")] layout_mode = 0 -offset_left = 8.0 -offset_top = 622.0 -offset_right = 175.0 -offset_bottom = 717.0 +offset_left = 47.0 +offset_top = 476.0 +offset_right = 214.0 +offset_bottom = 571.0 fname = "РМ16-20М" rname = "A20" value0_info = "Мощность" @@ -260,10 +260,10 @@ metadata/um = "um_13" [node name="rm1620m_A21" parent="." groups=["power_amplifier"] instance=ExtResource("5_c7lv8")] layout_mode = 0 -offset_left = 8.0 -offset_top = 717.0 -offset_right = 175.0 -offset_bottom = 812.0 +offset_left = 47.0 +offset_top = 571.0 +offset_right = 214.0 +offset_bottom = 666.0 fname = "РМ16-20М" rname = "A21" value0_info = "Мощность" @@ -272,18 +272,18 @@ metadata/um = "um_14" [node name="kasseta_fs_kd" parent="." instance=ExtResource("7_ia27q")] layout_mode = 0 -offset_left = 175.0 -offset_top = 432.0 -offset_right = 485.0 -offset_bottom = 622.0 +offset_left = 214.0 +offset_top = 286.0 +offset_right = 524.0 +offset_bottom = 476.0 fname = "Кассета ФС-КД" [node name="kasseta_p_1" type="NinePatchRect" parent="."] layout_mode = 0 -offset_left = 175.0 -offset_top = 622.0 -offset_right = 340.0 -offset_bottom = 812.0 +offset_left = 214.0 +offset_top = 476.0 +offset_right = 379.0 +offset_bottom = 666.0 texture = ExtResource("2_14h25") patch_margin_left = 16 patch_margin_top = 16 @@ -332,42 +332,49 @@ vertical_alignment = 1 [node name="kasseta_p_2" parent="." instance=ExtResource("8_6fdp7")] layout_mode = 0 -offset_left = 365.0 -offset_top = 622.0 -offset_right = 485.0 -offset_bottom = 812.0 +offset_left = 404.0 +offset_top = 476.0 +offset_right = 524.0 +offset_bottom = 666.0 fname = "Кассета П-2" -[node name="control_result" type="Label" parent="."] -layout_mode = 0 -offset_left = 9.0 -offset_top = 960.0 -offset_right = 649.0 -offset_bottom = 1003.0 -text = "Прибор ПРД- неисправен" -horizontal_alignment = 1 -metadata/_edit_lock_ = true - [node name="input_0" type="AnimatedSprite2D" parent="."] -position = Vector2(353, 618) +position = Vector2(392, 472) sprite_frames = SubResource("SpriteFrames_di0aa") [node name="input_1" type="AnimatedSprite2D" parent="."] -position = Vector2(405, 618) +position = Vector2(444, 472) sprite_frames = SubResource("SpriteFrames_di0aa") [node name="input_2" type="AnimatedSprite2D" parent="."] -position = Vector2(255, 619) +position = Vector2(294, 473) sprite_frames = SubResource("SpriteFrames_di0aa") [node name="output_0" type="AnimatedSprite2D" parent="."] -position = Vector2(355, 464) +position = Vector2(394, 318) sprite_frames = SubResource("SpriteFrames_di0aa") [node name="output_1" type="AnimatedSprite2D" parent="."] -position = Vector2(405, 464) +position = Vector2(444, 318) sprite_frames = SubResource("SpriteFrames_di0aa") [node name="output_2" type="AnimatedSprite2D" parent="."] -position = Vector2(255, 464) +position = Vector2(294, 318) sprite_frames = SubResource("SpriteFrames_di0aa") + +[node name="control_result" type="Label" parent="."] +offset_left = 49.0 +offset_top = 993.0 +offset_right = 689.0 +offset_bottom = 1036.0 +theme_override_font_sizes/font_size = 22 +horizontal_alignment = 1 +metadata/_edit_lock_ = true + +[node name="line" type="Line2D" parent="."] +position = Vector2(59, 920) +scale = Vector2(1.03548, 1) +points = PackedVector2Array(-8, 0, 61.8069, 0, 608, 0) +width = 2.0 +default_color = Color(1, 1, 1, 0.352941) +metadata/_edit_lock_ = true diff --git a/scenes/pribor-prd-n/pribor-prd-n.tscn b/scenes/pribor-prd-n/pribor-prd-n.tscn index acb800a..3e041eb 100644 --- a/scenes/pribor-prd-n/pribor-prd-n.tscn +++ b/scenes/pribor-prd-n/pribor-prd-n.tscn @@ -42,48 +42,48 @@ script = ExtResource("1_bnnv3") [node name="maa2000_A23" parent="." groups=["power_supply"] instance=ExtResource("2_is25t")] layout_mode = 2 -offset_left = 8.0 -offset_top = 877.0 -offset_right = 175.0 -offset_bottom = 949.0 +offset_left = 47.0 +offset_top = 731.0 +offset_right = 214.0 +offset_bottom = 803.0 fname = "MAA2000" rname = "A23" metadata/ip = "maa2000_2" [node name="maa2000_A22" parent="." groups=["power_supply"] instance=ExtResource("2_is25t")] layout_mode = 2 -offset_left = 485.0 -offset_top = 877.0 -offset_right = 652.0 -offset_bottom = 949.0 +offset_left = 524.0 +offset_top = 731.0 +offset_right = 691.0 +offset_bottom = 803.0 fname = "MAA2000" rname = "A22" metadata/ip = "maa2000_1" [node name="dou2_A5" parent="." groups=["default_reset"] instance=ExtResource("2_is25t")] layout_mode = 2 -offset_left = 485.0 -offset_top = 812.0 -offset_right = 652.0 -offset_bottom = 877.0 +offset_left = 524.0 +offset_top = 666.0 +offset_right = 691.0 +offset_bottom = 731.0 fname = "ДОУ-2" rname = "A5" [node name="dou3_A6" parent="." groups=["default_reset"] instance=ExtResource("2_is25t")] layout_mode = 2 -offset_left = 8.0 -offset_top = 812.0 -offset_right = 175.0 -offset_bottom = 877.0 +offset_left = 47.0 +offset_top = 666.0 +offset_right = 214.0 +offset_bottom = 731.0 fname = "ДОУ-3" rname = "A6" [node name="ref_ZZ3" type="NinePatchRect" parent="."] layout_mode = 0 -offset_left = 175.0 -offset_top = 812.0 -offset_right = 485.0 -offset_bottom = 949.0 +offset_left = 214.0 +offset_top = 666.0 +offset_right = 524.0 +offset_bottom = 803.0 texture = ExtResource("3_meukj") patch_margin_left = 16 patch_margin_top = 16 @@ -104,10 +104,10 @@ vertical_alignment = 1 [node name="kasseta_U5" type="NinePatchRect" parent="."] layout_mode = 0 -offset_left = 175.0 -offset_top = 242.0 -offset_right = 485.0 -offset_bottom = 432.0 +offset_left = 214.0 +offset_top = 96.0 +offset_right = 524.0 +offset_bottom = 286.0 texture = ExtResource("3_meukj") patch_margin_left = 16 patch_margin_top = 16 @@ -182,10 +182,10 @@ metadata/y5 = "ukp2" [node name="kasseta_FS_ND" type="NinePatchRect" parent="."] layout_mode = 0 -offset_left = 175.0 -offset_top = 432.0 -offset_right = 485.0 -offset_bottom = 622.0 +offset_left = 214.0 +offset_top = 286.0 +offset_right = 524.0 +offset_bottom = 476.0 texture = ExtResource("3_meukj") patch_margin_left = 16 patch_margin_top = 16 @@ -242,10 +242,10 @@ rname = "A3" [node name="kasseta_P_1" type="NinePatchRect" parent="."] layout_mode = 0 -offset_left = 175.0 -offset_top = 622.0 -offset_right = 485.0 -offset_bottom = 812.0 +offset_left = 214.0 +offset_top = 476.0 +offset_right = 524.0 +offset_bottom = 666.0 texture = ExtResource("3_meukj") patch_margin_left = 16 patch_margin_top = 16 @@ -294,10 +294,10 @@ vertical_alignment = 1 [node name="um1535_A7" parent="." groups=["power_amplifier"] instance=ExtResource("7_bnnv3")] layout_mode = 0 -offset_left = 485.0 -offset_top = 242.0 -offset_right = 652.0 -offset_bottom = 337.0 +offset_left = 524.0 +offset_top = 96.0 +offset_right = 691.0 +offset_bottom = 191.0 fname = "УМ1535А" rname = "A7" value0_info = "Мощность" @@ -306,10 +306,10 @@ metadata/um = "um_1" [node name="um1535_A8" parent="." groups=["power_amplifier"] instance=ExtResource("7_bnnv3")] layout_mode = 0 -offset_left = 485.0 -offset_top = 337.0 -offset_right = 652.0 -offset_bottom = 432.0 +offset_left = 524.0 +offset_top = 191.0 +offset_right = 691.0 +offset_bottom = 286.0 fname = "УМ1535А" rname = "A8" value0_info = "Мощность" @@ -318,10 +318,10 @@ metadata/um = "um_2" [node name="um1535_A9" parent="." groups=["power_amplifier"] instance=ExtResource("7_bnnv3")] layout_mode = 0 -offset_left = 485.0 -offset_top = 432.0 -offset_right = 652.0 -offset_bottom = 527.0 +offset_left = 524.0 +offset_top = 286.0 +offset_right = 691.0 +offset_bottom = 381.0 fname = "УМ1535А" rname = "A9" value0_info = "Мощность" @@ -330,10 +330,10 @@ metadata/um = "um_3" [node name="um1535_A10" parent="." groups=["power_amplifier"] instance=ExtResource("7_bnnv3")] layout_mode = 0 -offset_left = 485.0 -offset_top = 527.0 -offset_right = 652.0 -offset_bottom = 622.0 +offset_left = 524.0 +offset_top = 381.0 +offset_right = 691.0 +offset_bottom = 476.0 fname = "УМ1535А" rname = "A10" value0_info = "Мощность" @@ -342,10 +342,10 @@ metadata/um = "um_4" [node name="um1535_A11" parent="." groups=["power_amplifier"] instance=ExtResource("7_bnnv3")] layout_mode = 0 -offset_left = 485.0 -offset_top = 622.0 -offset_right = 652.0 -offset_bottom = 717.0 +offset_left = 524.0 +offset_top = 476.0 +offset_right = 691.0 +offset_bottom = 571.0 fname = "УМ1535А" rname = "A11" value0_info = "Мощность" @@ -354,10 +354,10 @@ metadata/um = "um_5" [node name="um1535_A12" parent="." groups=["power_amplifier"] instance=ExtResource("7_bnnv3")] layout_mode = 0 -offset_left = 485.0 -offset_top = 717.0 -offset_right = 652.0 -offset_bottom = 812.0 +offset_left = 524.0 +offset_top = 571.0 +offset_right = 691.0 +offset_bottom = 666.0 fname = "УМ1535А" rname = "A12" value0_info = "Мощность" @@ -366,10 +366,10 @@ metadata/um = "um_6" [node name="um1535_A13" parent="." groups=["power_amplifier"] instance=ExtResource("7_bnnv3")] layout_mode = 0 -offset_left = 8.0 -offset_top = 242.0 -offset_right = 175.0 -offset_bottom = 337.0 +offset_left = 47.0 +offset_top = 96.0 +offset_right = 214.0 +offset_bottom = 191.0 fname = "УМ1535А" rname = "A13" value0_info = "Мощность" @@ -378,10 +378,10 @@ metadata/um = "um_9" [node name="um1535_A14" parent="." groups=["power_amplifier"] instance=ExtResource("7_bnnv3")] layout_mode = 0 -offset_left = 8.0 -offset_top = 337.0 -offset_right = 175.0 -offset_bottom = 432.0 +offset_left = 47.0 +offset_top = 191.0 +offset_right = 214.0 +offset_bottom = 286.0 fname = "УМ1535А" rname = "A14" value0_info = "Мощность" @@ -390,10 +390,10 @@ metadata/um = "um_10" [node name="um1535_A15" parent="." groups=["power_amplifier"] instance=ExtResource("7_bnnv3")] layout_mode = 0 -offset_left = 8.0 -offset_top = 432.0 -offset_right = 175.0 -offset_bottom = 527.0 +offset_left = 47.0 +offset_top = 286.0 +offset_right = 214.0 +offset_bottom = 381.0 fname = "УМ1535А" rname = "A15" value0_info = "Мощность" @@ -402,10 +402,10 @@ metadata/um = "um_11" [node name="um1535_A16" parent="." groups=["power_amplifier"] instance=ExtResource("7_bnnv3")] layout_mode = 0 -offset_left = 8.0 -offset_top = 527.0 -offset_right = 175.0 -offset_bottom = 622.0 +offset_left = 47.0 +offset_top = 381.0 +offset_right = 214.0 +offset_bottom = 476.0 fname = "УМ1535А" rname = "A16" value0_info = "Мощность" @@ -414,10 +414,10 @@ metadata/um = "um_12" [node name="um1535_A17" parent="." groups=["power_amplifier"] instance=ExtResource("7_bnnv3")] layout_mode = 0 -offset_left = 8.0 -offset_top = 622.0 -offset_right = 175.0 -offset_bottom = 717.0 +offset_left = 47.0 +offset_top = 476.0 +offset_right = 214.0 +offset_bottom = 571.0 fname = "УМ1535А" rname = "A17" value0_info = "Мощность" @@ -426,10 +426,10 @@ metadata/um = "um_13" [node name="um1535_A18" parent="." groups=["power_amplifier"] instance=ExtResource("7_bnnv3")] layout_mode = 0 -offset_left = 8.0 -offset_top = 717.0 -offset_right = 175.0 -offset_bottom = 812.0 +offset_left = 47.0 +offset_top = 571.0 +offset_right = 214.0 +offset_bottom = 666.0 fname = "УМ1535А" rname = "A18" value0_info = "Мощность" @@ -438,25 +438,34 @@ metadata/um = "um_14" [node name="control_result" type="Label" parent="."] layout_mode = 0 -offset_left = 9.0 -offset_top = 960.0 -offset_right = 649.0 -offset_bottom = 1003.0 +offset_left = 49.0 +offset_top = 993.0 +offset_right = 689.0 +offset_bottom = 1036.0 +theme_override_font_sizes/font_size = 22 horizontal_alignment = 1 metadata/_edit_lock_ = true [node name="input_0" type="AnimatedSprite2D" parent="."] -position = Vector2(456, 589) +position = Vector2(495, 443) sprite_frames = SubResource("SpriteFrames_1wf07") [node name="input_1" type="AnimatedSprite2D" parent="."] -position = Vector2(207, 586) +position = Vector2(246, 440) sprite_frames = SubResource("SpriteFrames_1wf07") [node name="output_0" type="AnimatedSprite2D" parent="."] -position = Vector2(458, 476) +position = Vector2(497, 330) sprite_frames = SubResource("SpriteFrames_1wf07") [node name="output_1" type="AnimatedSprite2D" parent="."] -position = Vector2(210, 477) +position = Vector2(249, 331) sprite_frames = SubResource("SpriteFrames_1wf07") + +[node name="line" type="Line2D" parent="."] +position = Vector2(59, 920) +scale = Vector2(1.03548, 1) +points = PackedVector2Array(-8, 0, 61.8069, 0, 608, 0) +width = 2.0 +default_color = Color(1, 1, 1, 0.352941) +metadata/_edit_lock_ = true diff --git a/scenes/pribor-prd-v/pribor-prd-v.tscn b/scenes/pribor-prd-v/pribor-prd-v.tscn index d2b7ead..f4654c6 100644 --- a/scenes/pribor-prd-v/pribor-prd-v.tscn +++ b/scenes/pribor-prd-v/pribor-prd-v.tscn @@ -43,48 +43,48 @@ script = ExtResource("1_c20s6") [node name="maa2000_A22" parent="." groups=["power_supply"] instance=ExtResource("2_xpo4b")] layout_mode = 2 -offset_left = 485.0 -offset_top = 877.0 -offset_right = 652.0 -offset_bottom = 949.0 +offset_left = 524.0 +offset_top = 731.0 +offset_right = 691.0 +offset_bottom = 803.0 fname = "MAA2000" rname = "A22" metadata/ip = "maa2000_1" [node name="dou4_A5" parent="." groups=["default_reset"] instance=ExtResource("2_xpo4b")] layout_mode = 2 -offset_left = 485.0 -offset_top = 812.0 -offset_right = 652.0 -offset_bottom = 877.0 +offset_left = 524.0 +offset_top = 666.0 +offset_right = 691.0 +offset_bottom = 731.0 fname = "ДОУ-4" rname = "A5" [node name="maa2000_A23" parent="." groups=["power_supply"] instance=ExtResource("2_xpo4b")] layout_mode = 2 -offset_left = 8.0 -offset_top = 877.0 -offset_right = 175.0 -offset_bottom = 949.0 +offset_left = 47.0 +offset_top = 731.0 +offset_right = 214.0 +offset_bottom = 803.0 fname = "MAA2000" rname = "A23" metadata/ip = "maa2000_2" [node name="dou5_A6" parent="." groups=["default_reset"] instance=ExtResource("2_xpo4b")] layout_mode = 2 -offset_left = 8.0 -offset_top = 812.0 -offset_right = 175.0 -offset_bottom = 877.0 +offset_left = 47.0 +offset_top = 666.0 +offset_right = 214.0 +offset_bottom = 731.0 fname = "ДОУ-5" rname = "A6" [node name="ref_ZZ3" type="NinePatchRect" parent="."] layout_mode = 0 -offset_left = 175.0 -offset_top = 812.0 -offset_right = 485.0 -offset_bottom = 949.0 +offset_left = 214.0 +offset_top = 666.0 +offset_right = 524.0 +offset_bottom = 803.0 texture = ExtResource("3_wyy1b") patch_margin_left = 16 patch_margin_top = 16 @@ -105,10 +105,10 @@ vertical_alignment = 1 [node name="kasseta_U5" type="NinePatchRect" parent="."] layout_mode = 0 -offset_left = 175.0 -offset_top = 242.0 -offset_right = 485.0 -offset_bottom = 432.0 +offset_left = 214.0 +offset_top = 96.0 +offset_right = 524.0 +offset_bottom = 286.0 texture = ExtResource("3_wyy1b") patch_margin_left = 16 patch_margin_top = 16 @@ -183,18 +183,18 @@ metadata/y5 = "ukp2" [node name="kasseta_FS_VD" parent="." instance=ExtResource("5_nhd2k")] layout_mode = 0 -offset_left = 175.0 -offset_top = 432.0 -offset_right = 485.0 -offset_bottom = 622.0 +offset_left = 214.0 +offset_top = 286.0 +offset_right = 524.0 +offset_bottom = 476.0 fname = "Кассета ФС-ВД" [node name="kasseta_P_1" type="NinePatchRect" parent="."] layout_mode = 0 -offset_left = 175.0 -offset_top = 622.0 -offset_right = 485.0 -offset_bottom = 812.0 +offset_left = 214.0 +offset_top = 476.0 +offset_right = 524.0 +offset_bottom = 666.0 texture = ExtResource("3_wyy1b") patch_margin_left = 16 patch_margin_top = 16 @@ -243,10 +243,10 @@ vertical_alignment = 1 [node name="um1535_A7" parent="." groups=["power_amplifier"] instance=ExtResource("8_4e87c")] layout_mode = 0 -offset_left = 485.0 -offset_top = 242.0 -offset_right = 652.0 -offset_bottom = 337.0 +offset_left = 524.0 +offset_top = 96.0 +offset_right = 691.0 +offset_bottom = 191.0 fname = "УМ1535А" rname = "A7" value0_info = "Мощность" @@ -255,10 +255,10 @@ metadata/um = "um_1" [node name="um1535_A8" parent="." groups=["power_amplifier"] instance=ExtResource("8_4e87c")] layout_mode = 0 -offset_left = 485.0 -offset_top = 337.0 -offset_right = 652.0 -offset_bottom = 432.0 +offset_left = 524.0 +offset_top = 191.0 +offset_right = 691.0 +offset_bottom = 286.0 fname = "УМ1535А" rname = "A8" value0_info = "Мощность" @@ -267,10 +267,10 @@ metadata/um = "um_2" [node name="um1535_A9" parent="." groups=["power_amplifier"] instance=ExtResource("8_4e87c")] layout_mode = 0 -offset_left = 485.0 -offset_top = 432.0 -offset_right = 652.0 -offset_bottom = 527.0 +offset_left = 524.0 +offset_top = 286.0 +offset_right = 691.0 +offset_bottom = 381.0 fname = "УМ1535А" rname = "A9" value0_info = "Мощность" @@ -279,10 +279,10 @@ metadata/um = "um_3" [node name="um1535_A10" parent="." groups=["power_amplifier"] instance=ExtResource("8_4e87c")] layout_mode = 0 -offset_left = 485.0 -offset_top = 527.0 -offset_right = 652.0 -offset_bottom = 622.0 +offset_left = 524.0 +offset_top = 381.0 +offset_right = 691.0 +offset_bottom = 476.0 fname = "УМ1535А" rname = "A10" value0_info = "Мощность" @@ -291,10 +291,10 @@ metadata/um = "um_4" [node name="um1535_A11" parent="." groups=["power_amplifier"] instance=ExtResource("8_4e87c")] layout_mode = 0 -offset_left = 485.0 -offset_top = 622.0 -offset_right = 652.0 -offset_bottom = 717.0 +offset_left = 524.0 +offset_top = 476.0 +offset_right = 691.0 +offset_bottom = 571.0 fname = "УМ1535А" rname = "A11" value0_info = "Мощность" @@ -303,10 +303,10 @@ metadata/um = "um_5" [node name="um1535_A12" parent="." groups=["power_amplifier"] instance=ExtResource("8_4e87c")] layout_mode = 0 -offset_left = 485.0 -offset_top = 717.0 -offset_right = 652.0 -offset_bottom = 812.0 +offset_left = 524.0 +offset_top = 571.0 +offset_right = 691.0 +offset_bottom = 666.0 fname = "УМ1535А" rname = "A12" value0_info = "Мощность" @@ -315,10 +315,10 @@ metadata/um = "um_6" [node name="um1535_A13" parent="." groups=["power_amplifier"] instance=ExtResource("8_4e87c")] layout_mode = 0 -offset_left = 8.0 -offset_top = 242.0 -offset_right = 175.0 -offset_bottom = 337.0 +offset_left = 47.0 +offset_top = 96.0 +offset_right = 214.0 +offset_bottom = 191.0 fname = "УМ1535А" rname = "A13" value0_info = "Мощность" @@ -327,10 +327,10 @@ metadata/um = "um_9" [node name="um1535_A14" parent="." groups=["power_amplifier"] instance=ExtResource("8_4e87c")] layout_mode = 0 -offset_left = 8.0 -offset_top = 337.0 -offset_right = 175.0 -offset_bottom = 432.0 +offset_left = 47.0 +offset_top = 191.0 +offset_right = 214.0 +offset_bottom = 286.0 fname = "УМ1535А" rname = "A14" value0_info = "Мощность" @@ -339,10 +339,10 @@ metadata/um = "um_10" [node name="um1535_A15" parent="." groups=["power_amplifier"] instance=ExtResource("8_4e87c")] layout_mode = 0 -offset_left = 8.0 -offset_top = 432.0 -offset_right = 175.0 -offset_bottom = 527.0 +offset_left = 47.0 +offset_top = 286.0 +offset_right = 214.0 +offset_bottom = 381.0 fname = "УМ1535А" rname = "A15" value0_info = "Мощность" @@ -351,10 +351,10 @@ metadata/um = "um_11" [node name="um1535_A16" parent="." groups=["power_amplifier"] instance=ExtResource("8_4e87c")] layout_mode = 0 -offset_left = 8.0 -offset_top = 527.0 -offset_right = 175.0 -offset_bottom = 622.0 +offset_left = 47.0 +offset_top = 381.0 +offset_right = 214.0 +offset_bottom = 476.0 fname = "УМ1535А" rname = "A16" value0_info = "Мощность" @@ -363,10 +363,10 @@ metadata/um = "um_12" [node name="um1535_A17" parent="." groups=["power_amplifier"] instance=ExtResource("8_4e87c")] layout_mode = 0 -offset_left = 8.0 -offset_top = 622.0 -offset_right = 175.0 -offset_bottom = 717.0 +offset_left = 47.0 +offset_top = 476.0 +offset_right = 214.0 +offset_bottom = 571.0 fname = "УМ1535А" rname = "A17" value0_info = "Мощность" @@ -375,37 +375,45 @@ metadata/um = "um_13" [node name="um1535_A18" parent="." groups=["power_amplifier"] instance=ExtResource("8_4e87c")] layout_mode = 0 -offset_left = 8.0 -offset_top = 717.0 -offset_right = 175.0 -offset_bottom = 812.0 +offset_left = 47.0 +offset_top = 571.0 +offset_right = 214.0 +offset_bottom = 666.0 fname = "УМ1535А" rname = "A18" value0_info = "Мощность" value1_info = "Температура,°C" metadata/um = "um_14" -[node name="control_result" type="Label" parent="."] -layout_mode = 0 -offset_left = 9.0 -offset_top = 960.0 -offset_right = 649.0 -offset_bottom = 1003.0 -horizontal_alignment = 1 -metadata/_edit_lock_ = true - [node name="input_0" type="AnimatedSprite2D" parent="."] -position = Vector2(457, 586) +position = Vector2(496, 440) sprite_frames = SubResource("SpriteFrames_s5gcy") [node name="input_1" type="AnimatedSprite2D" parent="."] -position = Vector2(209, 586) +position = Vector2(248, 440) sprite_frames = SubResource("SpriteFrames_s5gcy") [node name="output_0" type="AnimatedSprite2D" parent="."] -position = Vector2(457, 482) +position = Vector2(496, 336) sprite_frames = SubResource("SpriteFrames_s5gcy") [node name="output_1" type="AnimatedSprite2D" parent="."] -position = Vector2(209, 482) +position = Vector2(248, 336) sprite_frames = SubResource("SpriteFrames_s5gcy") + +[node name="line" type="Line2D" parent="."] +position = Vector2(59, 920) +scale = Vector2(1.03548, 1) +points = PackedVector2Array(-8, 0, 61.8069, 0, 608, 0) +width = 2.0 +default_color = Color(1, 1, 1, 0.352941) +metadata/_edit_lock_ = true + +[node name="control_result" type="Label" parent="."] +offset_left = 49.0 +offset_top = 993.0 +offset_right = 689.0 +offset_bottom = 1036.0 +theme_override_font_sizes/font_size = 22 +horizontal_alignment = 1 +metadata/_edit_lock_ = true diff --git a/scenes/pribor-uf/pribor-uf.tscn b/scenes/pribor-uf/pribor-uf.tscn index 998ace6..82ceaaf 100644 --- a/scenes/pribor-uf/pribor-uf.tscn +++ b/scenes/pribor-uf/pribor-uf.tscn @@ -7,14 +7,16 @@ [node name="pribor_uf" type="Control"] layout_mode = 3 anchors_preset = 0 +offset_left = -121.0 +offset_right = -121.0 script = ExtResource("1_7gtpa") [node name="ref_uf" type="NinePatchRect" parent="."] layout_mode = 0 -offset_left = 187.0 -offset_top = 247.0 -offset_right = 708.0 -offset_bottom = 955.0 +offset_left = 244.0 +offset_top = 128.0 +offset_right = 765.0 +offset_bottom = 836.0 texture = ExtResource("2_ho0da") patch_margin_left = 16 patch_margin_top = 16 @@ -142,19 +144,25 @@ offset_bottom = 35.0 text = "Кассета В-13" [node name="lbl_header2" type="Label" parent="."] -visible = false layout_mode = 0 -offset_left = 199.0 -offset_top = 974.0 -offset_right = 704.0 -offset_bottom = 1000.0 +offset_left = 252.0 +offset_top = 1009.0 +offset_right = 757.0 +offset_bottom = 1064.0 theme_override_font_sizes/font_size = 22 -text = "Прибор не исправен -" +text = "Состояние неизвестно..." horizontal_alignment = 1 vertical_alignment = 1 [node name="timer" type="Timer" parent="."] autostart = true +[node name="line" type="Line2D" parent="."] +position = Vector2(195, 950) +scale = Vector2(1.03548, 1) +points = PackedVector2Array(-8, 0, 61.8069, 0, 608, 0) +width = 2.0 +default_color = Color(1, 1, 1, 0.352941) +metadata/_edit_lock_ = true + [connection signal="timeout" from="timer" to="." method="on_timer" binds= [&"уарэп-эмс"]] diff --git a/scenes/pribor-uyep/pribor-uyep.tscn b/scenes/pribor-uyep/pribor-uyep.tscn index e78e782..f5a9c52 100644 --- a/scenes/pribor-uyep/pribor-uyep.tscn +++ b/scenes/pribor-uyep/pribor-uyep.tscn @@ -17,10 +17,10 @@ script = ExtResource("1_46rp6") [node name="ref_G1" type="NinePatchRect" parent="."] layout_mode = 0 -offset_left = 70.0 -offset_top = 303.0 -offset_right = 660.0 -offset_bottom = 1085.0 +offset_left = 88.0 +offset_top = 128.0 +offset_right = 678.0 +offset_bottom = 910.0 texture = ExtResource("1_6olof") patch_margin_left = 16 patch_margin_top = 16 @@ -29,10 +29,10 @@ patch_margin_bottom = 16 [node name="spt25_A1" parent="." instance=ExtResource("6_60xs3")] layout_mode = 0 -offset_left = 88.0 -offset_top = 319.0 -offset_right = 343.0 -offset_bottom = 749.0 +offset_left = 106.0 +offset_top = 144.0 +offset_right = 361.0 +offset_bottom = 574.0 tooltip_text = "Ящик - 11, Позиция - 3" script = ExtResource("4_v0lil") unit_name = "уарэп-спт25-1" @@ -64,10 +64,10 @@ offset_bottom = 417.0 [node name="spt25_A2" parent="." instance=ExtResource("6_60xs3")] layout_mode = 0 -offset_left = 392.0 -offset_top = 320.0 -offset_right = 642.0 -offset_bottom = 750.0 +offset_left = 410.0 +offset_top = 145.0 +offset_right = 660.0 +offset_bottom = 575.0 tooltip_text = "Ящик - 11, Позиция - 2" script = ExtResource("4_v0lil") unit_name = "уарэп-спт25-2" @@ -98,10 +98,10 @@ offset_right = 235.0 offset_bottom = 417.0 [node name="sch3" parent="." instance=ExtResource("7_qu7ja")] -offset_left = 88.0 -offset_top = 774.0 -offset_right = 643.0 -offset_bottom = 1059.0 +offset_left = 106.0 +offset_top = 599.0 +offset_right = 661.0 +offset_bottom = 884.0 unit_name = "уарэп-щ3" fname = "Щ3 (контроль и управление питанием)" rname = "A1" diff --git a/scenes/контроль/кнопка-прибора.gd b/scenes/контроль/кнопка-прибора.gd index 3c8488e..837c5c1 100644 --- a/scenes/контроль/кнопка-прибора.gd +++ b/scenes/контроль/кнопка-прибора.gd @@ -12,9 +12,9 @@ func _ready(): connect("focus_exited", _on_focus_exited) -#func _enter_tree() -> void: - #if has_node("label"): - #$label.self_modulate = state_colors[state] +func _enter_tree() -> void: + if has_node("label"): + $label.self_modulate = state_colors[state] func update_progress_bar(target_value) -> void: diff --git a/scenes/контроль/контроль.tscn b/scenes/контроль/контроль.tscn index 0b8d870..14e10a0 100644 --- a/scenes/контроль/контроль.tscn +++ b/scenes/контроль/контроль.tscn @@ -191,9 +191,9 @@ metadata/_edit_lock_ = true editor_description = "Кнопка для отображения внешних соединений." self_modulate = Color(0.788235, 0.788235, 0.788235, 1) layout_mode = 0 -offset_left = 959.0 +offset_left = 945.0 offset_top = 1021.0 -offset_right = 1215.0 +offset_right = 1201.0 offset_bottom = 1277.0 scale = Vector2(0.25, 0.25) size_flags_horizontal = 15 @@ -225,9 +225,9 @@ script = ExtResource("11_u7tym") editor_description = "Кнопка для отображения внешних соединений." self_modulate = Color(0.788235, 0.788235, 0.788235, 1) layout_mode = 0 -offset_left = 1088.0 +offset_left = 1074.0 offset_top = 1021.0 -offset_right = 1344.0 +offset_right = 1330.0 offset_bottom = 1277.0 scale = Vector2(0.25, 0.25) size_flags_horizontal = 15 @@ -260,9 +260,9 @@ script = ExtResource("11_u7tym") editor_description = "Кнопка для отображения внешних соединений." self_modulate = Color(0.788235, 0.788235, 0.788235, 1) layout_mode = 0 -offset_left = 1216.0 +offset_left = 1202.0 offset_top = 1021.0 -offset_right = 1472.0 +offset_right = 1458.0 offset_bottom = 1277.0 scale = Vector2(0.25, 0.25) size_flags_horizontal = 15 @@ -295,9 +295,9 @@ script = ExtResource("11_u7tym") editor_description = "Кнопка для отображения внешних соединений." self_modulate = Color(0.788235, 0.788235, 0.788235, 1) layout_mode = 0 -offset_left = 1344.0 +offset_left = 1330.0 offset_top = 1021.0 -offset_right = 1600.0 +offset_right = 1586.0 offset_bottom = 1277.0 scale = Vector2(0.25, 0.25) size_flags_horizontal = 15 @@ -330,9 +330,9 @@ script = ExtResource("11_u7tym") editor_description = "Кнопка для отображения внешних соединений." self_modulate = Color(0.788235, 0.788235, 0.788235, 1) layout_mode = 0 -offset_left = 1472.0 +offset_left = 1458.0 offset_top = 1021.0 -offset_right = 1728.0 +offset_right = 1714.0 offset_bottom = 1277.0 scale = Vector2(0.25, 0.25) size_flags_horizontal = 15 @@ -1561,9 +1561,9 @@ tint_progress = Color(0.890196, 0.486275, 0.196078, 1) [node name="txr_legend0" type="TextureRect" parent="."] layout_mode = 0 -offset_left = 219.0 +offset_left = 316.0 offset_top = 1141.0 -offset_right = 443.0 +offset_right = 540.0 offset_bottom = 1365.0 scale = Vector2(0.1, 0.1) texture = ExtResource("7_6j01w") @@ -1571,9 +1571,9 @@ texture = ExtResource("7_6j01w") [node name="lbl_legend0" type="Label" parent="."] self_modulate = Color(1, 1, 1, 0.627451) layout_mode = 0 -offset_left = 247.0 +offset_left = 344.0 offset_top = 1142.0 -offset_right = 403.0 +offset_right = 500.0 offset_bottom = 1162.0 theme_override_font_sizes/font_size = 17 text = "Ожидание результата" @@ -1581,27 +1581,27 @@ text = "Ожидание результата" [node name="lbl_legend1" type="Label" parent="."] self_modulate = Color(1, 1, 1, 0.627451) layout_mode = 0 -offset_left = 52.0 +offset_left = 149.0 offset_top = 1142.0 -offset_right = 125.0 +offset_right = 222.0 offset_bottom = 1162.0 theme_override_font_sizes/font_size = 17 text = "Исправно" [node name="txr_legend1" type="TextureRect" parent="."] layout_mode = 0 -offset_left = 26.0001 +offset_left = 123.0 offset_top = 1141.0 -offset_right = 250.0 +offset_right = 347.0 offset_bottom = 1365.0 scale = Vector2(0.1, 0.1) texture = ExtResource("8_isjua") [node name="txr_legend2" type="TextureRect" parent="."] layout_mode = 0 -offset_left = 476.0 +offset_left = 573.0 offset_top = 1141.0 -offset_right = 700.0 +offset_right = 797.0 offset_bottom = 1365.0 scale = Vector2(0.1, 0.1) texture = ExtResource("9_ll0vs") @@ -1609,18 +1609,18 @@ texture = ExtResource("9_ll0vs") [node name="lbl_legend2" type="Label" parent="."] self_modulate = Color(1, 1, 1, 0.627451) layout_mode = 0 -offset_left = 504.0 +offset_left = 601.0 offset_top = 1142.0 -offset_right = 548.0 +offset_right = 645.0 offset_bottom = 1162.0 theme_override_font_sizes/font_size = 17 text = "Сбой" [node name="lbl_header" type="Label" parent="."] layout_mode = 0 -offset_left = 78.0 +offset_left = 88.0 offset_top = 27.0 -offset_right = 656.0 +offset_right = 666.0 offset_bottom = 58.0 theme_override_font_sizes/font_size = 22 text = "Контроль исправности прибора" @@ -1663,19 +1663,20 @@ text = "На связи" metadata/_edit_use_anchors_ = true [node name="line0" type="Line2D" parent="."] -position = Vector2(936, 950) -points = PackedVector2Array(-8, 0, 608, 0) +position = Vector2(929, 950) +points = PackedVector2Array(-8, 0, 582.16, 0, 608, 0) width = 2.0 default_color = Color(1, 1, 1, 0.352941) [node name="line1" type="Line2D" parent="."] -position = Vector2(936, 1128) +position = Vector2(929, 1128) points = PackedVector2Array(-8, 0, 608, 0) width = 2.0 default_color = Color(1, 1, 1, 0.352941) [node name="line2" type="Line2D" parent="."] -position = Vector2(32, 1128) +position = Vector2(73.3548, 1127) +scale = Vector2(1.03548, 1) points = PackedVector2Array(-8, 0, 608, 0) width = 2.0 default_color = Color(1, 1, 1, 0.352941) diff --git a/scenes/работа/работа.tscn b/scenes/работа/работа.tscn index 8f77b23..8313ec3 100644 --- a/scenes/работа/работа.tscn +++ b/scenes/работа/работа.tscn @@ -379,8 +379,8 @@ texture_normal = ExtResource("14_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"] [connection signal="button_down" from="zoom_plus" to="tilemap" method="_on_zoom_plus_button_down"] [connection signal="button_up" from="zoom_plus" to="tilemap" method="_on_zoom_plus_button_up"] diff --git a/scripts/pribor-prd.gd b/scripts/pribor-prd.gd index 201c0ef..acaa7fb 100644 --- a/scripts/pribor-prd.gd +++ b/scripts/pribor-prd.gd @@ -62,6 +62,7 @@ var flag_fs_status_ok: bool = false var flag_si_fs_input: bool = false var flag_si_fs_output: bool = false var flag_in_control: bool = false +var flag_control_is_over: bool = false var unit_prd: Object var control_timer: Timer = Timer.new() var ems_6666_timer: Timer = Timer.new() @@ -127,12 +128,12 @@ func _ensure_config_exists() -> bool: func _load_configuration() -> void: - if not _ensure_config_exists(): - return + if not _ensure_config_exists(): return var config_file = FileAccess.open(CONFIG_PATH, FileAccess.READ) if config_file: var json_text = config_file.get_as_text() config_file.close() + var json = JSON.new() var parse_result = json.parse(json_text) if parse_result == OK: @@ -202,13 +203,14 @@ func on_data_received(unit_pribor: Object) -> void: return _process_dkm_status(status) - if current_litera != 0: + if current_litera != 0: # Формирование мощностей в литерах var tek_litera: Dictionary = power_for_litera[current_litera] var interes = _get_ray_key(state) if interes != '': tek_litera[_get_ray_key(state)] = power_um_ukp(status, current_litera, tek_litera[_get_ray_key(state)]) power_for_litera[current_litera] = tek_litera + var ems_input_1: int var ems_input_2: int var ems_input_lit_1: int @@ -220,17 +222,18 @@ var ems_output_lit_1: int func _get_data_index(key: String) -> int: return data_indices.get(key, -1) + func socket_status_ems_g(packet_form_yau_07: PackedByteArray) -> void: if self_name in ['1н', '2н', '3н', '4н']: ems_input_1 = (packet_form_yau_07.decode_u16(_get_data_index('IN_BLANK_PRD')) & (1 << 9)) != 0 ems_input_2 = (packet_form_yau_07.decode_u16(_get_data_index('IN_BLANK_PRD')) & (1 << 10)) != 0 if self_name in ['1в', '2в', '3в', '4в']: ems_input_1 = (packet_form_yau_07.decode_u16(_get_data_index('IN_BLANK_PRD')) & (1 << 11)) != 0 - ems_input_1 = (packet_form_yau_07.decode_u16(_get_data_index('IN_BLANK_PRD')) & (1 << 12)) != 0 + ems_input_2 = (packet_form_yau_07.decode_u16(_get_data_index('IN_BLANK_PRD')) & (1 << 12)) != 0 if self_name in ['1к', '2к', '3к', '4к']: - ems_input_1 = (packet_form_yau_07.decode_u16(_get_data_index('IN_BLANK_PRD')) & (1 << 13)) != 0 - ems_input_1 = (packet_form_yau_07.decode_u16(_get_data_index('IN_BLANK_PRD')) & (1 << 14)) != 0 ems_input_lit_1 = (packet_form_yau_07.decode_u16(_get_data_index('IN_BLANK_PRD')) & (1 << 8)) != 0 + ems_input_1 = (packet_form_yau_07.decode_u16(_get_data_index('IN_BLANK_PRD')) & (1 << 13)) != 0 + ems_input_2 = (packet_form_yau_07.decode_u16(_get_data_index('IN_BLANK_PRD')) & (1 << 14)) != 0 ems_output_1 = (packet_form_yau_07.decode_u16(_get_data_index('OUT_BLANK_PRD')) & (1 << 4)) != 0 ems_output_2 = (packet_form_yau_07.decode_u16(_get_data_index('OUT_BLANK_PRD')) & (1 << 5)) != 0 @@ -265,7 +268,6 @@ func on_fs_update_state(packet_type_7: Dictionary, fs_mapping: Dictionary) -> vo func state_control_machine() -> void: match state: STATE_MACHINE.INIT: - print("Start control for %s device %s litera" % [self_name, current_litera]) _handle_init_state() STATE_MACHINE.FS_TURN_ON: _handle_fs_turn_on_state() @@ -353,15 +355,24 @@ func state_control_machine() -> void: STATE_MACHINE.STOP_CONTROL: _handle_stop_control_state() ## В машине состояний вызов изменения состояния прогресс бара контроля - progressbar_status() + if block_kasseta_y5_config['yau07']: + progressbar_status() ## 'Выполняется инициализация ФС-%s' % current_litera func _handle_init_state() -> void: if current_litera in [1, 2, 3, 4, 5, 6, 7]: - if not ecms.size(): + var flag_ecm: bool = false + for key in ecms: + var params = ecms[key].params.freq + if fs_parameters[current_litera].freq == params: + var kni = ecms[key].kni + if pribor_config[self_name].angle == kni: + flag_ecm = true + if not flag_ecm: state = STATE_MACHINE.FS_TURN_ON else: + flag_control_is_over = true control_results = on_control_result(block_ip_config, control_results) power_result = prep_power(power_for_litera, self_name) emit_signal('control_is_over') @@ -542,12 +553,12 @@ func setup_timer() -> void: func on_mode_changed(in_tree: bool) -> void: flag_in_control = in_tree if not in_tree: ## TODO: Дополнительная проверка если контроль идет, если нет, то смысла вызывать нет + flag_control_is_over = false progress_value = 0 machine_timer.stop() state = STATE_MACHINE.INIT _handle_fs_turn_off_state() #prd_v_module.cmd_array.append([unit_prd_v.CmdCode.WRITE_ISA, [constants_v.ADDR_UG_LITERA_1, ug_work_1, constants_v.ADDR_UG_LITERA_2, ug_work_2]]) - func _process_dkm_status(status: PackedByteArray) -> void: