Merge remote-tracking branch 'origin/dev_danil' into dev_maxim

# Conflicts:
#	scripts/PRD.gd
#	scripts/network.gd

PRD_MP550.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=50 format=3 uid="uid://cvor2jm4xk3ha"]
+[gd_scene load_steps=49 format=3 uid="uid://cvor2jm4xk3ha"]
 
 [ext_resource type="Script" path="res://scripts/PRD.gd" id="1_v273n"]
 [ext_resource type="Texture2D" uid="uid://cdxdluvyb5uei" path="res://table/on.png" id="2_dv7xx"]
@@ -13,7 +13,6 @@
 [ext_resource type="Script" path="res://scripts/ems_g.gd" id="9_g1wia"]
 [ext_resource type="Shader" path="res://load.gdshader" id="10_lf1xh"]
 [ext_resource type="PackedScene" uid="uid://bdb0bhfu7366l" path="res://kasseta-fs-kd.tscn" id="10_tdh2s"]
-[ext_resource type="PackedScene" uid="uid://bnlkbbn7b4a3k" path="res://table/элемент-эмс.tscn" id="11_d60jk"]
 [ext_resource type="PackedScene" uid="uid://p2suppildvq0" path="res://table/элемент-в.tscn" id="11_fg7ul"]
 [ext_resource type="Script" path="res://scripts/modul_fs.gd" id="15_b4pr1"]
 
@@ -269,7 +268,7 @@ metadata/_edit_lock_ = true
 offset_left = 216.0
 offset_top = 39.0
 offset_right = 2420.0
-offset_bottom = 917.0
+offset_bottom = 936.0
 theme = SubResource("Theme_k5ur4")
 theme_override_colors/font_unselected_color = Color(0, 0, 0, 0.0392157)
 theme_override_colors/font_selected_color = Color(0, 0, 0, 0)
@@ -281,11 +280,12 @@ theme_override_styles/tab_selected = SubResource("StyleBoxTexture_k08q3")
 theme_override_styles/tab_hovered = SubResource("StyleBoxTexture_dklg6")
 theme_override_styles/tab_unselected = SubResource("StyleBoxTexture_17le6")
 tab_alignment = 2
-current_tab = 0
+current_tab = 1
 tab_focus_mode = 0
 metadata/_edit_lock_ = true
 
 [node name="PRD" type="Panel" parent="TabContainer"]
+visible = false
 layout_mode = 2
 theme_override_styles/panel = SubResource("StyleBoxTexture_7u7p7")
 metadata/_tab_index = 0
@@ -429,7 +429,6 @@ script = ExtResource("2_vmbyo")
 node_gap = Vector2(100, 50)
 
 [node name="ControlPanel" type="Panel" parent="TabContainer"]
-visible = false
 layout_mode = 2
 theme_override_styles/panel = SubResource("StyleBoxTexture_tn8m6")
 script = ExtResource("9_akagi")
@@ -438,10 +437,10 @@ metadata/_edit_lock_ = true
 
 [node name="lbl_control" type="Label" parent="TabContainer/ControlPanel"]
 layout_mode = 0
-offset_left = 4.0
-offset_top = 21.0
-offset_right = 624.0
-offset_bottom = 52.0
+offset_left = 45.0
+offset_top = -37.0
+offset_right = 665.0
+offset_bottom = -6.0
 theme_override_font_sizes/font_size = 22
 text = "Контроль исправности прибора ПРД-Н"
 horizontal_alignment = 1
@@ -450,77 +449,64 @@ vertical_alignment = 1
 [node name="soc_y5" type="NinePatchRect" parent="TabContainer/ControlPanel"]
 layout_mode = 0
 offset_left = 199.0
-offset_top = 103.0
+offset_top = 10.0
 offset_right = 516.0
-offset_bottom = 293.0
+offset_bottom = 200.0
 texture = ExtResource("9_0r2qk")
 patch_margin_left = 16
 patch_margin_top = 16
 patch_margin_right = 16
 patch_margin_bottom = 16
 
