Рефактор

This commit is contained in:
sasha80
2024-11-01 09:45:50 +03:00
parent 10130cec69
commit efe541d9c9
4 changed files with 27 additions and 23 deletions

View File

@@ -2,3 +2,6 @@
extends "res://scenes/контроль/элемент-я.gd"
func on_data_received():
pass

View File

@@ -54,6 +54,7 @@ offset_right = 635.0
offset_bottom = 855.0
script = ExtResource("1_mb0l2")
textures = [ExtResource("2_qglal"), ExtResource("3_gqvwf"), ExtResource("4_2lj00")]
unit_name = "уарэп-щ3"
[node name="rect" type="NinePatchRect" parent="."]
layout_mode = 2

View File

@@ -2,21 +2,6 @@
extends "res://scenes/контроль/элемент-я.gd"
@export var unit_name: String = ''
enum STATE_VAL {
NONE = 0,
GOOD = 1,
ERROR = 2 }
func _enter_tree() -> void:
if Engine.is_editor_hint(): return
var unit_key = settings.get_unit_key(unit_name)
var unit = network.units[unit_key]
unit.connect('data_received', on_data_received.bind(unit))
unit.connect('line_changed', on_line_changed)
func on_line_changed(unit):
if not unit.online:
@@ -34,14 +19,6 @@ func on_line_changed(unit):
$block_input2.state2 = STATE_VAL.NONE
func _exit_tree() -> void:
if Engine.is_editor_hint(): return
var unit_key = settings.get_unit_key(unit_name)
var unit = network.units[unit_key]
unit.disconnect('data_received', on_data_received)
unit.disconnect('line_changed', on_line_changed)
func on_data_received(data: PackedByteArray, unit):
if data.size() <= 6:
push_error('ошибка: неверная длина данных %d байт %s' % [data.size(), unit])

View File

@@ -3,6 +3,13 @@
extends Control
@export var textures: Array
@export var unit_name: String = ''
enum STATE_VAL {
NONE = 0,
GOOD = 1,
ERROR = 2 }
signal pressed(control: PanelContainer)
@@ -42,3 +49,19 @@ func _on_resized() -> void:
$rect.size = size
$margin.size = size
$button.size = size
func _enter_tree() -> void:
if Engine.is_editor_hint(): return
var unit_key = settings.get_unit_key(unit_name)
var unit = network.units[unit_key]
unit.connect('data_received', Callable(self, 'on_data_received').bind(unit))
unit.connect('line_changed', Callable(self, 'on_line_changed'))
func _exit_tree() -> void:
if Engine.is_editor_hint(): return
var unit_key = settings.get_unit_key(unit_name)
var unit = network.units[unit_key]
unit.disconnect('data_received', Callable(self, 'on_data_received'))
unit.disconnect('line_changed', Callable(self, 'on_line_changed'))