From 9727eb04a9019fa5afa456f8d8a3f4f03d4be9ae Mon Sep 17 00:00:00 2001 From: TotMaxim Date: Sun, 16 Nov 2025 14:05:57 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9A=D0=BE=D1=80=D1=80=D0=B5=D0=BA=D1=82?= =?UTF-8?q?=D0=B8=D1=80=D0=BE=D0=B2=D0=BA=D0=B0=20=D0=B8=D0=BD=D1=82=D0=B5?= =?UTF-8?q?=D1=80=D1=84=D0=B5=D0=B9=D1=81=D0=B0=20=D0=BA=D0=BE=D0=BD=D1=82?= =?UTF-8?q?=D1=80=D0=BE=D0=BB=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scenes/pribor-prd-k/kasseta-fs-kd.tscn | 8 +- scenes/pribor-prd-k/pribor-prd-k.tscn | 203 +++++++++++++++++++++++-- scenes/pribor-prd-n/pribor-prd-n.tscn | 86 ++++++++++- scenes/pribor-prd-v/pribor-prd-v.tscn | 78 +++++++++- scenes/контроль/блок-в.tscn | 8 +- scenes/контроль/кассета-п-2.tscn | 5 +- scenes/контроль/кассета-у-5-нв.tscn | 12 +- 7 files changed, 358 insertions(+), 42 deletions(-) diff --git a/scenes/pribor-prd-k/kasseta-fs-kd.tscn b/scenes/pribor-prd-k/kasseta-fs-kd.tscn index ac2d952b..3fcc635c 100644 --- a/scenes/pribor-prd-k/kasseta-fs-kd.tscn +++ b/scenes/pribor-prd-k/kasseta-fs-kd.tscn @@ -49,7 +49,7 @@ offset_top = 33.0 offset_right = 155.0 offset_bottom = 183.0 fname = "Блок ФС-2" -rname = "A2" +rname = "A6" [node name="ref_A6" parent="." groups=["default_reset", "fs_group"] instance=ExtResource("3_kqnvt")] offset_left = 155.0 @@ -57,7 +57,7 @@ offset_top = 33.0 offset_right = 205.0 offset_bottom = 183.0 fname = "Модуль ФС" -rname = "A5" +rname = "A3" metadata/fs = "fs_6" [node name="ref_A5" parent="." groups=["default_reset", "fs_group"] instance=ExtResource("3_kqnvt")] @@ -66,7 +66,7 @@ offset_top = 33.0 offset_right = 255.0 offset_bottom = 183.0 fname = "Модуль ФС" -rname = "A3" +rname = "A2" metadata/fs = "fs_7" [node name="ref_A7" parent="." groups=["default_reset"] instance=ExtResource("3_kqnvt")] @@ -75,4 +75,4 @@ offset_top = 33.0 offset_right = 305.0 offset_bottom = 183.0 fname = "Блок ФС-6" -rname = "A6" +rname = "A5" diff --git a/scenes/pribor-prd-k/pribor-prd-k.tscn b/scenes/pribor-prd-k/pribor-prd-k.tscn index 0096012d..55af1377 100644 --- a/scenes/pribor-prd-k/pribor-prd-k.tscn +++ b/scenes/pribor-prd-k/pribor-prd-k.tscn @@ -1,19 +1,59 @@ -[gd_scene load_steps=15 format=3 uid="uid://m5s87q7m66lj"] +[gd_scene load_steps=25 format=3 uid="uid://m5s87q7m66lj"] [ext_resource type="PackedScene" uid="uid://d3iqb5e4g81m5" path="res://scenes/контроль/элемент-г.tscn" id="1_8dmgr"] [ext_resource type="Script" uid="uid://cwvikiygf8b1m" path="res://scenes/pribor-prd-k/pribor-prd-k.gd" id="1_tpdyp"] [ext_resource type="Texture2D" uid="uid://c4mdrmk7h638f" path="res://data/nine-patch-round.png" id="2_14h25"] [ext_resource type="PackedScene" uid="uid://cm5jd4gjrrpba" path="res://scenes/контроль/кассета-у-5-к.tscn" id="2_tb85r"] [ext_resource type="PackedScene" uid="uid://bcyxqni7gxvtq" path="res://scenes/контроль/блок-в.tscn" id="5_c7lv8"] +[ext_resource type="Texture2D" uid="uid://c6nve6f8sfyj2" path="res://data/состояние-исправности-0.png" id="6_l0j7c"] [ext_resource type="PackedScene" uid="uid://bmagw8nd0ulhj" path="res://scenes/pribor-prd-k/kasseta-fs-kd.tscn" id="7_ia27q"] [ext_resource type="Script" uid="uid://crpedygm3gohi" path="res://scenes/контроль/кассета.gd" id="7_xpa2n"] [ext_resource type="PackedScene" uid="uid://dq31j24gv5vi4" path="res://scenes/контроль/кассета-п-2.tscn" id="8_6fdp7"] [ext_resource type="PackedScene" uid="uid://p2suppildvq0" path="res://scenes/контроль/элемент-в.tscn" id="8_la5yt"] +[ext_resource type="Texture2D" uid="uid://00871pb6moln" path="res://data/прогресс-фон-1.png" id="9_0ba6e"] +[ext_resource type="Texture2D" uid="uid://c1k856fxhrjnh" path="res://data/прогресс-заполнение-1.png" id="10_b3870"] [ext_resource type="Texture2D" uid="uid://belwchvdktrw0" path="res://data/эмс-бланк.png" id="10_c7lv8"] [ext_resource type="Texture2D" uid="uid://bwddxs24es81u" path="res://data/эмс-бланк-пост.png" id="11_wd1vi"] [ext_resource type="Texture2D" uid="uid://pfoscstbm025" path="res://data/эмс-бланк-перем.png" id="12_bjebg"] [ext_resource type="Texture2D" uid="uid://dvl3sq036gn75" path="res://data/эмс-бланк-замыкание.png" id="13_kc77u"] +[sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_3nd2u"] + +[sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_rceim"] + +[sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_8yvwo"] + +[sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_6qu57"] + +[sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_mlxje"] + +[sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_3dspb"] + +[sub_resource type="GDScript" id="GDScript_45hqb"] +script/source = "@tool + +extends MarginContainer + + +func _enter_tree() -> void: + margins = [8, 8, 8, 8] + + +@export var margins: Array: + set(vals): + add_theme_constant_override('margin_top', vals[0]) + add_theme_constant_override('margin_left', vals[1]) + add_theme_constant_override('margin_bottom', vals[2]) + add_theme_constant_override('margin_right', vals[3]) + get: + var vals = [0, 0, 0, 0] + vals[0] = get_theme_constant('margin_top') + vals[1] = get_theme_constant('margin_left') + vals[2] = get_theme_constant('margin_bottom') + vals[3] = get_theme_constant('margin_right') + return vals +" + [sub_resource type="SpriteFrames" id="SpriteFrames_di0aa"] animations = [{ "frames": [{ @@ -185,25 +225,158 @@ value0_info = "Мощность, Вт" value1_info = "Температура,°C" metadata/um = "um_6" -[node name="utm80_A9" parent="." groups=["power_amplifier"] instance=ExtResource("5_c7lv8")] +[node name="utm80_A9" type="PanelContainer" parent="."] +editor_description = "Элемент замены из ЗИП" layout_mode = 0 offset_left = 485.0 offset_top = 812.0 offset_right = 652.0 offset_bottom = 907.0 -fname = "УТМ80" -rname = "A9" -value0_info = "Мощность, Вт" -value1_info = "Температура,°C" +theme_override_styles/panel = SubResource("StyleBoxEmpty_3nd2u") metadata/um = "um_7" +[node name="button" type="Button" parent="utm80_A9"] +layout_mode = 2 +theme_override_styles/focus = SubResource("StyleBoxEmpty_rceim") +theme_override_styles/disabled = SubResource("StyleBoxEmpty_8yvwo") +theme_override_styles/hover = SubResource("StyleBoxEmpty_6qu57") +theme_override_styles/pressed = SubResource("StyleBoxEmpty_mlxje") +theme_override_styles/normal = SubResource("StyleBoxEmpty_3dspb") + +[node name="rect" type="NinePatchRect" parent="utm80_A9"] +layout_mode = 2 +texture = ExtResource("2_14h25") +draw_center = false +region_rect = Rect2(0, 0, 63, 63) +patch_margin_left = 17 +patch_margin_top = 17 +patch_margin_right = 17 +patch_margin_bottom = 15 + +[node name="margin" type="MarginContainer" parent="utm80_A9"] +layout_mode = 2 +theme_override_constants/margin_left = 8 +theme_override_constants/margin_top = 8 +theme_override_constants/margin_right = 8 +theme_override_constants/margin_bottom = 8 +script = SubResource("GDScript_45hqb") +margins = [8, 8, 8, 8] + +[node name="vbox" type="VBoxContainer" parent="utm80_A9/margin"] +layout_mode = 2 + +[node name="grid0" type="GridContainer" parent="utm80_A9/margin/vbox"] +layout_mode = 2 +columns = 3 + +[node name="state" type="TextureRect" parent="utm80_A9/margin/vbox/grid0"] +custom_minimum_size = Vector2(24, 24) +layout_mode = 2 +size_flags_horizontal = 2 +size_flags_vertical = 6 +texture = ExtResource("6_l0j7c") +expand_mode = 1 + +[node name="fname" type="Label" parent="utm80_A9/margin/vbox/grid0"] +self_modulate = Color(1, 1, 1, 0.627451) +custom_minimum_size = Vector2(0, 20) +layout_mode = 2 +size_flags_horizontal = 3 +size_flags_vertical = 3 +theme_override_font_sizes/font_size = 17 +text = "УТМ80" +horizontal_alignment = 1 +vertical_alignment = 1 + +[node name="rname" type="Label" parent="utm80_A9/margin/vbox/grid0"] +layout_mode = 2 +size_flags_horizontal = 3 +size_flags_vertical = 6 +theme_override_font_sizes/font_size = 18 +text = "A9" +horizontal_alignment = 2 +vertical_alignment = 1 + +[node name="grid1" type="GridContainer" parent="utm80_A9/margin/vbox"] +custom_minimum_size = Vector2(80, 0) +layout_mode = 2 +size_flags_horizontal = 4 +size_flags_vertical = 3 +columns = 2 + +[node name="level1" type="TextureProgressBar" parent="utm80_A9/margin/vbox/grid1" groups=["уровни"]] +layout_mode = 2 +size_flags_horizontal = 3 +size_flags_vertical = 3 +tooltip_text = "Мощность, Вт +Текущее: 0.00 +Диапазон: 0.00…1400.00" +mouse_filter = 0 +max_value = 1400.0 +fill_mode = 3 +nine_patch_stretch = true +stretch_margin_left = 8 +stretch_margin_top = 8 +stretch_margin_right = 8 +stretch_margin_bottom = 8 +texture_under = ExtResource("9_0ba6e") +texture_progress = ExtResource("10_b3870") +tint_under = Color(1, 1, 1, 0.419608) +tint_progress = Color(0.890196, 0.486275, 0.196078, 1) + +[node name="level7" type="TextureProgressBar" parent="utm80_A9/margin/vbox/grid1"] +layout_mode = 2 +size_flags_horizontal = 3 +size_flags_vertical = 3 +tooltip_text = "Температура,°C +Текущее: 56.00 +Диапазон: -50.00…120.00" +mouse_filter = 0 +min_value = -50.0 +max_value = 120.0 +value = 56.0 +fill_mode = 3 +nine_patch_stretch = true +stretch_margin_left = 8 +stretch_margin_top = 8 +stretch_margin_right = 8 +stretch_margin_bottom = 8 +texture_under = ExtResource("9_0ba6e") +texture_progress = ExtResource("10_b3870") +tint_under = Color(0.890196, 0.486275, 0.196078, 1) +tint_over = Color(0.890196, 0.486275, 0.196078, 1) + +[node name="grid2" type="GridContainer" parent="utm80_A9/margin/vbox"] +clip_contents = true +custom_minimum_size = Vector2(80, 0) +layout_mode = 2 +size_flags_horizontal = 4 +size_flags_vertical = 4 +columns = 2 + +[node name="lbl6" type="Label" parent="utm80_A9/margin/vbox/grid2" groups=["названия"]] +clip_contents = true +layout_mode = 2 +size_flags_horizontal = 3 +theme_override_font_sizes/font_size = 8 +text = "P,%" +horizontal_alignment = 1 + +[node name="lbl7" type="Label" parent="utm80_A9/margin/vbox/grid2"] +clip_contents = true +layout_mode = 2 +size_flags_horizontal = 3 +theme_override_font_sizes/font_size = 8 +text = "°C" +horizontal_alignment = 1 + [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 -fname = "УМ1535Б" +fname = "РМ16-20М" rname = "A16" value0_info = "Мощность, Вт" value1_info = "Температура,°C" @@ -215,7 +388,7 @@ offset_left = 8.0 offset_top = 337.0 offset_right = 173.0 offset_bottom = 432.0 -fname = "УМ1535Б" +fname = "РМ16-20М" rname = "A17" value0_info = "Мощность, Вт" value1_info = "Температура,°C" @@ -227,7 +400,7 @@ offset_left = 8.0 offset_top = 432.0 offset_right = 175.0 offset_bottom = 527.0 -fname = "УМ1535Б" +fname = "РМ16-20М" rname = "A18" value0_info = "Мощность, Вт" value1_info = "Температура,°C" @@ -239,7 +412,7 @@ offset_left = 8.0 offset_top = 527.0 offset_right = 175.0 offset_bottom = 622.0 -fname = "УМ1535Б" +fname = "РМ16-20М" rname = "A19" value0_info = "Мощность, Вт" value1_info = "Температура,°C" @@ -251,7 +424,7 @@ offset_left = 8.0 offset_top = 622.0 offset_right = 175.0 offset_bottom = 717.0 -fname = "УМ1535Б" +fname = "РМ16-20М" rname = "A20" value0_info = "Мощность, Вт" value1_info = "Температура,°C" @@ -263,7 +436,7 @@ offset_left = 8.0 offset_top = 717.0 offset_right = 175.0 offset_bottom = 812.0 -fname = "УМ1535Б" +fname = "РМ16-20М" rname = "A21" value0_info = "Мощность, Вт" value1_info = "Температура,°C" @@ -321,9 +494,9 @@ metadata/ip = "ip12_50_1" [node name="lbl_fname" type="Label" parent="kasseta_p_1"] self_modulate = Color(1, 1, 1, 0.62) layout_mode = 0 -offset_left = 7.0 +offset_left = 2.0 offset_top = 8.0 -offset_right = 159.0 +offset_right = 162.0 offset_bottom = 33.0 text = "Кассета П-1" horizontal_alignment = 1 @@ -385,3 +558,5 @@ sprite_frames = SubResource("SpriteFrames_di0aa") [node name="output_2" type="AnimatedSprite2D" parent="."] position = Vector2(383, 177) sprite_frames = SubResource("SpriteFrames_di0aa") + +[connection signal="pressed" from="utm80_A9/button" to="utm80_A9" method="_on_button_pressed"] diff --git a/scenes/pribor-prd-n/pribor-prd-n.tscn b/scenes/pribor-prd-n/pribor-prd-n.tscn index 899c9735..a12b1ab5 100644 --- a/scenes/pribor-prd-n/pribor-prd-n.tscn +++ b/scenes/pribor-prd-n/pribor-prd-n.tscn @@ -1,9 +1,8 @@ -[gd_scene load_steps=13 format=3 uid="uid://dnuexoef2nnv5"] +[gd_scene load_steps=12 format=3 uid="uid://dnuexoef2nnv5"] [ext_resource type="Script" uid="uid://cto2r4ipew65m" path="res://scenes/pribor-prd-n/pribor-prd-n.gd" id="1_bnnv3"] [ext_resource type="PackedScene" uid="uid://d3iqb5e4g81m5" path="res://scenes/контроль/элемент-г.tscn" id="2_is25t"] [ext_resource type="Texture2D" uid="uid://c4mdrmk7h638f" path="res://data/nine-patch-round.png" id="3_meukj"] -[ext_resource type="PackedScene" uid="uid://bk1655p4e8y4u" path="res://scenes/контроль/кассета-у-5-нв.tscn" id="4_xkifg"] [ext_resource type="Script" uid="uid://crpedygm3gohi" path="res://scenes/контроль/кассета.gd" id="6_b5wvk"] [ext_resource type="PackedScene" uid="uid://bcyxqni7gxvtq" path="res://scenes/контроль/блок-в.tscn" id="7_bnnv3"] [ext_resource type="PackedScene" uid="uid://p2suppildvq0" path="res://scenes/контроль/элемент-в.tscn" id="7_eoqf2"] @@ -103,12 +102,83 @@ text = "Панель horizontal_alignment = 1 vertical_alignment = 1 -[node name="kasseta_U5" parent="." instance=ExtResource("4_xkifg")] +[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 +texture = ExtResource("3_meukj") +patch_margin_left = 16 +patch_margin_top = 16 +patch_margin_right = 16 +patch_margin_bottom = 16 +script = ExtResource("6_b5wvk") + +[node name="lbl_fname" type="Label" parent="kasseta_U5"] +self_modulate = Color(1, 1, 1, 0.62) +layout_mode = 0 +offset_left = 5.0 +offset_top = 7.0 +offset_right = 305.0 +offset_bottom = 35.0 +text = "Кассета У5" +horizontal_alignment = 1 +vertical_alignment = 1 + +[node name="ref_A24" parent="kasseta_U5" groups=["power_supply"] instance=ExtResource("7_eoqf2")] +offset_left = 5.0 +offset_top = 32.0 +offset_right = 55.0 +offset_bottom = 182.0 +fname = "ИП5-25" +rname = "A24" +metadata/ip = "ip5_25" + +[node name="ref_A30" parent="kasseta_U5" groups=["y-5"] instance=ExtResource("7_eoqf2")] +offset_left = 55.0 +offset_top = 32.0 +offset_right = 105.0 +offset_bottom = 182.0 +fname = "ЯУ-07Б" +rname = "A30" +metadata/y5 = "yau07" + +[node name="ref_A26" parent="kasseta_U5" groups=["y-5"] instance=ExtResource("7_eoqf2")] +offset_left = 105.0 +offset_top = 32.0 +offset_right = 155.0 +offset_bottom = 182.0 +fname = "ЭМС-Г" +rname = "A26" +metadata/y5 = "ems" + +[node name="ref_A27" parent="kasseta_U5" groups=["y-5"] instance=ExtResource("7_eoqf2")] +offset_left = 155.0 +offset_top = 32.0 +offset_right = 205.0 +offset_bottom = 182.0 +fname = "УГ" +rname = "A27" +metadata/y5 = "ug" + +[node name="ref_A28" parent="kasseta_U5" groups=["y-5"] instance=ExtResource("7_eoqf2")] +offset_left = 205.0 +offset_top = 32.0 +offset_right = 255.0 +offset_bottom = 182.0 +fname = "УКП" +rname = "A28" +metadata/y5 = "ukp1" + +[node name="ref_A29" parent="kasseta_U5" groups=["y-5"] instance=ExtResource("7_eoqf2")] +offset_left = 254.0 +offset_top = 32.0 +offset_right = 304.0 +offset_bottom = 182.0 +fname = "УКП" +rname = "A29" +metadata/y5 = "ukp2" [node name="kasseta_FS_ND" type="NinePatchRect" parent="."] layout_mode = 0 @@ -142,7 +212,7 @@ offset_top = 32.0 offset_right = 105.0 offset_bottom = 182.0 fname = "Блок ФС-3" -rname = "A3" +rname = "A4" [node name="ref_A1" parent="kasseta_FS_ND" groups=["default_reset", "fs_group"] instance=ExtResource("7_eoqf2")] offset_left = 105.0 @@ -150,7 +220,7 @@ offset_top = 32.0 offset_right = 155.0 offset_bottom = 182.0 fname = "Модуль ФС" -rname = "A1" +rname = "A2" metadata/fs = "fs_3" [node name="ref_A2" parent="kasseta_FS_ND" groups=["default_reset", "fs_group"] instance=ExtResource("7_eoqf2")] @@ -159,7 +229,7 @@ offset_top = 32.0 offset_right = 205.0 offset_bottom = 182.0 fname = "Модуль ФС" -rname = "A2" +rname = "A1" metadata/fs = "fs_2" [node name="ref_A4" parent="kasseta_FS_ND" groups=["default_reset"] instance=ExtResource("7_eoqf2")] @@ -168,7 +238,7 @@ offset_top = 32.0 offset_right = 255.0 offset_bottom = 182.0 fname = "Блок ФС-2" -rname = "A4" +rname = "A3" [node name="kasseta_P_1" type="NinePatchRect" parent="."] layout_mode = 0 @@ -228,7 +298,7 @@ offset_left = 485.0 offset_top = 242.0 offset_right = 652.0 offset_bottom = 337.0 -fname = "УМ1535Б" +fname = "УМ1535А" rname = "A7" value0_info = "Мощность, Вт" value1_info = "Температура,°C" diff --git a/scenes/pribor-prd-v/pribor-prd-v.tscn b/scenes/pribor-prd-v/pribor-prd-v.tscn index e53a2aef..3d9bd2e6 100644 --- a/scenes/pribor-prd-v/pribor-prd-v.tscn +++ b/scenes/pribor-prd-v/pribor-prd-v.tscn @@ -1,9 +1,8 @@ -[gd_scene load_steps=14 format=3 uid="uid://cvskpe1ti3p45"] +[gd_scene load_steps=13 format=3 uid="uid://cvskpe1ti3p45"] [ext_resource type="Script" uid="uid://cvuosuvjaci1h" path="res://scenes/pribor-prd-v/pribor-prd-v.gd" id="1_c20s6"] [ext_resource type="PackedScene" uid="uid://d3iqb5e4g81m5" path="res://scenes/контроль/элемент-г.tscn" id="2_xpo4b"] [ext_resource type="Texture2D" uid="uid://c4mdrmk7h638f" path="res://data/nine-patch-round.png" id="3_wyy1b"] -[ext_resource type="PackedScene" uid="uid://bk1655p4e8y4u" path="res://scenes/контроль/кассета-у-5-нв.tscn" id="4_gl2bl"] [ext_resource type="PackedScene" uid="uid://cd5sue1e8iyrv" path="res://scenes/pribor-prd-n/kasseta-fs-nd.tscn" id="5_nhd2k"] [ext_resource type="Script" uid="uid://crpedygm3gohi" path="res://scenes/контроль/кассета.gd" id="6_os4mt"] [ext_resource type="PackedScene" uid="uid://p2suppildvq0" path="res://scenes/контроль/элемент-в.tscn" id="7_38u2b"] @@ -104,12 +103,83 @@ text = "Панель horizontal_alignment = 1 vertical_alignment = 1 -[node name="kasseta_U5" parent="." instance=ExtResource("4_gl2bl")] +[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 +texture = ExtResource("3_wyy1b") +patch_margin_left = 16 +patch_margin_top = 16 +patch_margin_right = 16 +patch_margin_bottom = 16 +script = ExtResource("6_os4mt") + +[node name="lbl_fname" type="Label" parent="kasseta_U5"] +self_modulate = Color(1, 1, 1, 0.62) +layout_mode = 0 +offset_left = 5.0 +offset_top = 7.0 +offset_right = 305.0 +offset_bottom = 35.0 +text = "Кассета У5" +horizontal_alignment = 1 +vertical_alignment = 1 + +[node name="ref_A24" parent="kasseta_U5" groups=["power_supply"] instance=ExtResource("7_38u2b")] +offset_left = 5.0 +offset_top = 32.0 +offset_right = 55.0 +offset_bottom = 182.0 +fname = "ИП5-25" +rname = "A24" +metadata/ip = "ip5_25" + +[node name="ref_A30" parent="kasseta_U5" groups=["y-5"] instance=ExtResource("7_38u2b")] +offset_left = 55.0 +offset_top = 32.0 +offset_right = 105.0 +offset_bottom = 182.0 +fname = "ЯУ-07Б" +rname = "A30" +metadata/y5 = "yau07" + +[node name="ref_A26" parent="kasseta_U5" groups=["y-5"] instance=ExtResource("7_38u2b")] +offset_left = 105.0 +offset_top = 32.0 +offset_right = 155.0 +offset_bottom = 182.0 +fname = "ЭМС-Г" +rname = "A26" +metadata/y5 = "ems" + +[node name="ref_A27" parent="kasseta_U5" groups=["y-5"] instance=ExtResource("7_38u2b")] +offset_left = 155.0 +offset_top = 32.0 +offset_right = 205.0 +offset_bottom = 182.0 +fname = "УГ" +rname = "A27" +metadata/y5 = "ug" + +[node name="ref_A28" parent="kasseta_U5" groups=["y-5"] instance=ExtResource("7_38u2b")] +offset_left = 205.0 +offset_top = 32.0 +offset_right = 255.0 +offset_bottom = 182.0 +fname = "УКП" +rname = "A28" +metadata/y5 = "ukp1" + +[node name="ref_A29" parent="kasseta_U5" groups=["y-5"] instance=ExtResource("7_38u2b")] +offset_left = 254.0 +offset_top = 32.0 +offset_right = 304.0 +offset_bottom = 182.0 +fname = "УКП" +rname = "A29" +metadata/y5 = "ukp2" [node name="kasseta_FS_VD" parent="." instance=ExtResource("5_nhd2k")] layout_mode = 0 @@ -177,7 +247,7 @@ offset_left = 485.0 offset_top = 242.0 offset_right = 652.0 offset_bottom = 337.0 -fname = "УМ1535Б" +fname = "УМ1535А" rname = "A7" value0_info = "Мощность, Вт" value1_info = "Температура,°C" diff --git a/scenes/контроль/блок-в.tscn b/scenes/контроль/блок-в.tscn index 06dcfa85..578fee59 100644 --- a/scenes/контроль/блок-в.tscn +++ b/scenes/контроль/блок-в.tscn @@ -145,10 +145,10 @@ func _enter_tree() -> void: call_deferred('_enter_tree_defered') func _ready(): - var items: Array = get_level_nodes() - for item in items: - item.connect('value_changed', on_level_changed.bind(item, value0_info)) - on_level_changed(item.value, item, value0_info) + #var items: Array = get_level_nodes() + #for item in items: + #item.connect('value_changed', on_level_changed.bind(item, value0_info)) + #on_level_changed(item.value, item, value0_info) var level7: = $margin/vbox/grid1/level7 level7.connect('value_changed', on_level_changed.bind(level7, value1_info)) on_level_changed(level7.value, level7, value1_info) diff --git a/scenes/контроль/кассета-п-2.tscn b/scenes/контроль/кассета-п-2.tscn index a265d9d7..abe840d4 100644 --- a/scenes/контроль/кассета-п-2.tscn +++ b/scenes/контроль/кассета-п-2.tscn @@ -35,9 +35,10 @@ metadata/ip = "ip12_50_2" [node name="lbl_fname" type="Label" parent="."] self_modulate = Color(1, 1, 1, 0.62) layout_mode = 0 -offset_left = 5.0 +offset_left = 8.0 offset_top = 5.0 -offset_right = 105.0 +offset_right = 112.0 offset_bottom = 30.0 +text = "Касета П-2" horizontal_alignment = 1 vertical_alignment = 1 diff --git a/scenes/контроль/кассета-у-5-нв.tscn b/scenes/контроль/кассета-у-5-нв.tscn index dad7c794..011731bb 100644 --- a/scenes/контроль/кассета-у-5-нв.tscn +++ b/scenes/контроль/кассета-у-5-нв.tscn @@ -31,7 +31,7 @@ offset_top = 32.0 offset_right = 55.0 offset_bottom = 182.0 fname = "ИП5-25" -rname = "A24" +rname = "A31" metadata/ip = "ip5_25" [node name="ref_A30" parent="." groups=["y-5"] instance=ExtResource("3_picsk")] @@ -40,7 +40,7 @@ offset_top = 32.0 offset_right = 105.0 offset_bottom = 182.0 fname = "ЯУ-07Б" -rname = "A30" +rname = "A37" metadata/y5 = "yau07" [node name="ref_A26" parent="." groups=["y-5"] instance=ExtResource("3_picsk")] @@ -49,7 +49,7 @@ offset_top = 32.0 offset_right = 155.0 offset_bottom = 182.0 fname = "ЭМС-Г" -rname = "A26" +rname = "A33" metadata/y5 = "ems" [node name="ref_A27" parent="." groups=["y-5"] instance=ExtResource("3_picsk")] @@ -58,7 +58,7 @@ offset_top = 32.0 offset_right = 205.0 offset_bottom = 182.0 fname = "УГ" -rname = "A27" +rname = "A34" metadata/y5 = "ug" [node name="ref_A28" parent="." groups=["y-5"] instance=ExtResource("3_picsk")] @@ -67,7 +67,7 @@ offset_top = 32.0 offset_right = 255.0 offset_bottom = 182.0 fname = "УКП" -rname = "A28" +rname = "A36" metadata/y5 = "ukp1" [node name="ref_A29" parent="." groups=["y-5"] instance=ExtResource("3_picsk")] @@ -76,5 +76,5 @@ offset_top = 32.0 offset_right = 304.0 offset_bottom = 182.0 fname = "УКП" -rname = "A29" +rname = "A35" metadata/y5 = "ukp2"