-[node name="ref_A24" parent="TabContainer/ControlPanel/soc_y5" instance=ExtResource("11_fg7ul")]
+[node name="IP5_25" parent="TabContainer/ControlPanel/soc_y5" instance=ExtResource("11_fg7ul")]
 offset_left = 9.0
 offset_top = 34.0
 offset_right = 59.0
 offset_bottom = 184.0
-textures = Array[Texture]([])
-fname = "ИП-25"
+fname = "ИП5-25"
 rname = "A24"
-metadata/_edit_lock_ = true
 
-[node name="ref_A30" parent="TabContainer/ControlPanel/soc_y5" instance=ExtResource("11_fg7ul")]
+[node name="ay07" parent="TabContainer/ControlPanel/soc_y5" instance=ExtResource("11_fg7ul")]
 offset_left = 59.0
 offset_top = 34.0
 offset_right = 109.0
 offset_bottom = 184.0
-textures = Array[Texture]([])
 fname = "ЯУ-07"
 rname = "A30"
-metadata/_edit_lock_ = true
 
-[node name="ref_A26" parent="TabContainer/ControlPanel/soc_y5" instance=ExtResource("11_fg7ul")]
+[node name="ems_g" parent="TabContainer/ControlPanel/soc_y5" instance=ExtResource("11_fg7ul")]
 offset_left = 109.0
 offset_top = 34.0
 offset_right = 159.0
 offset_bottom = 184.0
-textures = Array[Texture]([])
 fname = "ЭМС-Г"
 rname = "A26"
-metadata/_edit_lock_ = true
 
-[node name="ref_A27" parent="TabContainer/ControlPanel/soc_y5" instance=ExtResource("11_fg7ul")]
+[node name="ug" parent="TabContainer/ControlPanel/soc_y5" instance=ExtResource("11_fg7ul")]
 offset_left = 159.0
 offset_top = 34.0
 offset_right = 209.0
 offset_bottom = 184.0
-textures = Array[Texture]([])
 fname = "УГ"
 rname = "A27"
-metadata/_edit_lock_ = true
 
-[node name="ref_A28" parent="TabContainer/ControlPanel/soc_y5" instance=ExtResource("11_fg7ul")]
-offset_left = 209.0
-offset_top = 34.0
-offset_right = 259.0
-offset_bottom = 183.0
-textures = Array[Texture]([])
-self_size = Vector2i(50, 149)
-fname = "УКП-1"
-rname = "A28"
-metadata/_edit_lock_ = true
-
-[node name="ref_A29" parent="TabContainer/ControlPanel/soc_y5" instance=ExtResource("11_fg7ul")]
+[node name="ukp_2" parent="TabContainer/ControlPanel/soc_y5" instance=ExtResource("11_fg7ul")]
 offset_left = 259.0
 offset_top = 34.0
 offset_right = 309.0
 offset_bottom = 184.0
-textures = Array[Texture]([])
 fname = "УКП-2"
 rname = "A29"
-metadata/_edit_lock_ = true
 
-[node name="lbl_fname" type="Label" parent="TabContainer/ControlPanel/soc_y5"]
+[node name="ukp_1" parent="TabContainer/ControlPanel/soc_y5" instance=ExtResource("11_fg7ul")]
+offset_left = 210.0
+offset_top = 35.0
+offset_right = 260.0
+offset_bottom = 185.0
+fname = "УКП-1"
+rname = "A28"
+
+[node name="Kasseta" type="Label" parent="TabContainer/ControlPanel/soc_y5"]
 self_modulate = Color(1, 1, 1, 0.62)
 layout_mode = 0
 offset_left = 7.0
@@ -531,15 +517,15 @@ text = "Кассета У5"
 horizontal_alignment = 1
 vertical_alignment = 1
 
