From 7b23507d40b1a071c570ad827957af0e712d54ee Mon Sep 17 00:00:00 2001 From: Maxim Date: Thu, 6 Feb 2025 19:34:48 +0300 Subject: [PATCH] =?UTF-8?q?=D0=BA=D1=80=D0=B0=D1=81=D0=BA=D0=B0=20=D0=BA?= =?UTF-8?q?=D0=BD=D0=BE=D0=BF=D0=BE=D0=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PRD_MP550.tscn | 15 ++++++++------- scripts/PRD.gd | 22 ++++++++++++---------- scripts/constants.gd | 16 ++++++++-------- scripts/control_panel.gd | 2 +- table/header.tscn | 12 +++++------- table/node.tscn | 33 ++++++++++++++++++++++----------- table/socket_status.tscn | 23 ++++++++++------------- table/switch.tscn | 4 ++++ 8 files changed, 70 insertions(+), 57 deletions(-) diff --git a/PRD_MP550.tscn b/PRD_MP550.tscn index ee5c21a..9dcfdb1 100644 --- a/PRD_MP550.tscn +++ b/PRD_MP550.tscn @@ -150,8 +150,8 @@ CheckBox/font_sizes/font_size = 14 script = ExtResource("1_v273n") [node name="Background" type="ColorRect" parent="."] -offset_right = 1941.0 -offset_bottom = 988.0 +offset_right = 3025.0 +offset_bottom = 1060.0 theme = SubResource("Theme_k5ur4") color = Color(0.356863, 0.278431, 0.356863, 1) metadata/_edit_lock_ = true @@ -329,6 +329,7 @@ script = ExtResource("2_vmbyo") metadata/_edit_lock_ = true [node name="PSK" type="Sprite2D" parent="TabContainer/PRD/body_grid/litera_2_4_6"] +modulate = Color(1, 1, 0.941176, 0.588235) material = ExtResource("3_3syd3") position = Vector2(914, 5) scale = Vector2(0.247968, 0.234167) @@ -386,6 +387,7 @@ script = ExtResource("2_vmbyo") metadata/_edit_lock_ = true [node name="PSK2" type="Sprite2D" parent="TabContainer/PRD/body_grid/litera_3_5_7"] +modulate = Color(1, 1, 0.941176, 0.588235) material = ExtResource("3_3syd3") position = Vector2(914, -6) scale = Vector2(0.247968, 0.234167) @@ -796,12 +798,11 @@ metadata/_edit_lock_ = true [node name="table1" type="GridContainer" parent="TabContainer/EMS_G"] layout_mode = 2 -offset_left = 27.0 -offset_top = 148.0 -offset_right = 27.0 -offset_bottom = 148.0 +offset_left = 35.0 +offset_top = 60.0 +offset_right = 35.0 +offset_bottom = 60.0 script = ExtResource("2_vmbyo") -metadata/_edit_lock_ = true [node name="load_boadr" type="ColorRect" parent="TabContainer/EMS_G"] layout_mode = 0 diff --git a/scripts/PRD.gd b/scripts/PRD.gd index e4a7d03..7154cc7 100644 --- a/scripts/PRD.gd +++ b/scripts/PRD.gd @@ -47,9 +47,9 @@ func _ready() -> void: draw_tabl(node_select_yau_07b, Constants.ROWS_YAU_07B_1, Constants.ROWS_YAU_07B_1.size()) node_select_yau_07b.set_columns_min_size([160, 120]) node_select_yau_07b.set_node_text(0, 0, 'ПРД-Н') - node_select_yau_07b.set_node_text(1, 0, 'Литера_2') - node_select_yau_07b.set_node_text(0, 1, 'Запрет СИ_2') - node_select_yau_07b.set_node_text(0, 2, 'Модуляция УМ_2') + node_select_yau_07b.set_node_text(1, 0, 'Литера 2') + node_select_yau_07b.set_node_text(0, 1, 'Запрет СИ 2') + node_select_yau_07b.set_node_text(0, 2, 'Модуляция УМ 2') node_select_yau_07b.set_node_text(0, 3, 'Положение луча') node_select_yau_07b.set_node_text(0, 4, 'Аттенюатор') node_select_yau_07b.set_node_text(0, 6, 'СИ 2 в УФ') @@ -58,9 +58,9 @@ func _ready() -> void: draw_tabl(node_select_yau_07b_2, Constants.ROWS_YAU_07B_2, Constants.ROWS_YAU_07B_2.size()) node_select_yau_07b_2.set_columns_min_size([160, 120]) node_select_yau_07b_2.set_node_text(0, 0, 'ПРД-Н') - node_select_yau_07b_2.set_node_text(1, 0, 'Литера_3') - node_select_yau_07b_2.set_node_text(0, 1, 'Запрет СИ_3') - node_select_yau_07b_2.set_node_text(0, 2, 'Модуляция УМ_3') + node_select_yau_07b_2.set_node_text(1, 0, 'Литера 3') + node_select_yau_07b_2.set_node_text(0, 1, 'Запрет СИ 3') + node_select_yau_07b_2.set_node_text(0, 2, 'Модуляция УМ 3') node_select_yau_07b_2.set_node_text(0, 3, 'Положение луча') node_select_yau_07b_2.set_node_text(0, 4, 'Аттенюатор') node_select_yau_07b_2.set_node_text(0, 5, 'ФГОЗ 3') @@ -71,12 +71,14 @@ func _ready() -> void: draw_tabl(node_select_fs_1, Constants.ROWS_FS, Constants.ROWS_FS.size()) node_select_fs_1.set_columns_min_size([120, 120, 150]) node_select_fs_1.set_node_text(0, 0, 'Модуль ФС') - node_select_fs_1.set_node_text(1, 0, 'Литера_2') + node_select_fs_1.set_node_text(1, 0, 'Литера 2') node_select_fs_1.set_node_text(0, 1, 'Состояние') node_select_fs_1.set_node_text(0, 2, 'Частота') - #node_select_fs_1.get_node2(1, 2).placeholder_text = '500' + node_select_fs_1.get_node2(1, 2).placeholder_text = 'в МГц' + node_select_fs_1.get_node2(1, 2).editable = true node_select_fs_1.set_node_text(0, 3, 'Аттенюатор') - #node_select_fs_1.get_node2(1, 3).editable = true + node_select_fs_1.get_node2(1, 3).placeholder_text = 'в dB' + node_select_fs_1.get_node2(1, 3).editable = true node_select_fs_1.set_node_text(0, 4, 'Генератор') node_select_fs_1.set_node_text(0, 5, 'fpga') node_select_fs_1.set_node_text(0, 6, 'СИ 2 от ФС') @@ -85,7 +87,7 @@ func _ready() -> void: draw_tabl(node_select_fs_2, Constants.ROWS_FS, Constants.ROWS_FS.size()) node_select_fs_2.set_columns_min_size([120, 120, 150]) node_select_fs_2.set_node_text(0, 0, 'Модуль ФС') - node_select_fs_2.set_node_text(1, 0, 'Литера_3') + node_select_fs_2.set_node_text(1, 0, 'Литера 3') node_select_fs_2.set_node_text(0, 1, 'Состояние') node_select_fs_2.set_node_text(0, 2, 'Частота') #node_select_fs_2.get_node2(1, 2).placeholder_text = '500' diff --git a/scripts/constants.gd b/scripts/constants.gd index 8705ffd..12279cd 100644 --- a/scripts/constants.gd +++ b/scripts/constants.gd @@ -108,14 +108,14 @@ const RAY_DICT: Array = [ ' Контроль', ] const ATT_DICT: Array = [ - ' 0 db', - ' 0.5 db', - ' 2 db', - ' 2.5 db', - ' 8 db', - ' 8.5 db', - ' 10 db', - ' 10.5 db', + ' 0 dB', + ' 0.5 dB', + ' 2 dB', + ' 2.5 dB', + ' 8 dB', + ' 8.5 dB', + ' 10 dB', + ' 10.5 dB', ] const SIGNS_PRD: Array = [ ## ПРК-К diff --git a/scripts/control_panel.gd b/scripts/control_panel.gd index 2f15fea..80e2e5b 100644 --- a/scripts/control_panel.gd +++ b/scripts/control_panel.gd @@ -36,7 +36,7 @@ func _on_data_received(data_from_yau_07): ## SOCKETS BOARDS for i in 4: - var sockets_ind = [$soc_y5/ref_A26/light_ind, + var sockets_ind = [ $soc_y5/ref_A26/light_ind, $soc_y5/ref_A27/light_ind, $soc_y5/ref_A28/light_ind, $soc_y5/ref_A29/light_ind] diff --git a/table/header.tscn b/table/header.tscn index 881917e..f12873f 100644 --- a/table/header.tscn +++ b/table/header.tscn @@ -1,19 +1,17 @@ [gd_scene load_steps=2 format=3 uid="uid://ch14g46swx74h"] [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_2thpi"] -bg_color = Color(0.611765, 0.109804, 0.262745, 0.615686) -corner_radius_top_left = 2 +bg_color = Color(0.455894, 0.0685824, 0.187642, 0.945098) +corner_radius_top_left = 5 corner_radius_top_right = 2 -corner_radius_bottom_right = 2 -corner_radius_bottom_left = 2 -shadow_size = 2 -shadow_offset = Vector2(2, 2) +corner_radius_bottom_right = 5 +corner_radius_bottom_left = 5 [node name="heder" type="Label"] custom_minimum_size = Vector2(0, 30) offset_right = 128.0 offset_bottom = 23.0 -theme_override_colors/font_color = Color(0, 0, 0, 1) +theme_override_colors/font_color = Color(1, 1, 0.941176, 1) theme_override_font_sizes/font_size = 15 theme_override_styles/normal = SubResource("StyleBoxFlat_2thpi") horizontal_alignment = 1 diff --git a/table/node.tscn b/table/node.tscn index 01c02b1..f0db82f 100644 --- a/table/node.tscn +++ b/table/node.tscn @@ -2,24 +2,35 @@ [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_q1ixs"] bg_color = Color(0, 0, 0, 0.490196) -border_width_bottom = 2 -border_color = Color(0.223529, 0.168627, 0.223529, 1) -corner_radius_top_left = 3 -corner_radius_top_right = 3 -corner_radius_bottom_right = 3 -corner_radius_bottom_left = 3 +corner_radius_top_left = 5 +corner_radius_top_right = 5 +corner_radius_bottom_right = 5 +corner_radius_bottom_left = 5 [node name="Label" type="LineEdit"] -offset_right = 70.75 -offset_bottom = 32.0 -focus_mode = 0 -theme_override_colors/font_uneditable_color = Color(1, 1, 1, 1) +texture_filter = 2 +texture_repeat = 2 +clip_contents = true +layout_direction = 2 +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +offset_top = -103.0 +offset_right = 75.0 +offset_bottom = 137.0 +grow_horizontal = 2 +grow_vertical = 2 +size_flags_horizontal = 3 +size_flags_vertical = 3 +theme_override_colors/font_uneditable_color = Color(1, 1, 0.941176, 1) theme_override_font_sizes/font_size = 17 +theme_override_styles/read_only = SubResource("StyleBoxFlat_q1ixs") theme_override_styles/normal = SubResource("StyleBoxFlat_q1ixs") alignment = 1 +caret_blink = true caret_blink_interval = 0.5 -[node name="ColorRect" type="ColorRect" parent="."] +[node name="Color_Ems_g" type="ColorRect" parent="."] layout_mode = 0 offset_right = 1933.0 offset_bottom = 1088.0 diff --git a/table/socket_status.tscn b/table/socket_status.tscn index ae21dbe..1f6040a 100644 --- a/table/socket_status.tscn +++ b/table/socket_status.tscn @@ -6,12 +6,10 @@ [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_q1ixs"] bg_color = Color(0, 0, 0, 0.490196) -border_width_bottom = 2 -border_color = Color(0.223529, 0.168627, 0.223529, 1) -corner_radius_top_left = 3 -corner_radius_top_right = 3 -corner_radius_bottom_right = 3 -corner_radius_bottom_left = 3 +corner_radius_top_left = 5 +corner_radius_top_right = 5 +corner_radius_bottom_right = 5 +corner_radius_bottom_left = 5 [sub_resource type="SpriteFrames" id="SpriteFrames_a7q1i"] animations = [{ @@ -34,18 +32,17 @@ animations = [{ }] [node name="PanelContainer" type="PanelContainer"] +custom_minimum_size = Vector2(50, 35) offset_left = -3.0 -offset_right = 319.0 -offset_bottom = 66.0 +offset_right = 119.0 +offset_bottom = 35.0 theme_override_styles/panel = SubResource("StyleBoxFlat_q1ixs") -metadata/_edit_lock_ = true -[node name="ColorRect" type="ColorRect" parent="."] +[node name="Color_ems_g" type="ColorRect" parent="."] layout_mode = 2 -color = Color(0, 0, 0, 0.195) +color = Color(1, 1, 1, 0) [node name="SZI_x" type="AnimatedSprite2D" parent="."] -position = Vector2(40, 11) +position = Vector2(59, 18) scale = Vector2(1.2, 1.2) sprite_frames = SubResource("SpriteFrames_a7q1i") -metadata/_edit_lock_ = true diff --git a/table/switch.tscn b/table/switch.tscn index 6a79c95..edbab12 100644 --- a/table/switch.tscn +++ b/table/switch.tscn @@ -3,6 +3,10 @@ [ext_resource type="Script" path="res://scripts/switch.gd" id="1_h0k6p"] [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_r5cym"] +corner_radius_top_left = 5 +corner_radius_top_right = 5 +corner_radius_bottom_right = 5 +corner_radius_bottom_left = 5 [sub_resource type="StyleBoxTexture" id="StyleBoxTexture_b6sp7"]