Merge remote-tracking branch 'origin/master-Kuznetsov'

# Conflicts:
#	scenes/контроль/контроль.tscn

scenes/контроль/контроль.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=19 format=3 uid="uid://lwmw4egynmd1"]
+[gd_scene load_steps=25 format=3 uid="uid://lwmw4egynmd1"]
 
 [ext_resource type="Texture2D" uid="uid://bar8k5qef7kch" path="res://data/УФ.png" id="2_0nvm1"]
 [ext_resource type="Script" uid="uid://q3gmpsqspjfp" path="res://scenes/контроль/внешний.gd" id="2_8r80x"]
@@ -1178,7 +1178,6 @@ stretch_mode = 4
 flip_h = true
 script = ExtResource("3_4pt7j")
 state_colors = [Color(1, 1, 1, 1), Color(0, 0.87, 0, 1), Color(0.65, 0.0715, 0.0715, 1)]
-show_functional = null
 metadata/unit_name = ["уарэп-яу07-1в"]
 metadata/online_proc = "on_line_changed"
 
@@ -1215,6 +1214,17 @@ sprite_frames = SubResource("SpriteFrames_foasq")
 frame_progress = 0.72355
 script = ExtResource("11_u7tym")
 
+[node name="pic_functional" type="TextureRect" parent="pribor_prd_v_1"]
+visible = false
+z_index = 1
+layout_mode = 0
+offset_left = -1304.0
+offset_top = 2.0
+offset_right = 288.0
+offset_bottom = 810.0
+scale = Vector2(0.974661, 0.974661)
+texture = ExtResource("9_w6m6a")
+
 [node name="pribor_prd_k_1" type="TextureButton" parent="." groups=["pribor_buttons"]]
 editor_description = "Кнопка для выбора прибора."
 layout_mode = 0
@@ -1231,7 +1241,6 @@ stretch_mode = 4
 flip_h = true
 script = ExtResource("3_4pt7j")
 state_colors = [Color(1, 1, 1, 1), Color(0, 0.87, 0, 1), Color(0.65, 0.0715, 0.0715, 1)]
-show_functional = null
 metadata/unit_name = ["уарэп-яу07-1к"]
 metadata/online_proc = "on_line_changed"
 
@@ -1268,6 +1277,17 @@ sprite_frames = SubResource("SpriteFrames_foasq")
 frame_progress = 0.72355
 script = ExtResource("11_u7tym")
 
+[node name="pic_functional" type="TextureRect" parent="pribor_prd_k_1"]
+visible = false
+z_index = 1
+layout_mode = 0
+offset_left = -1163.0
+offset_top = 10.0
+offset_right = 600.0
+offset_bottom = 973.0
+scale = Vector2(0.883479, 0.883479)
+texture = ExtResource("16_32yvq")
+
 [node name="pribor_prd_v_4" type="TextureButton" parent="." groups=["pribor_buttons"]]
 editor_description = "Кнопка для выбора прибора."
 layout_mode = 0
@@ -1283,7 +1303,6 @@ texture_normal = ExtResource("6_i1yfn")
 stretch_mode = 4
 script = ExtResource("3_4pt7j")
 state_colors = [Color(1, 1, 1, 1), Color(0, 0.87, 0, 1), Color(0.65, 0.0715, 0.0715, 1)]
-show_functional = null
 metadata/unit_name = ["уарэп-яу07-4в"]
 metadata/online_proc = "on_line_changed"
 
@@ -1320,6 +1339,17 @@ sprite_frames = SubResource("SpriteFrames_foasq")
 frame_progress = 0.72355
 script = ExtResource("11_u7tym")
 
+[node name="pic_functional" type="TextureRect" parent="pribor_prd_v_4"]
+visible = false
+z_index = 1
+layout_mode = 0
+offset_left = -923.0
+offset_top = -144.0
+offset_right = 669.0
+offset_bottom = 664.0
+scale = Vector2(0.976707, 0.976707)
+texture = ExtResource("9_w6m6a")
+
 [node name="pribor_prd_n_4" type="TextureButton" parent="." groups=["pribor_buttons"]]
 editor_description = "Кнопка для выбора прибора."
 layout_mode = 0