-[node name="soc_fs-nkvd" parent="TabContainer/ControlPanel" instance=ExtResource("10_tdh2s")]
+[node name="Kasseta_FS" parent="TabContainer/ControlPanel" instance=ExtResource("10_tdh2s")]
 layout_mode = 0
-offset_left = 198.0
-offset_top = 311.0
-offset_right = 516.0
-offset_bottom = 538.0
+offset_left = 200.0
+offset_top = 201.0
+offset_right = 518.0
+offset_bottom = 420.0
 script = null
 
-[node name="lbl_fname" type="Label" parent="TabContainer/ControlPanel/soc_fs-nkvd"]
+[node name="Kasseta" type="Label" parent="TabContainer/ControlPanel/Kasseta_FS"]
 self_modulate = Color(1, 1, 1, 0.62)
 layout_mode = 0
 offset_left = 7.0
@@ -549,115 +535,119 @@ offset_bottom = 33.0
 text = "Кассета ФС-НД"
 horizontal_alignment = 1
 vertical_alignment = 1
-metadata/_edit_lock_ = true
 
-[node name="ref_A3" parent="TabContainer/ControlPanel/soc_fs-nkvd" instance=ExtResource("11_fg7ul")]
+[node name="ref_A3" parent="TabContainer/ControlPanel/Kasseta_FS" instance=ExtResource("11_fg7ul")]
 offset_left = 109.0
-offset_top = 68.0
+offset_top = 41.0
 offset_right = 159.0
-offset_bottom = 218.0
-textures = Array[Texture]([])
-fname = "ФС-2"
+offset_bottom = 211.0
+self_size = Vector2i(50, 170)
+fname = "БЛОК ФС-2"
 rname = "A3"
-metadata/_edit_lock_ = true
 
-[node name="ref_A1" parent="TabContainer/ControlPanel/soc_fs-nkvd" instance=ExtResource("11_fg7ul")]
+[node name="ref_A1" parent="TabContainer/ControlPanel/Kasseta_FS" instance=ExtResource("11_fg7ul")]
 offset_left = 159.0
-offset_top = 68.0
+offset_top = 41.0
 offset_right = 209.0
-offset_bottom = 218.0
-textures = Array[Texture]([])
-fname = "Модуль"
+offset_bottom = 211.0
+self_size = Vector2i(50, 170)
+fname = "Модуль ФС"
 rname = "A1"
-metadata/_edit_lock_ = true
 
-[node name="ref_A2" parent="TabContainer/ControlPanel/soc_fs-nkvd" instance=ExtResource("11_fg7ul")]
+[node name="ref_A2" parent="TabContainer/ControlPanel/Kasseta_FS" instance=ExtResource("11_fg7ul")]
 offset_left = 209.0
-offset_top = 68.0
+offset_top = 41.0
 offset_right = 259.0
-offset_bottom = 217.0
-textures = Array[Texture]([])
-self_size = Vector2i(50, 149)
-fname = "Модуль"
+offset_bottom = 211.0
+self_size = Vector2i(50, 170)
+fname = "Модуль ФС"
 rname = "A2"
-metadata/_edit_lock_ = true
 
-[node name="ref_A4" parent="TabContainer/ControlPanel/soc_fs-nkvd" instance=ExtResource("11_fg7ul")]
+[node name="ref_A4" parent="TabContainer/ControlPanel/Kasseta_FS" instance=ExtResource("11_fg7ul")]
 offset_left = 259.0
-offset_top = 68.0
+offset_top = 41.0
 offset_right = 309.0
-offset_bottom = 218.0
-textures = Array[Texture]([])
-fname = "ФС-3"
+offset_bottom = 211.0
+self_size = Vector2i(50, 170)
+fname = "БЛОК ФС-3"
 rname = "A4"
