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

scenes/pribor-prd-k/pribor-prd-k.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
 
 
@@ -83,10 +83,16 @@ static func power_fill(pow_dic: Dictionary, fs_result: Dictionary, power_amplifi
                 if powamp_meta == 'um_8' and not fs_result.fs_1: return
                 if powamp_meta in ['um_1', 'um_2', 'um_3', 'um_4', 'um_5', 'um_6'] and not fs_result.fs_6: return
                 if powamp_meta in ['um_9', 'um_10', 'um_11', 'um_12', 'um_13', 'um_14'] and not fs_result.fs_7: return
-                i_powapm.value0 = pow_dic[powamp_meta]
-                for i_p in pow_dic[powamp_meta]:
-                    if i_p < POWER_THRESHOLD:
+                
+                if powamp_meta == 'um_8':
+                    i_powapm.value0 = [pow_dic[powamp_meta][5]]
+                    if pow_dic[powamp_meta][5] < POWER_THRESHOLD:
                         status = STATE_VAL.ERROR
+                else:
+                    i_powapm.value0 = pow_dic[powamp_meta]
+                    for i_p in pow_dic[powamp_meta]:
+                        if i_p < POWER_THRESHOLD:
+                            status = STATE_VAL.ERROR
             i_powapm.state = status
 
 
@@ -121,7 +127,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_k: Dictionary = for_result_dic.block_kasseta_y5_config
@@ -134,14 +140,15 @@ func on_control_result(for_result_dic: Dictionary) -> void:
                 break
             node_y5.state = STATE_VAL.GOOD if block_kasseta_y5_prd_config_k[meta_y5] else STATE_VAL.ERROR
 
-    var block_ip_config_k: Dictionary = unit_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 block_ip_config_k: 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_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
 
-    ## 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-k/pribor-prd-k.tscn

@@ -51,7 +51,7 @@ offset_top = 242.0
 offset_right = 485.0
 offset_bottom = 432.0
 
-[node name="maa2000_A22" parent="." groups=["default_reset", "power_supply"] instance=ExtResource("1_8dmgr")]
+[node name="maa2000_A22" parent="." groups=["power_supply"] instance=ExtResource("1_8dmgr")]
 layout_mode = 0
 offset_left = 485.0
 offset_top = 907.0
@@ -70,7 +70,7 @@ offset_bottom = 907.0
 fname = "ДОУ-6"
 rname = "A7"
 
-[node name="maa2000_A23" parent="." groups=["default_reset", "power_supply"] instance=ExtResource("1_8dmgr")]
+[node name="maa2000_A23" parent="." groups=["power_supply"] instance=ExtResource("1_8dmgr")]
 layout_mode = 0
 offset_left = 8.0
 offset_top = 907.0
@@ -292,7 +292,7 @@ patch_margin_bottom = 16
 script = ExtResource("7_xpa2n")
 fname = "Кассета П-1"
 
-[node name="ref_A26" parent="kasseta_p_1" groups=["default_reset", "power_supply"] instance=ExtResource("8_la5yt")]
+[node name="ref_A26" parent="kasseta_p_1" groups=["power_supply"] instance=ExtResource("8_la5yt")]
 offset_left = 9.0
 offset_top = 33.0
 offset_right = 59.0
@@ -301,7 +301,7 @@ fname = "ИП9-50"
 rname = "A23"
 metadata/ip = "ip9_50_1"
 
-[node name="ref_A23" parent="kasseta_p_1" groups=["default_reset", "power_supply"] instance=ExtResource("8_la5yt")]
+[node name="ref_A23" parent="kasseta_p_1" groups=["power_supply"] instance=ExtResource("8_la5yt")]
 offset_left = 59.0
 offset_top = 33.0
 offset_right = 109.0
@@ -310,7 +310,7 @@ fname = "ИП9-50"
 rname = "A24"
 metadata/ip = "ip9_50_2"
 
-[node name="ref_A24" parent="kasseta_p_1" groups=["default_reset", "power_supply"] instance=ExtResource("8_la5yt")]
+[node name="ref_A24" parent="kasseta_p_1" groups=["power_supply"] instance=ExtResource("8_la5yt")]
 offset_left = 109.0
 offset_top = 33.0
 offset_right = 159.0
@@ -361,11 +361,11 @@ position = Vector2(255, 619)
 sprite_frames = SubResource("SpriteFrames_di0aa")
 
 [node name="output_0" type="AnimatedSprite2D" parent="."]
-position = Vector2(406, 464)
+position = Vector2(355, 464)
 sprite_frames = SubResource("SpriteFrames_di0aa")
 
 [node name="output_1" type="AnimatedSprite2D" parent="."]
-position = Vector2(355, 466)
+position = Vector2(405, 464)
 sprite_frames = SubResource("SpriteFrames_di0aa")
 
 [node name="output_2" type="AnimatedSprite2D" parent="."]