From 6bbd8333f9e57ec51f8eef156184bd9e2d98c07a Mon Sep 17 00:00:00 2001 From: Maxim Date: Fri, 16 Jan 2026 16:33:35 +0300 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=20=D1=81=D0=B8=D0=B3=D0=BD=D0=B0=D0=BB=20=D0=B7=D0=B0?= =?UTF-8?q?=D0=B2=D0=B5=D1=80=D1=88=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=BF=D1=80?= =?UTF-8?q?=D0=BE=D0=B3=D1=80=D0=B5=D1=81=D1=81=20=D0=B1=D0=B0=D1=80=D0=B0?= =?UTF-8?q?=20=D0=BF=D1=80=D0=B8=20=D0=BE=D1=82=D0=B2=D0=B5=D1=82=D0=B5=20?= =?UTF-8?q?=D0=BE=D1=82=20=D0=90=D0=A4=D0=A1=D0=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scenes/pribor-afsp/pribor-afsp.gd | 4 ++++ scenes/pribor-afsp/pribor-bpo.gd | 4 ++++ scenes/контроль/контроль.tscn | 9 +++++++++ 3 files changed, 17 insertions(+) diff --git a/scenes/pribor-afsp/pribor-afsp.gd b/scenes/pribor-afsp/pribor-afsp.gd index dc9ddbff..04ef8611 100644 --- a/scenes/pribor-afsp/pribor-afsp.gd +++ b/scenes/pribor-afsp/pribor-afsp.gd @@ -7,6 +7,8 @@ class_name pribor_afsp extends 'res://scenes/контроль/прибор.gd' @export var settings_path_to_url: String = '' ## Должно быть в ProjectSettings @export var settings_path_to_wait_time: String = '' ## Должно быть в ProjectSettings +signal receive_response_afp_bpo() + static var json_conv: JSON = JSON.new() static var node_maper = load('res://scenes/контроль/node-maper.gd') static var node_request: Node @@ -96,6 +98,8 @@ func _on_request_completed(result, _response_code, headers, body: PackedByteArra node_maper.map_value_to_item(json_conv.data, child, 'value1') node_maper.map_error_codes_to_item(json_conv.data, child, 'state', 0) + emit_signal('receive_response_afp_bpo') + ## Вызывается при клике мыши на элементе. ## [param block_a] - Кликнутый элемент. diff --git a/scenes/pribor-afsp/pribor-bpo.gd b/scenes/pribor-afsp/pribor-bpo.gd index 6a82b5c6..8a8c210f 100644 --- a/scenes/pribor-afsp/pribor-bpo.gd +++ b/scenes/pribor-afsp/pribor-bpo.gd @@ -10,6 +10,8 @@ class_name pribor_rtr extends 'res://scenes/контроль/прибор.gd' @export var settings_path2_to_url: String = '' ## Должно быть в ProjectSettings @export var settings_path_to_wait_time: String = '' ## Должно быть в ProjectSettings +signal receive_response_afp_bpo() + static var json_conv: JSON = JSON.new() static var node_maper = load('res://scenes/контроль/node-maper.gd') static var node_request_1: Node @@ -104,6 +106,8 @@ func _on_request_completed(result, _response_code, headers, body: PackedByteArra $mod_pit_g1.state = 1 break + emit_signal('receive_response_afp_bpo') + func find_labels(node1: Node): if node1 is Label: diff --git a/scenes/контроль/контроль.tscn b/scenes/контроль/контроль.tscn index b7d69f6e..8aa514fc 100644 --- a/scenes/контроль/контроль.tscn +++ b/scenes/контроль/контроль.tscn @@ -169,8 +169,12 @@ func on_pribor_press(pribor_path, header_text, pribor_node): update_pribor_items_visibility() if pribor_node.get_meta('unit_name')[0] == 'уарэп-афсп-левый' or pribor_node.get_meta('unit_name')[0] == 'уарэп-афсп-правый': pribor.node_request.connect('sending_request_afp_bpo', Callable(self, 'on_sending_request_afp_bpo').bind(pribor_node, pribor.node_request_timer.wait_time)) + pribor.connect('receive_response_afp_bpo', Callable(self, 'on_receive_response_afp_bpo').bind(pribor_node)) #signal receive_response_afp_bpo if pribor_node.get_meta('unit_name')[0] == 'уарэп-бпо-1' or pribor_node.get_meta('unit_name')[0] == 'уарэп-бпо-2': pribor.node_request_1.connect('sending_request_afp_bpo', Callable(self, 'on_sending_request_afp_bpo').bind(pribor_node, pribor.node_request_timer_1.wait_time)) + pribor.connect('receive_response_afp_bpo', Callable(self, 'on_receive_response_afp_bpo').bind(pribor_node)) #signal receive_response_afp_bpo + #signal receive_response_afp_bpo + #signal receive_response_afp_bpo # Вызов при отправке запроса на селфтест АФСП @@ -181,6 +185,10 @@ func on_sending_request_afp_bpo(node: Node, time_req: float) -> void: node.timeout_tween = time_req +func on_receive_response_afp_bpo(node: Node) -> void: + node.progress_value = 100 + + ## Прием сигналов о текущем состояниях приборах func on_serviceability_changed(state: int, prd_pribor_node: Node) -> void: prd_pribor_node.state = state @@ -828,6 +836,7 @@ frame_progress = 0.72355 [node name="control_progress" type="TextureProgressBar" parent="pribor_rtr"] visible = false +layout_mode = 0 offset_left = 6.0 offset_top = 172.0 offset_right = 102.0