From ebec36b2c1cc3f60f24d6e0921a622e6fec2610b Mon Sep 17 00:00:00 2001 From: MaD_CaT Date: Fri, 18 Aug 2023 10:26:48 +0300 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D1=80=D0=B0=D0=B1=D0=BE=D1=82?= =?UTF-8?q?=D0=BA=D0=B0.=20=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D1=8B=20=D0=BA=D0=BE=D0=BC=D0=BC=D0=B5=D0=BD=D1=82=D0=B0?= =?UTF-8?q?=D1=80=D0=B8=D0=B8=20=D0=BA=20=D1=84=D1=83=D0=BD=D0=BA=D1=86?= =?UTF-8?q?=D0=B8=D1=8F=D0=BC=20=D0=B2=20=D0=AD=D0=9C=D0=A1.gd?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- project.godot | 4 +- scenes/button_flat.tscn | 8 +-- scenes/cell-front-rear.tscn | 8 +-- scenes/cell-front.tscn | 8 +-- scenes/tab_switch.tscn | 20 +++--- scenes/ЭМС.gd | 72 ++++++++++++++------ scenes/ЭМС.tscn | 42 ++++++------ scenes/работа.tscn | 76 +++++++++++----------- scenes/состояния-эмс.tscn | 20 +++--- scripts/{yems_consts.gd => yems-consts.gd} | 0 scripts/{yems_devs.gd => yems-devs.gd} | 0 11 files changed, 146 insertions(+), 112 deletions(-) rename scripts/{yems_consts.gd => yems-consts.gd} (100%) rename scripts/{yems_devs.gd => yems-devs.gd} (100%) diff --git a/project.godot b/project.godot index f8acada9..2bf04e0e 100644 --- a/project.godot +++ b/project.godot @@ -30,9 +30,9 @@ yau07="*res://scripts/yau07.gd" capsrpb="*res://scripts/capsrpb.gd" Table="*res://table/table.gd" Threats="*res://scripts/threats.gd" -YemsDevs="*res://scripts/yems_devs.gd" +YemsDevs="*res://scripts/yems-devs.gd" Yemsboards="*res://scripts/yemsboards.gd" -YemsConsts="*res://scripts/yems_consts.gd" +YemsConsts="*res://scripts/yems-consts.gd" [debug] diff --git a/scenes/button_flat.tscn b/scenes/button_flat.tscn index e34193a5..ff3f1324 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_mjhcv"] -[ext_resource type="Texture2D" uid="uid://ct0ajcwno03h7" path="res://data/кнопка-квадрат-0.png" id="2_fosdr"] +[ext_resource type="Script" path="res://scenes/nine-patch-button.gd" id="1_sv3wd"] +[ext_resource type="Texture2D" uid="uid://ct0ajcwno03h7" path="res://data/кнопка-квадрат-0.png" id="2_ekocy"] [sub_resource type="StyleBoxEmpty" id="1"] @@ -19,13 +19,13 @@ offset_right = 30.0 offset_bottom = 30.0 theme_override_styles/panel = SubResource("1") -script = ExtResource("1_mjhcv") +script = ExtResource("1_sv3wd") toggle_mode = true [node name="state" type="NinePatchRect" parent="."] show_behind_parent = true layout_mode = 2 -texture = ExtResource("2_fosdr") +texture = ExtResource("2_ekocy") patch_margin_left = 10 patch_margin_top = 10 patch_margin_right = 10 diff --git a/scenes/cell-front-rear.tscn b/scenes/cell-front-rear.tscn index 9bd04015..c8f37d6f 100644 --- a/scenes/cell-front-rear.tscn +++ b/scenes/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_ckjh0"] -[ext_resource type="Texture2D" uid="uid://c6yuv0b51aauw" path="res://data/фронт-задний-1.png" id="2_5x6hc"] +[ext_resource type="Script" path="res://scenes/cell-front.gd" id="1_7lyc1"] +[ext_resource type="Texture2D" uid="uid://c6yuv0b51aauw" path="res://data/фронт-задний-1.png" id="2_7ugvw"] [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_ckjh0") +script = ExtResource("1_7lyc1") [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_5x6hc") +texture = ExtResource("2_7ugvw") diff --git a/scenes/cell-front.tscn b/scenes/cell-front.tscn index e773551f..17ad8ae3 100644 --- a/scenes/cell-front.tscn +++ b/scenes/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_fs0rx"] -[ext_resource type="Texture2D" uid="uid://ysctr84e77dc" path="res://data/фронт-передний-1.png" id="2_j6r08"] +[ext_resource type="Script" path="res://scenes/cell-front.gd" id="1_hgh3i"] +[ext_resource type="Texture2D" uid="uid://ysctr84e77dc" path="res://data/фронт-передний-1.png" id="2_u3c8i"] [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_fs0rx") +script = ExtResource("1_hgh3i") [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_j6r08") +texture = ExtResource("2_u3c8i") diff --git a/scenes/tab_switch.tscn b/scenes/tab_switch.tscn index 06c5e838..78350f2a 100644 --- a/scenes/tab_switch.tscn +++ b/scenes/tab_switch.tscn @@ -1,27 +1,27 @@ [gd_scene load_steps=6 format=3 uid="uid://3slb0i3pvowc"] -[ext_resource type="Script" path="res://scenes/tab_switch.gd" id="1_wyyi7"] -[ext_resource type="PackedScene" uid="uid://b276iygic5itk" path="res://scenes/работа.tscn" id="2_r1u0h"] -[ext_resource type="PackedScene" uid="uid://lwmw4egynmd1" path="res://scenes/контроль.tscn" id="3_dmb4a"] -[ext_resource type="PackedScene" uid="uid://trt0q8th3bn2" path="res://scenes/журнал.tscn" id="4_pp7si"] -[ext_resource type="PackedScene" uid="uid://dab6loryocc73" path="res://scenes/ЭМС.tscn" id="5_kbxv3"] +[ext_resource type="Script" path="res://scenes/tab_switch.gd" id="1_7r2o8"] +[ext_resource type="PackedScene" uid="uid://b276iygic5itk" path="res://scenes/работа.tscn" id="2_1dgoj"] +[ext_resource type="PackedScene" uid="uid://lwmw4egynmd1" path="res://scenes/контроль.tscn" id="3_5nxuy"] +[ext_resource type="PackedScene" uid="uid://trt0q8th3bn2" path="res://scenes/журнал.tscn" id="4_f2u82"] +[ext_resource type="PackedScene" uid="uid://dab6loryocc73" path="res://scenes/ЭМС.tscn" id="5_ocw3o"] [node name="tab_switch" type="TabContainer"] offset_right = 1600.0 offset_bottom = 1200.0 -script = ExtResource("1_wyyi7") +script = ExtResource("1_7r2o8") -[node name="работа" parent="." instance=ExtResource("2_r1u0h")] +[node name="работа" parent="." instance=ExtResource("2_1dgoj")] layout_mode = 2 -[node name="контроль" parent="." instance=ExtResource("3_dmb4a")] +[node name="контроль" parent="." instance=ExtResource("3_5nxuy")] visible = false layout_mode = 2 -[node name="журнал" parent="." instance=ExtResource("4_pp7si")] +[node name="журнал" parent="." instance=ExtResource("4_f2u82")] visible = false layout_mode = 2 -[node name="ЭМС" parent="." instance=ExtResource("5_kbxv3")] +[node name="ЭМС" parent="." instance=ExtResource("5_ocw3o")] visible = false layout_mode = 2 diff --git a/scenes/ЭМС.gd b/scenes/ЭМС.gd index 69961599..d4a4a31a 100644 --- a/scenes/ЭМС.gd +++ b/scenes/ЭМС.gd @@ -1,7 +1,7 @@ extends Panel +# Предзагрузка ячеек таблиц const TableHeader = preload('res://table/header.tscn') -const TableNode = preload('res://scenes/ячейка-1.tscn') const CellYemsButton = preload('res://scenes/кнопка-эмс.tscn') const CellLineEdit = preload('res://scenes/ячейка-2.tscn') const CellState = preload('res://scenes/состояния-эмс.tscn') @@ -11,22 +11,25 @@ const CellFront = preload('res://scenes/cell-front.tscn') const CellFrontRear = preload('res://scenes/cell-front-rear.tscn') # Режимы работы выходов -const OUT_MODE: Array = ['Работа', 'Контроль', '1', '0'] +const OUT_MODE: Array = ['Работа', 'Контроль', '1', '0'] # const COLUMN_OPTS_BTN: Array = [5] const TABLE_ENTRY_COLUMNS: Array = [2,3] const OUT_SET_ROW: Array = [CellLineEdit, CellLEEmpty, CellLEEmpty, CellLEEmpty, CellLEEmpty, CellLEEmpty] const IN_SET_ROW: Array = [CellLineEdit, CellLEEmpty, CellLEEmpty, CellLEEmpty, CellLEEmpty] -var g_boards: Dictionary # Список плат +var g_boards: Dictionary # Словарь плат ЭМС var posx: int = 125 # Позиция элементов по x var posy: int = 70 # Позиция элементов по y + func _ready() -> void: call_deferred('init_boards') +## Инициализация основных элементов экрана ЭМС func init_boards(): + # Выставление позиций элементов ЭМС на экране $scrollin.set_position(Vector2(posx,posy)) $scrollout.set_position(Vector2(posx+650,posy)) $scrl_in_set.set_position(Vector2(posx,posy + 700)) @@ -36,6 +39,7 @@ func init_boards(): $btn_flash_write.set_position(Vector2(posx,posy+ 935)) $btn_connect.set_position(Vector2(posx+590,posy-25)) $btn_disconnect.set_position(Vector2(posx+587,posy + 675)) + g_boards['КЭМС'] = Yemsboards.EmsBoard.new('КЭМС', 0x130, YemsConsts.INPUT_ROWS, YemsConsts.OUTPUT_ROWS) g_boards['П5-28'] = Yemsboards.EmsBoard.new('П5-28', 0x140, YemsConsts.INPUT_ROWS1, YemsConsts.OUTPUT_ROWS1) init_tbl_in() @@ -52,20 +56,23 @@ func init_boards(): $btn_flash_write.button_connect('pressed', Callable(self, 'on_btn_flash_write').bind($btn_flash_write)) +## Обработчик нажатия кнопки disconnect. func on_btn_disconnect(): - var selecter_rows_in: Array = [] - var selecter_rows_out: Array = [] - $scrl_in_set/tbl_in_set.get_selected_rows(selecter_rows_in) - $scrl_out_set/tbl_out_set.get_selected_rows(selecter_rows_out) - if len(selecter_rows_in): - on_disconnect($scrl_in_set/tbl_in_set, selecter_rows_in, 'вход') - elif len(selecter_rows_out): - on_disconnect($scrl_out_set/tbl_out_set, selecter_rows_out, 'выход') + var selected_rows_in: Array = [] + var selected_rows_out: Array = [] + $scrl_in_set/tbl_in_set.get_selected_rows(selected_rows_in) + $scrl_out_set/tbl_out_set.get_selected_rows(selected_rows_out) + if len(selected_rows_in): + on_disconnect($scrl_in_set/tbl_in_set, selected_rows_in, 'вход') + elif len(selected_rows_out): + on_disconnect($scrl_out_set/tbl_out_set, selected_rows_out, 'выход') -func on_disconnect(tbl, selecter_rows, type_dev: String): +## Разрывает связь входа и выхода, [param tbl] - таблица, [param selected_rows] - выбранные строки +## [param type_dev] - тип, 'вход' или 'выход' +func on_disconnect(tbl, selected_rows, type_dev: String): var dev = tbl.get_node_user_data(0, 0) - var user_data: Array = tbl.get_node_user_data(0, selecter_rows[0]) + var user_data: Array = tbl.get_node_user_data(0, selected_rows[0]) var con_dev = user_data[0] var connector: String = con_dev.connector dev.connect_devs.erase(con_dev.connector) @@ -78,23 +85,28 @@ func on_disconnect(tbl, selecter_rows, type_dev: String): set_out_dev(dev) +## Обработчик нажатия кнопки "Прочитать" func on_btn_flash_read(btn): await get_tree().create_timer(0.1).timeout btn.pressed = false +## Обработчик нажатия кнопки "Записать" func on_btn_flash_write(btn): await get_tree().create_timer(0.1).timeout btn.pressed = false +## Инициализация таблицы с файлами настроек ЭМС func init_tbl_files(): $scrl_files/tbl_files.set_header([TableHeader, TableHeader, TableHeader]) $scrl_files/tbl_files.set_header_text(['Имя файла', 'Дата изменения', 'Размер']) $scrl_files/tbl_files.set_columns_min_size([200, 120, 70]) - + +## Инициализация таблиц входов func init_tbl_in(): + # Инициализация основной таблицы входов, в ней отображается информация о параметрах и состоянии var header_type: Array = [TableHeader, TableHeader, CellFront, CellFrontRear, TableHeader] var header_text: Array = ['Входы', 'Соединитель', 'мкс', 'мкс', 'Состояние'] var row_type: Array = [CellLineEdit, CellLineEdit, CellLineEdit, CellLineEdit, CellState] @@ -120,22 +132,22 @@ func init_tbl_in(): $scrollin/tbl_in.connect('row_pressed', Callable(self, 'on_row_pressed_in')) $scrollin/tbl_in.connect('selected_changed', Callable(self, 'on_selected_changed_in')) - - + # Инициализация таблицы изменения параметров входа и списка выходов связанных с ним header_text[0] = 'Вход' $scrl_in_set/tbl_in_set.set_header(header_type) $scrl_in_set/tbl_in_set.set_header_text(header_text) $scrl_in_set/tbl_in_set.set_columns_alignments(yams_alligment_in) $scrl_in_set/tbl_in_set.set_columns_min_size(column_size) - $scrl_in_set/tbl_in_set.connect('row_pressed', Callable(self, 'on_row_pressed_si')) $scrl_in_set/tbl_in_set.connect('selected_changed', Callable(self, 'on_selected_changed_si')) +## Обработчик редактирования Entry в таблице параметров входов/выходов func on_edit_entry(text : String, entry): print_debug(text, entry) - + +## Обработчик выбора строки в таблице входов func on_selected_changed_in(i_row: int): var selecter_rows: Array = [] $scrollin/tbl_in.get_selected_rows(selecter_rows) @@ -144,16 +156,19 @@ func on_selected_changed_in(i_row: int): set_in_dev(dev) +## Обработчик нажатия на таблицу входов func on_row_pressed_in(i_row: int): on_row_pressed(i_row, $scrollin/tbl_in) on_selected_changed_in(i_row) +## Выбор входного устройства, для отображения в таблице соединений входа и изменения параметров func set_in_dev(dev): var row_type: Array = [CellLineEdit, CellLineEdit, CellLineEdit, CellLineEdit, CellState] set_dev($scrl_in_set/tbl_in_set, dev, row_type, IN_SET_ROW, 'Список соединённых выходов :') +## Обработчик выбора строки в таблице соединений входа и изменения параметров func on_selected_changed_si(i_row: int): if i_row < 2: return @@ -166,6 +181,7 @@ func on_selected_changed_si(i_row: int): on_row_pressed_out(i) +## Обработчик нажатия на таблицу соединений входа и изменения параметров func on_row_pressed_si(i_row: int): if i_row < 2: return @@ -173,7 +189,9 @@ func on_row_pressed_si(i_row: int): on_selected_changed_si(i_row) +## Инициализация таблиц выходов func init_tbl_out(): + # Инициализация основной таблицы выходов, в ней отображается информация о параметрах и состоянии var header_text = ['Выходы', 'Соединитель', 'мкс', 'мкс', 'Состояние', 'Режим'] var yams_alligment_out: Array = [ HORIZONTAL_ALIGNMENT_LEFT, HORIZONTAL_ALIGNMENT_CENTER, HORIZONTAL_ALIGNMENT_CENTER, HORIZONTAL_ALIGNMENT_CENTER, HORIZONTAL_ALIGNMENT_CENTER, HORIZONTAL_ALIGNMENT_CENTER] $scrollout/tbl_out.set_header([TableHeader, TableHeader, CellFront, CellFrontRear, TableHeader, TableHeader]) @@ -197,7 +215,8 @@ func init_tbl_out(): $scrollout/tbl_out.set_columns_alignments(yams_alligment_out) $scrollout/tbl_out.connect('row_pressed', Callable(self, 'on_row_pressed_out')) $scrollout/tbl_out.connect('selected_changed', Callable(self, 'on_selected_changed_out')) - + + # Инициализация таблицы изменения параметров выхода и списка входов связанных с ним header_text[0] = 'Выход' $scrl_out_set/tbl_out_set.set_header([TableHeader, TableHeader, CellFront, CellFrontRear, TableHeader, TableHeader]) $scrl_out_set/tbl_out_set.set_header_text(header_text) @@ -206,6 +225,7 @@ func init_tbl_out(): $scrl_out_set/tbl_out_set.connect('selected_changed', Callable(self, 'on_selected_changed_so')) +## Обработчик выбора строки в таблице соединений выхода и изменения параметров func on_selected_changed_so(i_row: int): if i_row < 2: return @@ -218,6 +238,7 @@ func on_selected_changed_so(i_row: int): on_row_pressed_in(i) +## Обработчик нажатия на таблицу соединений выхода и изменения параметров func on_row_pressed_so(i_row: int): if i_row < 2: return @@ -225,6 +246,7 @@ func on_row_pressed_so(i_row: int): on_selected_changed_so(i_row) +## Обработчик выбора строки в таблице выходов func on_selected_changed_out(i_row: int): var selecter_rows: Array = [] $scrollout/tbl_out.get_selected_rows(selecter_rows) @@ -233,11 +255,13 @@ func on_selected_changed_out(i_row: int): set_out_dev(dev) +## Обработчик выбора строки в таблице выходов func on_row_pressed_out(i_row: int): on_row_pressed(i_row, $scrollout/tbl_out) on_selected_changed_out(i_row) +## Выбор выходного устройства, для отображения в таблице соединений выхода и изменения параметров func set_out_dev(dev): var row_type: Array = [CellLineEdit, CellLineEdit, CellLineEdit, CellLineEdit, CellState, CellOptBtn] set_dev($scrl_out_set/tbl_out_set, dev, row_type, OUT_SET_ROW, 'Список соединённых входов :') @@ -249,6 +273,9 @@ func set_out_dev(dev): mode.select(mode_index) +## Выбор входного или выходного устройства [param tbl] - таблица, [param dev] - устройство, +## [param row_type] - массив с типами колонок, [param row_type_conn] - массив с пустыми LineEdit +## [param lbl_text] - текст отображаемый во 2 строке: пример: ('Список соединённых входов :') func set_dev(tbl, dev, row_type, row_type_conn, lbl_text): tbl.clear_rows() tbl.add_row(row_type) @@ -283,6 +310,7 @@ func set_dev(tbl, dev, row_type, row_type_conn, lbl_text): tbl.connect_columns(self, 'text_submitted', 'on_edit_entry', TABLE_ENTRY_COLUMNS, []) +## Обработчик нажатия кнопки connect func on_btn_connect(): var in_row_index: Array = [] var out_row_index: Array = [] @@ -297,6 +325,9 @@ func on_btn_connect(): add_connection_dev($scrl_in_set/tbl_in_set, out_dev, in_dev, IN_SET_ROW, out_user_data) +## образовывает связь между выбранным входом и выходом [param tbl] - таблица, [param dev1] - устройство1, +## [param dev2] - устройство 2, [param set_row] - массив с пустыми LineEdit +## [param user_data] - пользовательские данные устройства1 func add_connection_dev(tbl, dev1, dev2, set_row, user_data): if not dev1.connector in dev2.connect_devs: tbl.add_row(set_row) @@ -308,12 +339,15 @@ func add_connection_dev(tbl, dev1, dev2, set_row, user_data): dev2.connect_devs[dev1.connector] = user_data +## Отключает возможность редактирования LineEdit в таблице [param tbl] - таблица, +## [param num_col] - номер колонки, [param i_row] - номер столбца func disable_edit(tbl, num_col: int, i_row: int): for col in range(num_col): var node: LineEdit = tbl.get_node2(col, i_row) node.editable = false +## Обработчик выбора строки с таблице func on_row_pressed(i_row: int, tbl): tbl.clear_rows_selected() var is_row_selected = tbl.is_row_selected(i_row) diff --git a/scenes/ЭМС.tscn b/scenes/ЭМС.tscn index 4d09ffe9..96a48597 100644 --- a/scenes/ЭМС.tscn +++ b/scenes/ЭМС.tscn @@ -1,18 +1,18 @@ [gd_scene load_steps=9 format=3 uid="uid://dab6loryocc73"] -[ext_resource type="Script" path="res://scenes/ЭМС.gd" id="1_7ip0t"] -[ext_resource type="PackedScene" uid="uid://da7w3vkhadfwe" path="res://scenes/button_flat.tscn" id="2_85cl8"] -[ext_resource type="Texture2D" uid="uid://dd60btbqnpiqw" path="res://data/document-new-0.png" id="3_mtj4x"] -[ext_resource type="Texture2D" uid="uid://coqg6wsftvtxr" path="res://data/document-save-0.png" id="4_m4ucm"] -[ext_resource type="Texture2D" uid="uid://cywuevvpkxl7v" path="res://data/edit-copy-0.png" id="5_eeb4o"] -[ext_resource type="Texture2D" uid="uid://7h55yvh84cve" path="res://data/connect.png" id="6_kacis"] -[ext_resource type="Texture2D" uid="uid://cjsr544qccftu" path="res://data/disconnect.png" id="7_2f7bd"] -[ext_resource type="Script" path="res://table/table.gd" id="8_1mtjm"] +[ext_resource type="Script" path="res://scenes/ЭМС.gd" id="1_l8oni"] +[ext_resource type="PackedScene" uid="uid://da7w3vkhadfwe" path="res://scenes/button_flat.tscn" id="2_1es6v"] +[ext_resource type="Texture2D" uid="uid://dd60btbqnpiqw" path="res://data/document-new-0.png" id="3_tv8rv"] +[ext_resource type="Texture2D" uid="uid://coqg6wsftvtxr" path="res://data/document-save-0.png" id="4_e18vy"] +[ext_resource type="Texture2D" uid="uid://cywuevvpkxl7v" path="res://data/edit-copy-0.png" id="5_s6771"] +[ext_resource type="Texture2D" uid="uid://7h55yvh84cve" path="res://data/connect.png" id="6_r6u3y"] +[ext_resource type="Texture2D" uid="uid://cjsr544qccftu" path="res://data/disconnect.png" id="7_tbfsu"] +[ext_resource type="Script" path="res://table/table.gd" id="8_qm3xd"] [node name="ЭМС" type="Panel"] offset_right = 1598.0 offset_bottom = 1201.0 -script = ExtResource("1_7ip0t") +script = ExtResource("1_l8oni") [node name="lbl_online" type="Label" parent="."] layout_mode = 0 @@ -23,7 +23,7 @@ offset_bottom = 30.0 theme_override_colors/font_color = Color(0, 0.647059, 0.184314, 1) text = "Ячейка на связи" -[node name="btn_flash_read" parent="." instance=ExtResource("2_85cl8")] +[node name="btn_flash_read" parent="." instance=ExtResource("2_1es6v")] layout_mode = 0 offset_left = 1446.0 offset_top = 55.0 @@ -31,7 +31,7 @@ offset_right = 1583.0 offset_bottom = 85.0 text = "Прочитать" -[node name="btn_flash_write" parent="." instance=ExtResource("2_85cl8")] +[node name="btn_flash_write" parent="." instance=ExtResource("2_1es6v")] layout_mode = 0 offset_left = 1446.0 offset_top = 99.0 @@ -48,7 +48,7 @@ offset_bottom = 1016.0 focus_mode = 0 shortcut_feedback = false shortcut_in_tooltip = false -icon = ExtResource("3_mtj4x") +icon = ExtResource("3_tv8rv") [node name="btn_save" type="Button" parent="."] layout_mode = 0 @@ -57,7 +57,7 @@ offset_top = 1017.0 offset_right = 1509.0 offset_bottom = 1073.0 focus_mode = 0 -icon = ExtResource("4_m4ucm") +icon = ExtResource("4_e18vy") [node name="btn_copy" type="Button" parent="."] layout_mode = 0 @@ -66,7 +66,7 @@ offset_top = 1074.0 offset_right = 1510.0 offset_bottom = 1130.0 focus_mode = 0 -icon = ExtResource("5_eeb4o") +icon = ExtResource("5_s6771") [node name="btn_connect" type="Button" parent="."] layout_mode = 0 @@ -76,7 +76,7 @@ offset_right = 683.0 offset_bottom = 111.0 focus_mode = 0 theme_override_colors/icon_normal_color = Color(1, 1, 1, 1) -icon = ExtResource("6_kacis") +icon = ExtResource("6_r6u3y") [node name="btn_disconnect" type="Button" parent="."] layout_mode = 0 @@ -86,7 +86,7 @@ offset_right = 770.0 offset_bottom = 815.0 focus_mode = 0 theme_override_colors/icon_normal_color = Color(1, 1, 1, 1) -icon = ExtResource("7_2f7bd") +icon = ExtResource("7_tbfsu") [node name="scrollin" type="ScrollContainer" parent="."] layout_mode = 0 @@ -97,7 +97,7 @@ offset_bottom = 679.0 [node name="tbl_in" type="GridContainer" parent="scrollin"] layout_mode = 2 -script = ExtResource("8_1mtjm") +script = ExtResource("8_qm3xd") [node name="scrl_files" type="ScrollContainer" parent="."] layout_mode = 0 @@ -108,7 +108,7 @@ offset_bottom = 1166.0 [node name="tbl_files" type="GridContainer" parent="scrl_files"] layout_mode = 2 -script = ExtResource("8_1mtjm") +script = ExtResource("8_qm3xd") [node name="scrollout" type="ScrollContainer" parent="."] layout_mode = 0 @@ -119,7 +119,7 @@ offset_bottom = 679.0 [node name="tbl_out" type="GridContainer" parent="scrollout"] layout_mode = 2 -script = ExtResource("8_1mtjm") +script = ExtResource("8_qm3xd") [node name="scrl_in_set" type="ScrollContainer" parent="."] layout_mode = 0 @@ -130,7 +130,7 @@ offset_bottom = 942.0 [node name="tbl_in_set" type="GridContainer" parent="scrl_in_set"] layout_mode = 2 -script = ExtResource("8_1mtjm") +script = ExtResource("8_qm3xd") [node name="scrl_out_set" type="ScrollContainer" parent="."] layout_mode = 0 @@ -141,4 +141,4 @@ offset_bottom = 924.0 [node name="tbl_out_set" type="GridContainer" parent="scrl_out_set"] layout_mode = 2 -script = ExtResource("8_1mtjm") +script = ExtResource("8_qm3xd") diff --git a/scenes/работа.tscn b/scenes/работа.tscn index d9786569..9c946b99 100644 --- a/scenes/работа.tscn +++ b/scenes/работа.tscn @@ -1,19 +1,19 @@ [gd_scene load_steps=10 format=3 uid="uid://b276iygic5itk"] -[ext_resource type="Script" path="res://scenes/работа.gd" id="1_g2xk6"] -[ext_resource type="PackedScene" uid="uid://nl1vklubr5kr" path="res://scenes/bip.tscn" id="2_ijbv2"] -[ext_resource type="PackedScene" uid="uid://b5kjdyxuwsot5" path="res://scenes/canvas.tscn" id="3_fppu7"] -[ext_resource type="PackedScene" uid="uid://bq7haw1ypiv48" path="res://scenes/frame.tscn" id="4_35qoc"] -[ext_resource type="Script" path="res://scenes/scrl_threats.gd" id="5_j58w3"] -[ext_resource type="Script" path="res://table/table.gd" id="6_fpdpm"] -[ext_resource type="PackedScene" uid="uid://da7w3vkhadfwe" path="res://scenes/button_flat.tscn" id="7_2sxkw"] -[ext_resource type="FontFile" uid="uid://befva8r034a4v" path="res://data/DSEG7Classic-Regular.ttf" id="8_68ssn"] +[ext_resource type="Script" path="res://scenes/работа.gd" id="1_k0ut3"] +[ext_resource type="PackedScene" uid="uid://nl1vklubr5kr" path="res://scenes/bip.tscn" id="2_3ldht"] +[ext_resource type="PackedScene" uid="uid://b5kjdyxuwsot5" path="res://scenes/canvas.tscn" id="3_6w03t"] +[ext_resource type="PackedScene" uid="uid://bq7haw1ypiv48" path="res://scenes/frame.tscn" id="4_f8xkd"] +[ext_resource type="Script" path="res://scenes/scrl_threats.gd" id="5_207n1"] +[ext_resource type="Script" path="res://table/table.gd" id="6_e0av7"] +[ext_resource type="PackedScene" uid="uid://da7w3vkhadfwe" path="res://scenes/button_flat.tscn" id="7_dds2h"] +[ext_resource type="FontFile" uid="uid://befva8r034a4v" path="res://data/DSEG7Classic-Regular.ttf" id="8_imp4n"] [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_5ugj8"] [node name="Работа" type="Panel"] -script = ExtResource("1_g2xk6") -Bip = ExtResource("2_ijbv2") +script = ExtResource("1_k0ut3") +Bip = ExtResource("2_3ldht") col_grey = Color(0.34902, 0.643137, 0.772549, 0.168627) col_red = Color(1, 0.568627, 0.431373, 0.239216) drag_scale_band = 0.05 @@ -25,10 +25,10 @@ strob_min_width = 5.0 metadata/_edit_vertical_guides_ = [] metadata/_edit_lock_ = true -[node name="canvas" parent="." instance=ExtResource("3_fppu7")] +[node name="canvas" parent="." instance=ExtResource("3_6w03t")] metadata/_edit_lock_ = true -[node name="frm_threats" parent="." instance=ExtResource("4_35qoc")] +[node name="frm_threats" parent="." instance=ExtResource("4_f8xkd")] layout_mode = 0 offset_left = 1121.0 offset_top = 6.0 @@ -37,7 +37,7 @@ offset_bottom = 642.0 script = null metadata/_edit_lock_ = true -[node name="рамка-параметры-цели" parent="frm_threats" instance=ExtResource("4_35qoc")] +[node name="рамка-параметры-цели" parent="frm_threats" instance=ExtResource("4_f8xkd")] layout_mode = 0 offset_left = 5.0 offset_top = 313.0 @@ -203,14 +203,14 @@ offset_top = 57.0 offset_right = 464.0 offset_bottom = 306.0 horizontal_scroll_mode = 0 -script = ExtResource("5_j58w3") +script = ExtResource("5_207n1") [node name="tbl_threats" type="GridContainer" parent="frm_threats/scrl_threats"] layout_mode = 2 columns = 4 -script = ExtResource("6_fpdpm") +script = ExtResource("6_e0av7") -[node name="рамка-сеансы-помех" parent="." instance=ExtResource("4_35qoc")] +[node name="рамка-сеансы-помех" parent="." instance=ExtResource("4_f8xkd")] layout_mode = 0 offset_left = 1121.0 offset_top = 648.0 @@ -304,7 +304,7 @@ theme_override_colors/font_color = Color(0.729412, 0.729412, 0.729412, 1) text = "ПД-М4С" horizontal_alignment = 1 -[node name="рамка-помеха" parent="рамка-сеансы-помех" instance=ExtResource("4_35qoc")] +[node name="рамка-помеха" parent="рамка-сеансы-помех" instance=ExtResource("4_f8xkd")] layout_mode = 0 offset_left = 5.0 offset_top = 250.0 @@ -463,7 +463,7 @@ theme_override_colors/font_color = Color(0.729412, 0.729412, 0.729412, 1) text = "ЛЧМ" horizontal_alignment = 1 -[node name="btn_auto_threat" parent="." instance=ExtResource("7_2sxkw")] +[node name="btn_auto_threat" parent="." instance=ExtResource("7_dds2h")] layout_mode = 0 offset_left = 912.0 offset_top = 67.0 @@ -471,7 +471,7 @@ offset_right = 1102.0 offset_bottom = 117.0 text = "Автоматически" -[node name="btn_strobe" parent="." instance=ExtResource("7_2sxkw")] +[node name="btn_strobe" parent="." instance=ExtResource("7_dds2h")] layout_mode = 0 offset_left = 912.0 offset_top = 6.0 @@ -479,7 +479,7 @@ offset_right = 1102.0 offset_bottom = 56.0 text = "Строб" -[node name="btn_p5" parent="." groups=["группа-режим-помехи"] instance=ExtResource("7_2sxkw")] +[node name="btn_p5" parent="." groups=["группа-режим-помехи"] instance=ExtResource("7_dds2h")] layout_mode = 1 anchors_preset = -1 offset_left = 980.0 @@ -491,7 +491,7 @@ grow_vertical = 2 text = "ОЗП-1" metadata/rfi_name = "ozp1" -[node name="btn_p4" parent="." groups=["группа-режим-помехи"] instance=ExtResource("7_2sxkw")] +[node name="btn_p4" parent="." groups=["группа-режим-помехи"] instance=ExtResource("7_dds2h")] layout_mode = 1 anchors_preset = -1 offset_left = 1052.0 @@ -504,7 +504,7 @@ tooltip_text = "Выбор цели или сектора" text = "<-" metadata/rfi_name = "" -[node name="btn_p6" parent="." groups=["группа-режим-помехи"] instance=ExtResource("7_2sxkw")] +[node name="btn_p6" parent="." groups=["группа-режим-помехи"] instance=ExtResource("7_dds2h")] layout_mode = 0 offset_left = 840.0 offset_top = 1118.0 @@ -513,7 +513,7 @@ offset_bottom = 1168.0 text = "СВ-М2" metadata/rfi_name = "svm2" -[node name="btn_p7" parent="." groups=["группа-режим-помехи"] instance=ExtResource("7_2sxkw")] +[node name="btn_p7" parent="." groups=["группа-режим-помехи"] instance=ExtResource("7_dds2h")] layout_mode = 0 offset_left = 910.0 offset_top = 1118.0 @@ -522,7 +522,7 @@ offset_bottom = 1168.0 text = "K1" metadata/rfi_name = "k1" -[node name="btn_p8" parent="." groups=["группа-режим-помехи"] instance=ExtResource("7_2sxkw")] +[node name="btn_p8" parent="." groups=["группа-режим-помехи"] instance=ExtResource("7_dds2h")] layout_mode = 0 offset_left = 770.0 offset_top = 1118.0 @@ -531,7 +531,7 @@ offset_bottom = 1168.0 text = "СВ-И1" metadata/rfi_name = "svi1" -[node name="btn_p9" parent="." groups=["группа-режим-помехи"] instance=ExtResource("7_2sxkw")] +[node name="btn_p9" parent="." groups=["группа-режим-помехи"] instance=ExtResource("7_dds2h")] layout_mode = 0 offset_left = 700.0 offset_top = 1118.0 @@ -540,7 +540,7 @@ offset_bottom = 1168.0 text = "ПД-ЧМ" metadata/rfi_name = "pdchm" -[node name="btn_p10" parent="." groups=["группа-режим-помехи"] instance=ExtResource("7_2sxkw")] +[node name="btn_p10" parent="." groups=["группа-режим-помехи"] instance=ExtResource("7_dds2h")] layout_mode = 1 anchors_preset = -1 offset_left = 630.0 @@ -552,7 +552,7 @@ grow_vertical = 2 text = "ПД-М4С" metadata/rfi_name = "pdm4s" -[node name="btn_p11" parent="." groups=["группа-режим-помехи"] instance=ExtResource("7_2sxkw")] +[node name="btn_p11" parent="." groups=["группа-режим-помехи"] instance=ExtResource("7_dds2h")] layout_mode = 0 offset_left = 350.0 offset_top = 1118.0 @@ -561,7 +561,7 @@ offset_bottom = 1168.0 text = "ЛЧМ-1" metadata/rfi_name = "lchm1" -[node name="btn_p12" parent="." groups=["группа-режим-помехи"] instance=ExtResource("7_2sxkw")] +[node name="btn_p12" parent="." groups=["группа-режим-помехи"] instance=ExtResource("7_dds2h")] layout_mode = 1 anchors_preset = -1 offset_left = 420.0 @@ -573,7 +573,7 @@ grow_vertical = 2 text = "МЧМ-1" metadata/rfi_name = "mchm1" -[node name="btn_p13" parent="." groups=["группа-режим-помехи"] instance=ExtResource("7_2sxkw")] +[node name="btn_p13" parent="." groups=["группа-режим-помехи"] instance=ExtResource("7_dds2h")] layout_mode = 1 anchors_preset = -1 offset_left = 490.0 @@ -585,7 +585,7 @@ grow_vertical = 2 text = "ПД-М2" metadata/rfi_name = "pdm2" -[node name="btn_p14" parent="." groups=["группа-режим-помехи"] instance=ExtResource("7_2sxkw")] +[node name="btn_p14" parent="." groups=["группа-режим-помехи"] instance=ExtResource("7_dds2h")] layout_mode = 1 anchors_preset = -1 offset_left = 560.0 @@ -597,7 +597,7 @@ grow_vertical = 2 text = "ПД-М4" metadata/rfi_name = "pdm4" -[node name="btn_p15" parent="." groups=["группа-режим-помехи"] instance=ExtResource("7_2sxkw")] +[node name="btn_p15" parent="." groups=["группа-режим-помехи"] instance=ExtResource("7_dds2h")] layout_mode = 1 anchors_preset = -1 offset_left = 280.0 @@ -609,7 +609,7 @@ grow_vertical = 2 text = "СРН-М2" metadata/rfi_name = "srnm2" -[node name="btn_p16" parent="." groups=["группа-режим-помехи"] instance=ExtResource("7_2sxkw")] +[node name="btn_p16" parent="." groups=["группа-режим-помехи"] instance=ExtResource("7_dds2h")] layout_mode = 0 offset_left = 210.0 offset_top = 1118.0 @@ -618,7 +618,7 @@ offset_bottom = 1168.0 text = "СРН-И1" metadata/rfi_name = "srni1" -[node name="btn_off" parent="." groups=["группа-режим-помехи"] instance=ExtResource("7_2sxkw")] +[node name="btn_off" parent="." groups=["группа-режим-помехи"] instance=ExtResource("7_dds2h")] layout_mode = 0 offset_left = 140.0 offset_top = 1118.0 @@ -627,7 +627,7 @@ offset_bottom = 1168.0 text = "Откл." metadata/rfi_name = "" -[node name="btn_auto_rfi" parent="." groups=["группа-режим-помехи"] instance=ExtResource("7_2sxkw")] +[node name="btn_auto_rfi" parent="." groups=["группа-режим-помехи"] instance=ExtResource("7_dds2h")] layout_mode = 0 offset_left = 10.0 offset_top = 1118.0 @@ -643,7 +643,7 @@ offset_left = 96.0 offset_top = 109.0 offset_right = 164.0 offset_bottom = 142.0 -theme_override_fonts/font = ExtResource("8_68ssn") +theme_override_fonts/font = ExtResource("8_imp4n") theme_override_font_sizes/font_size = 20 text = "88" vertical_alignment = 1 @@ -652,7 +652,7 @@ vertical_alignment = 1 layout_mode = 0 offset_right = 68.0 offset_bottom = 33.0 -theme_override_fonts/font = ExtResource("8_68ssn") +theme_override_fonts/font = ExtResource("8_imp4n") theme_override_font_sizes/font_size = 20 text = "00" vertical_alignment = 1 @@ -664,7 +664,7 @@ offset_left = 96.0 offset_top = 29.0 offset_right = 188.0 offset_bottom = 88.0 -theme_override_fonts/font = ExtResource("8_68ssn") +theme_override_fonts/font = ExtResource("8_imp4n") theme_override_font_sizes/font_size = 56 text = "88" @@ -672,7 +672,7 @@ text = "88" layout_mode = 0 offset_right = 92.0 offset_bottom = 59.0 -theme_override_fonts/font = ExtResource("8_68ssn") +theme_override_fonts/font = ExtResource("8_imp4n") theme_override_font_sizes/font_size = 56 text = "00" diff --git a/scenes/состояния-эмс.tscn b/scenes/состояния-эмс.tscn index 7a18cd84..63872391 100644 --- a/scenes/состояния-эмс.tscn +++ b/scenes/состояния-эмс.tscn @@ -1,25 +1,25 @@ [gd_scene load_steps=7 format=3 uid="uid://by22sta8tt8dn"] -[ext_resource type="Script" path="res://scenes/состояния-эмс.gd" id="1_do21t"] -[ext_resource type="Texture2D" uid="uid://belwchvdktrw0" path="res://data/эмс-бланк.png" id="2_m87j8"] -[ext_resource type="Texture2D" uid="uid://bwddxs24es81u" path="res://data/эмс-бланк-пост.png" id="3_vjums"] -[ext_resource type="Texture2D" uid="uid://pfoscstbm025" path="res://data/эмс-бланк-перем.png" id="4_fejul"] -[ext_resource type="Texture2D" uid="uid://dvl3sq036gn75" path="res://data/эмс-бланк-замыкание.png" id="5_72oii"] +[ext_resource type="Script" path="res://scenes/состояния-эмс.gd" id="1_25ipd"] +[ext_resource type="Texture2D" uid="uid://belwchvdktrw0" path="res://data/эмс-бланк.png" id="2_ysp8j"] +[ext_resource type="Texture2D" uid="uid://bwddxs24es81u" path="res://data/эмс-бланк-пост.png" id="3_2jn2j"] +[ext_resource type="Texture2D" uid="uid://pfoscstbm025" path="res://data/эмс-бланк-перем.png" id="4_ngbif"] +[ext_resource type="Texture2D" uid="uid://dvl3sq036gn75" path="res://data/эмс-бланк-замыкание.png" id="5_uwjrg"] [sub_resource type="SpriteFrames" id="SpriteFrames_ow7xh"] animations = [{ "frames": [{ "duration": 1.0, -"texture": ExtResource("2_m87j8") +"texture": ExtResource("2_ysp8j") }, { "duration": 1.0, -"texture": ExtResource("3_vjums") +"texture": ExtResource("3_2jn2j") }, { "duration": 1.0, -"texture": ExtResource("4_fejul") +"texture": ExtResource("4_ngbif") }, { "duration": 1.0, -"texture": ExtResource("5_72oii") +"texture": ExtResource("5_uwjrg") }], "loop": true, "name": &"default", @@ -35,7 +35,7 @@ offset_right = -1540.0 offset_bottom = -1182.0 grow_horizontal = 2 grow_vertical = 2 -script = ExtResource("1_do21t") +script = ExtResource("1_25ipd") [node name="sprite" type="AnimatedSprite2D" parent="."] position = Vector2(34, 9) diff --git a/scripts/yems_consts.gd b/scripts/yems-consts.gd similarity index 100% rename from scripts/yems_consts.gd rename to scripts/yems-consts.gd diff --git a/scripts/yems_devs.gd b/scripts/yems-devs.gd similarity index 100% rename from scripts/yems_devs.gd rename to scripts/yems-devs.gd