From 8de41884199388c13de6ee04ef5f2b48daee0b42 Mon Sep 17 00:00:00 2001 From: sasha80 Date: Mon, 26 May 2025 11:33:31 +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=A3=20=D0=BF=D1=80=D0=B8=D0=B1=D0=BE=D1=80?= =?UTF-8?q?=D0=BE=D0=B2=20=D0=90=D0=A4=D0=A1=D0=9F=20=D0=B8=20=D0=A0=D0=A2?= =?UTF-8?q?=D0=A0=20=D0=BE=D0=B4=D0=B8=D0=BD=20=D0=BE=D0=B1=D1=89=D0=B8?= =?UTF-8?q?=D0=B9=20=D1=81=D0=BA=D1=80=D0=B8=D0=BF=D1=82=20=D0=B4=D0=BB?= =?UTF-8?q?=D1=8F=20=D0=B7=D0=B0=D0=B3=D1=80=D1=83=D0=B7=D0=BA=D0=B8=20?= =?UTF-8?q?=D1=80=D0=B5=D0=B7=D1=83=D0=BB=D1=8C=D1=82=D0=B0=D1=82=D0=BE?= =?UTF-8?q?=D0=B2=20=D0=BA=D0=BE=D0=BD=D1=82=D1=80=D0=BE=D0=BB=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- project.godot | 1 - scenes/pribor-afsp/pribor-afsp-1.tscn | 2 +- scenes/pribor-afsp/pribor-afsp-2.tscn | 2 +- scenes/pribor-afsp/pribor-afsp.gd | 10 +--- .../{pribor-rtr => pribor-afsp}/pribor-rtr.gd | 0 .../pribor-rtr.gd.uid | 0 .../pribor-rtr.tscn | 50 +++++++++---------- scenes/{контроль => pribor-afsp}/request.gd | 0 .../{контроль => pribor-afsp}/request.gd.uid | 0 scenes/контроль/контроль.gd | 2 +- 10 files changed, 30 insertions(+), 37 deletions(-) rename scenes/{pribor-rtr => pribor-afsp}/pribor-rtr.gd (100%) rename scenes/{pribor-rtr => pribor-afsp}/pribor-rtr.gd.uid (100%) rename scenes/{pribor-rtr => pribor-afsp}/pribor-rtr.tscn (84%) rename scenes/{контроль => pribor-afsp}/request.gd (100%) rename scenes/{контроль => pribor-afsp}/request.gd.uid (100%) diff --git a/project.godot b/project.godot index 5442dace..31c3bfb2 100644 --- a/project.godot +++ b/project.godot @@ -122,7 +122,6 @@ folder_colors={ "res://scenes/pribor-prd-k/": "purple", "res://scenes/pribor-prd-n/": "purple", "res://scenes/pribor-prd-v/": "purple", -"res://scenes/pribor-rtr/": "purple", "res://scenes/pribor-uf/": "purple", "res://scenes/pribor-uyep/": "purple", "res://scenes/tabs-switch/": "blue", diff --git a/scenes/pribor-afsp/pribor-afsp-1.tscn b/scenes/pribor-afsp/pribor-afsp-1.tscn index b7bc472e..b9e3da60 100644 --- a/scenes/pribor-afsp/pribor-afsp-1.tscn +++ b/scenes/pribor-afsp/pribor-afsp-1.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=5 format=3 uid="uid://8ll27id5ajq1"] [ext_resource type="Script" uid="uid://d0jwv5opi3mrl" path="res://scenes/pribor-afsp/pribor-afsp.gd" id="1_151rh"] -[ext_resource type="Script" uid="uid://bux47vkw71w1t" path="res://scenes/контроль/request.gd" id="2_4vyhj"] +[ext_resource type="Script" uid="uid://bux47vkw71w1t" path="res://scenes/pribor-afsp/request.gd" id="2_4vyhj"] [ext_resource type="PackedScene" uid="uid://dnxq870xf6pkh" path="res://scenes/pribor-afsp/bort-afsp.tscn" id="3_d7iti"] [sub_resource type="GDScript" id="GDScript_yhnwg"] diff --git a/scenes/pribor-afsp/pribor-afsp-2.tscn b/scenes/pribor-afsp/pribor-afsp-2.tscn index 292b7427..a13639b3 100644 --- a/scenes/pribor-afsp/pribor-afsp-2.tscn +++ b/scenes/pribor-afsp/pribor-afsp-2.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=5 format=3 uid="uid://5uv1idl3lqet"] [ext_resource type="Script" uid="uid://d0jwv5opi3mrl" path="res://scenes/pribor-afsp/pribor-afsp.gd" id="1_tfses"] -[ext_resource type="Script" uid="uid://bux47vkw71w1t" path="res://scenes/контроль/request.gd" id="2_miwrd"] +[ext_resource type="Script" uid="uid://bux47vkw71w1t" path="res://scenes/pribor-afsp/request.gd" id="2_miwrd"] [ext_resource type="PackedScene" uid="uid://dnxq870xf6pkh" path="res://scenes/pribor-afsp/bort-afsp.tscn" id="3_xpxb5"] [sub_resource type="GDScript" id="GDScript_yhnwg"] diff --git a/scenes/pribor-afsp/pribor-afsp.gd b/scenes/pribor-afsp/pribor-afsp.gd index 33d54fc7..f7c57577 100644 --- a/scenes/pribor-afsp/pribor-afsp.gd +++ b/scenes/pribor-afsp/pribor-afsp.gd @@ -49,7 +49,6 @@ func _on_request_rtr_request_completed(result, _response_code, headers, body: Pa push_error('разбор json прерван - \"%s\" (%s)' % [err, headers]) return - var pp = ['DeviceDescripton', 'DeviceName'] var ppp = [] map_solid_to_array(prefix_path, ppp) @@ -60,13 +59,8 @@ func _on_request_rtr_request_completed(result, _response_code, headers, body: Pa push_error('путь %s не найден (%s)' % [pp_copy, ret_val[2]]) return - var bort_rtr_name_left: StringName = $left.get_meta('DeviceName', '') - var bort_rtr_name_right: StringName = $right.get_meta('DeviceName', '') - var bb = {bort_rtr_name_left: $left, bort_rtr_name_right: $right} - if not bb.has(ret_val[0]): - return - - var bort_rtr = bb[ret_val[0]] + var bort_rtr_name: StringName = get_meta('DeviceName', '') + var bort_rtr = self for child in bort_rtr.get_node('konverter/grid').get_children(): map_value_to_item(json_conv.data, child, 'value0') map_value_to_item(json_conv.data, child, 'value1') diff --git a/scenes/pribor-rtr/pribor-rtr.gd b/scenes/pribor-afsp/pribor-rtr.gd similarity index 100% rename from scenes/pribor-rtr/pribor-rtr.gd rename to scenes/pribor-afsp/pribor-rtr.gd diff --git a/scenes/pribor-rtr/pribor-rtr.gd.uid b/scenes/pribor-afsp/pribor-rtr.gd.uid similarity index 100% rename from scenes/pribor-rtr/pribor-rtr.gd.uid rename to scenes/pribor-afsp/pribor-rtr.gd.uid diff --git a/scenes/pribor-rtr/pribor-rtr.tscn b/scenes/pribor-afsp/pribor-rtr.tscn similarity index 84% rename from scenes/pribor-rtr/pribor-rtr.tscn rename to scenes/pribor-afsp/pribor-rtr.tscn index a90bee3c..345ec836 100644 --- a/scenes/pribor-rtr/pribor-rtr.tscn +++ b/scenes/pribor-afsp/pribor-rtr.tscn @@ -1,8 +1,8 @@ [gd_scene load_steps=4 format=3 uid="uid://5uv1idl3lqea"] -[ext_resource type="Script" uid="uid://d0jwv5opi3mrk" path="res://scenes/pribor-rtr/pribor-rtr.gd" id="1_sqyma"] -[ext_resource type="PackedScene" uid="uid://p2suppildvq0" path="res://scenes/контроль/элемент-в.tscn" id="2_yb5ym"] -[ext_resource type="PackedScene" uid="uid://d3iqb5e4g81m5" path="res://scenes/контроль/элемент-г.tscn" id="3_xqaxm"] +[ext_resource type="Script" uid="uid://d0jwv5opi3mrk" path="res://scenes/pribor-afsp/pribor-rtr.gd" id="1_soedq"] +[ext_resource type="PackedScene" uid="uid://d3iqb5e4g81m5" path="res://scenes/контроль/элемент-г.tscn" id="2_pspup"] +[ext_resource type="PackedScene" uid="uid://p2suppildvq0" path="res://scenes/контроль/элемент-в.tscn" id="3_gh777"] [node name="pribor_rtr" type="Control"] layout_mode = 3 @@ -11,9 +11,9 @@ offset_left = 115.0 offset_top = 150.0 offset_right = 115.0 offset_bottom = 150.0 -script = ExtResource("1_sqyma") +script = ExtResource("1_soedq") -[node name="yach_svyzi" parent="." instance=ExtResource("3_xqaxm")] +[node name="yach_svyzi" parent="." instance=ExtResource("2_pspup")] layout_mode = 2 offset_left = 40.0 offset_top = 535.0 @@ -24,7 +24,7 @@ size_flags_vertical = 7 fname = "Модуль электропитания" rname = "G1" -[node name="blok_bpo_a1" parent="." instance=ExtResource("3_xqaxm")] +[node name="blok_bpo_a1" parent="." instance=ExtResource("2_pspup")] layout_mode = 0 offset_left = 40.0 offset_top = 135.0 @@ -42,55 +42,55 @@ offset_right = 498.0 offset_bottom = 320.0 columns = 4 -[node name="a1_kanal1" parent="grid_bpo_a1" instance=ExtResource("3_xqaxm")] +[node name="a1_kanal1" parent="grid_bpo_a1" instance=ExtResource("2_pspup")] layout_mode = 2 size_flags_horizontal = 7 size_flags_vertical = 7 fname = "Канал 1" -[node name="a1_kanal2" parent="grid_bpo_a1" instance=ExtResource("3_xqaxm")] +[node name="a1_kanal2" parent="grid_bpo_a1" instance=ExtResource("2_pspup")] layout_mode = 2 size_flags_horizontal = 7 size_flags_vertical = 7 fname = "Канал 2" -[node name="a1_kanal3" parent="grid_bpo_a1" instance=ExtResource("3_xqaxm")] +[node name="a1_kanal3" parent="grid_bpo_a1" instance=ExtResource("2_pspup")] layout_mode = 2 size_flags_horizontal = 7 size_flags_vertical = 7 fname = "Канал 3" -[node name="a1_kanal4" parent="grid_bpo_a1" instance=ExtResource("3_xqaxm")] +[node name="a1_kanal4" parent="grid_bpo_a1" instance=ExtResource("2_pspup")] layout_mode = 2 size_flags_horizontal = 7 size_flags_vertical = 7 fname = "Канал 4" -[node name="a1_kanal5" parent="grid_bpo_a1" instance=ExtResource("3_xqaxm")] +[node name="a1_kanal5" parent="grid_bpo_a1" instance=ExtResource("2_pspup")] layout_mode = 2 size_flags_horizontal = 7 size_flags_vertical = 7 fname = "Канал 5" -[node name="a1_kanal6" parent="grid_bpo_a1" instance=ExtResource("3_xqaxm")] +[node name="a1_kanal6" parent="grid_bpo_a1" instance=ExtResource("2_pspup")] layout_mode = 2 size_flags_horizontal = 7 size_flags_vertical = 7 fname = "Канал 6" -[node name="a1_kanal7" parent="grid_bpo_a1" instance=ExtResource("3_xqaxm")] +[node name="a1_kanal7" parent="grid_bpo_a1" instance=ExtResource("2_pspup")] layout_mode = 2 size_flags_horizontal = 7 size_flags_vertical = 7 fname = "Канал 7" -[node name="a1_kanal8" parent="grid_bpo_a1" instance=ExtResource("3_xqaxm")] +[node name="a1_kanal8" parent="grid_bpo_a1" instance=ExtResource("2_pspup")] layout_mode = 2 size_flags_horizontal = 7 size_flags_vertical = 7 fname = "Канал 8" -[node name="yas_bpo_a1" parent="." instance=ExtResource("2_yb5ym")] +[node name="yas_bpo_a1" parent="." instance=ExtResource("3_gh777")] offset_left = 500.0 offset_top = 175.0 offset_right = 550.0 @@ -99,7 +99,7 @@ show_rname = false self_size = Vector2i(50, 145) fname = "Яч. связи" -[node name="blok_bpo_a2" parent="." instance=ExtResource("3_xqaxm")] +[node name="blok_bpo_a2" parent="." instance=ExtResource("2_pspup")] layout_mode = 0 offset_left = 40.0 offset_top = 335.0 @@ -117,55 +117,55 @@ offset_right = 498.0 offset_bottom = 520.0 columns = 4 -[node name="a1_kanal1" parent="grid_bpo_a2" instance=ExtResource("3_xqaxm")] +[node name="a1_kanal1" parent="grid_bpo_a2" instance=ExtResource("2_pspup")] layout_mode = 2 size_flags_horizontal = 7 size_flags_vertical = 7 fname = "Канал 1" -[node name="a1_kanal2" parent="grid_bpo_a2" instance=ExtResource("3_xqaxm")] +[node name="a1_kanal2" parent="grid_bpo_a2" instance=ExtResource("2_pspup")] layout_mode = 2 size_flags_horizontal = 7 size_flags_vertical = 7 fname = "Канал 2" -[node name="a1_kanal3" parent="grid_bpo_a2" instance=ExtResource("3_xqaxm")] +[node name="a1_kanal3" parent="grid_bpo_a2" instance=ExtResource("2_pspup")] layout_mode = 2 size_flags_horizontal = 7 size_flags_vertical = 7 fname = "Канал 3" -[node name="a1_kanal4" parent="grid_bpo_a2" instance=ExtResource("3_xqaxm")] +[node name="a1_kanal4" parent="grid_bpo_a2" instance=ExtResource("2_pspup")] layout_mode = 2 size_flags_horizontal = 7 size_flags_vertical = 7 fname = "Канал 4" -[node name="a1_kanal5" parent="grid_bpo_a2" instance=ExtResource("3_xqaxm")] +[node name="a1_kanal5" parent="grid_bpo_a2" instance=ExtResource("2_pspup")] layout_mode = 2 size_flags_horizontal = 7 size_flags_vertical = 7 fname = "Канал 5" -[node name="a1_kanal6" parent="grid_bpo_a2" instance=ExtResource("3_xqaxm")] +[node name="a1_kanal6" parent="grid_bpo_a2" instance=ExtResource("2_pspup")] layout_mode = 2 size_flags_horizontal = 7 size_flags_vertical = 7 fname = "Канал 6" -[node name="a1_kanal7" parent="grid_bpo_a2" instance=ExtResource("3_xqaxm")] +[node name="a1_kanal7" parent="grid_bpo_a2" instance=ExtResource("2_pspup")] layout_mode = 2 size_flags_horizontal = 7 size_flags_vertical = 7 fname = "Канал 7" -[node name="a1_kanal8" parent="grid_bpo_a2" instance=ExtResource("3_xqaxm")] +[node name="a1_kanal8" parent="grid_bpo_a2" instance=ExtResource("2_pspup")] layout_mode = 2 size_flags_horizontal = 7 size_flags_vertical = 7 fname = "Канал 8" -[node name="yas_bpo_a2" parent="." instance=ExtResource("2_yb5ym")] +[node name="yas_bpo_a2" parent="." instance=ExtResource("3_gh777")] offset_left = 500.0 offset_top = 375.0 offset_right = 550.0 diff --git a/scenes/контроль/request.gd b/scenes/pribor-afsp/request.gd similarity index 100% rename from scenes/контроль/request.gd rename to scenes/pribor-afsp/request.gd diff --git a/scenes/контроль/request.gd.uid b/scenes/pribor-afsp/request.gd.uid similarity index 100% rename from scenes/контроль/request.gd.uid rename to scenes/pribor-afsp/request.gd.uid diff --git a/scenes/контроль/контроль.gd b/scenes/контроль/контроль.gd index f864be2c..92e17525 100644 --- a/scenes/контроль/контроль.gd +++ b/scenes/контроль/контроль.gd @@ -18,7 +18,7 @@ const PRIBORS_RES = \ 'pribor_prd_v_2': ['res://scenes/pribor-prd-v/pribor-prd-v.tscn', 'Контроль исправности прибора ПРД-В 2'], 'pribor_prd_v_3': ['res://scenes/pribor-prd-v/pribor-prd-v.tscn', 'Контроль исправности прибора ПРД-В 3'], 'pribor_prd_v_4': ['res://scenes/pribor-prd-v/pribor-prd-v.tscn', 'Контроль исправности прибора ПРД-В 4'], - 'pribor_rtr': ['res://scenes/pribor-rtr/pribor-rtr.tscn', 'Контроль исправности прибора РТР'], + 'pribor_rtr': ['res://scenes/pribor-afsp/pribor-rtr.tscn', 'Контроль исправности прибора РТР'], 'pribor_afsp_1': ['res://scenes/pribor-afsp/pribor-afsp-1.tscn', 'Контроль исправности прибора АФСП 1'], 'pribor_afsp_2': ['res://scenes/pribor-afsp/pribor-afsp-2.tscn', 'Контроль исправности прибора АФСП 2'], 'pribor_uf': ['res://scenes/pribor-uf/pribor-uf.tscn', 'Контроль исправности прибора УФ'],