From 8754dcc7f09f85b7e78b7b220b09fe332f02cdcb Mon Sep 17 00:00:00 2001 From: lepshiy Date: Wed, 12 Nov 2025 16:35:27 +0300 Subject: [PATCH] Line separators - LF --- scenes/frame-ecm-list/scroll-ecm-list.gd | 2 +- scenes/контроль/контроль.tscn | 45 +++++++++++++++--------- scenes/работа/работа.tscn | 2 +- 3 files changed, 30 insertions(+), 19 deletions(-) diff --git a/scenes/frame-ecm-list/scroll-ecm-list.gd b/scenes/frame-ecm-list/scroll-ecm-list.gd index 23f9d4c..8de36cd 100644 --- a/scenes/frame-ecm-list/scroll-ecm-list.gd +++ b/scenes/frame-ecm-list/scroll-ecm-list.gd @@ -8,7 +8,7 @@ const TableHeader = preload('res://table/header.tscn') ## Ячейка за const TABLE_HEADER = [ TableHeader, TableHeader, TableHeader , TableHeader ] ## Описание ряда заголовка. const TABLE_ROW = [ CellLineEdit, CellLineEdit, CellLineEdit , CellLineEdit ] ## Описание ряда. const TABLE_HEADERS_TEXT = ['№', 'Название', 'Пеленг', 'Состояние' ] ## Заголовки таблицы. -const TABLE_COLUMN_SIZE = [ 65, 100, 90, 170 ] ## Ширины колонок. +const TABLE_COLUMN_SIZE = [ 65, 100, 90, 195 ] ## Ширины колонок. ## Состояние выполнения сеанса помехи const INTERFER_STATE = { diff --git a/scenes/контроль/контроль.tscn b/scenes/контроль/контроль.tscn index c60a618..445e54a 100644 --- a/scenes/контроль/контроль.tscn +++ b/scenes/контроль/контроль.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=20 format=3 uid="uid://lwmw4egynmd1"] +[gd_scene load_steps=22 format=3 uid="uid://lwmw4egynmd1"] [ext_resource type="Texture2D" uid="uid://bar8k5qef7kch" path="res://data/УФ.png" id="2_0nvm1"] [ext_resource type="Script" uid="uid://q3gmpsqspjfp" path="res://scenes/контроль/внешний.gd" id="2_8r80x"] @@ -17,6 +17,7 @@ [ext_resource type="Texture2D" uid="uid://00871pb6moln" path="res://data/прогресс-фон-1.png" id="9_w6m6a"] [ext_resource type="Texture2D" uid="uid://c1k856fxhrjnh" path="res://data/прогресс-заполнение-1.png" id="10_lbx5w"] [ext_resource type="Script" uid="uid://bncy1x53jp73d" path="res://scenes/контроль/connect_pribor.gd" id="11_u7tym"] +[ext_resource type="Script" uid="uid://cjj7pbbhk8q7c" path="res://scenes/контроль/control_prd.gd" id="18_lbx5w"] [sub_resource type="GDScript" id="GDScript_iqgf5"] script/source = "extends Panel @@ -177,6 +178,15 @@ animations = [{ "speed": 5.0 }] +[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_lbx5w"] +bg_color = Color(0.6, 0.6, 0.6, 0) +border_width_left = 10 +border_width_top = 10 +border_width_right = 10 +border_width_bottom = 10 +border_color = Color(0.833286, 0.436556, 0.229611, 1) +border_blend = true + [node name="Контроль" type="Panel"] anchors_preset = 15 anchor_right = 1.0 @@ -412,7 +422,7 @@ sprite_frames = SubResource("SpriteFrames_foasq") frame_progress = 0.72355 script = ExtResource("11_u7tym") -[node name="control_progress" type="TextureProgressBar" parent="pribor_prd_n_1"] +[node name="control_progress" type="TextureProgressBar" parent="pribor_prd_n_1" groups=["control_progress"]] visible = false layout_mode = 0 offset_left = -4.0 @@ -455,7 +465,6 @@ metadata/unit_name = ["уарэп-эмс"] metadata/online_proc = "on_line_changed" [node name="label" type="Label" parent="pribor_uf"] -self_modulate = Color(0, 1, 0, 1) layout_mode = 0 offset_left = 15.0 offset_top = -44.0 @@ -754,7 +763,7 @@ sprite_frames = SubResource("SpriteFrames_foasq") frame_progress = 0.72355 script = ExtResource("11_u7tym") -[node name="control_progress" type="TextureProgressBar" parent="pribor_prd_v_2"] +[node name="control_progress" type="TextureProgressBar" parent="pribor_prd_v_2" groups=["control_progress"]] visible = false layout_mode = 0 offset_left = -4.0 @@ -831,7 +840,7 @@ sprite_frames = SubResource("SpriteFrames_foasq") frame_progress = 0.72355 script = ExtResource("11_u7tym") -[node name="control_progress" type="TextureProgressBar" parent="pribor_prd_n_2"] +[node name="control_progress" type="TextureProgressBar" parent="pribor_prd_n_2" groups=["control_progress"]] visible = false layout_mode = 0 offset_left = -4.0 @@ -906,7 +915,7 @@ sprite_frames = SubResource("SpriteFrames_foasq") frame_progress = 0.72355 script = ExtResource("11_u7tym") -[node name="control_progress" type="TextureProgressBar" parent="pribor_prd_k_2"] +[node name="control_progress" type="TextureProgressBar" parent="pribor_prd_k_2" groups=["control_progress"]] visible = false layout_mode = 0 offset_left = -4.0 @@ -981,7 +990,7 @@ sprite_frames = SubResource("SpriteFrames_foasq") frame_progress = 0.72355 script = ExtResource("11_u7tym") -[node name="control_progress" type="TextureProgressBar" parent="pribor_prd_v_3"] +[node name="control_progress" type="TextureProgressBar" parent="pribor_prd_v_3" groups=["control_progress"]] visible = false layout_mode = 0 offset_left = -8.0 @@ -1056,7 +1065,7 @@ sprite_frames = SubResource("SpriteFrames_foasq") frame_progress = 0.72355 script = ExtResource("11_u7tym") -[node name="control_progress" type="TextureProgressBar" parent="pribor_prd_n_3"] +[node name="control_progress" type="TextureProgressBar" parent="pribor_prd_n_3" groups=["control_progress"]] visible = false layout_mode = 0 offset_left = -7.0 @@ -1131,7 +1140,7 @@ sprite_frames = SubResource("SpriteFrames_foasq") frame_progress = 0.72355 script = ExtResource("11_u7tym") -[node name="control_progress" type="TextureProgressBar" parent="pribor_prd_k_3"] +[node name="control_progress" type="TextureProgressBar" parent="pribor_prd_k_3" groups=["control_progress"]] visible = false layout_mode = 0 offset_left = -8.0 @@ -1206,7 +1215,7 @@ sprite_frames = SubResource("SpriteFrames_foasq") frame_progress = 0.72355 script = ExtResource("11_u7tym") -[node name="control_progress" type="TextureProgressBar" parent="pribor_prd_v_1"] +[node name="control_progress" type="TextureProgressBar" parent="pribor_prd_v_1" groups=["control_progress"]] visible = false layout_mode = 0 offset_left = -4.0 @@ -1281,7 +1290,7 @@ sprite_frames = SubResource("SpriteFrames_foasq") frame_progress = 0.72355 script = ExtResource("11_u7tym") -[node name="control_progress" type="TextureProgressBar" parent="pribor_prd_k_1"] +[node name="control_progress" type="TextureProgressBar" parent="pribor_prd_k_1" groups=["control_progress"]] visible = false layout_mode = 0 offset_left = -4.0 @@ -1355,7 +1364,7 @@ sprite_frames = SubResource("SpriteFrames_foasq") frame_progress = 0.72355 script = ExtResource("11_u7tym") -[node name="control_progress" type="TextureProgressBar" parent="pribor_prd_v_4"] +[node name="control_progress" type="TextureProgressBar" parent="pribor_prd_v_4" groups=["control_progress"]] visible = false layout_mode = 0 offset_left = -6.0 @@ -1429,7 +1438,7 @@ sprite_frames = SubResource("SpriteFrames_foasq") frame_progress = 0.72355 script = ExtResource("11_u7tym") -[node name="control_progress" type="TextureProgressBar" parent="pribor_prd_n_4"] +[node name="control_progress" type="TextureProgressBar" parent="pribor_prd_n_4" groups=["control_progress"]] visible = false layout_mode = 0 offset_left = -8.0 @@ -1503,7 +1512,7 @@ sprite_frames = SubResource("SpriteFrames_foasq") frame_progress = 0.72355 script = ExtResource("11_u7tym") -[node name="control_progress" type="TextureProgressBar" parent="pribor_prd_k_4"] +[node name="control_progress" type="TextureProgressBar" parent="pribor_prd_k_4" groups=["control_progress"]] visible = false layout_mode = 0 offset_left = -8.0 @@ -1647,14 +1656,16 @@ points = PackedVector2Array(-8, 0, 608, 0) width = 2.0 default_color = Color(1, 1, 1, 0.352941) -[node name="control_prd" type="Button" parent="."] +[node name="control_prd" type="Button" parent="." groups=["control_progress"]] layout_mode = 0 -offset_left = 1101.0 +offset_left = 1106.0 offset_top = 64.0 -offset_right = 1326.0 +offset_right = 1331.0 offset_bottom = 104.0 focus_mode = 0 +theme_override_styles/disabled = SubResource("StyleBoxFlat_lbx5w") text = "Запуск контроля" +script = ExtResource("18_lbx5w") [connection signal="toggled" from="pribor_prd_n_1" to="pribor_prd_n_1" method="_on_toggled"] [connection signal="toggled" from="pribor_uf" to="pribor_uf" method="_on_toggled"] diff --git a/scenes/работа/работа.tscn b/scenes/работа/работа.tscn index 8313ec3..8f77b23 100644 --- a/scenes/работа/работа.tscn +++ b/scenes/работа/работа.tscn @@ -379,8 +379,8 @@ texture_normal = ExtResource("14_ggrwd") [connection signal="drag_continue" from="." to="." method="_on_drag_continue"] [connection signal="toggled" from="btn_view" to="." method="on_button_view_toggled"] [connection signal="toggled" from="chk_auto" to="." method="on_value_changed"] -[connection signal="toggled" from="btn_activate" to="." method="on_btn_activate"] [connection signal="toggled" from="btn_activate" to="." method="on_btn_activate_toggled"] +[connection signal="toggled" from="btn_activate" to="." method="on_btn_activate"] [connection signal="toggled" from="btn_center" to="." method="on_btn_center_toggled"] [connection signal="button_down" from="zoom_plus" to="tilemap" method="_on_zoom_plus_button_down"] [connection signal="button_up" from="zoom_plus" to="tilemap" method="_on_zoom_plus_button_up"]