diff --git a/data/прд-н-1-мнемо.png b/data/прд-н-1-мнемо.png new file mode 100644 index 0000000..ada19b1 Binary files /dev/null and b/data/прд-н-1-мнемо.png differ diff --git a/data/прд-н-1-мнемо.png.import b/data/прд-н-1-мнемо.png.import new file mode 100644 index 0000000..556cd5d --- /dev/null +++ b/data/прд-н-1-мнемо.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://b1brrobrh4abl" +path="res://.godot/imported/прд-н-1-мнемо.png-b182e3c955273e94b2b553f63ee3d54b.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://data/прд-н-1-мнемо.png" +dest_files=["res://.godot/imported/прд-н-1-мнемо.png-b182e3c955273e94b2b553f63ee3d54b.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/прд-н-1.png b/data/прд-н-1.png new file mode 100644 index 0000000..658dd66 Binary files /dev/null and b/data/прд-н-1.png differ diff --git a/data/прд-н-1.png.import b/data/прд-н-1.png.import new file mode 100644 index 0000000..b67d962 --- /dev/null +++ b/data/прд-н-1.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://b374sx8vongp8" +path="res://.godot/imported/прд-н-1.png-de5109feb392b36ebc078a61c3b36e94.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://data/прд-н-1.png" +dest_files=["res://.godot/imported/прд-н-1.png-de5109feb392b36ebc078a61c3b36e94.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/project.godot b/project.godot index a605683..b014571 100644 --- a/project.godot +++ b/project.godot @@ -11,7 +11,7 @@ config_version=5 [application] config/name="uarep-ctl" -run/main_scene="res://scenes/tab-switch.tscn" +run/main_scene="res://scenes/tabs-switch/tab-switch.tscn" config/features=PackedStringArray("4.2") run/low_processor_mode=true run/delta_smoothing=false diff --git a/scenes/bip.gd b/scenes/bip/bip.gd similarity index 100% rename from scenes/bip.gd rename to scenes/bip/bip.gd diff --git a/scenes/bip.tscn b/scenes/bip/bip.tscn similarity index 97% rename from scenes/bip.tscn rename to scenes/bip/bip.tscn index d66fbad..f1601e5 100644 --- a/scenes/bip.tscn +++ b/scenes/bip/bip.tscn @@ -1,11 +1,11 @@ [gd_scene load_steps=14 format=3 uid="uid://nl1vklubr5kr"] -[ext_resource type="Script" path="res://scenes/bip.gd" id="1_4t8mr"] -[ext_resource type="Shader" path="res://shaders/bip.gdshader" id="2_17aco"] -[ext_resource type="Shader" path="res://shaders/tracked.gdshader" id="3_fiufo"] +[ext_resource type="Script" path="res://scenes/bip/bip.gd" id="1_h7l70"] +[ext_resource type="Shader" path="res://shaders/bip.gdshader" id="2_rt0la"] +[ext_resource type="Shader" path="res://shaders/tracked.gdshader" id="3_2a1qb"] [sub_resource type="ShaderMaterial" id="ShaderMaterial_2dulj"] -shader = ExtResource("2_17aco") +shader = ExtResource("2_rt0la") shader_parameter/color = Color(0.972549, 0.12549, 0.411765, 1) shader_parameter/color_up = Color(1, 1, 1, 1) shader_parameter/tick_update = 0 @@ -206,7 +206,7 @@ shader_parameter/ant_band_r0_0 = 0.47 shader_parameter/ant_band_r1_0 = 0.5 [sub_resource type="ShaderMaterial" id="ShaderMaterial_lkrha"] -shader = ExtResource("3_fiufo") +shader = ExtResource("3_2a1qb") shader_parameter/ColorFig = Color(0, 0.862745, 0, 1) shader_parameter/point_1 = Vector2(0.125, 0) shader_parameter/point_2 = Vector2(0.125, 0.036) @@ -226,7 +226,7 @@ layout_mode = 3 anchors_preset = 0 offset_right = 20.0 offset_bottom = 20.0 -script = ExtResource("1_4t8mr") +script = ExtResource("1_h7l70") [node name="bip" type="TextureButton" parent="."] material = SubResource("ShaderMaterial_2dulj") diff --git a/scenes/btn_scale.tscn b/scenes/btn_scale/btn_scale.tscn similarity index 100% rename from scenes/btn_scale.tscn rename to scenes/btn_scale/btn_scale.tscn diff --git a/scenes/button-flat.gdshader b/scenes/button-flat.gdshader deleted file mode 100644 index 8f0b8a1..0000000 --- a/scenes/button-flat.gdshader +++ /dev/null @@ -1,16 +0,0 @@ -shader_type canvas_item; - -uniform vec4 color_gap = vec4(0.0, 0.0, 0.0, 0.0); -uniform vec4 color_stripe = vec4(0.3, 0.3, 0.3, 0.7); -uniform float divisions = 50.0; // increase for more stripe density -uniform float stripe_bias = 2.0; // 1.0 means no stripes; 2.0 means stripes and gaps are equal size -uniform float speed = 0.01; -uniform float angle = 0.7854; // in radians -uniform bool disabled = false; - -void fragment() -{ - float w = cos(angle) * UV.x + sin(angle) * UV.y - speed * TIME; - float rc = floor(float(mod(w * divisions, stripe_bias) < 0.0001)) * float(disabled); - COLOR = color_gap * rc + color_stripe * (1.0 - rc); -} diff --git a/scenes/button-flat.tscn b/scenes/button-flat/button-flat.tscn similarity index 93% rename from scenes/button-flat.tscn rename to scenes/button-flat/button-flat.tscn index 0a5b3d6..ab9a290 100644 --- a/scenes/button-flat.tscn +++ b/scenes/button-flat/button-flat.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=13 format=3 uid="uid://da7w3vkhadfwe"] -[ext_resource type="Script" path="res://scenes/nine-patch-button.gd" id="1_mm6jw"] -[ext_resource type="Texture2D" uid="uid://ct0ajcwno03h7" path="res://data/кнопка-квадрат-0.png" id="2_yle0i"] +[ext_resource type="Script" path="res://scenes/button-flat/nine-patch-button.gd" id="1_ui6sg"] +[ext_resource type="Texture2D" uid="uid://ct0ajcwno03h7" path="res://data/кнопка-квадрат-0.png" id="2_0cn5u"] [sub_resource type="StyleBoxEmpty" id="1"] @@ -75,12 +75,12 @@ extends Sprite2D offset_right = 30.0 offset_bottom = 30.0 theme_override_styles/panel = SubResource("1") -script = ExtResource("1_mm6jw") +script = ExtResource("1_ui6sg") toggle_mode = true [node name="state" type="NinePatchRect" parent="."] layout_mode = 2 -texture = ExtResource("2_yle0i") +texture = ExtResource("2_0cn5u") patch_margin_left = 10 patch_margin_top = 10 patch_margin_right = 10 diff --git a/scenes/nine-patch-button.gd b/scenes/button-flat/nine-patch-button.gd similarity index 100% rename from scenes/nine-patch-button.gd rename to scenes/button-flat/nine-patch-button.gd diff --git a/scenes/canvas.gd b/scenes/canvas/canvas.gd similarity index 100% rename from scenes/canvas.gd rename to scenes/canvas/canvas.gd diff --git a/scenes/canvas.tscn b/scenes/canvas/canvas.tscn similarity index 72% rename from scenes/canvas.tscn rename to scenes/canvas/canvas.tscn index 812b39a..84cdf2c 100644 --- a/scenes/canvas.tscn +++ b/scenes/canvas/canvas.tscn @@ -1,16 +1,16 @@ [gd_scene load_steps=7 format=3 uid="uid://b5kjdyxuwsot5"] -[ext_resource type="Material" uid="uid://s6xe8igevnv2" path="res://shaders/antenas.tres" id="1_itkeo"] -[ext_resource type="Script" path="res://scenes/canvas.gd" id="2_clpjo"] -[ext_resource type="PackedScene" uid="uid://c73ahpv8uiuc7" path="res://scenes/sector.tscn" id="3_kddns"] -[ext_resource type="Shader" path="res://shaders/sector.gdshader" id="4_q0nxn"] +[ext_resource type="Material" uid="uid://s6xe8igevnv2" path="res://shaders/antenas.tres" id="1_nh31y"] +[ext_resource type="Script" path="res://scenes/canvas/canvas.gd" id="2_rxxh6"] +[ext_resource type="PackedScene" uid="uid://c73ahpv8uiuc7" path="res://scenes/canvas/sector.tscn" id="3_8x5qa"] +[ext_resource type="Shader" path="res://shaders/sector.gdshader" id="4_gcyda"] [sub_resource type="PlaceholderTexture2D" id="PlaceholderTexture2D_2bft1"] size = Vector2(1600, 1200) [sub_resource type="ShaderMaterial" id="ShaderMaterial_lniyv"] resource_local_to_scene = true -shader = ExtResource("4_q0nxn") +shader = ExtResource("4_gcyda") shader_parameter/color = Color(1, 1, 1, 0.168627) shader_parameter/clip_color = Color(1, 0.5, 0.5, 1) shader_parameter/width = 45.0 @@ -20,12 +20,12 @@ shader_parameter/dir = 0.0 shader_parameter/inner_clip = 0.045 [node name="canvas" type="Sprite2D"] -material = ExtResource("1_itkeo") +material = ExtResource("1_nh31y") texture = SubResource("PlaceholderTexture2D_2bft1") centered = false -script = ExtResource("2_clpjo") +script = ExtResource("2_rxxh6") -[node name="строб" parent="." instance=ExtResource("3_kddns")] +[node name="строб" parent="." instance=ExtResource("3_8x5qa")] material = SubResource("ShaderMaterial_lniyv") position = Vector2(560, 560) scale = Vector2(1100, 1100) diff --git a/scenes/sector.tscn b/scenes/canvas/sector.tscn similarity index 88% rename from scenes/sector.tscn rename to scenes/canvas/sector.tscn index dddbccf..2d95a61 100644 --- a/scenes/sector.tscn +++ b/scenes/canvas/sector.tscn @@ -1,10 +1,10 @@ [gd_scene load_steps=4 format=3 uid="uid://c73ahpv8uiuc7"] -[ext_resource type="Shader" path="res://shaders/sector.gdshader" id="1_jalbg"] +[ext_resource type="Shader" path="res://shaders/sector.gdshader" id="1_e0gfn"] [sub_resource type="ShaderMaterial" id="ShaderMaterial_xo5or"] resource_local_to_scene = true -shader = ExtResource("1_jalbg") +shader = ExtResource("1_e0gfn") shader_parameter/color = Color(1, 1, 1, 0.168627) shader_parameter/clip_color = Color(1, 0.5, 0.5, 1) shader_parameter/width = 45.0 @@ -15,7 +15,7 @@ shader_parameter/inner_clip = 0.045 [sub_resource type="PlaceholderTexture2D" id="PlaceholderTexture2D_2lkm8"] -[node name="строб" type="Sprite2D"] +[node name="sector" type="Sprite2D"] material = SubResource("ShaderMaterial_xo5or") position = Vector2(610, 600) scale = Vector2(1108, 1108) diff --git a/scenes/cell-front-rear.tscn b/scenes/cell/cell-front-rear.tscn similarity index 78% rename from scenes/cell-front-rear.tscn rename to scenes/cell/cell-front-rear.tscn index 8efbdbd..f5f467c 100644 --- a/scenes/cell-front-rear.tscn +++ b/scenes/cell/cell-front-rear.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=4 format=3 uid="uid://b8txs4xi722wt"] -[ext_resource type="Script" path="res://scenes/cell-front.gd" id="1_g8e2k"] -[ext_resource type="Texture2D" uid="uid://c6yuv0b51aauw" path="res://data/фронт-задний-1.png" id="2_s86rq"] +[ext_resource type="Script" path="res://scenes/cell/cell-front.gd" id="1_2vfsf"] +[ext_resource type="Texture2D" uid="uid://c6yuv0b51aauw" path="res://data/фронт-задний-1.png" id="2_nlylb"] [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_2thpi"] bg_color = Color(0.8, 0.533333, 0.27451, 1) @@ -12,7 +12,7 @@ layout_mode = 3 anchors_preset = 0 offset_right = 71.0 offset_bottom = 21.0 -script = ExtResource("1_g8e2k") +script = ExtResource("1_2vfsf") [node name="label" type="Label" parent="."] clip_contents = true @@ -26,4 +26,4 @@ vertical_alignment = 1 [node name="Sprite2D" type="Sprite2D" parent="."] position = Vector2(58, 11) -texture = ExtResource("2_s86rq") +texture = ExtResource("2_nlylb") diff --git a/scenes/cell-front.gd b/scenes/cell/cell-front.gd similarity index 100% rename from scenes/cell-front.gd rename to scenes/cell/cell-front.gd diff --git a/scenes/cell-front.tscn b/scenes/cell/cell-front.tscn similarity index 78% rename from scenes/cell-front.tscn rename to scenes/cell/cell-front.tscn index 9d13285..c6b0acf 100644 --- a/scenes/cell-front.tscn +++ b/scenes/cell/cell-front.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=4 format=3 uid="uid://bccr42bckei41"] -[ext_resource type="Script" path="res://scenes/cell-front.gd" id="1_sd1qt"] -[ext_resource type="Texture2D" uid="uid://ysctr84e77dc" path="res://data/фронт-передний-1.png" id="2_64vta"] +[ext_resource type="Script" path="res://scenes/cell/cell-front.gd" id="1_s7c0f"] +[ext_resource type="Texture2D" uid="uid://ysctr84e77dc" path="res://data/фронт-передний-1.png" id="2_87fw5"] [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_2thpi"] bg_color = Color(0.8, 0.533333, 0.27451, 1) @@ -12,7 +12,7 @@ layout_mode = 3 anchors_preset = 0 offset_right = 71.0 offset_bottom = 21.0 -script = ExtResource("1_sd1qt") +script = ExtResource("1_s7c0f") [node name="label" type="Label" parent="."] clip_contents = true @@ -26,4 +26,4 @@ vertical_alignment = 1 [node name="Sprite2D" type="Sprite2D" parent="."] position = Vector2(16, 11) -texture = ExtResource("2_64vta") +texture = ExtResource("2_87fw5") diff --git a/scenes/count_all_pad.tscn b/scenes/count-all/count-all-pad.tscn similarity index 77% rename from scenes/count_all_pad.tscn rename to scenes/count-all/count-all-pad.tscn index eb73072..59d9f8d 100644 --- a/scenes/count_all_pad.tscn +++ b/scenes/count-all/count-all-pad.tscn @@ -1,12 +1,12 @@ [gd_scene load_steps=2 format=3 uid="uid://dymo732qc2doa"] -[ext_resource type="FontFile" uid="uid://befva8r034a4v" path="res://data/DSEG7Classic-Regular.ttf" id="1_omx3t"] +[ext_resource type="FontFile" uid="uid://befva8r034a4v" path="res://data/DSEG7Classic-Regular.ttf" id="1_l42jy"] [node name="count_all_pad" type="Label"] self_modulate = Color(0.403922, 0.403922, 0.403922, 1) offset_right = 33.0 offset_bottom = 23.0 -theme_override_fonts/font = ExtResource("1_omx3t") +theme_override_fonts/font = ExtResource("1_l42jy") theme_override_font_sizes/font_size = 20 text = "88" vertical_alignment = 1 @@ -15,7 +15,7 @@ vertical_alignment = 1 layout_mode = 0 offset_right = 33.0 offset_bottom = 23.0 -theme_override_fonts/font = ExtResource("1_omx3t") +theme_override_fonts/font = ExtResource("1_l42jy") theme_override_font_sizes/font_size = 20 text = "00" vertical_alignment = 1 diff --git a/scenes/count_danger_pad.tscn b/scenes/count-danger/count_danger_pad.tscn similarity index 80% rename from scenes/count_danger_pad.tscn rename to scenes/count-danger/count_danger_pad.tscn index 628b958..03b5559 100644 --- a/scenes/count_danger_pad.tscn +++ b/scenes/count-danger/count_danger_pad.tscn @@ -1,12 +1,12 @@ [gd_scene load_steps=2 format=3 uid="uid://bwti82byphl68"] -[ext_resource type="FontFile" uid="uid://befva8r034a4v" path="res://data/DSEG7Classic-Regular.ttf" id="1_1blw4"] +[ext_resource type="FontFile" uid="uid://befva8r034a4v" path="res://data/DSEG7Classic-Regular.ttf" id="1_xsxpy"] [node name="count_danger_pad" type="Label"] self_modulate = Color(0.403922, 0.403922, 0.403922, 1) offset_right = 92.0 offset_bottom = 63.0 -theme_override_fonts/font = ExtResource("1_1blw4") +theme_override_fonts/font = ExtResource("1_xsxpy") theme_override_font_sizes/font_size = 56 text = "88" horizontal_alignment = 1 @@ -17,7 +17,7 @@ modulate = Color(0.8, 0.533333, 0.27451, 1) layout_mode = 0 offset_right = 92.0 offset_bottom = 63.0 -theme_override_fonts/font = ExtResource("1_1blw4") +theme_override_fonts/font = ExtResource("1_xsxpy") theme_override_font_sizes/font_size = 56 text = "00" horizontal_alignment = 1 diff --git a/scenes/frm_ecm_list.tscn b/scenes/frame-ecm-list/frm_ecm_list.tscn similarity index 78% rename from scenes/frm_ecm_list.tscn rename to scenes/frame-ecm-list/frm_ecm_list.tscn index e19e309..fcd2223 100644 --- a/scenes/frm_ecm_list.tscn +++ b/scenes/frame-ecm-list/frm_ecm_list.tscn @@ -1,16 +1,16 @@ [gd_scene load_steps=5 format=3 uid="uid://7rvw671tlx2i"] -[ext_resource type="Texture2D" uid="uid://cs6i1xwx0pmdk" path="res://data/рамка-панели.png" id="1_6swor"] -[ext_resource type="Script" path="res://scenes/scroll-ecm-list.gd" id="2_3x81o"] -[ext_resource type="Script" path="res://table/table.gd" id="3_4hydx"] -[ext_resource type="PackedScene" uid="uid://da7w3vkhadfwe" path="res://scenes/button-flat.tscn" id="4_7ys3c"] +[ext_resource type="Texture2D" uid="uid://cs6i1xwx0pmdk" path="res://data/рамка-панели.png" id="1_i25vj"] +[ext_resource type="Script" path="res://scenes/frame-ecm-list/scroll-ecm-list.gd" id="2_qtnok"] +[ext_resource type="Script" path="res://table/table.gd" id="3_pqvqk"] +[ext_resource type="PackedScene" uid="uid://da7w3vkhadfwe" path="res://scenes/button-flat/button-flat.tscn" id="4_op11p"] [node name="frm_ecm_list" type="NinePatchRect"] offset_right = 480.0 offset_bottom = 288.0 size_flags_horizontal = 3 size_flags_vertical = 3 -texture = ExtResource("1_6swor") +texture = ExtResource("1_i25vj") patch_margin_left = 15 patch_margin_top = 30 patch_margin_right = 15 @@ -34,11 +34,11 @@ offset_left = 8.0 offset_top = 57.0 offset_right = 472.0 offset_bottom = 237.0 -script = ExtResource("2_3x81o") +script = ExtResource("2_qtnok") [node name="table" type="GridContainer" parent="scroll"] layout_mode = 2 -script = ExtResource("3_4hydx") +script = ExtResource("3_pqvqk") [node name="grd_forced" type="GridContainer" parent="."] layout_mode = 0 @@ -48,7 +48,7 @@ offset_right = 472.0 offset_bottom = 281.0 columns = 4 -[node name="btn_srn" parent="grd_forced" groups=["группа-принудительно"] instance=ExtResource("4_7ys3c")] +[node name="btn_srn" parent="grd_forced" groups=["группа-принудительно"] instance=ExtResource("4_op11p")] layout_mode = 2 size_flags_horizontal = 3 size_flags_vertical = 3 @@ -56,7 +56,7 @@ tooltip_text = "Включает принудительную помеху" text = "СРН" metadata/rfi_name = "ozp1" -[node name="btn_jtids" parent="grd_forced" groups=["группа-принудительно"] instance=ExtResource("4_7ys3c")] +[node name="btn_jtids" parent="grd_forced" groups=["группа-принудительно"] instance=ExtResource("4_op11p")] editor_description = "Кнопка для принудительного включения группы секторов в режим JTIDS" layout_mode = 2 size_flags_horizontal = 3 @@ -64,7 +64,7 @@ size_flags_vertical = 3 text = "JTIDS" metadata/rfi_name = "ozp1" -[node name="btn_kupd" parent="grd_forced" groups=["группа-принудительно"] instance=ExtResource("4_7ys3c")] +[node name="btn_kupd" parent="grd_forced" groups=["группа-принудительно"] instance=ExtResource("4_op11p")] layout_mode = 2 size_flags_horizontal = 3 size_flags_vertical = 3 @@ -72,7 +72,7 @@ tooltip_text = "Кнопка для принудительного включе text = "КУПД" metadata/rfi_name = "ozp1" -[node name="btn_cancel" parent="grd_forced" groups=["прин-секторы-срн"] instance=ExtResource("4_7ys3c")] +[node name="btn_cancel" parent="grd_forced" groups=["прин-секторы-срн"] instance=ExtResource("4_op11p")] layout_mode = 2 size_flags_horizontal = 3 size_flags_vertical = 3 diff --git a/scenes/scroll-ecm-list.gd b/scenes/frame-ecm-list/scroll-ecm-list.gd similarity index 98% rename from scenes/scroll-ecm-list.gd rename to scenes/frame-ecm-list/scroll-ecm-list.gd index 4bacd50..10dd765 100644 --- a/scenes/scroll-ecm-list.gd +++ b/scenes/frame-ecm-list/scroll-ecm-list.gd @@ -2,7 +2,7 @@ extends ScrollContainer ## Отображает список помех в таблице. -const CellLineEdit = preload('res://scenes/ячейка-2.tscn') ## Ячейка таблицы. +const CellLineEdit = preload('res://table/ячейка-2.tscn') ## Ячейка таблицы. const TableHeader = preload('res://table/header.tscn') ## Ячейка заголовок таблицы. const TABLE_HEADER = [ TableHeader, TableHeader, TableHeader, TableHeader , TableHeader ] ## Описание ряда заголовка. diff --git a/scenes/frm_ecm_params.tscn b/scenes/frame-ecm-params/frame-ecm-params.tscn similarity index 91% rename from scenes/frm_ecm_params.tscn rename to scenes/frame-ecm-params/frame-ecm-params.tscn index cef92db..0c03755 100644 --- a/scenes/frm_ecm_params.tscn +++ b/scenes/frame-ecm-params/frame-ecm-params.tscn @@ -2,7 +2,7 @@ [ext_resource type="Texture2D" uid="uid://cs6i1xwx0pmdk" path="res://data/рамка-панели.png" id="1_q1ow7"] [ext_resource type="Script" path="res://table/table.gd" id="2_82yax"] -[ext_resource type="Script" path="res://scenes/scroll-ecm-params.gd" id="2_sm6tk"] +[ext_resource type="Script" path="res://scenes/frame-ecm-params/scroll-ecm-params.gd" id="2_sm6tk"] [node name="frm_ecm_params" type="NinePatchRect"] size_flags_horizontal = 3 diff --git a/scenes/scroll-ecm-params.gd b/scenes/frame-ecm-params/scroll-ecm-params.gd similarity index 97% rename from scenes/scroll-ecm-params.gd rename to scenes/frame-ecm-params/scroll-ecm-params.gd index 15b97bc..9ba746f 100644 --- a/scenes/scroll-ecm-params.gd +++ b/scenes/frame-ecm-params/scroll-ecm-params.gd @@ -2,7 +2,7 @@ extends ScrollContainer ## Отображает список параметров помехи в таблице. -const CellLineEdit = preload('res://scenes/ячейка-2.tscn') ## Ячейка таблицы. +const CellLineEdit = preload('res://table/ячейка-2.tscn') ## Ячейка таблицы. const TableHeader = preload('res://table/header.tscn') ## Ячейка заголовок таблицы. const TABLE_HEADER = [ TableHeader, TableHeader ] ## Описание ряда заголовка. diff --git a/scenes/frm_params.tscn b/scenes/frame-params/frame-params.tscn similarity index 92% rename from scenes/frm_params.tscn rename to scenes/frame-params/frame-params.tscn index f7e6073..2505e0d 100644 --- a/scenes/frm_params.tscn +++ b/scenes/frame-params/frame-params.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=4 format=3 uid="uid://t54wukutvmjq"] [ext_resource type="Texture2D" uid="uid://cs6i1xwx0pmdk" path="res://data/рамка-панели.png" id="1_65sy4"] -[ext_resource type="Script" path="res://scenes/scroll-params.gd" id="2_f8bq4"] +[ext_resource type="Script" path="res://scenes/frame-params/scroll-params.gd" id="2_f8bq4"] [ext_resource type="Script" path="res://table/table.gd" id="3_y0507"] [node name="frm_params" type="NinePatchRect"] diff --git a/scenes/scroll-params.gd b/scenes/frame-params/scroll-params.gd similarity index 95% rename from scenes/scroll-params.gd rename to scenes/frame-params/scroll-params.gd index 835c9ac..45a6ce0 100644 --- a/scenes/scroll-params.gd +++ b/scenes/frame-params/scroll-params.gd @@ -2,7 +2,7 @@ extends ScrollContainer ## Отображение параметров цели -const CellLineEdit = preload('res://scenes/ячейка-2.tscn') ## Ячейка таблицы. +const CellLineEdit = preload('res://table/ячейка-2.tscn') ## Ячейка таблицы. const TableHeader = preload('res://table/header.tscn') ## Ячейка заголовок таблицы. @@ -50,7 +50,7 @@ func _ready() -> void: ## Обрабатывает сигнал [signal threats.threat_update]. ## Обновляет отображение только для выбранной цели. func on_threat_update(th): - if th.selected == false: return + if th.selected == false: return if th.id != $table.get_meta('id'): return var mnms = tools.get_members_names(th) for member_name in mnms: diff --git a/scenes/frm_threats.tscn b/scenes/frame-threats/frame-threats.tscn similarity index 91% rename from scenes/frm_threats.tscn rename to scenes/frame-threats/frame-threats.tscn index bb8543b..8c393f4 100644 --- a/scenes/frm_threats.tscn +++ b/scenes/frame-threats/frame-threats.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=4 format=3 uid="uid://bsd67ktk8xp5a"] [ext_resource type="Texture2D" uid="uid://cs6i1xwx0pmdk" path="res://data/рамка-панели.png" id="1_m3no0"] -[ext_resource type="Script" path="res://scenes/scroll-threats.gd" id="2_empn3"] +[ext_resource type="Script" path="res://scenes/frame-threats/scroll-threats.gd" id="2_empn3"] [ext_resource type="Script" path="res://table/table.gd" id="3_4bupu"] [node name="frm_threats" type="NinePatchRect"] diff --git a/scenes/scroll-threats.gd b/scenes/frame-threats/scroll-threats.gd similarity index 97% rename from scenes/scroll-threats.gd rename to scenes/frame-threats/scroll-threats.gd index dad4955..b5026b2 100644 --- a/scenes/scroll-threats.gd +++ b/scenes/frame-threats/scroll-threats.gd @@ -3,7 +3,7 @@ extends ScrollContainer ## Отображает список целей в таблице. -const CellLineEdit = preload('res://scenes/ячейка-2.tscn') ## Ячейка таблицы. +const CellLineEdit = preload('res://table/ячейка-2.tscn') ## Ячейка таблицы. const TableHeader = preload('res://table/header.tscn') ## Ячейка заголовок таблицы. @@ -96,8 +96,8 @@ func on_rto_threat_sel(th_id, tbl): if node.text.to_int() == th_id: row_pressed(i) break - - + + ## Снимает выделение цели func on_rto_threat_unsel(_th_id): $table.clear_rows_selected() diff --git a/scenes/frame.tscn b/scenes/frame/frame.tscn similarity index 74% rename from scenes/frame.tscn rename to scenes/frame/frame.tscn index 273a7ed..13cf6dc 100644 --- a/scenes/frame.tscn +++ b/scenes/frame/frame.tscn @@ -1,17 +1,17 @@ [gd_scene load_steps=3 format=3 uid="uid://bq7haw1ypiv48"] -[ext_resource type="Texture2D" uid="uid://cs6i1xwx0pmdk" path="res://data/рамка-панели.png" id="1_o7lya"] -[ext_resource type="Script" path="res://scenes/рамка.gd" id="2_7mns1"] +[ext_resource type="Texture2D" uid="uid://cs6i1xwx0pmdk" path="res://data/рамка-панели.png" id="1_n1ea1"] +[ext_resource type="Script" path="res://scenes/frame/рамка.gd" id="2_ki0kf"] [node name="ramka" type="NinePatchRect"] offset_right = 150.0 offset_bottom = 100.0 -texture = ExtResource("1_o7lya") +texture = ExtResource("1_n1ea1") patch_margin_left = 15 patch_margin_top = 30 patch_margin_right = 15 patch_margin_bottom = 10 -script = ExtResource("2_7mns1") +script = ExtResource("2_ki0kf") text = "" [node name="header" type="Label" parent="."] diff --git a/scenes/рамка.gd b/scenes/frame/рамка.gd similarity index 100% rename from scenes/рамка.gd rename to scenes/frame/рамка.gd diff --git a/scenes/grd_side.tscn b/scenes/grd_side.tscn deleted file mode 100644 index 7836388..0000000 --- a/scenes/grd_side.tscn +++ /dev/null @@ -1,24 +0,0 @@ -[gd_scene load_steps=5 format=3 uid="uid://dem3fcec25awh"] - -[ext_resource type="PackedScene" uid="uid://bsd67ktk8xp5a" path="res://scenes/frm_threats.tscn" id="1_swvxc"] -[ext_resource type="PackedScene" uid="uid://t54wukutvmjq" path="res://scenes/frm_params.tscn" id="2_1dbju"] -[ext_resource type="PackedScene" uid="uid://7rvw671tlx2i" path="res://scenes/frm_ecm_list.tscn" id="3_pdajn"] -[ext_resource type="PackedScene" uid="uid://b1o10yvgjpb0j" path="res://scenes/frm_ecm_params.tscn" id="4_pmt7h"] - -[node name="grd_side" type="GridContainer"] -offset_left = 1112.0 -offset_top = 6.0 -offset_right = 1592.0 -offset_bottom = 1169.0 - -[node name="frm_threats" parent="." instance=ExtResource("1_swvxc")] -layout_mode = 2 - -[node name="frm_params" parent="." instance=ExtResource("2_1dbju")] -layout_mode = 2 - -[node name="frm_ecm_list" parent="." instance=ExtResource("3_pdajn")] -layout_mode = 2 - -[node name="frm_ecm_params" parent="." instance=ExtResource("4_pmt7h")] -layout_mode = 2 diff --git a/scenes/grd_btns.tscn b/scenes/grid-buttons-ecm/grid-buttons-ecm.tscn similarity index 79% rename from scenes/grd_btns.tscn rename to scenes/grid-buttons-ecm/grid-buttons-ecm.tscn index 56b6718..5af9d2d 100644 --- a/scenes/grd_btns.tscn +++ b/scenes/grid-buttons-ecm/grid-buttons-ecm.tscn @@ -1,13 +1,13 @@ [gd_scene load_steps=2 format=3 uid="uid://cnkbk53mi7viu"] -[ext_resource type="PackedScene" uid="uid://da7w3vkhadfwe" path="res://scenes/button-flat.tscn" id="1_uiv1n"] +[ext_resource type="PackedScene" uid="uid://da7w3vkhadfwe" path="res://scenes/button-flat/button-flat.tscn" id="1_oy80h"] [node name="grd_btns" type="GridContainer"] offset_right = 1096.0 offset_bottom = 54.0 columns = 14 -[node name="btn_off" parent="." groups=["группа-режим-помехи"] instance=ExtResource("1_uiv1n")] +[node name="btn_off" parent="." groups=["группа-режим-помехи"] instance=ExtResource("1_oy80h")] layout_mode = 2 size_flags_horizontal = 3 size_flags_vertical = 3 @@ -15,7 +15,7 @@ text = "Откл." disabled = true metadata/rfi_name = "off" -[node name="btn_auto_rfi" parent="." groups=["группа-режим-помехи"] instance=ExtResource("1_uiv1n")] +[node name="btn_auto_rfi" parent="." groups=["группа-режим-помехи"] instance=ExtResource("1_oy80h")] layout_mode = 2 size_flags_horizontal = 3 size_flags_vertical = 3 @@ -23,7 +23,7 @@ text = "Автомат" disabled = true metadata/rfi_name = "auto" -[node name="btn_p12" parent="." groups=["группа-режим-помехи"] instance=ExtResource("1_uiv1n")] +[node name="btn_p12" parent="." groups=["группа-режим-помехи"] instance=ExtResource("1_oy80h")] layout_mode = 2 size_flags_horizontal = 3 size_flags_vertical = 3 @@ -31,7 +31,7 @@ text = "МЧМ-1" disabled = true metadata/rfi_name = "mchm1" -[node name="btn_p16" parent="." groups=["группа-режим-помехи"] instance=ExtResource("1_uiv1n")] +[node name="btn_p16" parent="." groups=["группа-режим-помехи"] instance=ExtResource("1_oy80h")] layout_mode = 2 size_flags_horizontal = 3 size_flags_vertical = 3 @@ -39,7 +39,7 @@ text = "СРН-И1" disabled = true metadata/rfi_name = "srni1" -[node name="btn_p15" parent="." groups=["группа-режим-помехи"] instance=ExtResource("1_uiv1n")] +[node name="btn_p15" parent="." groups=["группа-режим-помехи"] instance=ExtResource("1_oy80h")] layout_mode = 2 size_flags_horizontal = 3 size_flags_vertical = 3 @@ -47,7 +47,7 @@ text = "СРН-М2" disabled = true metadata/rfi_name = "srnm2" -[node name="btn_p14" parent="." groups=["группа-режим-помехи"] instance=ExtResource("1_uiv1n")] +[node name="btn_p14" parent="." groups=["группа-режим-помехи"] instance=ExtResource("1_oy80h")] layout_mode = 2 size_flags_horizontal = 3 size_flags_vertical = 3 @@ -55,7 +55,7 @@ text = "ПД-М4" disabled = true metadata/rfi_name = "pdm4" -[node name="btn_p13" parent="." groups=["группа-режим-помехи"] instance=ExtResource("1_uiv1n")] +[node name="btn_p13" parent="." groups=["группа-режим-помехи"] instance=ExtResource("1_oy80h")] layout_mode = 2 size_flags_horizontal = 3 size_flags_vertical = 3 @@ -63,7 +63,7 @@ text = "ПД-М2" disabled = true metadata/rfi_name = "pdm2" -[node name="btn_p11" parent="." groups=["группа-режим-помехи"] instance=ExtResource("1_uiv1n")] +[node name="btn_p11" parent="." groups=["группа-режим-помехи"] instance=ExtResource("1_oy80h")] layout_mode = 2 size_flags_horizontal = 3 size_flags_vertical = 3 @@ -71,7 +71,7 @@ text = "ЛЧМ-1" disabled = true metadata/rfi_name = "lchm1" -[node name="btn_p10" parent="." groups=["группа-режим-помехи"] instance=ExtResource("1_uiv1n")] +[node name="btn_p10" parent="." groups=["группа-режим-помехи"] instance=ExtResource("1_oy80h")] layout_mode = 2 size_flags_horizontal = 3 size_flags_vertical = 3 @@ -79,7 +79,7 @@ text = "ПД-М4С" disabled = true metadata/rfi_name = "pdm4s" -[node name="btn_p9" parent="." groups=["группа-режим-помехи"] instance=ExtResource("1_uiv1n")] +[node name="btn_p9" parent="." groups=["группа-режим-помехи"] instance=ExtResource("1_oy80h")] layout_mode = 2 size_flags_horizontal = 3 size_flags_vertical = 3 @@ -87,7 +87,7 @@ text = "ПД-ЧМ" disabled = true metadata/rfi_name = "pdchm" -[node name="btn_p8" parent="." groups=["группа-режим-помехи"] instance=ExtResource("1_uiv1n")] +[node name="btn_p8" parent="." groups=["группа-режим-помехи"] instance=ExtResource("1_oy80h")] layout_mode = 2 size_flags_horizontal = 3 size_flags_vertical = 3 @@ -95,7 +95,7 @@ text = "СВ-И1" disabled = true metadata/rfi_name = "svi1" -[node name="btn_p7" parent="." groups=["группа-режим-помехи"] instance=ExtResource("1_uiv1n")] +[node name="btn_p7" parent="." groups=["группа-режим-помехи"] instance=ExtResource("1_oy80h")] layout_mode = 2 size_flags_horizontal = 3 size_flags_vertical = 3 @@ -103,7 +103,7 @@ text = "K1" disabled = true metadata/rfi_name = "k1" -[node name="btn_p6" parent="." groups=["группа-режим-помехи"] instance=ExtResource("1_uiv1n")] +[node name="btn_p6" parent="." groups=["группа-режим-помехи"] instance=ExtResource("1_oy80h")] layout_mode = 2 size_flags_horizontal = 3 size_flags_vertical = 3 @@ -111,7 +111,7 @@ text = "СВ-М2" disabled = true metadata/rfi_name = "svm2" -[node name="btn_p5" parent="." groups=["группа-режим-помехи"] instance=ExtResource("1_uiv1n")] +[node name="btn_p5" parent="." groups=["группа-режим-помехи"] instance=ExtResource("1_oy80h")] layout_mode = 2 size_flags_horizontal = 3 size_flags_vertical = 3 diff --git a/scenes/grid-side-panel/grid-side-panel.tscn b/scenes/grid-side-panel/grid-side-panel.tscn new file mode 100644 index 0000000..bfb5f52 --- /dev/null +++ b/scenes/grid-side-panel/grid-side-panel.tscn @@ -0,0 +1,24 @@ +[gd_scene load_steps=5 format=3 uid="uid://dem3fcec25awh"] + +[ext_resource type="PackedScene" uid="uid://bsd67ktk8xp5a" path="res://scenes/frame-threats/frame-threats.tscn" id="1_rkek6"] +[ext_resource type="PackedScene" uid="uid://t54wukutvmjq" path="res://scenes/frame-params/frame-params.tscn" id="2_35s57"] +[ext_resource type="PackedScene" uid="uid://7rvw671tlx2i" path="res://scenes/frame-ecm-list/frm_ecm_list.tscn" id="3_7jd28"] +[ext_resource type="PackedScene" uid="uid://b1o10yvgjpb0j" path="res://scenes/frame-ecm-params/frame-ecm-params.tscn" id="4_00fe7"] + +[node name="grd_side" type="GridContainer"] +offset_left = 1112.0 +offset_top = 6.0 +offset_right = 1592.0 +offset_bottom = 1169.0 + +[node name="frm_threats" parent="." instance=ExtResource("1_rkek6")] +layout_mode = 2 + +[node name="frm_params" parent="." instance=ExtResource("2_35s57")] +layout_mode = 2 + +[node name="frm_ecm_list" parent="." instance=ExtResource("3_7jd28")] +layout_mode = 2 + +[node name="frm_ecm_params" parent="." instance=ExtResource("4_00fe7")] +layout_mode = 2 diff --git a/scenes/pribor_afsp_l.tscn b/scenes/pribor-afsp-l/pribor-afsp-l.tscn similarity index 100% rename from scenes/pribor_afsp_l.tscn rename to scenes/pribor-afsp-l/pribor-afsp-l.tscn diff --git a/scenes/pribor_afsp_r.tscn b/scenes/pribor-afsp-r/pribor-afsp-r.tscn similarity index 63% rename from scenes/pribor_afsp_r.tscn rename to scenes/pribor-afsp-r/pribor-afsp-r.tscn index b3559ea..8b808ed 100644 --- a/scenes/pribor_afsp_r.tscn +++ b/scenes/pribor-afsp-r/pribor-afsp-r.tscn @@ -1,10 +1,6 @@ -[gd_scene format=2] +[gd_scene format=3 uid="uid://o2juk6in2nke"] [node name="pribor_UF" type="Node2D"] [node name="test_label" type="Label" parent="."] -margin_left = 12.0 -margin_top = 8.0 -margin_right = 154.0 -margin_bottom = 22.0 text = "Здесь будет схема прибора АФСП Правый" diff --git a/scenes/pribor_afsp_sch3.tscn b/scenes/pribor-afsp-sch3/pribor-afsp-sch3.tscn similarity index 60% rename from scenes/pribor_afsp_sch3.tscn rename to scenes/pribor-afsp-sch3/pribor-afsp-sch3.tscn index 4a16ab1..d8e5e90 100644 --- a/scenes/pribor_afsp_sch3.tscn +++ b/scenes/pribor-afsp-sch3/pribor-afsp-sch3.tscn @@ -1,10 +1,6 @@ -[gd_scene format=2] +[gd_scene format=3 uid="uid://iw38n1tqx3qx"] [node name="pribor_UF" type="Node2D"] [node name="test_label" type="Label" parent="."] -margin_left = 12.0 -margin_top = 8.0 -margin_right = 154.0 -margin_bottom = 22.0 text = "Здесь будет схема прибора Щ3" diff --git a/scenes/pribor_prd_k_1.tscn b/scenes/pribor-prd-k-1/pribor-prd-k-1.tscn similarity index 61% rename from scenes/pribor_prd_k_1.tscn rename to scenes/pribor-prd-k-1/pribor-prd-k-1.tscn index 7c8ec53..d8a2eeb 100644 --- a/scenes/pribor_prd_k_1.tscn +++ b/scenes/pribor-prd-k-1/pribor-prd-k-1.tscn @@ -1,10 +1,6 @@ -[gd_scene format=2] +[gd_scene format=3 uid="uid://c3tn1awam3tfe"] [node name="pribor_UF" type="Node2D"] [node name="test_label" type="Label" parent="."] -margin_left = 12.0 -margin_top = 8.0 -margin_right = 154.0 -margin_bottom = 22.0 text = "Здесь будет схема прибора ПРД-К 1" diff --git a/scenes/pribor_prd_k_2.tscn b/scenes/pribor-prd-k-2/pribor-prd-k-2.tscn similarity index 61% rename from scenes/pribor_prd_k_2.tscn rename to scenes/pribor-prd-k-2/pribor-prd-k-2.tscn index 825a950..d033477 100644 --- a/scenes/pribor_prd_k_2.tscn +++ b/scenes/pribor-prd-k-2/pribor-prd-k-2.tscn @@ -1,10 +1,6 @@ -[gd_scene format=2] +[gd_scene format=3 uid="uid://cmspxgjtpawm4"] [node name="pribor_UF" type="Node2D"] [node name="test_label" type="Label" parent="."] -margin_left = 12.0 -margin_top = 8.0 -margin_right = 154.0 -margin_bottom = 22.0 text = "Здесь будет схема прибора ПРД-К 2" diff --git a/scenes/pribor_prd_k_3.tscn b/scenes/pribor-prd-k-3/pribor-prd-k-3.tscn similarity index 61% rename from scenes/pribor_prd_k_3.tscn rename to scenes/pribor-prd-k-3/pribor-prd-k-3.tscn index 69566e1..1533af8 100644 --- a/scenes/pribor_prd_k_3.tscn +++ b/scenes/pribor-prd-k-3/pribor-prd-k-3.tscn @@ -1,10 +1,6 @@ -[gd_scene format=2] +[gd_scene format=3 uid="uid://k2k1eas57xkn"] [node name="pribor_UF" type="Node2D"] [node name="test_label" type="Label" parent="."] -margin_left = 12.0 -margin_top = 8.0 -margin_right = 154.0 -margin_bottom = 22.0 text = "Здесь будет схема прибора ПРД-К 3" diff --git a/scenes/pribor_prd_k_4.tscn b/scenes/pribor-prd-k-4/pribor-prd-k-4.tscn similarity index 61% rename from scenes/pribor_prd_k_4.tscn rename to scenes/pribor-prd-k-4/pribor-prd-k-4.tscn index c9e3c4c..a7633fc 100644 --- a/scenes/pribor_prd_k_4.tscn +++ b/scenes/pribor-prd-k-4/pribor-prd-k-4.tscn @@ -1,10 +1,6 @@ -[gd_scene format=2] +[gd_scene format=3 uid="uid://8t6pfkjeujc8"] [node name="pribor_UF" type="Node2D"] [node name="test_label" type="Label" parent="."] -margin_left = 12.0 -margin_top = 8.0 -margin_right = 154.0 -margin_bottom = 22.0 text = "Здесь будет схема прибора ПРД-К 4" diff --git a/scenes/pribor-prd-n-1/pribor-prd-n-1.tscn b/scenes/pribor-prd-n-1/pribor-prd-n-1.tscn new file mode 100644 index 0000000..e03a015 --- /dev/null +++ b/scenes/pribor-prd-n-1/pribor-prd-n-1.tscn @@ -0,0 +1,23 @@ +[gd_scene load_steps=2 format=3 uid="uid://dnuexoef2nnv5"] + +[ext_resource type="Texture2D" uid="uid://b1brrobrh4abl" path="res://data/прд-н-1-мнемо.png" id="1_jlonr"] + +[node name="pribor_prd_n_1" type="Control"] +layout_mode = 3 +anchors_preset = 0 +offset_left = 15.0 +offset_top = 30.0 +offset_right = 15.0 +offset_bottom = 30.0 + +[node name="test_label" type="Label" parent="."] +layout_mode = 0 +text = "Здесь будет схема прибора ПРД-Н 1" +metadata/_edit_use_anchors_ = true +metadata/_edit_lock_ = true + +[node name="Sprite2D" type="Sprite2D" parent="."] +position = Vector2(436, 589) +scale = Vector2(0.13, 0.13) +texture = ExtResource("1_jlonr") +metadata/_edit_lock_ = true diff --git a/scenes/pribor_prd_n_2.tscn b/scenes/pribor-prd-n-2/pribor-prd-n-2.tscn similarity index 61% rename from scenes/pribor_prd_n_2.tscn rename to scenes/pribor-prd-n-2/pribor-prd-n-2.tscn index 4f8efdc..be841a1 100644 --- a/scenes/pribor_prd_n_2.tscn +++ b/scenes/pribor-prd-n-2/pribor-prd-n-2.tscn @@ -1,10 +1,6 @@ -[gd_scene format=2] +[gd_scene format=3 uid="uid://blwydjs6hkxg0"] [node name="pribor_UF" type="Node2D"] [node name="test_label" type="Label" parent="."] -margin_left = 12.0 -margin_top = 8.0 -margin_right = 154.0 -margin_bottom = 22.0 text = "Здесь будет схема прибора ПРД-Н 2" diff --git a/scenes/pribor_prd_n_3.tscn b/scenes/pribor-prd-n-3/pribor-prd-n-3.tscn similarity index 61% rename from scenes/pribor_prd_n_3.tscn rename to scenes/pribor-prd-n-3/pribor-prd-n-3.tscn index 157f5c9..da94b88 100644 --- a/scenes/pribor_prd_n_3.tscn +++ b/scenes/pribor-prd-n-3/pribor-prd-n-3.tscn @@ -1,10 +1,6 @@ -[gd_scene format=2] +[gd_scene format=3 uid="uid://bjepce3jbg60y"] [node name="pribor_UF" type="Node2D"] [node name="test_label" type="Label" parent="."] -margin_left = 12.0 -margin_top = 8.0 -margin_right = 154.0 -margin_bottom = 22.0 text = "Здесь будет схема прибора ПРД-Н 3" diff --git a/scenes/pribor_prd_n_4.tscn b/scenes/pribor-prd-n-4/pribor-prd-n-4.tscn similarity index 61% rename from scenes/pribor_prd_n_4.tscn rename to scenes/pribor-prd-n-4/pribor-prd-n-4.tscn index 3896f0a..8f42571 100644 --- a/scenes/pribor_prd_n_4.tscn +++ b/scenes/pribor-prd-n-4/pribor-prd-n-4.tscn @@ -1,10 +1,6 @@ -[gd_scene format=2] +[gd_scene format=3 uid="uid://bbouhbiuqm8sn"] [node name="pribor_UF" type="Node2D"] [node name="test_label" type="Label" parent="."] -margin_left = 12.0 -margin_top = 8.0 -margin_right = 154.0 -margin_bottom = 22.0 text = "Здесь будет схема прибора ПРД-Н 4" diff --git a/scenes/pribor_prd_v_1.tscn b/scenes/pribor-prd-v-1/pribor-prd-v-1.tscn similarity index 61% rename from scenes/pribor_prd_v_1.tscn rename to scenes/pribor-prd-v-1/pribor-prd-v-1.tscn index 6f6c53b..e478db0 100644 --- a/scenes/pribor_prd_v_1.tscn +++ b/scenes/pribor-prd-v-1/pribor-prd-v-1.tscn @@ -1,10 +1,6 @@ -[gd_scene format=2] +[gd_scene format=3 uid="uid://dv45fwc77flro"] [node name="pribor_UF" type="Node2D"] [node name="test_label" type="Label" parent="."] -margin_left = 12.0 -margin_top = 8.0 -margin_right = 154.0 -margin_bottom = 22.0 text = "Здесь будет схема прибора ПРД-В 1" diff --git a/scenes/pribor_prd_v_2.tscn b/scenes/pribor-prd-v-2/pribor-prd-v-2.tscn similarity index 61% rename from scenes/pribor_prd_v_2.tscn rename to scenes/pribor-prd-v-2/pribor-prd-v-2.tscn index 50ec6b9..84fc231 100644 --- a/scenes/pribor_prd_v_2.tscn +++ b/scenes/pribor-prd-v-2/pribor-prd-v-2.tscn @@ -1,10 +1,6 @@ -[gd_scene format=2] +[gd_scene format=3 uid="uid://bn43ofklq62jw"] [node name="pribor_UF" type="Node2D"] [node name="test_label" type="Label" parent="."] -margin_left = 12.0 -margin_top = 8.0 -margin_right = 154.0 -margin_bottom = 22.0 text = "Здесь будет схема прибора ПРД-В 2" diff --git a/scenes/pribor_prd_v_3.tscn b/scenes/pribor-prd-v-3/pribor-prd-v-3.tscn similarity index 61% rename from scenes/pribor_prd_v_3.tscn rename to scenes/pribor-prd-v-3/pribor-prd-v-3.tscn index 54cf5a8..685b606 100644 --- a/scenes/pribor_prd_v_3.tscn +++ b/scenes/pribor-prd-v-3/pribor-prd-v-3.tscn @@ -1,10 +1,6 @@ -[gd_scene format=2] +[gd_scene format=3 uid="uid://cf7le7xc5fbxx"] [node name="pribor_UF" type="Node2D"] [node name="test_label" type="Label" parent="."] -margin_left = 12.0 -margin_top = 8.0 -margin_right = 154.0 -margin_bottom = 22.0 text = "Здесь будет схема прибора ПРД-В 3" diff --git a/scenes/pribor_prd_v_4.tscn b/scenes/pribor-prd-v-4/pribor-prd-v-4.tscn similarity index 61% rename from scenes/pribor_prd_v_4.tscn rename to scenes/pribor-prd-v-4/pribor-prd-v-4.tscn index 6f6c53b..fe3b9cc 100644 --- a/scenes/pribor_prd_v_4.tscn +++ b/scenes/pribor-prd-v-4/pribor-prd-v-4.tscn @@ -1,10 +1,6 @@ -[gd_scene format=2] +[gd_scene format=3 uid="uid://dhvq0w8gdbqw3"] [node name="pribor_UF" type="Node2D"] [node name="test_label" type="Label" parent="."] -margin_left = 12.0 -margin_top = 8.0 -margin_right = 154.0 -margin_bottom = 22.0 text = "Здесь будет схема прибора ПРД-В 1" diff --git a/scenes/pribor_rtr.tscn b/scenes/pribor-rtr/pribor-rtr.tscn similarity index 60% rename from scenes/pribor_rtr.tscn rename to scenes/pribor-rtr/pribor-rtr.tscn index 368aea3..a3718a4 100644 --- a/scenes/pribor_rtr.tscn +++ b/scenes/pribor-rtr/pribor-rtr.tscn @@ -1,10 +1,6 @@ -[gd_scene format=2] +[gd_scene format=3 uid="uid://5uv1idl3lqet"] [node name="pribor_UF" type="Node2D"] [node name="test_label" type="Label" parent="."] -margin_left = 12.0 -margin_top = 8.0 -margin_right = 154.0 -margin_bottom = 22.0 text = "Здесь будет схема прибора РТР" diff --git a/scenes/pribor_sch3.tscn b/scenes/pribor-sch3/pribor-sch3.tscn similarity index 60% rename from scenes/pribor_sch3.tscn rename to scenes/pribor-sch3/pribor-sch3.tscn index 4a16ab1..35b10b8 100644 --- a/scenes/pribor_sch3.tscn +++ b/scenes/pribor-sch3/pribor-sch3.tscn @@ -1,10 +1,6 @@ -[gd_scene format=2] +[gd_scene format=3 uid="uid://bs7h65e7bodp3"] [node name="pribor_UF" type="Node2D"] [node name="test_label" type="Label" parent="."] -margin_left = 12.0 -margin_top = 8.0 -margin_right = 154.0 -margin_bottom = 22.0 text = "Здесь будет схема прибора Щ3" diff --git a/scenes/pribor_spt_l.tscn b/scenes/pribor-spt-l/pribor-spt-l.tscn similarity index 62% rename from scenes/pribor_spt_l.tscn rename to scenes/pribor-spt-l/pribor-spt-l.tscn index 0c9066f..53e3167 100644 --- a/scenes/pribor_spt_l.tscn +++ b/scenes/pribor-spt-l/pribor-spt-l.tscn @@ -1,10 +1,6 @@ -[gd_scene format=2] +[gd_scene format=3 uid="uid://4bjn35xdurgx"] [node name="pribor_UF" type="Node2D"] [node name="test_label" type="Label" parent="."] -margin_left = 12.0 -margin_top = 8.0 -margin_right = 154.0 -margin_bottom = 22.0 text = "Здесь будет схема прибора СПТ Левый" diff --git a/scenes/pribor_spt_r.tscn b/scenes/pribor-spt-r/pribor-spt-r.tscn similarity index 100% rename from scenes/pribor_spt_r.tscn rename to scenes/pribor-spt-r/pribor-spt-r.tscn diff --git a/scenes/pribor_uf.tscn b/scenes/pribor-uf/pribor-uf.tscn similarity index 60% rename from scenes/pribor_uf.tscn rename to scenes/pribor-uf/pribor-uf.tscn index a00ecf8..12dccce 100644 --- a/scenes/pribor_uf.tscn +++ b/scenes/pribor-uf/pribor-uf.tscn @@ -1,10 +1,6 @@ -[gd_scene format=2] +[gd_scene format=3 uid="uid://dwxn2puh462nl"] [node name="pribor_UF" type="Node2D"] [node name="test_label" type="Label" parent="."] -margin_left = 12.0 -margin_top = 8.0 -margin_right = 154.0 -margin_bottom = 22.0 text = "Здесь будет схема прибора УФ" diff --git a/scenes/pribor_prd_n_1.tscn b/scenes/pribor_prd_n_1.tscn deleted file mode 100644 index cc68167..0000000 --- a/scenes/pribor_prd_n_1.tscn +++ /dev/null @@ -1,10 +0,0 @@ -[gd_scene format=2] - -[node name="pribor_UF" type="Node2D"] - -[node name="test_label" type="Label" parent="."] -margin_left = 12.0 -margin_top = 8.0 -margin_right = 154.0 -margin_bottom = 22.0 -text = "Здесь будет схема прибора ПРД-Н 1" diff --git a/scenes/tab-switch.gd b/scenes/tabs-switch/tab-switch.gd similarity index 100% rename from scenes/tab-switch.gd rename to scenes/tabs-switch/tab-switch.gd diff --git a/scenes/tab-switch.tscn b/scenes/tabs-switch/tab-switch.tscn similarity index 73% rename from scenes/tab-switch.tscn rename to scenes/tabs-switch/tab-switch.tscn index 827f9c1..f94bf87 100644 --- a/scenes/tab-switch.tscn +++ b/scenes/tabs-switch/tab-switch.tscn @@ -1,11 +1,11 @@ [gd_scene load_steps=7 format=3 uid="uid://3slb0i3pvowc"] -[ext_resource type="Script" path="res://scenes/tab-switch.gd" id="1_fg0vd"] -[ext_resource type="PackedScene" uid="uid://b276iygic5itk" path="res://scenes/работа.tscn" id="2_u7p16"] -[ext_resource type="PackedScene" uid="uid://lwmw4egynmd1" path="res://scenes/контроль.tscn" id="3_txp0s"] -[ext_resource type="PackedScene" uid="uid://trt0q8th3bn2" path="res://scenes/журнал.tscn" id="4_cu5k8"] -[ext_resource type="PackedScene" uid="uid://dab6loryocc73" path="res://scenes/эмс.tscn" id="5_u71bh"] -[ext_resource type="PackedScene" uid="uid://bnptm4rlp60dq" path="res://scenes/настройки.tscn" id="6_i8iv3"] +[ext_resource type="Script" path="res://scenes/tabs-switch/tab-switch.gd" id="1_fg0vd"] +[ext_resource type="PackedScene" uid="uid://b276iygic5itk" path="res://scenes/работа/работа.tscn" id="2_u7p16"] +[ext_resource type="PackedScene" uid="uid://lwmw4egynmd1" path="res://scenes/контроль/контроль.tscn" id="3_txp0s"] +[ext_resource type="PackedScene" uid="uid://trt0q8th3bn2" path="res://scenes/журнал/журнал.tscn" id="4_cu5k8"] +[ext_resource type="PackedScene" uid="uid://dab6loryocc73" path="res://scenes/эмс/эмс.tscn" id="5_u71bh"] +[ext_resource type="PackedScene" uid="uid://bnptm4rlp60dq" path="res://scenes/настройки/настройки.tscn" id="6_i8iv3"] [node name="tab_switch" type="TabContainer"] offset_right = 1600.0 diff --git a/scenes/tilemap.gd b/scenes/tilemap/tilemap.gd similarity index 100% rename from scenes/tilemap.gd rename to scenes/tilemap/tilemap.gd diff --git a/scenes/tilemap.tscn b/scenes/tilemap/tilemap.tscn similarity index 84% rename from scenes/tilemap.tscn rename to scenes/tilemap/tilemap.tscn index b3f8e22..595b1d5 100644 --- a/scenes/tilemap.tscn +++ b/scenes/tilemap/tilemap.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=4 format=3 uid="uid://bbq6nklh36yij"] -[ext_resource type="Script" path="res://scenes/tilemap.gd" id="1_mkfgj"] +[ext_resource type="Script" path="res://scenes/tilemap/tilemap.gd" id="1_mkfgj"] [ext_resource type="Shader" path="res://shaders/tilemap.gdshader" id="1_tsdui"] [sub_resource type="ShaderMaterial" id="ShaderMaterial_pmqvj"] diff --git a/scenes/журнал.gd b/scenes/журнал/журнал.gd similarity index 100% rename from scenes/журнал.gd rename to scenes/журнал/журнал.gd diff --git a/scenes/журнал.tscn b/scenes/журнал/журнал.tscn similarity index 97% rename from scenes/журнал.tscn rename to scenes/журнал/журнал.tscn index e811e30..a9d4ad4 100644 --- a/scenes/журнал.tscn +++ b/scenes/журнал/журнал.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=3 format=3 uid="uid://trt0q8th3bn2"] -[ext_resource type="Script" path="res://scenes/журнал.gd" id="1_jtuvb"] +[ext_resource type="Script" path="res://scenes/журнал/журнал.gd" id="1_jtuvb"] [ext_resource type="Script" path="res://addons/godot-logger/scripts/logger_output.gd" id="2_wm8il"] [node name="журнал" type="Panel"] @@ -46,8 +46,8 @@ text = "Очистить" [node name="dlg_file" type="FileDialog" parent="."] gui_embed_subwindows = true -initial_position = 2 title = "Сохранить журнал работы в файл" +initial_position = 2 size = Vector2i(900, 900) borderless = true ok_button_text = "Да" diff --git a/scenes/контроль.gd b/scenes/контроль.gd deleted file mode 100644 index 776bcb1..0000000 --- a/scenes/контроль.gd +++ /dev/null @@ -1,42 +0,0 @@ -extends Panel - -const PRIBORS_RES = \ - [['pribor_uf', 'res://scenes/pribor_uf.tscn'], - ['pribor_rtr', 'res://scenes/pribor_rtr.tscn'], - ['pribor_afsp_l', 'res://scenes/pribor_afsp_l.tscn'], - ['pribor_afsp_r', 'res://scenes/pribor_afsp_r.tscn'], - ['pribor_sch3', 'res://scenes/pribor_sch3.tscn'], - ['pribor_spt_l', 'res://scenes/pribor_spt_l.tscn'], - ['pribor_spt_r', 'res://scenes/pribor_spt_r.tscn'], - ['pribor_prd_v_1', 'res://scenes/pribor_prd_v_1.tscn'], - ['pribor_prd_n_1', 'res://scenes/pribor_prd_n_1.tscn'], - ['pribor_prd_k_1', 'res://scenes/pribor_prd_k_1.tscn'], - ['pribor_prd_v_2', 'res://scenes/pribor_prd_v_2.tscn'], - ['pribor_prd_n_2', 'res://scenes/pribor_prd_n_2.tscn'], - ['pribor_prd_k_2', 'res://scenes/pribor_prd_k_2.tscn'], - ['pribor_prd_v_3', 'res://scenes/pribor_prd_v_3.tscn'], - ['pribor_prd_n_3', 'res://scenes/pribor_prd_n_3.tscn'], - ['pribor_prd_k_3', 'res://scenes/pribor_prd_k_3.tscn'], - ['pribor_prd_v_4', 'res://scenes/pribor_prd_v_4.tscn'], - ['pribor_prd_n_4', 'res://scenes/pribor_prd_n_4.tscn'], - ['pribor_prd_k_4', 'res://scenes/pribor_prd_k_4.tscn']] - - -func _ready(): - for item in PRIBORS_RES: - var pribor_node = get_node(item[0]) - var pribor_sch_path = item[1] - pribor_node.connect('button_up', Callable(self, 'on_pribor_press').bind(pribor_sch_path)) - - -func on_pribor_press(pribor_sch_path): - clear_obj($pribor_sch) - var pribor_sch = load(pribor_sch_path).instantiate() - $pribor_sch.add_child(pribor_sch) - - -func clear_obj(obj: Object): - var items = obj.get_children() - for item in items: - obj.remove_child(item) - item.free() diff --git a/scenes/контроль/контроль.gd b/scenes/контроль/контроль.gd new file mode 100644 index 0000000..185dade --- /dev/null +++ b/scenes/контроль/контроль.gd @@ -0,0 +1,43 @@ +extends Panel + +const PRIBORS_RES = \ + [['pribor_uf', 'res://scenes/pribor-uf/pribor-uf.tscn'], + ['pribor_rtr', 'res://scenes/pribor-rtr/pribor-rtr.tscn'], + ['pribor_afsp_l', 'res://scenes/pribor-afsp-l/pribor-afsp-l.tscn'], + ['pribor_afsp_r', 'res://scenes/pribor-afsp-r/pribor-afsp-r.tscn'], + ['pribor_sch3', 'res://scenes/pribor-sch3/pribor-sch3.tscn'], + ['pribor_spt_l', 'res://scenes/pribor-spt-l/pribor-spt-l.tscn'], + ['pribor_spt_r', 'res://scenes/pribor-spt-r/pribor-spt-r.tscn'], + ['pribor_prd_v_1', 'res://scenes/pribor-prd-v-1/pribor-prd-v-1.tscn'], + ['pribor_prd_n_1', 'res://scenes/pribor-prd-n-1/pribor-prd-n-1.tscn'], + ['pribor_prd_k_1', 'res://scenes/pribor-prd-k-1/pribor-prd-k-1.tscn'], + ['pribor_prd_v_2', 'res://scenes/pribor-prd-v-2/pribor-prd-v-2.tscn'], + ['pribor_prd_n_2', 'res://scenes/pribor-prd-n-2/pribor-prd-n-2.tscn'], + ['pribor_prd_k_2', 'res://scenes/pribor-prd-k-2/pribor-prd-k-2.tscn'], + ['pribor_prd_v_3', 'res://scenes/pribor-prd-v-3/pribor-prd-v-3.tscn'], + ['pribor_prd_n_3', 'res://scenes/pribor-prd-n-3/pribor-prd-n-3.tscn'], + ['pribor_prd_k_3', 'res://scenes/pribor-prd-k-3/pribor-prd-k-3.tscn'], + ['pribor_prd_v_4', 'res://scenes/pribor-prd-v-4/pribor-prd-v-4.tscn'], + ['pribor_prd_n_4', 'res://scenes/pribor-prd-n-4/pribor-prd-n-4.tscn'], + ['pribor_prd_k_4', 'res://scenes/pribor-prd-k-4/pribor-prd-k-4.tscn']] + + +func _ready(): + for item in PRIBORS_RES: + var pribor_node = get_node(item[0]) + var pribor_sch_path = item[1] + pribor_node.connect('button_up', Callable(self, 'on_pribor_press').bind(pribor_sch_path)) + + +func on_pribor_press(pribor_sch_path): + clear_obj($pribor_sch) + var pribor_sch = load(pribor_sch_path).instantiate() + assert(pribor_sch) + $pribor_sch.add_child(pribor_sch) + + +func clear_obj(obj: Object): + var items = obj.get_children() + for item in items: + obj.remove_child(item) + item.free() diff --git a/scenes/контроль.tscn b/scenes/контроль/контроль.tscn similarity index 72% rename from scenes/контроль.tscn rename to scenes/контроль/контроль.tscn index 21f7dda..1ed2244 100644 --- a/scenes/контроль.tscn +++ b/scenes/контроль/контроль.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=7 format=3 uid="uid://lwmw4egynmd1"] -[ext_resource type="Script" path="res://scenes/контроль.gd" id="1_x5d6w"] +[ext_resource type="Script" path="res://scenes/контроль/контроль.gd" id="1_x5d6w"] [ext_resource type="Texture2D" uid="uid://bar8k5qef7kch" path="res://data/УФ.png" id="2_0nvm1"] [ext_resource type="Texture2D" uid="uid://dkqlvd750pplc" path="res://data/СПТ.png" id="3_hhadv"] [ext_resource type="Texture2D" uid="uid://b4isaggma6q3" path="res://data/Грани22.png" id="4_l0nc7"] @@ -18,10 +18,10 @@ metadata/_edit_lock_ = true [node name="pribor_uf" type="TextureButton" parent="."] layout_mode = 0 -offset_left = 1110.0 -offset_top = 477.0 -offset_right = 1191.0 -offset_bottom = 657.0 +offset_left = 1220.0 +offset_top = 539.0 +offset_right = 1301.0 +offset_bottom = 719.0 size_flags_horizontal = 15 size_flags_vertical = 15 texture_normal = ExtResource("2_0nvm1") @@ -29,10 +29,10 @@ stretch_mode = 4 [node name="pribor_rtr" type="TextureButton" parent="."] layout_mode = 0 -offset_left = 1105.0 -offset_top = 205.0 -offset_right = 1198.0 -offset_bottom = 361.0 +offset_left = 1220.0 +offset_top = 359.0 +offset_right = 1313.0 +offset_bottom = 515.0 size_flags_horizontal = 15 size_flags_vertical = 15 texture_normal = ExtResource("3_hhadv") @@ -40,10 +40,10 @@ stretch_mode = 4 [node name="pribor_afsp_l" type="TextureButton" parent="."] layout_mode = 0 -offset_left = 910.0 -offset_top = 220.0 -offset_right = 1743.0 -offset_bottom = 860.0 +offset_left = 1043.0 +offset_top = 300.0 +offset_right = 1876.0 +offset_bottom = 940.0 scale = Vector2(0.2, 0.2) size_flags_horizontal = 15 size_flags_vertical = 15 @@ -52,10 +52,10 @@ stretch_mode = 4 [node name="pribor_afsp_r" type="TextureButton" parent="."] layout_mode = 0 -offset_left = 1240.0 -offset_top = 225.0 -offset_right = 2073.0 -offset_bottom = 865.0 +offset_left = 1320.0 +offset_top = 300.0 +offset_right = 2153.0 +offset_bottom = 940.0 scale = Vector2(0.2, 0.2) size_flags_horizontal = 15 size_flags_vertical = 15 @@ -64,10 +64,10 @@ stretch_mode = 4 [node name="pribor_sch3" type="TextureButton" parent="."] layout_mode = 0 -offset_left = 1115.0 -offset_top = 765.0 -offset_right = 1208.0 -offset_bottom = 951.0 +offset_left = 1220.0 +offset_top = 739.0 +offset_right = 1313.0 +offset_bottom = 925.0 size_flags_horizontal = 15 size_flags_vertical = 15 texture_normal = ExtResource("5_kvnex") @@ -75,10 +75,10 @@ stretch_mode = 4 [node name="pribor_spt_l" type="TextureButton" parent="."] layout_mode = 0 -offset_left = 960.0 -offset_top = 795.0 -offset_right = 1053.0 -offset_bottom = 951.0 +offset_left = 1080.0 +offset_top = 755.0 +offset_right = 1173.0 +offset_bottom = 911.0 size_flags_horizontal = 15 size_flags_vertical = 15 texture_normal = ExtResource("3_hhadv") @@ -86,10 +86,10 @@ stretch_mode = 4 [node name="pribor_spt_r" type="TextureButton" parent="."] layout_mode = 0 -offset_left = 1260.0 -offset_top = 795.0 -offset_right = 1353.0 -offset_bottom = 951.0 +offset_left = 1360.0 +offset_top = 756.0 +offset_right = 1453.0 +offset_bottom = 912.0 size_flags_horizontal = 15 size_flags_vertical = 15 texture_normal = ExtResource("3_hhadv") @@ -97,10 +97,10 @@ stretch_mode = 4 [node name="pribor_prd_v_2" type="TextureButton" parent="."] layout_mode = 0 -offset_left = 795.0 -offset_top = 261.0 -offset_right = 872.0 -offset_bottom = 377.0 +offset_left = 960.0 +offset_top = 319.0 +offset_right = 1037.0 +offset_bottom = 435.0 size_flags_horizontal = 15 size_flags_vertical = 15 texture_normal = ExtResource("6_i1yfn") @@ -108,10 +108,10 @@ stretch_mode = 4 [node name="pribor_prd_n_2" type="TextureButton" parent="."] layout_mode = 0 -offset_left = 750.0 -offset_top = 437.0 -offset_right = 827.0 -offset_bottom = 553.0 +offset_left = 960.0 +offset_top = 479.0 +offset_right = 1037.0 +offset_bottom = 595.0 size_flags_horizontal = 15 size_flags_vertical = 15 texture_normal = ExtResource("6_i1yfn") @@ -119,10 +119,10 @@ stretch_mode = 4 [node name="pribor_prd_k_2" type="TextureButton" parent="."] layout_mode = 0 -offset_left = 875.0 -offset_top = 439.0 -offset_right = 952.0 -offset_bottom = 555.0 +offset_left = 1080.0 +offset_top = 479.0 +offset_right = 1157.0 +offset_bottom = 595.0 size_flags_horizontal = 15 size_flags_vertical = 15 texture_normal = ExtResource("6_i1yfn") @@ -130,10 +130,10 @@ stretch_mode = 4 [node name="pribor_prd_v_3" type="TextureButton" parent="."] layout_mode = 0 -offset_left = 1417.0 -offset_top = 780.0 -offset_right = 1494.0 -offset_bottom = 896.0 +offset_left = 1500.0 +offset_top = 799.0 +offset_right = 1577.0 +offset_bottom = 915.0 size_flags_horizontal = 15 size_flags_vertical = 15 texture_normal = ExtResource("6_i1yfn") @@ -142,10 +142,10 @@ flip_h = true [node name="pribor_prd_n_3" type="TextureButton" parent="."] layout_mode = 0 -offset_left = 1340.0 -offset_top = 605.0 -offset_right = 1417.0 -offset_bottom = 721.0 +offset_left = 1380.0 +offset_top = 619.0 +offset_right = 1457.0 +offset_bottom = 735.0 size_flags_horizontal = 15 size_flags_vertical = 15 texture_normal = ExtResource("6_i1yfn") @@ -154,10 +154,10 @@ flip_h = true [node name="pribor_prd_k_3" type="TextureButton" parent="."] layout_mode = 0 -offset_left = 1460.0 -offset_top = 605.0 -offset_right = 1537.0 -offset_bottom = 721.0 +offset_left = 1500.0 +offset_top = 639.0 +offset_right = 1577.0 +offset_bottom = 755.0 size_flags_horizontal = 15 size_flags_vertical = 15 texture_normal = ExtResource("6_i1yfn") @@ -166,10 +166,10 @@ flip_h = true [node name="pribor_prd_v_1" type="TextureButton" parent="."] layout_mode = 0 -offset_left = 1445.0 -offset_top = 275.0 -offset_right = 1522.0 -offset_bottom = 391.0 +offset_left = 1500.0 +offset_top = 319.0 +offset_right = 1577.0 +offset_bottom = 435.0 size_flags_horizontal = 15 size_flags_vertical = 15 texture_normal = ExtResource("6_i1yfn") @@ -178,10 +178,10 @@ flip_h = true [node name="pribor_prd_n_1" type="TextureButton" parent="."] layout_mode = 0 -offset_left = 1335.0 -offset_top = 437.0 -offset_right = 1412.0 -offset_bottom = 553.0 +offset_left = 1380.0 +offset_top = 479.0 +offset_right = 1457.0 +offset_bottom = 595.0 size_flags_horizontal = 15 size_flags_vertical = 15 texture_normal = ExtResource("6_i1yfn") @@ -190,10 +190,10 @@ flip_h = true [node name="pribor_prd_k_1" type="TextureButton" parent="."] layout_mode = 0 -offset_left = 1460.0 -offset_top = 446.0 -offset_right = 1537.0 -offset_bottom = 562.0 +offset_left = 1500.0 +offset_top = 479.0 +offset_right = 1577.0 +offset_bottom = 595.0 size_flags_horizontal = 15 size_flags_vertical = 15 texture_normal = ExtResource("6_i1yfn") @@ -202,10 +202,10 @@ flip_h = true [node name="pribor_prd_v_4" type="TextureButton" parent="."] layout_mode = 0 -offset_left = 805.0 -offset_top = 780.0 -offset_right = 882.0 -offset_bottom = 896.0 +offset_left = 960.0 +offset_top = 799.0 +offset_right = 1037.0 +offset_bottom = 915.0 size_flags_horizontal = 15 size_flags_vertical = 15 texture_normal = ExtResource("6_i1yfn") @@ -213,10 +213,10 @@ stretch_mode = 4 [node name="pribor_prd_n_4" type="TextureButton" parent="."] layout_mode = 0 -offset_left = 750.0 -offset_top = 607.0 -offset_right = 827.0 -offset_bottom = 723.0 +offset_left = 960.0 +offset_top = 639.0 +offset_right = 1037.0 +offset_bottom = 755.0 size_flags_horizontal = 15 size_flags_vertical = 15 texture_normal = ExtResource("6_i1yfn") @@ -224,10 +224,10 @@ stretch_mode = 4 [node name="pribor_prd_k_4" type="TextureButton" parent="."] layout_mode = 0 -offset_left = 885.0 -offset_top = 607.0 -offset_right = 962.0 -offset_bottom = 723.0 +offset_left = 1080.0 +offset_top = 619.0 +offset_right = 1157.0 +offset_bottom = 735.0 size_flags_horizontal = 15 size_flags_vertical = 15 texture_normal = ExtResource("6_i1yfn") diff --git a/scenes/настройки.gd b/scenes/настройки/настройки.gd similarity index 100% rename from scenes/настройки.gd rename to scenes/настройки/настройки.gd diff --git a/scenes/настройки.tscn b/scenes/настройки/настройки.tscn similarity index 99% rename from scenes/настройки.tscn rename to scenes/настройки/настройки.tscn index 4b79291..6293a8c 100644 --- a/scenes/настройки.tscn +++ b/scenes/настройки/настройки.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=3 format=3 uid="uid://bnptm4rlp60dq"] -[ext_resource type="Script" path="res://scenes/настройки.gd" id="1_2l3rd"] +[ext_resource type="Script" path="res://scenes/настройки/настройки.gd" id="1_2l3rd"] [sub_resource type="GDScript" id="GDScript_anjmx"] script/source = "extends LineEdit diff --git a/scenes/переключатель-эмс.tscn b/scenes/переключатель-эмс.tscn index 25d8152..27498f1 100644 --- a/scenes/переключатель-эмс.tscn +++ b/scenes/переключатель-эмс.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=6 format=3 uid="uid://cmtgncelo01jh"] +[gd_scene load_steps=6 format=3 uid="uid://dlrq4xuwy8sn2"] [sub_resource type="StyleBoxEmpty" id="3"] diff --git a/scenes/работа.gd b/scenes/работа/работа.gd similarity index 100% rename from scenes/работа.gd rename to scenes/работа/работа.gd diff --git a/scenes/работа.tscn b/scenes/работа/работа.tscn similarity index 87% rename from scenes/работа.tscn rename to scenes/работа/работа.tscn index 5f6ea8b..cc5885d 100644 --- a/scenes/работа.tscn +++ b/scenes/работа/работа.tscn @@ -1,15 +1,15 @@ [gd_scene load_steps=13 format=3 uid="uid://b276iygic5itk"] -[ext_resource type="Script" path="res://scenes/работа.gd" id="1_niok4"] -[ext_resource type="PackedScene" uid="uid://nl1vklubr5kr" path="res://scenes/bip.tscn" id="2_br3s6"] -[ext_resource type="PackedScene" uid="uid://dem3fcec25awh" path="res://scenes/grd_side.tscn" id="3_s2j0e"] -[ext_resource type="PackedScene" uid="uid://cnkbk53mi7viu" path="res://scenes/grd_btns.tscn" id="5_2jnbs"] -[ext_resource type="PackedScene" uid="uid://dymo732qc2doa" path="res://scenes/count_all_pad.tscn" id="6_e3re7"] -[ext_resource type="PackedScene" uid="uid://bwti82byphl68" path="res://scenes/count_danger_pad.tscn" id="7_2arls"] -[ext_resource type="PackedScene" uid="uid://da7w3vkhadfwe" path="res://scenes/button-flat.tscn" id="8_k0iv2"] -[ext_resource type="PackedScene" uid="uid://0uqi1ghf7sma" path="res://scenes/btn_scale.tscn" id="9_oey3x"] -[ext_resource type="PackedScene" uid="uid://bbq6nklh36yij" path="res://scenes/tilemap.tscn" id="10_gtwyg"] -[ext_resource type="PackedScene" uid="uid://b5kjdyxuwsot5" path="res://scenes/canvas.tscn" id="11_b6su4"] +[ext_resource type="Script" path="res://scenes/работа/работа.gd" id="1_niok4"] +[ext_resource type="PackedScene" uid="uid://nl1vklubr5kr" path="res://scenes/bip/bip.tscn" id="2_br3s6"] +[ext_resource type="PackedScene" uid="uid://dem3fcec25awh" path="res://scenes/grid-side-panel/grid-side-panel.tscn" id="3_s2j0e"] +[ext_resource type="PackedScene" uid="uid://cnkbk53mi7viu" path="res://scenes/grid-buttons-ecm/grid-buttons-ecm.tscn" id="5_2jnbs"] +[ext_resource type="PackedScene" uid="uid://dymo732qc2doa" path="res://scenes/count-all/count-all-pad.tscn" id="6_e3re7"] +[ext_resource type="PackedScene" uid="uid://bwti82byphl68" path="res://scenes/count-danger/count_danger_pad.tscn" id="7_2arls"] +[ext_resource type="PackedScene" uid="uid://da7w3vkhadfwe" path="res://scenes/button-flat/button-flat.tscn" id="8_k0iv2"] +[ext_resource type="PackedScene" uid="uid://0uqi1ghf7sma" path="res://scenes/btn_scale/btn_scale.tscn" id="9_oey3x"] +[ext_resource type="PackedScene" uid="uid://bbq6nklh36yij" path="res://scenes/tilemap/tilemap.tscn" id="10_gtwyg"] +[ext_resource type="PackedScene" uid="uid://b5kjdyxuwsot5" path="res://scenes/canvas/canvas.tscn" id="11_b6su4"] [ext_resource type="Shader" path="res://shaders/tilemap.gdshader" id="11_ekapd"] [sub_resource type="ShaderMaterial" id="ShaderMaterial_4p7y1"] diff --git a/scenes/line_edit_empty.tscn b/scenes/эмс/line-edit-empty.tscn similarity index 100% rename from scenes/line_edit_empty.tscn rename to scenes/эмс/line-edit-empty.tscn diff --git a/scenes/кнопка-5.tscn b/scenes/эмс/кнопка-5.tscn similarity index 100% rename from scenes/кнопка-5.tscn rename to scenes/эмс/кнопка-5.tscn diff --git a/scenes/кнопка-эмс.gd b/scenes/эмс/кнопка-эмс.gd similarity index 100% rename from scenes/кнопка-эмс.gd rename to scenes/эмс/кнопка-эмс.gd diff --git a/scenes/кнопка-эмс.tscn b/scenes/эмс/кнопка-эмс.tscn similarity index 94% rename from scenes/кнопка-эмс.tscn rename to scenes/эмс/кнопка-эмс.tscn index 4f37cbe..562b190 100644 --- a/scenes/кнопка-эмс.tscn +++ b/scenes/эмс/кнопка-эмс.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=9 format=3 uid="uid://gh3wqymu7cub"] -[ext_resource type="Script" path="res://scenes/кнопка-эмс.gd" id="1_pmsh3"] +[ext_resource type="Script" path="res://scenes/эмс/кнопка-эмс.gd" id="1_pmsh3"] [ext_resource type="Texture2D" uid="uid://nfpish471rjj" path="res://data/кнопка-эмс-1.png" id="2_0o537"] [sub_resource type="StyleBoxEmpty" id="1"] diff --git a/scenes/состояния-эмс.gd b/scenes/эмс/состояния-эмс.gd similarity index 100% rename from scenes/состояния-эмс.gd rename to scenes/эмс/состояния-эмс.gd diff --git a/scenes/состояния-эмс.tscn b/scenes/эмс/состояния-эмс.tscn similarity index 92% rename from scenes/состояния-эмс.tscn rename to scenes/эмс/состояния-эмс.tscn index 89ab18e..427f581 100644 --- a/scenes/состояния-эмс.tscn +++ b/scenes/эмс/состояния-эмс.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=7 format=3 uid="uid://by22sta8tt8dn"] -[ext_resource type="Script" path="res://scenes/состояния-эмс.gd" id="1_5cq67"] +[ext_resource type="Script" path="res://scenes/эмс/состояния-эмс.gd" id="1_5cq67"] [ext_resource type="Texture2D" uid="uid://belwchvdktrw0" path="res://data/эмс-бланк.png" id="2_don4l"] [ext_resource type="Texture2D" uid="uid://bwddxs24es81u" path="res://data/эмс-бланк-пост.png" id="3_lu634"] [ext_resource type="Texture2D" uid="uid://pfoscstbm025" path="res://data/эмс-бланк-перем.png" id="4_b33qw"] diff --git a/scenes/эмс.gd b/scenes/эмс/эмс.gd similarity index 97% rename from scenes/эмс.gd rename to scenes/эмс/эмс.gd index 0240d79..054309b 100644 --- a/scenes/эмс.gd +++ b/scenes/эмс/эмс.gd @@ -2,13 +2,13 @@ extends Panel # Предзагрузка ячеек таблиц const TableHeader = preload('res://table/header.tscn') -const CellYemsButton = preload('res://scenes/кнопка-эмс.tscn') -const CellLineEdit = preload('res://scenes/ячейка-2.tscn') -const CellState = preload('res://scenes/состояния-эмс.tscn') -const CellOptBtn = preload('res://scenes/кнопка-5.tscn') -const CellLEEmpty = preload('res://scenes/line_edit_empty.tscn') -const CellFront = preload('res://scenes/cell-front.tscn') -const CellFrontRear = preload('res://scenes/cell-front-rear.tscn') +const CellYemsButton = preload('res://scenes/эмс/кнопка-эмс.tscn') +const CellLineEdit = preload('res://table/ячейка-2.tscn') +const CellState = preload('res://scenes/эмс/состояния-эмс.tscn') +const CellOptBtn = preload('res://scenes/эмс/кнопка-5.tscn') +const CellLEEmpty = preload('res://scenes/эмс/line-edit-empty.tscn') +const CellFront = preload('res://scenes/cell/cell-front.tscn') +const CellFrontRear = preload('res://scenes/cell/cell-front-rear.tscn') # Режимы работы выходов const OUT_MODE: Array = ['Работа', 'Контроль', '1', '0'] # diff --git a/scenes/эмс.tscn b/scenes/эмс/эмс.tscn similarity index 96% rename from scenes/эмс.tscn rename to scenes/эмс/эмс.tscn index 444fca6..489af88 100644 --- a/scenes/эмс.tscn +++ b/scenes/эмс/эмс.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=9 format=3 uid="uid://dab6loryocc73"] -[ext_resource type="Script" path="res://scenes/эмс.gd" id="1_mk57x"] -[ext_resource type="PackedScene" uid="uid://da7w3vkhadfwe" path="res://scenes/button-flat.tscn" id="2_eju8r"] +[ext_resource type="Script" path="res://scenes/эмс/эмс.gd" id="1_mk57x"] +[ext_resource type="PackedScene" uid="uid://da7w3vkhadfwe" path="res://scenes/button-flat/button-flat.tscn" id="2_eju8r"] [ext_resource type="Texture2D" uid="uid://dd60btbqnpiqw" path="res://data/document-new-0.png" id="3_w7rqa"] [ext_resource type="Texture2D" uid="uid://coqg6wsftvtxr" path="res://data/document-save-0.png" id="4_gyaoq"] [ext_resource type="Texture2D" uid="uid://cywuevvpkxl7v" path="res://data/edit-copy-0.png" id="5_dxpqo"] diff --git a/scenes/file-table.gd b/scripts/file-table.gd similarity index 100% rename from scenes/file-table.gd rename to scripts/file-table.gd diff --git a/scenes/ячейка-2.tscn b/table/ячейка-2.tscn similarity index 100% rename from scenes/ячейка-2.tscn rename to table/ячейка-2.tscn