maxim/uarep-ctl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Рефектор от ide табуляция

Browse Source
This commit is contained in:
MaD_CaT
2025-12-09 10:26:14 +03:00
parent 426da5ff04
commit bd78e1010d
2 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scenes/pribor-uf/pribor-uf.gd
View File

@@ -90,7 +90,7 @@ func status_uf(status_uf_dic: Dictionary) -> void:
elif status_uf_dic['УФ-онлайн']:
for socket in status_uf_dic:
if not status_uf_dic[socket]:
is_ok = false
is_ok = false
if is_ok:
$lbl_header2.text = 'Прибор исправен'
$lbl_header2.modulate = Color.GREEN

36
scenes/tabs-switch/lbl_ready.gd
View File

@@ -79,7 +79,7 @@ func _ready() -> void:
# Подписка на УФ
signaller.connect('update_uf_serviceability', _on_uf_status_receive)
# Инициализация начального состояния
_recalculate_overall_state()
@@ -118,16 +118,16 @@ func _on_uf_status_receive(unit_uf_status: int) -> void:
func _recalculate_overall_state() -> void:
var new_state := DEVICE_STATE.NONE
# Проверяем статус ПРД
var prd_state := DEVICE_STATE.NONE
var has_online_prd := false
var all_prd_operational := true
for observer in device_observers.values():
if observer.status[DEVICE_STATUS.ONLINE]:
has_online_prd = true
if observer.status[DEVICE_STATUS.CONTROL]:
if not observer.status[DEVICE_STATUS.STATUS]:
all_prd_operational = false
@@ -135,7 +135,7 @@ func _recalculate_overall_state() -> void:
else:
if not observer.status[DEVICE_STATUS.STATUS]:
all_prd_operational = false
if has_online_prd:
if all_prd_operational:
prd_state = DEVICE_STATE.GOOD
@@ -143,19 +143,19 @@ func _recalculate_overall_state() -> void:
prd_state = DEVICE_STATE.ERR
else:
prd_state = DEVICE_STATE.NONE
# Комбинируем статусы по правилу:
# 1. Если хоть один ERROR → ERROR
# 2. Если нет ERROR и хоть один GOOD → GOOD
# 3. Иначе → NONE
if prd_state == DEVICE_STATE.ERR or status_uf == DEVICE_STATE.ERR:
new_state = DEVICE_STATE.ERR
elif prd_state == DEVICE_STATE.GOOD or status_uf == DEVICE_STATE.GOOD:
new_state = DEVICE_STATE.GOOD
else:
new_state = DEVICE_STATE.NONE
if overall_prd_state != new_state:
overall_prd_state = new_state
_update_display()
@@ -172,11 +172,11 @@ func _update_display() -> void:
func _get_tooltip_text() -> String:
var tooltip := ""
# Получаем статистику по ПРД
var prd_summary = _get_prd_summary()
var uf_status_str = _get_uf_status_text()
match overall_prd_state:
DEVICE_STATE.NONE:
tooltip = "Нет исправных систем в комплексе"
@@ -184,13 +184,13 @@ func _get_tooltip_text() -> String:
tooltip = "Комплекс исправен"
DEVICE_STATE.ERR:
tooltip = "Обнаружены неисправности в комплексе"
tooltip += "\n\nСтатус ПРД систем: " + prd_summary
tooltip += "\nСтатус УФ: " + uf_status_str
# Детализация по источникам статуса
tooltip += "\n\nСостояние систем:"
# ПРД системы
var prd_ok_count = 0
var prd_total = 0
@@ -199,25 +199,25 @@ func _get_tooltip_text() -> String:
prd_total += 1
if observer.status[DEVICE_STATUS.STATUS]:
prd_ok_count += 1
tooltip += "\nПРД: %d/%d исправно" % [prd_ok_count, prd_total]
# УФ система
tooltip += "\nУФ: " + _get_uf_status_text()
return tooltip
func _get_prd_summary() -> String:
var online_count := 0
var operational_count := 0
for observer in device_observers.values():
if observer.status[DEVICE_STATUS.ONLINE]:
online_count += 1
if observer.status[DEVICE_STATUS.STATUS]:
operational_count += 1
if online_count == 0:
return "Нет связи"
else: