diff --git a/project.godot b/project.godot index fe48e30f..d526b261 100644 --- a/project.godot +++ b/project.godot @@ -56,7 +56,8 @@ gdscript/warnings/integer_division=0 window/size/viewport_width=1600 window/size/viewport_height=1200 window/subwindows/embed_subwindows=false -window/stretch/mode="viewport" +window/stretch/mode="canvas_items" +window/dpi/allow_hidpi=false window/vsync/vsync_mode=false [editor] diff --git a/scenes/button-flat.tscn b/scenes/button-flat.tscn index 997f3141..52de7142 100644 --- a/scenes/button-flat.tscn +++ b/scenes/button-flat.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=9 format=3 uid="uid://da7w3vkhadfwe"] [ext_resource type="Script" path="res://scenes/nine-patch-button.gd" id="1_uqldr"] -[ext_resource type="Texture2D" uid="uid://ct0ajcwno03h7" path="res://data/кнопка-квадрат-0.png" id="2_0loew"] +[ext_resource type="Texture2D" uid="uid://ct0ajcwno03h7" path="res://data/кнопка-квадрат-0.png" id="2_ak74m"] [sub_resource type="StyleBoxEmpty" id="1"] @@ -22,17 +22,6 @@ theme_override_styles/panel = SubResource("1") script = ExtResource("1_uqldr") toggle_mode = true -[node name="state" type="NinePatchRect" parent="."] -show_behind_parent = true -layout_mode = 2 -texture = ExtResource("2_0loew") -patch_margin_left = 10 -patch_margin_top = 10 -patch_margin_right = 10 -patch_margin_bottom = 10 -axis_stretch_horizontal = 1 -axis_stretch_vertical = 1 - [node name="button" type="Button" parent="."] layout_mode = 2 theme_override_styles/normal = SubResource("6") @@ -43,7 +32,15 @@ theme_override_styles/focus = SubResource("4") toggle_mode = true clip_text = true -[node name="label" type="Label" parent="."] +[node name="state" type="NinePatchRect" parent="."] +show_behind_parent = true layout_mode = 2 +texture = ExtResource("2_ak74m") +patch_margin_left = 10 +patch_margin_top = 10 +patch_margin_right = 10 +patch_margin_bottom = 10 +axis_stretch_horizontal = 2 +axis_stretch_vertical = 2 [connection signal="toggled" from="button" to="." method="_on_button_toggled"] diff --git a/scenes/canvas.tscn b/scenes/canvas.tscn index ce18bb38..a9469770 100644 --- a/scenes/canvas.tscn +++ b/scenes/canvas.tscn @@ -8,7 +8,7 @@ [sub_resource type="PlaceholderTexture2D" id="PlaceholderTexture2D_2bft1"] size = Vector2(1600, 1200) -[sub_resource type="ShaderMaterial" id="ShaderMaterial_wl0b8"] +[sub_resource type="ShaderMaterial" id="ShaderMaterial_pnsbm"] resource_local_to_scene = true shader = ExtResource("4_gb4a1") shader_parameter/color = Color(1, 1, 1, 0.168627) @@ -26,6 +26,6 @@ centered = false script = ExtResource("2_vkwmy") [node name="строб" parent="." instance=ExtResource("3_uhdvc")] -material = SubResource("ShaderMaterial_wl0b8") +material = SubResource("ShaderMaterial_pnsbm") position = Vector2(560, 560) scale = Vector2(1100, 1100) diff --git a/scenes/tab-switch.tscn b/scenes/tab-switch.tscn index 2c3ccdbc..c2c1e3cb 100644 --- a/scenes/tab-switch.tscn +++ b/scenes/tab-switch.tscn @@ -1,27 +1,32 @@ -[gd_scene load_steps=6 format=3 uid="uid://3slb0i3pvowc"] +[gd_scene load_steps=7 format=3 uid="uid://3slb0i3pvowc"] [ext_resource type="Script" path="res://scenes/tab-switch.gd" id="1_qroqt"] [ext_resource type="PackedScene" uid="uid://b276iygic5itk" path="res://scenes/работа.tscn" id="2_pdbvn"] [ext_resource type="PackedScene" uid="uid://lwmw4egynmd1" path="res://scenes/контроль.tscn" id="3_2apbp"] [ext_resource type="PackedScene" uid="uid://trt0q8th3bn2" path="res://scenes/журнал.tscn" id="4_yq6c0"] [ext_resource type="PackedScene" uid="uid://dab6loryocc73" path="res://scenes/ЭМС.tscn" id="5_tlyql"] +[ext_resource type="PackedScene" uid="uid://bnptm4rlp60dq" path="res://scenes/настройки.tscn" id="6_rxq15"] [node name="tab_switch" type="TabContainer"] offset_right = 1600.0 offset_bottom = 1200.0 script = ExtResource("1_qroqt") -[node name="работа" parent="." instance=ExtResource("2_pdbvn")] +[node name="Работа" parent="." instance=ExtResource("2_pdbvn")] layout_mode = 2 -[node name="контроль" parent="." instance=ExtResource("3_2apbp")] +[node name="Контроль" parent="." instance=ExtResource("3_2apbp")] visible = false layout_mode = 2 -[node name="журнал" parent="." instance=ExtResource("4_yq6c0")] +[node name="Журнал" parent="." instance=ExtResource("4_yq6c0")] visible = false layout_mode = 2 [node name="ЭМС" parent="." instance=ExtResource("5_tlyql")] visible = false layout_mode = 2 + +[node name="Настройки" parent="." instance=ExtResource("6_rxq15")] +visible = false +layout_mode = 2 diff --git a/scenes/журнал.tscn b/scenes/журнал.tscn index 81237882..026e4845 100644 --- a/scenes/журнал.tscn +++ b/scenes/журнал.tscn @@ -3,8 +3,7 @@ [ext_resource type="Script" path="res://scenes/журнал.gd" id="1_4bknr"] [ext_resource type="Script" path="res://addons/godot-logger/scripts/logger_output.gd" id="2_4e6at"] -[node name="журнал" type="Control"] -layout_mode = 3 +[node name="журнал" type="Panel"] anchors_preset = 15 anchor_right = 1.0 anchor_bottom = 1.0 @@ -47,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/работа.tscn b/scenes/работа.tscn index 4823226b..e3475f78 100644 --- a/scenes/работа.tscn +++ b/scenes/работа.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=10 format=3 uid="uid://b276iygic5itk"] +[gd_scene load_steps=11 format=3 uid="uid://b276iygic5itk"] [ext_resource type="Script" path="res://scenes/работа.gd" id="1_vmjjl"] [ext_resource type="PackedScene" uid="uid://nl1vklubr5kr" path="res://scenes/bip.tscn" id="2_ew6j4"] @@ -9,6 +9,7 @@ [ext_resource type="PackedScene" uid="uid://b5kjdyxuwsot5" path="res://scenes/canvas.tscn" id="7_pvt8f"] [ext_resource type="PackedScene" uid="uid://da7w3vkhadfwe" path="res://scenes/button-flat.tscn" id="8_r2k1p"] [ext_resource type="FontFile" uid="uid://befva8r034a4v" path="res://data/DSEG7Classic-Regular.ttf" id="9_lr4kl"] +[ext_resource type="Texture2D" uid="uid://c1maea6yhd3k7" path="res://data/кнопка-масштаб.png" id="10_7gljt"] [node name="Работа" type="Panel"] script = ExtResource("1_vmjjl") @@ -129,15 +130,55 @@ vertical_alignment = 1 [node name="scroll" type="ScrollContainer" parent="grd_side/frm_ecm_list"] layout_mode = 0 -offset_left = 4.0 +offset_left = 8.0 offset_top = 57.0 offset_right = 472.0 -offset_bottom = 285.0 +offset_bottom = 237.0 [node name="table" type="GridContainer" parent="grd_side/frm_ecm_list/scroll"] layout_mode = 2 script = ExtResource("5_0lwxu") +[node name="grd_forced" type="GridContainer" parent="grd_side/frm_ecm_list"] +layout_mode = 0 +offset_left = 8.0 +offset_top = 245.0 +offset_right = 472.0 +offset_bottom = 281.0 +columns = 4 + +[node name="btn_srn" parent="grd_side/frm_ecm_list/grd_forced" groups=["группа-принудительно"] instance=ExtResource("8_r2k1p")] +layout_mode = 2 +size_flags_horizontal = 3 +size_flags_vertical = 3 +tooltip_text = "Включает принудительную помеху" +text = "СРН" +metadata/rfi_name = "ozp1" + +[node name="btn_jtids" parent="grd_side/frm_ecm_list/grd_forced" groups=["группа-принудительно"] instance=ExtResource("8_r2k1p")] +editor_description = "Кнопка для принудительного включения группы секторов в режим JTIDS" +layout_mode = 2 +size_flags_horizontal = 3 +size_flags_vertical = 3 +text = "JTIDS" +metadata/rfi_name = "ozp1" + +[node name="btn_kupd" parent="grd_side/frm_ecm_list/grd_forced" groups=["группа-принудительно"] instance=ExtResource("8_r2k1p")] +layout_mode = 2 +size_flags_horizontal = 3 +size_flags_vertical = 3 +tooltip_text = "Кнопка для принудительного включения группы секторов в режим КУПД" +text = "КУПД" +metadata/rfi_name = "ozp1" + +[node name="btn_cancel" parent="grd_side/frm_ecm_list/grd_forced" groups=["прин-секторы-срн"] instance=ExtResource("8_r2k1p")] +layout_mode = 2 +size_flags_horizontal = 3 +size_flags_vertical = 3 +text = "Отключить все" +pressed = true +metadata/rfi_name = "" + [node name="frm_ecm_params" type="NinePatchRect" parent="grd_side"] layout_mode = 2 size_flags_horizontal = 3 @@ -156,7 +197,7 @@ anchor_right = 1.0 offset_bottom = 22.0 grow_horizontal = 2 theme_override_colors/font_color = Color(0, 0, 0, 1) -text = "Параметры помехи" +text = "Параметры сеанса" horizontal_alignment = 1 vertical_alignment = 1 @@ -174,167 +215,113 @@ script = ExtResource("5_0lwxu") [node name="canvas" parent="." instance=ExtResource("7_pvt8f")] metadata/_edit_lock_ = true -[node name="btn_auto_threat" parent="." instance=ExtResource("8_r2k1p")] +[node name="grd_btns" type="GridContainer" parent="."] layout_mode = 0 -offset_left = 912.0 -offset_top = 67.0 -offset_right = 1102.0 -offset_bottom = 117.0 -text = "Автоматически" +offset_left = 8.0 +offset_top = 1116.0 +offset_right = 1104.0 +offset_bottom = 1170.0 +columns = 14 -[node name="btn_strobe" parent="." instance=ExtResource("8_r2k1p")] -layout_mode = 0 -offset_left = 912.0 -offset_top = 6.0 -offset_right = 1102.0 -offset_bottom = 56.0 -text = "Строб" - -[node name="btn_p5" parent="." groups=["группа-режим-помехи"] instance=ExtResource("8_r2k1p")] -layout_mode = 1 -anchors_preset = -1 -offset_left = 980.0 -offset_top = 1118.0 -offset_right = 1045.0 -offset_bottom = 1168.0 -grow_horizontal = 2 -grow_vertical = 2 -text = "ОЗП-1" -metadata/rfi_name = "ozp1" - -[node name="btn_p6" parent="." groups=["группа-режим-помехи"] instance=ExtResource("8_r2k1p")] -layout_mode = 0 -offset_left = 840.0 -offset_top = 1118.0 -offset_right = 905.0 -offset_bottom = 1168.0 -text = "СВ-М2" -metadata/rfi_name = "svm2" - -[node name="btn_p7" parent="." groups=["группа-режим-помехи"] instance=ExtResource("8_r2k1p")] -layout_mode = 0 -offset_left = 910.0 -offset_top = 1118.0 -offset_right = 975.0 -offset_bottom = 1168.0 -text = "K1" -metadata/rfi_name = "k1" - -[node name="btn_p8" parent="." groups=["группа-режим-помехи"] instance=ExtResource("8_r2k1p")] -layout_mode = 0 -offset_left = 770.0 -offset_top = 1118.0 -offset_right = 835.0 -offset_bottom = 1168.0 -text = "СВ-И1" -metadata/rfi_name = "svi1" - -[node name="btn_p9" parent="." groups=["группа-режим-помехи"] instance=ExtResource("8_r2k1p")] -layout_mode = 0 -offset_left = 700.0 -offset_top = 1118.0 -offset_right = 765.0 -offset_bottom = 1168.0 -text = "ПД-ЧМ" -metadata/rfi_name = "pdchm" - -[node name="btn_p10" parent="." groups=["группа-режим-помехи"] instance=ExtResource("8_r2k1p")] -layout_mode = 1 -anchors_preset = -1 -offset_left = 630.0 -offset_top = 1118.0 -offset_right = 695.0 -offset_bottom = 1168.0 -grow_horizontal = 2 -grow_vertical = 2 -text = "ПД-М4С" -metadata/rfi_name = "pdm4s" - -[node name="btn_p11" parent="." groups=["группа-режим-помехи"] instance=ExtResource("8_r2k1p")] -layout_mode = 0 -offset_left = 350.0 -offset_top = 1118.0 -offset_right = 415.0 -offset_bottom = 1168.0 -text = "ЛЧМ-1" -metadata/rfi_name = "lchm1" - -[node name="btn_p12" parent="." groups=["группа-режим-помехи"] instance=ExtResource("8_r2k1p")] -layout_mode = 1 -anchors_preset = -1 -offset_left = 420.0 -offset_top = 1118.0 -offset_right = 485.0 -offset_bottom = 1168.0 -grow_horizontal = 2 -grow_vertical = 2 -text = "МЧМ-1" -metadata/rfi_name = "mchm1" - -[node name="btn_p13" parent="." groups=["группа-режим-помехи"] instance=ExtResource("8_r2k1p")] -layout_mode = 1 -anchors_preset = -1 -offset_left = 490.0 -offset_top = 1118.0 -offset_right = 555.0 -offset_bottom = 1168.0 -grow_horizontal = 2 -grow_vertical = 2 -text = "ПД-М2" -metadata/rfi_name = "pdm2" - -[node name="btn_p14" parent="." groups=["группа-режим-помехи"] instance=ExtResource("8_r2k1p")] -layout_mode = 1 -anchors_preset = -1 -offset_left = 560.0 -offset_top = 1118.0 -offset_right = 625.0 -offset_bottom = 1168.0 -grow_horizontal = 2 -grow_vertical = 2 -text = "ПД-М4" -metadata/rfi_name = "pdm4" - -[node name="btn_p15" parent="." groups=["группа-режим-помехи"] instance=ExtResource("8_r2k1p")] -layout_mode = 1 -anchors_preset = -1 -offset_left = 280.0 -offset_top = 1118.0 -offset_right = 345.0 -offset_bottom = 1168.0 -grow_horizontal = 2 -grow_vertical = 2 -text = "СРН-М2" -metadata/rfi_name = "srnm2" - -[node name="btn_p16" parent="." groups=["группа-режим-помехи"] instance=ExtResource("8_r2k1p")] -layout_mode = 0 -offset_left = 210.0 -offset_top = 1118.0 -offset_right = 275.0 -offset_bottom = 1168.0 -text = "СРН-И1" -metadata/rfi_name = "srni1" - -[node name="btn_off" parent="." groups=["группа-режим-помехи"] instance=ExtResource("8_r2k1p")] -layout_mode = 0 -offset_left = 140.0 -offset_top = 1118.0 -offset_right = 205.0 -offset_bottom = 1168.0 +[node name="btn_off" parent="grd_btns" groups=["группа-режим-помехи"] instance=ExtResource("8_r2k1p")] +layout_mode = 2 +size_flags_horizontal = 3 +size_flags_vertical = 3 text = "Откл." pressed = true metadata/rfi_name = "" -[node name="btn_auto_rfi" parent="." groups=["группа-режим-помехи"] instance=ExtResource("8_r2k1p")] -layout_mode = 0 -offset_left = 10.0 -offset_top = 1118.0 -offset_right = 135.0 -offset_bottom = 1168.0 -text = "Автоматически" +[node name="btn_auto_rfi" parent="grd_btns" groups=["группа-режим-помехи"] instance=ExtResource("8_r2k1p")] +layout_mode = 2 +size_flags_horizontal = 3 +size_flags_vertical = 3 +text = "Автомат" metadata/rfi_name = "" +[node name="btn_p12" parent="grd_btns" groups=["группа-режим-помехи"] instance=ExtResource("8_r2k1p")] +layout_mode = 2 +size_flags_horizontal = 3 +size_flags_vertical = 3 +text = "МЧМ-1" +metadata/rfi_name = "mchm1" + +[node name="btn_p16" parent="grd_btns" groups=["группа-режим-помехи"] instance=ExtResource("8_r2k1p")] +layout_mode = 2 +size_flags_horizontal = 3 +size_flags_vertical = 3 +text = "СРН-И1" +metadata/rfi_name = "srni1" + +[node name="btn_p15" parent="grd_btns" groups=["группа-режим-помехи"] instance=ExtResource("8_r2k1p")] +layout_mode = 2 +size_flags_horizontal = 3 +size_flags_vertical = 3 +text = "СРН-М2" +metadata/rfi_name = "srnm2" + +[node name="btn_p14" parent="grd_btns" groups=["группа-режим-помехи"] instance=ExtResource("8_r2k1p")] +layout_mode = 2 +size_flags_horizontal = 3 +size_flags_vertical = 3 +text = "ПД-М4" +metadata/rfi_name = "pdm4" + +[node name="btn_p13" parent="grd_btns" groups=["группа-режим-помехи"] instance=ExtResource("8_r2k1p")] +layout_mode = 2 +size_flags_horizontal = 3 +size_flags_vertical = 3 +text = "ПД-М2" +metadata/rfi_name = "pdm2" + +[node name="btn_p11" parent="grd_btns" groups=["группа-режим-помехи"] instance=ExtResource("8_r2k1p")] +layout_mode = 2 +size_flags_horizontal = 3 +size_flags_vertical = 3 +text = "ЛЧМ-1" +metadata/rfi_name = "lchm1" + +[node name="btn_p10" parent="grd_btns" groups=["группа-режим-помехи"] instance=ExtResource("8_r2k1p")] +layout_mode = 2 +size_flags_horizontal = 3 +size_flags_vertical = 3 +text = "ПД-М4С" +metadata/rfi_name = "pdm4s" + +[node name="btn_p9" parent="grd_btns" groups=["группа-режим-помехи"] instance=ExtResource("8_r2k1p")] +layout_mode = 2 +size_flags_horizontal = 3 +size_flags_vertical = 3 +text = "ПД-ЧМ" +metadata/rfi_name = "pdchm" + +[node name="btn_p8" parent="grd_btns" groups=["группа-режим-помехи"] instance=ExtResource("8_r2k1p")] +layout_mode = 2 +size_flags_horizontal = 3 +size_flags_vertical = 3 +text = "СВ-И1" +metadata/rfi_name = "svi1" + +[node name="btn_p7" parent="grd_btns" groups=["группа-режим-помехи"] instance=ExtResource("8_r2k1p")] +layout_mode = 2 +size_flags_horizontal = 3 +size_flags_vertical = 3 +text = "K1" +metadata/rfi_name = "k1" + +[node name="btn_p6" parent="grd_btns" groups=["группа-режим-помехи"] instance=ExtResource("8_r2k1p")] +layout_mode = 2 +size_flags_horizontal = 3 +size_flags_vertical = 3 +text = "СВ-М2" +metadata/rfi_name = "svm2" + +[node name="btn_p5" parent="grd_btns" groups=["группа-режим-помехи"] instance=ExtResource("8_r2k1p")] +layout_mode = 2 +size_flags_horizontal = 3 +size_flags_vertical = 3 +text = "ОЗП-1" +metadata/rfi_name = "ozp1" + [node name="count_all_pad" type="Label" parent="."] self_modulate = Color(0.403922, 0.403922, 0.403922, 1) layout_mode = 0 @@ -368,6 +355,7 @@ theme_override_font_sizes/font_size = 56 text = "88" [node name="count_danger" type="Label" parent="count_danger_pad"] +modulate = Color(0.8, 0.533333, 0.27451, 1) layout_mode = 0 offset_right = 92.0 offset_bottom = 59.0 @@ -401,6 +389,61 @@ offset_right = 83.0 offset_bottom = 72.0 text = "Опасных:" +[node name="btn_auto_threat" parent="." instance=ExtResource("8_r2k1p")] +layout_mode = 0 +offset_left = 1022.0 +offset_top = 6.0 +offset_right = 1096.0 +offset_bottom = 60.0 +size_flags_horizontal = 3 +size_flags_vertical = 3 +text = "Автомат" + +[node name="btn_strob" parent="." instance=ExtResource("8_r2k1p")] +layout_mode = 2 +offset_left = 1022.0 +offset_top = 66.0 +offset_right = 1096.0 +offset_bottom = 120.0 +size_flags_horizontal = 3 +size_flags_vertical = 3 +tooltip_text = "Кнопка для выбора сектора при помощи клика мышкой" +text = "Строб" + +[node name="btn_view" parent="." instance=ExtResource("8_r2k1p")] +layout_mode = 2 +offset_left = 874.0 +offset_top = 1023.0 +offset_right = 948.0 +offset_bottom = 1056.0 +size_flags_horizontal = 3 +size_flags_vertical = 3 +text = "Вид" + +[node name="btn_scale" type="TextureButton" parent="."] +self_modulate = Color(1, 1, 1, 0.509804) +layout_mode = 0 +offset_left = 952.0 +offset_top = 1038.0 +offset_right = 1104.0 +offset_bottom = 1056.0 +tooltip_text = "Измененяет масштаб" +action_mode = 0 +texture_normal = ExtResource("10_7gljt") +ignore_texture_size = true +stretch_mode = 0 +metadata/i_scale = 0 +metadata/prefix = "Масштаб:" +metadata/scales = [10.0, 20.0, 50.0, 100.0, 250.0] + +[node name="lbl" type="Label" parent="btn_scale"] +layout_mode = 0 +offset_top = -18.0 +offset_right = 152.0 +offset_bottom = 1.0 +text = "Масштаб: 200 км" +vertical_alignment = 1 + [connection signal="drag_begin" from="." to="." method="_on_drag_begin"] [connection signal="drag_continue" from="." to="." method="_on_drag_continue"] -[connection signal="full_screen" from="." to="." method="toggle_full_screen" binds= [0]] +[connection signal="pressed" from="btn_scale" to="." method="_on_btn_scale_pressed"]