@@ -1335,7 +1365,6 @@ texture_normal = ExtResource("6_i1yfn")
 stretch_mode = 4
 script = ExtResource("3_4pt7j")
 state_colors = [Color(1, 1, 1, 1), Color(0, 0.87, 0, 1), Color(0.65, 0.0715, 0.0715, 1)]
-show_functional = null
 metadata/unit_name = ["уарэп-яу07-4н"]
 metadata/online_proc = "on_line_changed"
 
@@ -1372,6 +1401,17 @@ sprite_frames = SubResource("SpriteFrames_foasq")
 frame_progress = 0.72355
 script = ExtResource("11_u7tym")
 
+[node name="pic_functional" type="TextureRect" parent="pribor_prd_n_4"]
+visible = false
+z_index = 1
+layout_mode = 0
+offset_left = -919.0
+offset_top = -485.0
+offset_right = 686.0
+offset_bottom = 336.0
+scale = Vector2(0.968111, 0.968111)
+texture = ExtResource("9_qe1go")
+
 [node name="pribor_prd_k_4" type="TextureButton" parent="." groups=["pribor_buttons"]]
 editor_description = "Кнопка для выбора прибора."
 layout_mode = 0
@@ -1387,7 +1427,6 @@ texture_normal = ExtResource("6_i1yfn")
 stretch_mode = 4
 script = ExtResource("3_4pt7j")
 state_colors = [Color(1, 1, 1, 1), Color(0, 0.87, 0, 1), Color(0.65, 0.0715, 0.0715, 1)]
-show_functional = null
 metadata/unit_name = ["уарэп-яу07-4к"]
 metadata/online_proc = "on_line_changed"
 
@@ -1424,6 +1463,17 @@ sprite_frames = SubResource("SpriteFrames_foasq")
 frame_progress = 0.72355
 script = ExtResource("11_u7tym")
 
+[node name="pic_functional" type="TextureRect" parent="pribor_prd_k_4"]
+visible = false
+z_index = 1
+layout_mode = 0
+offset_left = -924.0
+offset_top = -315.0
+offset_right = 839.0
+offset_bottom = 648.0
+scale = Vector2(0.879295, 0.879295)
+texture = ExtResource("16_32yvq")
+
 [node name="txr_legend0" type="TextureRect" parent="."]
 layout_mode = 0
 offset_left = 219.0
@@ -1494,11 +1544,12 @@ vertical_alignment = 1
 
 [node name="chk_show_functional" type="CheckButton" parent="lbl_header"]
 layout_mode = 0
-offset_left = 452.0
-offset_top = 4.0
-offset_right = 578.0
-offset_bottom = 31.0
-text = "Показть Э2"
+offset_left = 972.0
+offset_top = -1.0
+offset_right = 1351.0
+offset_bottom = 33.0
+theme_override_font_sizes/font_size = 22
+text = "Показть функциональную схему Э2"
 flat = true
 
 [node name="connect_legend0" type="AnimatedSprite2D" parent="."]
@@ -1554,6 +1605,16 @@ points = PackedVector2Array(-8, 0, 608, 0)
 width = 2.0
 default_color = Color(1, 1, 1, 0.352941)
 
+[node name="pic_functional" type="TextureRect" parent="."]
+visible = false
+layout_mode = 0
+offset_left = -962.0
+offset_top = 73.0
+offset_right = 96.9999
+offset_bottom = 746.0
+scale = Vector2(5, 5)
+texture = ExtResource("22_1s34a")
+
 [connection signal="toggled" from="pribor_prd_n_1" to="pribor_prd_n_1" method="_on_toggled"]
 [connection signal="toggled" from="pribor_uf" to="pribor_uf" method="_on_toggled"]
 [connection signal="toggled" from="pribor_rtr" to="pribor_rtr" method="_on_toggled"]