рефактор

This commit is contained in:
Maxim
2025-08-15 17:46:24 +03:00
parent 295f81f694
commit bc8581773c
5 changed files with 212 additions and 275 deletions

View File

@@ -77,8 +77,8 @@ var control_results_k: Dictionary = {
'block_ip': false, # Проверка касет П1 и ИП МА2000
'temperature': true, # Проверка температур УМ
'dkm': false,
'dou': false,
'power_um': false, # Мощность от УКП
'dou_6': false,
'dou_7': false, # Мощность от УКП
'fs': false,
}
@@ -98,57 +98,6 @@ func _ready() -> void:
func on_state_mashine() -> void:
control_prd_k.state_control_machine()
block_kasseta_y5_prd_config_k = control_prd_k.block_kasseta_y5_config
var nodes_y5: Array = get_tree().get_nodes_in_group('y-5')
for node_y5 in nodes_y5:
var meta_y5 = node_y5.get_meta('y5')
if block_kasseta_y5_prd_config_k.has(meta_y5):
if block_kasseta_y5_prd_config_k['yau07'] == false:
node_y5.state = STATE_VAL.ERROR if meta_y5 == 'yau07' else STATE_VAL.NONE
return
node_y5.state = STATE_VAL.GOOD if block_kasseta_y5_prd_config_k[meta_y5] else STATE_VAL.ERROR
block_ip_config_k = control_prd_k.block_ip_config
var node_ip_power_arr: Array = get_tree().get_nodes_in_group('power_supply')
for power_supply in node_ip_power_arr:
var meta_ip = power_supply.get_meta('ip')
if block_ip_config_k.has(meta_ip) and block_kasseta_y5_prd_config_k.ug:
power_supply.state = STATE_VAL.GOOD if block_ip_config_k[meta_ip][1] else STATE_VAL.ERROR
var fs_results: Dictionary = control_prd_k.block_fs_config
var fs_nodes: Array = get_tree().get_nodes_in_group('fs_group')
for f in fs_nodes:
var fs_meta: String = f.get_meta('fs')
if fs_results.has(fs_meta):
var new_state = fs_results[fs_meta]
f.state = new_state
fs_results[fs_meta] = new_state
var dkm: Dictionary = control_prd_k.block_dkm_config
if control_prd_k.current_fs == 1 and fs_results.fs_1:
$kasseta_fs_kd/ref_A2.state = STATE_VAL.GOOD if dkm.dkm_1 else STATE_VAL.ERROR
elif control_prd_k.current_fs == 6 and fs_results.fs_6:
$kasseta_fs_kd/ref_A4.state = STATE_VAL.GOOD if dkm.dkm_6 else STATE_VAL.ERROR
elif control_prd_k.current_fs == 7 and fs_results.fs_7:
$kasseta_fs_kd/ref_A7.state = STATE_VAL.GOOD if dkm.dkm_7 else STATE_VAL.ERROR
#if not control_prd_k.power_result['ray_25_1'] or not control_prd_k.power_result['ray_25_6'] or not control_prd_k.power_result['ray_25_7']:
#return
if 1 == 1:
return
var node_arr_power: Array = get_tree().get_nodes_in_group('power_amplifier')
for i_pow in node_arr_power.size():
if i_pow < 1:
var pw = node_arr_power[i_pow]
pw.value1 = str(control_prd_k.power_result['ray_25_1'][i_pow])
elif i_pow < 7:
var pw = node_arr_power[i_pow]
pw.value1 = str(control_prd_k.power_result['ray_25_6'][i_pow-1])
elif i_pow < 13:
var pw = node_arr_power[i_pow]
pw.value1 = str(control_prd_k.power_result['ray_25_7'][i_pow-7])
func initialize_connections() -> void:
var unit_name = get_meta('unit_name')[0]
@@ -174,6 +123,7 @@ func initialize_connections() -> void:
}
control_prd_k = test.TestPRD.new(init_data)
add_child(control_prd_k)
control_prd_k.connect('control_is_over', Callable(self, 'on_control_result'))
func setup_timer() -> void:
@@ -212,38 +162,60 @@ func on_line_changed(unit_pribor: Object) -> void:
func on_mode_changed(in_tree: bool) -> void:
if not in_tree:
queue_free()
mashine_timer.stop()
prd_k_module.cmd_array.append([unit_prd_k.CmdCode.WRITE_ISA, [constants_k.ADDR_UG_LITERA_1, ug_work_1, constants_k.ADDR_UG_LITERA_2, ug_work_2, constants_k.ADDR_UG_LITERA_3, ug_work_3]])
signaller.emit_signal('interfer_off_all')
else:
mashine_timer.start()
#
#func on_control_result() -> void:
#var pribor = 'her'
#var all_blocks_ok = true
#for block in block_ip_config_k:
#if not block_ip_config_k[block][1]:
#all_blocks_ok = false
#break
#control_results_k['block_ip'] = all_blocks_ok
## Словарь соответствия ключей ошибок и нод
#var error_nodes := {
#'fs_1': $kasseta_fs_kd/ref_A3,
#'fs_6': $kasseta_fs_kd/ref_A6,
#'fs_7': $kasseta_fs_kd/ref_A5
#}
## Проверка результатов и установка состояний
#var result: bool = true
#for key in control_results_k:
#if not control_results_k[key]:
#result = false
#if error_nodes.has(key):
#error_nodes[key].state = STATE_VAL.ERROR
#
## Установка текста и цвета результата
#var status_text := 'неисправен'
#var status_color := Color.RED
#if result:
#status_text = 'исправен'
#status_color = Color.GREEN
#
#$control_result.text = 'Прибор ПРД-%s %s' % [pribor, status_text]
#$control_result.add_theme_color_override('font_color', status_color)
func on_control_result(result_dic: Dictionary) -> void:
mashine_timer.stop()
block_kasseta_y5_prd_config_k = control_prd_k.block_kasseta_y5_config
var nodes_y5: Array = get_tree().get_nodes_in_group('y-5')
for node_y5 in nodes_y5:
var meta_y5 = node_y5.get_meta('y5')
if block_kasseta_y5_prd_config_k.has(meta_y5):
if block_kasseta_y5_prd_config_k['yau07'] == false:
node_y5.state = STATE_VAL.ERROR if meta_y5 == 'yau07' else STATE_VAL.NONE
return
node_y5.state = STATE_VAL.GOOD if block_kasseta_y5_prd_config_k[meta_y5] else STATE_VAL.ERROR
block_ip_config_k = control_prd_k.block_ip_config
var node_ip_power_arr: Array = get_tree().get_nodes_in_group('power_supply')
for power_supply in node_ip_power_arr:
var meta_ip = power_supply.get_meta('ip')
if block_ip_config_k.has(meta_ip) and block_kasseta_y5_prd_config_k.ug:
power_supply.state = STATE_VAL.GOOD if block_ip_config_k[meta_ip][1] else STATE_VAL.ERROR
var fs_results: Dictionary = control_prd_k.block_fs_config
var fs_nodes: Array = get_tree().get_nodes_in_group('fs_group')
for f in fs_nodes:
var fs_meta: String = f.get_meta('fs')
if fs_results.has(fs_meta):
var new_state = fs_results[fs_meta]
f.state = new_state
fs_results[fs_meta] = new_state
var dkm: Dictionary = control_prd_k.block_dkm_config
if fs_results.fs_1:
$kasseta_fs_kd/ref_A2.state = STATE_VAL.GOOD if dkm.dkm_1 else STATE_VAL.ERROR
if fs_results.fs_6:
$kasseta_fs_kd/ref_A4.state = STATE_VAL.GOOD if dkm.dkm_6 else STATE_VAL.ERROR
$dou6_A7.state = STATE_VAL.GOOD if result_dic.dou_6 else STATE_VAL.ERROR
if fs_results.fs_7:
$kasseta_fs_kd/ref_A7.state = STATE_VAL.GOOD if dkm.dkm_7 else STATE_VAL.ERROR
$dou7_A8.state = STATE_VAL.GOOD if result_dic.dou_7 else STATE_VAL.ERROR
var result = true
for device in result_dic.values():
if not device:
result = false
var name_prd = control_prd_k.self_name
if result:
$control_result.text = 'Прибор ПРД-%s исправен' % name_prd
$control_result.add_theme_color_override('font_color', Color.AQUAMARINE)
else:
$control_result.text = 'Прибор ПРД-%s неисправен' % name_prd
$control_result.add_theme_color_override('font_color', Color.CRIMSON)