-metadata/_edit_lock_ = true
+
+[node name="Block_FS_PRD_K" parent="TabContainer/ControlPanel/Kasseta_FS" instance=ExtResource("11_fg7ul")]
+offset_left = 12.0
+offset_top = 40.0
+offset_right = 62.0
+offset_bottom = 210.0
+self_size = Vector2i(50, 170)
+fname = "БЛОК ФС-1"
+rname = "A4"
+
+[node name="FS_PRD_K" parent="TabContainer/ControlPanel/Kasseta_FS" instance=ExtResource("11_fg7ul")]
+offset_left = 61.0
+offset_top = 41.0
+offset_right = 111.0
+offset_bottom = 211.0
+self_size = Vector2i(50, 170)
+fname = "Модуль ФС"
+rname = "A1"
 
 [node name="soc_P1" type="NinePatchRect" parent="TabContainer/ControlPanel"]
 layout_mode = 0
-offset_left = 96.0
-offset_top = 560.0
-offset_right = 516.0
-offset_bottom = 776.0
+offset_left = 259.0
+offset_top = 427.0
+offset_right = 447.0
+offset_bottom = 643.0
 texture = ExtResource("9_0r2qk")
 patch_margin_left = 16
 patch_margin_top = 16
 patch_margin_right = 16
 patch_margin_bottom = 16
 
-[node name="lbl_fname" type="Label" parent="TabContainer/ControlPanel/soc_P1"]
+[node name="Kasseta" type="Label" parent="TabContainer/ControlPanel/soc_P1"]
 self_modulate = Color(1, 1, 1, 0.62)
 layout_mode = 0
 offset_left = 7.0
 offset_top = 8.0
-offset_right = 409.0
+offset_right = 181.0
 offset_bottom = 33.0
 text = "Кассета П-1"
 horizontal_alignment = 1
 vertical_alignment = 1
-metadata/_edit_lock_ = true
 
-[node name="ref_A23" parent="TabContainer/ControlPanel/soc_P1" instance=ExtResource("11_fg7ul")]
-offset_left = 40.0
-offset_top = -206.0
-offset_right = 90.0
-offset_bottom = -32.0
-textures = Array[Texture]([])
+[node name="MAA_1" parent="TabContainer/ControlPanel/soc_P1" instance=ExtResource("11_fg7ul")]
+offset_left = -64.0
+offset_top = 37.0
+offset_right = -14.0
+offset_bottom = 211.0
 self_size = Vector2i(50, 174)
+fname = "МАА2000"
+rname = "А22"
 
-[node name="ref_A24" parent="TabContainer/ControlPanel/soc_P1" instance=ExtResource("11_fg7ul")]
-offset_left = 40.0
-offset_top = -448.0
-offset_right = 90.0
-offset_bottom = -274.0
-textures = Array[Texture]([])
+[node name="MAA_2" parent="TabContainer/ControlPanel/soc_P1" instance=ExtResource("11_fg7ul")]
+offset_left = 203.0
+offset_top = 36.0
+offset_right = 253.0
+offset_bottom = 210.0
 self_size = Vector2i(50, 174)
+fname = "МАА2000"
+rname = "А23"
 
-[node name="ref_A25" parent="TabContainer/ControlPanel/soc_P1" instance=ExtResource("11_fg7ul")]
-offset_left = 109.0
-offset_top = 34.0
-offset_right = 159.0
-offset_bottom = 208.0
-textures = Array[Texture]([])
+[node name="IP9_50_2" parent="TabContainer/ControlPanel/soc_P1" instance=ExtResource("11_fg7ul")]
+offset_left = 129.0
+offset_top = 37.0
+offset_right = 179.0
+offset_bottom = 211.0
 self_size = Vector2i(50, 174)
-metadata/_edit_lock_ = true
+fname = "ИП9-50"
+rname = "А19"
 
-[node name="ref_A26" parent="TabContainer/ControlPanel/soc_P1" instance=ExtResource("11_fg7ul")]
-offset_left = 159.0
-offset_top = 34.0
-offset_right = 209.0
-offset_bottom = 208.0
-textures = Array[Texture]([])
+[node name="IP9_50_1" parent="TabContainer/ControlPanel/soc_P1" instance=ExtResource("11_fg7ul")]
+offset_left = 73.0
+offset_top = 37.0
+offset_right = 123.0
+offset_bottom = 211.0
 self_size = Vector2i(50, 174)
