Объединение исправления Александра
This commit is contained in:
@@ -13,7 +13,7 @@ func _ready() -> void:
|
||||
if Engine.is_editor_hint(): return
|
||||
#control_vk()
|
||||
uf_control = get_parent().uf_control
|
||||
uf_control.connect('update_uf_serviceability', on_update_uf_serviceability)
|
||||
signaller.connect('update_uf_serviceability', on_update_uf_serviceability)
|
||||
var uf_status = uf_control.get_current_status()
|
||||
control_ems(uf_status)
|
||||
find_labels(self)
|
||||
|
||||
@@ -10,7 +10,7 @@ var uf_status: Dictionary = {'УФ-онлайн': false, 'КЭМС-Б1': false,
|
||||
|
||||
var _self_name: String
|
||||
var _serviceability: int = STATE_VAL.NONE
|
||||
var serviceability: int:
|
||||
var serviceability_uf: int:
|
||||
get:
|
||||
return _serviceability
|
||||
set(value):
|
||||
@@ -58,7 +58,7 @@ func get_current_status() -> Dictionary:
|
||||
|
||||
func is_operational() -> bool:
|
||||
'''Проверка, все ли системы работают нормально'''
|
||||
return serviceability and uf_status.get('УФ-онлайн', false)
|
||||
return serviceability_uf and uf_status.get('УФ-онлайн', false)
|
||||
|
||||
|
||||
func update_serviceability() -> void:
|
||||
@@ -75,7 +75,7 @@ func update_serviceability() -> void:
|
||||
new_serviceability = STATE_VAL.ERROR
|
||||
break
|
||||
# Новое значение через setter
|
||||
self.serviceability = new_serviceability
|
||||
self.serviceability_uf = new_serviceability
|
||||
#endregion
|
||||
|
||||
#region Вспомогательные методы
|
||||
|
||||
@@ -566,7 +566,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
|
||||
@@ -1937,6 +1936,7 @@ offset_top = 15.0
|
||||
offset_right = 1408.0
|
||||
offset_bottom = 49.0
|
||||
theme_override_font_sizes/font_size = 22
|
||||
disabled = true
|
||||
text = "Показать функциональную схему Э2"
|
||||
flat = true
|
||||
|
||||
@@ -1996,9 +1996,9 @@ default_color = Color(1, 1, 1, 0.352941)
|
||||
|
||||
[node name="control_prd_button" type="Button" parent="."]
|
||||
layout_mode = 0
|
||||
offset_left = 1043.0
|
||||
offset_left = 1040.0
|
||||
offset_top = 64.0
|
||||
offset_right = 1390.0
|
||||
offset_right = 1416.0
|
||||
offset_bottom = 104.0
|
||||
focus_mode = 0
|
||||
theme_override_colors/font_hover_color = Color(1, 1, 1, 1)
|
||||
|
||||
Reference in New Issue
Block a user