Доработка индикации прогресс бара, проверку загрузки файла, сброс результатов контроля

scenes/pribor-prd-n/pribor-prd-n.gd

@@ -37,15 +37,15 @@ func set_frame(node_frame: Node, val: int): node_frame.set_frame(val)
 
 
 func start_control() -> void:
-    set_default_state()
+    set_default_state(get_tree().get_nodes_in_group('default_reset'), get_tree().get_nodes_in_group('power_amplifier'))
     find_labels(self)
 
 
-func set_default_state() -> void:
-    for group in get_tree().get_nodes_in_group('default_reset'):
+static func set_default_state(default_reset_array_node: Array, power_amplifier_arr_node: Array) -> void:
+    for group in default_reset_array_node:
         group.state = STATE_VAL.NONE
 
-    for group in get_tree().get_nodes_in_group('power_amplifier'):
+    for group in power_amplifier_arr_node:
         group.state = STATE_VAL.NONE
 
 
@@ -88,11 +88,13 @@ func on_press_device() -> void:
     var node_ip_power_arr: Array = get_tree().get_nodes_in_group('power_supply')
     var fs_nodes: Array = get_tree().get_nodes_in_group('fs_group')
     var power_amplifier_arr_node: Array = get_tree().get_nodes_in_group('power_amplifier')
+    var default_reset_array_node = get_tree().get_nodes_in_group('default_reset')
     var module_fs_2: Node = $kasseta_FS_ND/ref_A4
     var dou_2: Node = $dou2_A5
     var module_fs_3: Node = $kasseta_FS_ND/ref_A3
     var dou_3: Node = $dou3_A6
     var for_control_result: Dictionary = {
+        'control_is_over': unit_prd_n.flag_control_is_over,
         'result_dic': unit_prd_n.control_results,
         'power_dic': unit_prd_n.power_result,
         'block_kasseta_y5_config': unit_prd_n.block_kasseta_y5_config,
@@ -102,6 +104,7 @@ func on_press_device() -> void:
         'node_ip_power_arr': node_ip_power_arr,
         'fs_nodes': fs_nodes,
         'power_amplifier': power_amplifier_arr_node,
+        'default_reset_array_node': default_reset_array_node,
         'POWER_THRESHOLD': unit_prd_n.constants.POWER_THRESHOLD,
         'name_prd': unit_prd_n.self_name,
         'module_fs_2': module_fs_2,
@@ -112,7 +115,7 @@ func on_press_device() -> void:
     on_control_result(for_control_result)
 
 
-func on_control_result(for_result_dic: Dictionary) -> void:
+static func on_control_result(for_result_dic: Dictionary) -> void:
     temperature_fill(for_result_dic.power_amplifier,  for_result_dic.temperature_um)
     
     var block_kasseta_y5_prd_config_n: Dictionary = for_result_dic.block_kasseta_y5_config
@@ -125,14 +128,15 @@ func on_control_result(for_result_dic: Dictionary) -> void:
                 break
             node_y5.state = STATE_VAL.GOOD if block_kasseta_y5_prd_config_n[meta_y5] else STATE_VAL.ERROR
 
-    var block_ip_config_n: Dictionary = unit_prd_n.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 block_ip_config_n: Dictionary = for_result_dic.block_ip_config
+    for power_supply in for_result_dic.node_ip_power_arr:
         var meta_ip  = power_supply.get_meta('ip')
         if block_ip_config_n.has(meta_ip) and block_kasseta_y5_prd_config_n.ug:
             power_supply.state = STATE_VAL.GOOD if block_ip_config_n[meta_ip][1] else STATE_VAL.ERROR
 
-    ## If control is end
+    if not for_result_dic.control_is_over:  
+        set_default_state(for_result_dic.default_reset_array_node, for_result_dic.power_amplifier)
+        return
     var result_dic: Dictionary = for_result_dic.result_dic
     for f in for_result_dic.fs_nodes:
             var fs_meta: String = f.get_meta('fs')

scenes/pribor-prd-n/pribor-prd-n.tscn

@@ -40,7 +40,7 @@ offset_right = 15.0
 offset_bottom = 30.0
 script = ExtResource("1_bnnv3")
 
-[node name="maa2000_A23" parent="." groups=["default_reset", "power_supply"] instance=ExtResource("2_is25t")]
+[node name="maa2000_A23" parent="." groups=["power_supply"] instance=ExtResource("2_is25t")]
 layout_mode = 2
 offset_left = 8.0
 offset_top = 877.0
@@ -50,7 +50,7 @@ fname = "MAA2000"
 rname = "A23"
 metadata/ip = "maa2000_2"
 
-[node name="maa2000_A22" parent="." groups=["default_reset", "power_supply"] instance=ExtResource("2_is25t")]
+[node name="maa2000_A22" parent="." groups=["power_supply"] instance=ExtResource("2_is25t")]
 layout_mode = 2
 offset_left = 485.0
 offset_top = 877.0
@@ -254,7 +254,7 @@ patch_margin_bottom = 16
 script = ExtResource("6_b5wvk")
 fname = "Кассета П-1"
 
-[node name="ref_A21" parent="kasseta_P_1" groups=["default_reset", "power_supply"] instance=ExtResource("7_eoqf2")]
+[node name="ref_A21" parent="kasseta_P_1" groups=["power_supply"] instance=ExtResource("7_eoqf2")]
 offset_left = 9.0
 offset_top = 33.0
 offset_right = 59.0
@@ -263,7 +263,7 @@ fname = "ИП12-50"
 rname = "A21"
 metadata/ip = "ip12_50_1"
 
-[node name="ref_A20" parent="kasseta_P_1" groups=["default_reset", "power_supply"] instance=ExtResource("7_eoqf2")]
+[node name="ref_A20" parent="kasseta_P_1" groups=["power_supply"] instance=ExtResource("7_eoqf2")]
 offset_left = 59.0
 offset_top = 33.0
 offset_right = 109.0
@@ -272,7 +272,7 @@ fname = "ИП9-50"
 rname = "A20"
 metadata/ip = "ip9_50_1"
 
-[node name="ref_A19" parent="kasseta_P_1" groups=["default_reset", "power_supply"] instance=ExtResource("7_eoqf2")]
+[node name="ref_A19" parent="kasseta_P_1" groups=["power_supply"] instance=ExtResource("7_eoqf2")]
 offset_left = 109.0
 offset_top = 33.0
 offset_right = 159.0