-metadata/_edit_lock_ = true
-
-[node name="ref_A27" parent="TabContainer/ControlPanel/soc_P1" instance=ExtResource("11_fg7ul")]
-offset_left = 209.0
-offset_top = 34.0
-offset_right = 259.0
-offset_bottom = 208.0
-textures = Array[Texture]([])
-self_size = Vector2i(50, 174)
-metadata/_edit_lock_ = true
+fname = "ИП9-50"
+rname = "А20"
 
 [node name="ref_A28" parent="TabContainer/ControlPanel/soc_P1" instance=ExtResource("11_fg7ul")]
 visible = false
@@ -667,7 +657,8 @@ offset_right = 309.0
 offset_bottom = 208.0
 textures = Array[Texture]([])
 self_size = Vector2i(50, 174)
-metadata/_edit_lock_ = true
+fname = "ИП12-50"
+rname = "A21"
 
 [node name="ref_A29" parent="TabContainer/ControlPanel/soc_P1" instance=ExtResource("11_fg7ul")]
 visible = false
@@ -677,121 +668,66 @@ offset_right = 359.0
 offset_bottom = 208.0
 textures = Array[Texture]([])
 self_size = Vector2i(50, 174)
+fname = "ИП9-50"
+rname = "А22"
 metadata/_edit_lock_ = true
 
-[node name="Signal_EMS_G" type="NinePatchRect" parent="TabContainer/ControlPanel"]
+[node name="IP12_50" parent="TabContainer/ControlPanel/soc_P1" instance=ExtResource("11_fg7ul")]
+offset_left = 16.0
+offset_top = 36.0
+offset_right = 66.0
+offset_bottom = 210.0
+self_size = Vector2i(50, 174)
+fname = "ИП12-50"
+rname = "А21"
+
+[node name="soc_P2" type="NinePatchRect" parent="TabContainer/ControlPanel"]
 layout_mode = 0
-offset_left = 536.0
-offset_top = 550.0
-offset_right = 1055.0
-offset_bottom = 777.0
+offset_left = 278.0
+offset_top = 645.0
+offset_right = 432.0
+offset_bottom = 861.0
 texture = ExtResource("9_0r2qk")
 patch_margin_left = 16
 patch_margin_top = 16
 patch_margin_right = 16
 patch_margin_bottom = 16
 
-[node name="lbl_fname" type="Label" parent="TabContainer/ControlPanel/Signal_EMS_G"]
+[node name="Kasseta" type="Label" parent="TabContainer/ControlPanel/soc_P2"]
 self_modulate = Color(1, 1, 1, 0.62)
 layout_mode = 0
-offset_left = 7.0
+offset_left = 8.0
 offset_top = 8.0
-offset_right = 508.0
+offset_right = 142.0
 offset_bottom = 33.0
-text = "ЭМС-Г"
+text = "Кассета П-2"
 horizontal_alignment = 1
 vertical_alignment = 1
-metadata/_edit_lock_ = true
 
-[node name="ref_A22" parent="TabContainer/ControlPanel/Signal_EMS_G" instance=ExtResource("11_d60jk")]
-offset_left = 9.0
-offset_top = 38.0
-offset_right = 59.0
-offset_bottom = 216.0
-self_size = Vector2i(50, 178)
+[node name="IP12_50" parent="TabContainer/ControlPanel/soc_P2" instance=ExtResource("11_fg7ul")]
+offset_left = 81.0
+offset_top = 36.0
+offset_right = 131.0
+offset_bottom = 210.0
+self_size = Vector2i(50, 174)
+fname = "ИП12-50"
+rname = "A25"
+
+[node name="IP9_50" parent="TabContainer/ControlPanel/soc_P2" instance=ExtResource("11_fg7ul")]
+offset_left = 24.0
+offset_top = 36.0
+offset_right = 74.0
+offset_bottom = 210.0
+self_size = Vector2i(50, 174)
+fname = "ИП9-50"
 rname = "A22"
