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

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

data/АФСП-РТР.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://vdhmga62vjsj"
+path="res://.godot/imported/АФСП-РТР.png-0b840f65d8791cdd41736204e8128ac9.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://data/АФСП-РТР.png"
+dest_files=["res://.godot/imported/АФСП-РТР.png-0b840f65d8791cdd41736204e8128ac9.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1

data/У-РЭП-РПД-В.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://b2vf7en1jj8dv"
+path="res://.godot/imported/У-РЭП-РПД-В.png-16e53650006353b1f4857905926a9d2e.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://data/У-РЭП-РПД-В.png"
+dest_files=["res://.godot/imported/У-РЭП-РПД-В.png-16e53650006353b1f4857905926a9d2e.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1

data/У-РЭП-РПД-К.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://dm350ta8noa0v"
+path="res://.godot/imported/У-РЭП-РПД-К.png-382bf7e19c5207a25529ff47820a3140.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://data/У-РЭП-РПД-К.png"
+dest_files=["res://.godot/imported/У-РЭП-РПД-К.png-382bf7e19c5207a25529ff47820a3140.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1

data/У-РЭП-РПД-Н.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://bktiige0i2lhl"
+path="res://.godot/imported/У-РЭП-РПД-Н.png-1812f48d3e2d228cc07e3a1f352eee1f.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://data/У-РЭП-РПД-Н.png"
+dest_files=["res://.godot/imported/У-РЭП-РПД-Н.png-1812f48d3e2d228cc07e3a1f352eee1f.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1

data/У-УФ.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://u7h3l0jjrsnp"
+path="res://.godot/imported/У-УФ.png-e70ef42c717c17d1d5bd404916252ea3.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://data/У-УФ.png"
+dest_files=["res://.godot/imported/У-УФ.png-e70ef42c717c17d1d5bd404916252ea3.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1

data/У-ЭП.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://c3cyog3gy24ft"
+path="res://.godot/imported/У-ЭП.png-5de01103a8e9a06ea0e900facdc90d4d.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://data/У-ЭП.png"
+dest_files=["res://.godot/imported/У-ЭП.png-5de01103a8e9a06ea0e900facdc90d4d.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1

data/УА-РЭП.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://cllxcfa130vqu"
+path="res://.godot/imported/УА-РЭП.png-2578a93f5ba5f7909945125656980bd6.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://data/УА-РЭП.png"
+dest_files=["res://.godot/imported/УА-РЭП.png-2578a93f5ba5f7909945125656980bd6.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1

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

@@ -12,10 +12,16 @@
 [ext_resource type="Texture2D" uid="uid://c6nve6f8sfyj2" path="res://data/состояние-исправности-0.png" id="7_6j01w"]
 [ext_resource type="Texture2D" uid="uid://u3tnejvpm8it" path="res://data/disconnect-a.png" id="8_gs2be"]
 [ext_resource type="Texture2D" uid="uid://dnreyfh3cd1k2" path="res://data/состояние-исправности-1.png" id="8_isjua"]
-[ext_resource type="Texture2D" uid="uid://bj6gixv60xcrq" path="res://data/Структура1.wmf.png" id="9_8r80x"]
 [ext_resource type="Texture2D" uid="uid://b4isaggma6q3" path="res://data/Грани22.png" id="9_iqgf5"]
 [ext_resource type="Texture2D" uid="uid://c6booa8753u5t" path="res://data/состояние-исправности-2.png" id="9_ll0vs"]
+[ext_resource type="Texture2D" uid="uid://bktiige0i2lhl" path="res://data/У-РЭП-РПД-Н.png" id="9_qe1go"]
+[ext_resource type="Texture2D" uid="uid://b2vf7en1jj8dv" path="res://data/У-РЭП-РПД-В.png" id="9_w6m6a"]
+[ext_resource type="Texture2D" uid="uid://u7h3l0jjrsnp" path="res://data/У-УФ.png" id="11_gjf0t"]
 [ext_resource type="Script" uid="uid://bncy1x53jp73d" path="res://scenes/контроль/connect_pribor.gd" id="11_u7tym"]
+[ext_resource type="Texture2D" uid="uid://vdhmga62vjsj" path="res://data/АФСП-РТР.png" id="13_32yvq"]
+[ext_resource type="Texture2D" uid="uid://dm350ta8noa0v" path="res://data/У-РЭП-РПД-К.png" id="16_32yvq"]
+[ext_resource type="Texture2D" uid="uid://c3cyog3gy24ft" path="res://data/У-ЭП.png" id="16_gjf0t"]
+[ext_resource type="Texture2D" uid="uid://cllxcfa130vqu" path="res://data/УА-РЭП.png" id="22_1s34a"]
 
 [sub_resource type="GDScript" id="GDScript_iqgf5"]
 script/source = "extends Panel
@@ -182,6 +188,8 @@ grow_horizontal = 2
 grow_vertical = 2
 script = SubResource("GDScript_iqgf5")
 metadata/_edit_lock_ = true
+metadata/_edit_vertical_guides_ = [21.0, 1578.0]
+metadata/_edit_horizontal_guides_ = [200.0, 51.0]
 
 [node name="capsrpb" type="TextureRect" parent="." groups=["pribor_pics"]]
 editor_description = "Кнопка для отображения внешних соединений."
@@ -411,13 +419,14 @@ script = ExtResource("11_u7tym")
 
 [node name="pic_functional" type="TextureRect" parent="pribor_prd_n_1"]
 visible = false
+z_index = 1
 layout_mode = 0
-offset_left = -962.0
-offset_top = 73.0
-offset_right = 96.9999
-offset_bottom = 746.0
-scale = Vector2(0.737826, 0.948813)
-texture = ExtResource("9_8r80x")
+offset_left = -1029.0
+offset_top = 9.0
+offset_right = 576.0
+offset_bottom = 830.0
+scale = Vector2(0.97094, 0.97094)
+texture = ExtResource("9_qe1go")
 
 [node name="pribor_uf" type="TextureButton" parent="." groups=["pribor_buttons"]]
 editor_description = "Кнопка для выбора прибора."
@@ -474,13 +483,14 @@ script = ExtResource("11_u7tym")
 
 [node name="pic_functional" type="TextureRect" parent="pribor_uf"]
 visible = false
+z_index = 1
 layout_mode = 0
-offset_left = -962.0
-offset_top = 73.0
-offset_right = 96.9999
-offset_bottom = 746.0
-scale = Vector2(0.737826, 0.948813)
-texture = ExtResource("9_8r80x")
+offset_left = -1155.0
+offset_top = -362.0
+offset_right = -96.0001
+offset_bottom = 311.0
+scale = Vector2(0.789429, 0.789429)
+texture = ExtResource("11_gjf0t")
 
 [node name="pribor_rtr" type="TextureButton" parent="." groups=["pribor_buttons"]]
 editor_description = "Кнопка для выбора прибора."
@@ -544,6 +554,17 @@ sprite_frames = SubResource("SpriteFrames_foasq")
 frame_progress = 0.72355
 script = ExtResource("11_u7tym")
 
+[node name="pic_functional" type="TextureRect" parent="pribor_rtr"]
+visible = false
+z_index = 1
+layout_mode = 0
+offset_left = -1036.0
+offset_top = -394.0
+offset_right = 927.0
+offset_bottom = 595.0
+scale = Vector2(0.792688, 0.792688)
+texture = ExtResource("13_32yvq")
+
 [node name="pribor_afsp_1" type="TextureButton" parent="." groups=["pribor_buttons"]]
 editor_description = "Кнопка для выбора прибора."
 layout_mode = 0
@@ -610,6 +631,17 @@ sprite_frames = SubResource("SpriteFrames_foasq")
 frame_progress = 0.72355
 script = ExtResource("11_u7tym")
 
+[node name="pic_functional" type="TextureRect" parent="pribor_afsp_1"]
+visible = false
+z_index = 1
+layout_mode = 0
+offset_left = -5120.0
+offset_top = -895.0
+offset_right = -3157.0
+offset_bottom = 93.9999
+scale = Vector2(3.96323, 3.96323)
+texture = ExtResource("13_32yvq")
+
 [node name="pribor_afsp_2" type="TextureButton" parent="." groups=["pribor_buttons"]]
 editor_description = "Кнопка для выбора прибора."
 layout_mode = 0
@@ -677,6 +709,17 @@ sprite_frames = SubResource("SpriteFrames_foasq")
 frame_progress = 0.72355
 script = ExtResource("11_u7tym")
 
+[node name="pic_functional" type="TextureRect" parent="pribor_afsp_2"]
+visible = false
+z_index = 1
+layout_mode = 0
+offset_left = -6070.0
+offset_top = -900.0
+offset_right = -4107.0
+offset_bottom = 89.0001
+scale = Vector2(3.96409, 4.54663)
+texture = ExtResource("13_32yvq")
+
 [node name="pribor_uyep" type="TextureButton" parent="." groups=["pribor_buttons"]]
 editor_description = "Кнопка для выбора прибора."
 layout_mode = 0
@@ -728,6 +771,17 @@ sprite_frames = SubResource("SpriteFrames_foasq")
 frame_progress = 0.872305
 script = ExtResource("11_u7tym")
 
+[node name="pic_functional" type="TextureRect" parent="pribor_uyep"]
+visible = false
+z_index = 1
+layout_mode = 0
+offset_left = -1292.0
+offset_top = -365.0
+offset_right = 821.0
+offset_bottom = 764.0
+scale = Vector2(0.736875, 0.814493)
+texture = ExtResource("16_gjf0t")
+
 [node name="pribor_prd_v_2" type="TextureButton" parent="." groups=["pribor_buttons"]]
 editor_description = "Кнопка для выбора прибора."
 layout_mode = 0
@@ -780,6 +834,17 @@ sprite_frames = SubResource("SpriteFrames_foasq")
 frame_progress = 0.72355
 script = ExtResource("11_u7tym")
 
+[node name="pic_functional" type="TextureRect" parent="pribor_prd_v_2"]
+visible = false
+z_index = 1
+layout_mode = 0
+offset_left = -1419.0
+offset_top = -480.0
+offset_right = 173.0
+offset_bottom = 328.0
+scale = Vector2(0.977411, 0.977411)
+texture = ExtResource("9_w6m6a")
+
 [node name="pribor_prd_n_2" type="TextureButton" parent="." groups=["pribor_buttons"]]
 editor_description = "Кнопка для выбора прибора."
 layout_mode = 0
@@ -834,6 +899,17 @@ sprite_frames = SubResource("SpriteFrames_foasq")
 frame_progress = 0.72355
 script = ExtResource("11_u7tym")
 
+[node name="pic_functional" type="TextureRect" parent="pribor_prd_n_2"]
+visible = false
+z_index = 1
+layout_mode = 0
+offset_left = -1419.0
+offset_top = -145.0
+offset_right = 186.0
+offset_bottom = 676.0
+scale = Vector2(0.96888, 0.96888)
+texture = ExtResource("9_qe1go")
+
 [node name="pribor_prd_k_2" type="TextureButton" parent="." groups=["pribor_buttons"]]
 editor_description = "Кнопка для выбора прибора."
 layout_mode = 0
@@ -886,6 +962,17 @@ sprite_frames = SubResource("SpriteFrames_foasq")
 frame_progress = 0.72355
 script = ExtResource("11_u7tym")
 
+[node name="pic_functional" type="TextureRect" parent="pribor_prd_k_2"]
+visible = false
+z_index = 1
+layout_mode = 0
+offset_left = -1418.0
+offset_top = -314.0
+offset_right = 345.0
+offset_bottom = 649.0
+scale = Vector2(0.881522, 0.881522)
+texture = ExtResource("16_32yvq")
+
 [node name="pribor_prd_v_3" type="TextureButton" parent="." groups=["pribor_buttons"]]
 editor_description = "Кнопка для выбора прибора."
 layout_mode = 0
@@ -938,6 +1025,17 @@ sprite_frames = SubResource("SpriteFrames_foasq")
 frame_progress = 0.72355
 script = ExtResource("11_u7tym")
 
+[node name="pic_functional" type="TextureRect" parent="pribor_prd_v_3"]
+visible = false
+z_index = 1
+layout_mode = 0
+offset_left = -1026.0
+offset_top = -601.0
+offset_right = 566.0
+offset_bottom = 207.0
+scale = Vector2(0.975409, 0.975409)
+texture = ExtResource("9_w6m6a")
+
 [node name="pribor_prd_n_3" type="TextureButton" parent="." groups=["pribor_buttons"]]
 editor_description = "Кнопка для выбора прибора."
 layout_mode = 0
@@ -990,6 +1088,17 @@ sprite_frames = SubResource("SpriteFrames_foasq")
 frame_progress = 0.72355
 script = ExtResource("11_u7tym")
 
+[node name="pic_functional" type="TextureRect" parent="pribor_prd_n_3"]
+visible = false
+z_index = 1
+layout_mode = 0
+offset_left = -1302.0
+offset_top = -602.0
+offset_right = 303.0
+offset_bottom = 219.0
+scale = Vector2(0.969291, 0.969291)
+texture = ExtResource("9_qe1go")
+
 [node name="pribor_prd_k_3" type="TextureButton" parent="." groups=["pribor_buttons"]]
 editor_description = "Кнопка для выбора прибора."
 layout_mode = 0
@@ -1042,6 +1151,17 @@ sprite_frames = SubResource("SpriteFrames_foasq")
 frame_progress = 0.72355
 script = ExtResource("11_u7tym")
 
+[node name="pic_functional" type="TextureRect" parent="pribor_prd_k_3"]
+visible = false
+z_index = 1
+layout_mode = 0
+offset_left = -1167.0
+offset_top = -602.0
+offset_right = 596.0
+offset_bottom = 361.0
+scale = Vector2(0.882165, 0.896739)
+texture = ExtResource("16_32yvq")
+
 [node name="pribor_prd_v_1" type="TextureButton" parent="." groups=["pribor_buttons"]]
 editor_description = "Кнопка для выбора прибора."
 layout_mode = 0
@@ -1058,6 +1178,7 @@ 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"
 
@@ -1110,6 +1231,7 @@ 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"
 
@@ -1161,6 +1283,7 @@ 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"
 
@@ -1212,6 +1335,7 @@ 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"
 
@@ -1263,6 +1387,7 @@ 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"