diff --git a/scenes/контроль/request.gd b/scenes/контроль/request.gd index e299fc32..fda7abda 100644 --- a/scenes/контроль/request.gd +++ b/scenes/контроль/request.gd @@ -21,7 +21,7 @@ const RESULT_STRINGS = { @export var request_url: String = '' -signal sending_request_afp_bpo() ## Отправка запроса +signal send_http_request() ## Отправка запроса func get_result_string(result: Result): @@ -34,4 +34,5 @@ func _on_request_timer(): var rc: = request(request_url) if rc != Error.OK: push_error('%s: \"%s\"' % [error_string(rc), request_url]) - emit_signal('sending_request_afp_bpo') + else: + emit_signal('send_http_request') diff --git a/scenes/контроль/контроль.tscn b/scenes/контроль/контроль.tscn index 89eaca6e..0e96152c 100644 --- a/scenes/контроль/контроль.tscn +++ b/scenes/контроль/контроль.tscn @@ -167,16 +167,16 @@ func on_pribor_press(pribor_path, header_text, pribor_node): add_child(pribor) 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.node_request.connect('send_http_request', Callable(self, 'on_send_http_request').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)) 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.node_request_1.connect('send_http_request', Callable(self, 'on_send_http_request').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 # Вызов при отправке запроса на селфтест АФСП -func on_sending_request_afp_bpo(node: Node, time_req: float) -> void: +func on_send_http_request(node: Node, time_req: float) -> void: node.progress_max_value = 100 node.progress_value = 0 node.progress_visible = true