-metadata/_edit_lock_ = true
 
-[node name="ref_A23" parent="TabContainer/ControlPanel/Signal_EMS_G" instance=ExtResource("11_d60jk")]
-offset_left = 59.0
-offset_top = 38.0
-offset_right = 109.0
-offset_bottom = 216.0
-self_size = Vector2i(50, 178)
-rname = "A23"
-metadata/_edit_lock_ = true
-
-[node name="ref_A26" parent="TabContainer/ControlPanel/Signal_EMS_G" instance=ExtResource("11_d60jk")]
-offset_left = 109.0
-offset_top = 38.0
-offset_right = 159.0
-offset_bottom = 216.0
-self_size = Vector2i(50, 178)
-rname = "A26"
-metadata/_edit_lock_ = true
-
-[node name="ref_A27" parent="TabContainer/ControlPanel/Signal_EMS_G" instance=ExtResource("11_d60jk")]
-offset_left = 159.0
-offset_top = 38.0
-offset_right = 209.0
-offset_bottom = 216.0
-self_size = Vector2i(50, 178)
-rname = "A27"
-metadata/_edit_lock_ = true
-
-[node name="ref_A28" parent="TabContainer/ControlPanel/Signal_EMS_G" instance=ExtResource("11_d60jk")]
-offset_left = 209.0
-offset_top = 38.0
-offset_right = 259.0
-offset_bottom = 216.0
-self_size = Vector2i(50, 178)
-rname = "A28"
-metadata/_edit_lock_ = true
-
-[node name="ref_A29" parent="TabContainer/ControlPanel/Signal_EMS_G" instance=ExtResource("11_d60jk")]
-offset_left = 259.0
-offset_top = 38.0
-offset_right = 309.0
-offset_bottom = 216.0
-self_size = Vector2i(50, 178)
-rname = "A29"
-metadata/_edit_lock_ = true
-
-[node name="ref_A31" parent="TabContainer/ControlPanel/Signal_EMS_G" instance=ExtResource("11_d60jk")]
-offset_left = 309.0
-offset_top = 38.0
-offset_right = 359.0
-offset_bottom = 216.0
-self_size = Vector2i(50, 178)
-rname = "УМ2"
-metadata/_edit_lock_ = true
-
-[node name="ref_A32" parent="TabContainer/ControlPanel/Signal_EMS_G" instance=ExtResource("11_d60jk")]
-offset_left = 359.0
-offset_top = 38.0
-offset_right = 409.0
-offset_bottom = 216.0
-self_size = Vector2i(50, 178)
-rname = "УМ3"
-metadata/_edit_lock_ = true
-
-[node name="ref_A33" parent="TabContainer/ControlPanel/Signal_EMS_G" instance=ExtResource("11_d60jk")]
-offset_left = 409.0
-offset_top = 38.0
-offset_right = 459.0
-offset_bottom = 216.0
-self_size = Vector2i(50, 178)
-rname = "A33"
-metadata/_edit_lock_ = true
-
-[node name="ref_A34" parent="TabContainer/ControlPanel/Signal_EMS_G" instance=ExtResource("11_d60jk")]
-offset_left = 459.0
-offset_top = 38.0
-offset_right = 509.0
-offset_bottom = 216.0
-self_size = Vector2i(50, 178)
-rname = "A33"
-metadata/_edit_lock_ = true
+[node name="device" type="Label" parent="TabContainer/ControlPanel"]
+layout_mode = 0
+offset_left = 1451.0
+offset_top = 792.0
+offset_right = 1616.0
+offset_bottom = 847.0
 
 [node name="EMS_G" type="Panel" parent="TabContainer"]
 visible = false