Рефактор. Большое перемещение файлов (продолжено)

scenes/diagram/diagram.tscn

@@ -1,16 +1,16 @@
 [gd_scene load_steps=7 format=3 uid="uid://b5kjdyxuwsot5"]
 
-[ext_resource type="Material" uid="uid://s6xe8igevnv2" path="res://shaders/antenas.tres" id="1_nh31y"]
-[ext_resource type="Script" path="res://scenes/canvas/canvas.gd" id="2_rxxh6"]
-[ext_resource type="PackedScene" uid="uid://c73ahpv8uiuc7" path="res://scenes/canvas/sector.tscn" id="3_8x5qa"]
-[ext_resource type="Shader" path="res://shaders/sector.gdshader" id="4_gcyda"]
+[ext_resource type="Material" uid="uid://s6xe8igevnv2" path="res://shaders/antenas.tres" id="1_newdt"]
+[ext_resource type="Script" path="res://scenes/diagram/diagram.gd" id="2_8xjuy"]
+[ext_resource type="PackedScene" uid="uid://c73ahpv8uiuc7" path="res://scenes/diagram/sector.tscn" id="3_tgnog"]
+[ext_resource type="Shader" path="res://shaders/sector.gdshader" id="4_obn6s"]
 
 [sub_resource type="PlaceholderTexture2D" id="PlaceholderTexture2D_2bft1"]
 size = Vector2(1600, 1200)
 
 [sub_resource type="ShaderMaterial" id="ShaderMaterial_lniyv"]
 resource_local_to_scene = true
-shader = ExtResource("4_gcyda")
+shader = ExtResource("4_obn6s")
 shader_parameter/color = Color(1, 1, 1, 0.168627)
 shader_parameter/clip_color = Color(1, 0.5, 0.5, 1)
 shader_parameter/width = 45.0
@@ -20,12 +20,12 @@ shader_parameter/dir = 0.0
 shader_parameter/inner_clip = 0.045
 
 [node name="canvas" type="Sprite2D"]
-material = ExtResource("1_nh31y")
+material = ExtResource("1_newdt")
 texture = SubResource("PlaceholderTexture2D_2bft1")
 centered = false
-script = ExtResource("2_rxxh6")
+script = ExtResource("2_8xjuy")
 
-[node name="строб" parent="." instance=ExtResource("3_8x5qa")]
+[node name="строб" parent="." instance=ExtResource("3_tgnog")]
 material = SubResource("ShaderMaterial_lniyv")
 position = Vector2(560, 560)
 scale = Vector2(1100, 1100)

scenes/frame-ecm-params/scroll-ecm-params.gd

@@ -2,7 +2,7 @@ extends ScrollContainer
 
 ## Отображает список параметров помехи в таблице.
 
-const CellLineEdit = preload('res://table/ячейка-2.tscn')  ## Ячейка таблицы.
+const CellLineEdit = preload('res://table/ячейка-2.tscn')   ## Ячейка таблицы.
 const TableHeader  = preload('res://table/header.tscn')     ## Ячейка заголовок таблицы.
 
 const TABLE_HEADER       = [ TableHeader,    TableHeader  ]  ## Описание ряда заголовка.
@@ -86,11 +86,6 @@ func on_ecm_update():
         $table.set_node_editable(1, p[0], p[2])
 
 
-# Called every frame. 'delta' is the elapsed time since the previous frame.
-func _process(delta):
-    pass
-
-
 func on_rto_threat_unsel(_th_id):
     for item in range(len(TABLE_PARAMS)):
         $table.set_node_text(1, item, '')

scenes/tilemap/tilemap.gd

@@ -69,7 +69,7 @@ func _on_zoom_changed(zoom: int):
     if map_tile_stack.size() != 0:
         return
     map_zoom = zoom
-    var ll = TEST_DATA['Фиджи']
+    var ll = TEST_DATA['Хельсинки']
     var tile: = mercator.create_tile(ll[0], ll[1], zoom)
     map_tile_stack.clear()
     map_tile_stack.append(tile)
@@ -86,7 +86,6 @@ func img_tile_to_map_image(image: Image, dst_pos: Vector2i):
     map_image.blit_rect(image, map_tile, dst_pos)
 
 
-
 func _process(_delta: float):
     if (map_tile_state == TASK_STATE.DONE) and map_tile_stack.size():
         var tile: mercator.Tile = map_tile_stack[-1]

scenes/контроль/контроль.gd

@@ -13,7 +13,7 @@ const PRIBORS_RES    = \
     'pribor_prd_k_1': 'res://scenes/pribor-prd-k-1/pribor-prd-k-1.tscn',
     'pribor_prd_v_2': 'res://scenes/pribor-prd-v-2/pribor-prd-v-2.tscn',
     'pribor_prd_n_2': 'res://scenes/pribor-prd-n-2/pribor-prd-n-2.tscn',
-    'pribor_prd_k_2': 'res//scenes/pribor-prd-k-2/pribor-prd-k-2.tscn',
+    'pribor_prd_k_2': 'res://scenes/pribor-prd-k-2/pribor-prd-k-2.tscn',
     'pribor_prd_v_3': 'res://scenes/pribor-prd-v-3/pribor-prd-v-3.tscn',
     'pribor_prd_n_3': 'res://scenes/pribor-prd-n-3/pribor-prd-n-3.tscn',
     'pribor_prd_k_3': 'res://scenes/pribor-prd-k-3/pribor-prd-k-3.tscn',
@@ -31,7 +31,9 @@ func _ready():
 
 func on_pribor_press(pribor_sch_path):
     clear_obj($pribor_sch)
-    var pribor_sch = load(pribor_sch_path).instantiate()
+    var pribor_sch_obj = load(pribor_sch_path)
+    assert(pribor_sch_obj)
+    var pribor_sch = pribor_sch_obj.instantiate()
     assert(pribor_sch)
     $pribor_sch.add_child(pribor_sch)
 

scenes/работа/работа.tscn

@@ -9,7 +9,7 @@
 [ext_resource type="PackedScene" uid="uid://da7w3vkhadfwe" path="res://scenes/button-flat/button-flat.tscn" id="8_k0iv2"]
 [ext_resource type="PackedScene" uid="uid://0uqi1ghf7sma" path="res://scenes/btn-scale/btn-scale.tscn" id="9_oey3x"]
 [ext_resource type="PackedScene" uid="uid://bbq6nklh36yij" path="res://scenes/tilemap/tilemap.tscn" id="10_gtwyg"]
-[ext_resource type="PackedScene" uid="uid://b5kjdyxuwsot5" path="res://scenes/canvas/canvas.tscn" id="11_b6su4"]
+[ext_resource type="PackedScene" uid="uid://b5kjdyxuwsot5" path="res://scenes/diagram/diagram.tscn" id="11_b6su4"]
 [ext_resource type="Shader" path="res://shaders/tilemap.gdshader" id="11_ekapd"]
 
 [sub_resource type="ShaderMaterial" id="ShaderMaterial_4p7y1"]