diff --git a/scenes/diagram/diagram.gd b/scenes/diagram/diagram.gd index d1ad627f..d33a1599 100644 --- a/scenes/diagram/diagram.gd +++ b/scenes/diagram/diagram.gd @@ -35,8 +35,8 @@ func get_radius_outter() -> float: return material.get('shader_parameter/radius func get_radius_inner_0() -> float: return material.get('shader_parameter/radius_inner_0') func get_radius_inner_1() -> float: return material.get('shader_parameter/radius_inner_1') -func get_band_colors(val: Array): return material.get('shader_parameter/ant_band_c') -func get_band_failures(val: Array): return material.get('shader_parameter/ant_band_m') +func get_band_colors(_val: Array): return material.get('shader_parameter/ant_band_c') +func get_band_failures(_val: Array): return material.get('shader_parameter/ant_band_m') func set_band_colors(val: Array): material.set('shader_parameter/ant_band_c', val) func set_band_failures(val: Array): material.set('shader_parameter/ant_band_m', val) diff --git a/scenes/контроль/контроль.tscn b/scenes/контроль/контроль.tscn index f5090ee7..8a59d61b 100644 --- a/scenes/контроль/контроль.tscn +++ b/scenes/контроль/контроль.tscn @@ -16,16 +16,16 @@ [ext_resource type="Texture2D" uid="uid://b4isaggma6q3" path="res://data/Грани22.png" id="9_iqgf5"] [ext_resource type="Texture2D" uid="uid://c6booa8753u5t" path="res://data/состояние-исправности-2.png" id="9_ll0vs"] [ext_resource type="Texture2D" uid="uid://bktiige0i2lhl" path="res://data/У-РЭП-РПД-Н.png" id="9_qe1go"] -[ext_resource type="Texture2D" uid="uid://b2vf7en1jj8dv" path="res://data/У-РЭП-РПД-В.png" id="9_w6m6a"] -[ext_resource type="Texture2D" uid="uid://u7h3l0jjrsnp" path="res://data/У-УФ.png" id="11_gjf0t"] [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="Texture2D" uid="uid://u7h3l0jjrsnp" path="res://data/У-УФ.png" id="11_gjf0t"] [ext_resource type="Script" uid="uid://bncy1x53jp73d" path="res://scenes/контроль/connect_pribor.gd" id="11_u7tym"] [ext_resource type="Texture2D" uid="uid://vdhmga62vjsj" path="res://data/АФСП-РТР.png" id="13_32yvq"] [ext_resource type="Texture2D" uid="uid://dm350ta8noa0v" path="res://data/У-РЭП-РПД-К.png" id="16_32yvq"] [ext_resource type="Texture2D" uid="uid://c3cyog3gy24ft" path="res://data/У-ЭП.png" id="16_gjf0t"] -[ext_resource type="Texture2D" uid="uid://cllxcfa130vqu" path="res://data/УА-РЭП.png" id="22_1s34a"] [ext_resource type="Script" uid="uid://xjs7owe2iexn" path="res://scenes/контроль/control_prd.gd" id="18_lbx5w"] +[ext_resource type="Texture2D" uid="uid://b2vf7en1jj8dv" path="res://data/У-РЭП-РПД-В.png" id="20_l5wui"] +[ext_resource type="Texture2D" uid="uid://cllxcfa130vqu" path="res://data/УА-РЭП.png" id="22_1s34a"] [sub_resource type="GDScript" id="GDScript_iqgf5"] script/source = "extends Panel @@ -939,7 +939,7 @@ offset_top = -480.0 offset_right = 173.0 offset_bottom = 328.0 scale = Vector2(0.977411, 0.977411) -texture = ExtResource("9_w6m6a") +texture = ExtResource("20_l5wui") [node name="pribor_prd_n_2" type="TextureButton" parent="." groups=["pribor_buttons"]] editor_description = "Кнопка для выбора прибора." @@ -1203,7 +1203,7 @@ offset_top = -601.0 offset_right = 566.0 offset_bottom = 207.0 scale = Vector2(0.975409, 0.975409) -texture = ExtResource("9_w6m6a") +texture = ExtResource("20_l5wui") [node name="pribor_prd_n_3" type="TextureButton" parent="." groups=["pribor_buttons"]] editor_description = "Кнопка для выбора прибора." @@ -1441,7 +1441,7 @@ offset_top = 2.0 offset_right = 288.0 offset_bottom = 810.0 scale = Vector2(0.974661, 0.974661) -texture = ExtResource("9_w6m6a") +texture = ExtResource("20_l5wui") [node name="control_progress" type="TextureProgressBar" parent="pribor_prd_v_1"] visible = false @@ -1637,7 +1637,7 @@ offset_top = -144.0 offset_right = 669.0 offset_bottom = 664.0 scale = Vector2(0.976707, 0.976707) -texture = ExtResource("9_w6m6a") +texture = ExtResource("20_l5wui") [node name="pribor_prd_n_4" type="TextureButton" parent="." groups=["pribor_buttons"]] editor_description = "Кнопка для выбора прибора." @@ -1982,5 +1982,5 @@ texture = ExtResource("22_1s34a") [connection signal="toggled" from="pribor_prd_v_4" to="pribor_prd_v_4" method="_on_toggled"] [connection signal="toggled" from="pribor_prd_n_4" to="pribor_prd_n_4" method="_on_toggled"] [connection signal="toggled" from="pribor_prd_k_4" to="pribor_prd_k_4" method="_on_toggled"] -[connection signal="pressed" from="control_prd" to="." method="_on_control_prd_pressed"] [connection signal="toggled" from="lbl_header/chk_show_functional" to="." method="_on_chk_show_functional_toggled"] +[connection signal="pressed" from="control_prd" to="." method="_on_control_prd_pressed"] diff --git a/table/table.gd b/table/table.gd index 21a2c59c..351fb677 100644 --- a/table/table.gd +++ b/table/table.gd @@ -322,7 +322,6 @@ func _set_row_selected(i_row: int, selected: bool = true) -> void: push_error('нет такого ряда: %d (всего %d рядов)\n' % [i_row, rows_count]) return if nodes.has(selector_key) and (not selected): - var node = nodes[node_key] var selector = nodes[selector_key] nodes.erase(selector_key) if is_instance_valid(selector):