diff --git a/data/РТР.png b/data/РТР.png new file mode 100644 index 0000000..6f3cd44 Binary files /dev/null and b/data/РТР.png differ diff --git a/data/РТР.png.import b/data/РТР.png.import new file mode 100644 index 0000000..955653b --- /dev/null +++ b/data/РТР.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://5dm8b0hcmkc3" +path="res://.godot/imported/РТР.png-4dffef42cf4e5844aa84c964b0a8a676.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://data/РТР.png" +dest_files=["res://.godot/imported/РТР.png-4dffef42cf4e5844aa84c964b0a8a676.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 diff --git a/data/Щ3-mnemo.png b/data/Щ3-mnemo.png new file mode 100644 index 0000000..44f58f3 Binary files /dev/null and b/data/Щ3-mnemo.png differ diff --git a/data/Щ3-mnemo.png.import b/data/Щ3-mnemo.png.import new file mode 100644 index 0000000..7cc0794 --- /dev/null +++ b/data/Щ3-mnemo.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://rkvki3gs2kk0" +path="res://.godot/imported/Щ3-mnemo.png-7a21825106619ee1b5125d77505fb52b.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://data/Щ3-mnemo.png" +dest_files=["res://.godot/imported/Щ3-mnemo.png-7a21825106619ee1b5125d77505fb52b.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 diff --git a/scenes/bip/bip.gd b/scenes/bip/bip.gd index 64a4456..9a06c4f 100644 --- a/scenes/bip/bip.gd +++ b/scenes/bip/bip.gd @@ -20,6 +20,7 @@ func set_ecm_visible(value: bool): $ecm_done.visible = value func _on_bip_gui_input(event): + print_debug(event) if event is InputEventMouseButton and event.pressed: match event.button_index: MOUSE_BUTTON_LEFT: diff --git a/scenes/frame-ecm-list/scroll-ecm-list.gd b/scenes/frame-ecm-list/scroll-ecm-list.gd index b7f5e43..a417d70 100644 --- a/scenes/frame-ecm-list/scroll-ecm-list.gd +++ b/scenes/frame-ecm-list/scroll-ecm-list.gd @@ -49,7 +49,6 @@ const COLUMN_STATE = 4 func on_row_pressed(i_row: int): $table.clear_rows_selected() $table.set_row_selected(i_row, true) - $table.ensure_row_visible(i_row) var ecm = $table.get_node_user_data(0, i_row) if interfer.thrs.has(ecm.ispp): signaller.emit_signal('rto_threat_sel', interfer.thrs[ecm.ispp]) @@ -66,7 +65,6 @@ func on_rto_threat_sel(th_id: int, table_index): ecm = $table.get_node_user_data(0, i_row) $table.clear_rows_selected() $table.set_row_selected(i_row, true) - $table.ensure_row_visible(i_row) else: $table.clear_rows_selected() signaller.emit_signal('interfer_selected', ecm) @@ -113,7 +111,6 @@ func on_interfer_new(ecm, table_index): table_index[ecm.ispp] = i_row $table.clear_rows_selected() $table.set_row_selected(i_row, true) - $table.ensure_row_visible(i_row) signaller.emit_signal('interfer_selected', ecm) diff --git a/scenes/pribor-rtr/pribor-rtr.tscn b/scenes/pribor-rtr/pribor-rtr.tscn index a3718a4..3aaa8f6 100644 --- a/scenes/pribor-rtr/pribor-rtr.tscn +++ b/scenes/pribor-rtr/pribor-rtr.tscn @@ -1,6 +1,87 @@ -[gd_scene format=3 uid="uid://5uv1idl3lqet"] +[gd_scene load_steps=3 format=3 uid="uid://5uv1idl3lqet"] + +[ext_resource type="PackedScene" uid="uid://d3iqb5e4g81m5" path="res://scenes/контроль/element_h.tscn" id="2_e75yj"] +[ext_resource type="Texture2D" uid="uid://c4mdrmk7h638f" path="res://data/nine-patch-round.png" id="3_a2683"] [node name="pribor_UF" type="Node2D"] [node name="test_label" type="Label" parent="."] text = "Здесь будет схема прибора РТР" + +[node name="ref_A23" parent="." instance=ExtResource("2_e75yj")] +offset_left = 499.0 +offset_top = 185.0 +offset_right = 659.0 +offset_bottom = 340.0 +fname = "MAA2000" +rname = "A23" +state = 1 + +[node name="ref_A24" parent="." instance=ExtResource("2_e75yj")] +offset_left = 457.0 +offset_top = 508.0 +offset_right = 767.0 +offset_bottom = 666.0 +fname = "Модуль процессорный O31S.B" +rname = "A24" +state = 1 + +[node name="ref_A26" parent="." instance=ExtResource("2_e75yj")] +offset_left = 460.0 +offset_top = 871.0 +offset_right = 770.0 +offset_bottom = 1029.0 +fname = "Модуль процессорный O31S.B" +rname = "A27" +state = 1 + +[node name="ref_A25" parent="." instance=ExtResource("2_e75yj")] +offset_left = 193.0 +offset_top = 549.0 +offset_right = 398.0 +offset_bottom = 665.0 +fname = "Плата" +rname = "A25" +state = 1 + +[node name="ref_A27" parent="." instance=ExtResource("2_e75yj")] +offset_left = 192.0 +offset_top = 915.0 +offset_right = 397.0 +offset_bottom = 1031.0 +fname = "Плата" +rname = "A27" +state = 1 + +[node name="ref_G1" type="NinePatchRect" parent="."] +offset_left = 394.0 +offset_top = 157.0 +offset_right = 786.0 +offset_bottom = 367.0 +texture = ExtResource("3_a2683") +patch_margin_left = 16 +patch_margin_top = 16 +patch_margin_right = 16 +patch_margin_bottom = 16 + +[node name="ref_A1" type="NinePatchRect" parent="."] +offset_left = 123.0 +offset_top = 434.0 +offset_right = 783.0 +offset_bottom = 728.0 +texture = ExtResource("3_a2683") +patch_margin_left = 16 +patch_margin_top = 16 +patch_margin_right = 16 +patch_margin_bottom = 16 + +[node name="ref_A2" type="NinePatchRect" parent="."] +offset_left = 124.0 +offset_top = 803.0 +offset_right = 784.0 +offset_bottom = 1097.0 +texture = ExtResource("3_a2683") +patch_margin_left = 16 +patch_margin_top = 16 +patch_margin_right = 16 +patch_margin_bottom = 16 diff --git a/scenes/pribor-sch3/pribor-sch3.tscn b/scenes/pribor-sch3/pribor-sch3.tscn index 35b10b8..257d74b 100644 --- a/scenes/pribor-sch3/pribor-sch3.tscn +++ b/scenes/pribor-sch3/pribor-sch3.tscn @@ -1,6 +1,115 @@ -[gd_scene format=3 uid="uid://bs7h65e7bodp3"] +[gd_scene load_steps=5 format=3 uid="uid://bs7h65e7bodp3"] + +[ext_resource type="Texture2D" uid="uid://c4mdrmk7h638f" path="res://data/nine-patch-round.png" id="1_7xobt"] +[ext_resource type="PackedScene" uid="uid://p2suppildvq0" path="res://scenes/контроль/element_v.tscn" id="2_bp8jp"] +[ext_resource type="Texture2D" uid="uid://c6nve6f8sfyj2" path="res://data/состояние-исправности-0.png" id="3_vvbft"] +[ext_resource type="Texture2D" uid="uid://c6booa8753u5t" path="res://data/состояние-исправности-2.png" id="4_ly6ja"] [node name="pribor_UF" type="Node2D"] [node name="test_label" type="Label" parent="."] text = "Здесь будет схема прибора Щ3" + +[node name="ref_G1" type="NinePatchRect" parent="."] +offset_left = 98.0 +offset_top = 184.0 +offset_right = 756.0 +offset_bottom = 1122.0 +texture = ExtResource("1_7xobt") +patch_margin_left = 16 +patch_margin_top = 16 +patch_margin_right = 16 +patch_margin_bottom = 16 + +[node name="ref_A1" parent="." instance=ExtResource("2_bp8jp")] +offset_left = 175.0 +offset_top = 529.0 +offset_right = 332.0 +offset_bottom = 984.0 +self_size = Vector2i(157, 455) +fname = "МАА150-1С27" +rname = "A1" +state = 1 + +[node name="ref_A2" parent="." instance=ExtResource("2_bp8jp")] +offset_left = 496.0 +offset_top = 531.0 +offset_right = 631.0 +offset_bottom = 988.0 +self_size = Vector2i(135, 457) +fname = "МАА150-1С27" +rname = "A2" +state = 1 + +[node name="ref_A3" parent="." instance=ExtResource("2_bp8jp")] +offset_left = 377.0 +offset_top = 531.0 +offset_right = 468.0 +offset_bottom = 985.0 +self_size = Vector2i(91, 454) +fname = "МАА150-1С27" +rname = "A2" +state = 1 + +[node name="lbl_legend1" type="Label" parent="."] +self_modulate = Color(1, 1, 1, 0.627451) +offset_left = 130.0 +offset_top = 1064.0 +offset_right = 203.0 +offset_bottom = 1084.0 +theme_override_font_sizes/font_size = 17 +text = "Исправно" + +[node name="txr_legend0" type="TextureRect" parent="."] +offset_left = 302.0 +offset_top = 1064.0 +offset_right = 526.0 +offset_bottom = 1288.0 +scale = Vector2(0.1, 0.1) +texture = ExtResource("3_vvbft") + +[node name="lbl_legend0" type="Label" parent="."] +self_modulate = Color(1, 1, 1, 0.627451) +offset_left = 330.0 +offset_top = 1064.0 +offset_right = 486.0 +offset_bottom = 1084.0 +theme_override_font_sizes/font_size = 17 +text = "Ожидание результата" + +[node name="txr_legend2" type="TextureRect" parent="."] +offset_left = 559.0 +offset_top = 1064.0 +offset_right = 783.0 +offset_bottom = 1288.0 +scale = Vector2(0.1, 0.1) +texture = ExtResource("4_ly6ja") + +[node name="lbl_legend2" type="Label" parent="."] +self_modulate = Color(1, 1, 1, 0.627451) +offset_left = 587.0 +offset_top = 1064.0 +offset_right = 743.0 +offset_bottom = 1084.0 +theme_override_font_sizes/font_size = 17 +text = "Сбой" + +[node name="lbl_header" type="Label" parent="."] +offset_left = 10.0 +offset_top = 195.0 +offset_right = 865.0 +offset_bottom = 221.0 +theme_override_font_sizes/font_size = 22 +text = "Схема контроля прибора Щ3" +horizontal_alignment = 1 +vertical_alignment = 1 + +[node name="Label" type="Label" parent="."] +self_modulate = Color(0.835294, 0.141176, 0.286275, 1) +offset_left = 244.0 +offset_top = 1039.0 +offset_right = 619.0 +offset_bottom = 1058.0 +text = "** Позиционные обозначения требуют уточнения **" +horizontal_alignment = 1 +vertical_alignment = 1