Глобальное изменение: Параллеьный контроль. Новая ветка prd-control. Первый коммит инициализации.

2025-11-09 15:45:22 +03:00
parent 77e15627d0
commit 36e47bbd13
10 changed files with 768 additions and 168 deletions
--- a/scenes/pribor-prd-k/pribor-prd-k.gd
+++ b/scenes/pribor-prd-k/pribor-prd-k.gd
@@ -59,64 +59,70 @@ var ug_work_1: int = 3  ## Аттенюация усилителей мощно
 var ug_work_2: int = 2  ## Аттенюация усилителей мощности
 var ug_work_3: int = 0  ## Аттенюация усилителей мощности
 var mashine_timer: Timer = Timer.new()
-var prd_k_module: Object
+#var prd_k_module: Object
 var unit_prd_k: Object
-var control_prd_k: Object
+#var control_prd_k: Object
 # Результаты контроля
-var control_results_k: Dictionary = {
-    'block_ip': false,     # Проверка касет П1 и ИП МА2000
-    'temperature': true,
-    'dkm_1': false,
-    'dkm_6': false,
-    'dkm_7': false,
-    'dou_6': false,
-    'dou_7': false,
-    'fs_1': 2,
-    'fs_6': 2,
-    'fs_7': 2,
-}
+#var control_results_k: Dictionary = {
+    #'block_ip': false,     # Проверка касет П1 и ИП МА2000
+    #'temperature': true,
+    #'dkm_1': false,
+    #'dkm_6': false,
+    #'dkm_7': false,
+    #'dou_6': false,
+    #'dou_7': false,
+    #'fs_1': 2,
+    #'fs_6': 2,
+    #'fs_7': 2,
+#}

-var test_control_k = preload('res://scripts/pribor-prd.gd')
 var ctrl_pos = 30


 func _ready() -> void:
    if Engine.is_editor_hint():
        return
+    var unit_name = get_meta('unit_name')[0]
+    var prd_k_module = prd.prd_dict[unit_name]
+    unit_prd_k = prd_k_module.unit_control

-    initialize_connections()
+    unit_prd_k.connect('control_is_over', Callable(self, 'on_control_result'))
+
+
+func start_control() -> void:
+    #initialize_connections()
    setup_timer()
    set_default_state()
    find_labels(self)


-func on_state_mashine() -> void:
-    control_prd_k.state_control_machine()
+#func on_state_mashine() -> void:
+    #control_prd_k.state_control_machine()


-func initialize_connections() -> void:
-    var unit_name = get_meta('unit_name')[0]
-    prd_k_module = prd.prd_dict[unit_name]
-    unit_prd_k = prd_k_module.unit_yau07
-
-    unit_prd_k.connect('line_changed', Callable(self, 'on_line_changed'))
-    var power_amplifiers: Array = get_tree().get_nodes_in_group('power_amplifier')
-    var init_data: Dictionary = {
-        'control_label': $control_result,
-        'power_amplifiers': power_amplifiers,
-        'unit_prd': unit_prd_k,
-        'module_prd' : prd_k_module,
-        'constants': constants_k,
-        'prd_config': PRIBOR_CONFIG,
-        'fs_params': FS_PARAMS,
-        'block_ip_prd_config': block_ip_config_k,
-        'block_kasseta_y5_prd_config': block_kasseta_y5_prd_config_k,
-        'control_results': control_results_k,
-        'current_litera': start_litera,
-    }
-    control_prd_k = test_control_k.TestPRD.new(init_data)
-    add_child(control_prd_k)
-    control_prd_k.connect('control_is_over', Callable(self, 'on_control_result'))
+#func initialize_connections() -> void:
+    #var unit_name = get_meta('unit_name')[0]
+    #prd_k_module = prd.prd_dict[unit_name]
+    #unit_prd_k = prd_k_module.unit_yau07
+#
+    #unit_prd_k.connect('line_changed', Callable(self, 'on_line_changed'))
+    #var power_amplifiers: Array = get_tree().get_nodes_in_group('power_amplifier')
+    #var init_data: Dictionary = {
+        #'control_label': $control_result,
+        #'power_amplifiers': power_amplifiers,
+        #'unit_prd': unit_prd_k,
+        #'module_prd' : prd_k_module,
+        #'constants': constants_k,
+        #'prd_config': PRIBOR_CONFIG,
+        #'fs_params': FS_PARAMS,
+        #'block_ip_prd_config': block_ip_config_k,
+        #'block_kasseta_y5_prd_config': block_kasseta_y5_prd_config_k,
+        #'control_results': control_results_k,
+        #'current_litera': start_litera,
+    #}
+    #control_prd_k = test_control_k.TestPRD.new(init_data)
+    #add_child(control_prd_k)
+    #control_prd_k.connect('control_is_over', Callable(self, 'on_control_result'))


 func setup_timer() -> void:
@@ -149,7 +155,7 @@ func _enter_tree() -> void:
 func _exit_tree() -> void:
    if Engine.is_editor_hint():
        return
-    prd_k_module.cmd_array.append([unit_prd_k.CmdCode.WRITE_ISA, [constants_k.ADDR_UG_LITERA_1, ug_work_1, constants_k.ADDR_UG_LITERA_2, ug_work_2, constants_k.ADDR_UG_LITERA_3, ug_work_3]])
+    #prd_k_module.cmd_array.append([unit_prd_k.CmdCode.WRITE_ISA, [constants_k.ADDR_UG_LITERA_1, ug_work_1, constants_k.ADDR_UG_LITERA_2, ug_work_2, constants_k.ADDR_UG_LITERA_3, ug_work_3]])


 func on_line_changed(unit_pribor: Object) -> void:
@@ -159,13 +165,15 @@ func on_line_changed(unit_pribor: Object) -> void:

 func on_mode_changed(in_tree: bool) -> void:
    if not in_tree:
-        mashine_timer.stop()
-        prd_k_module.cmd_array.append([unit_prd_k.CmdCode.WRITE_ISA, [constants_k.ADDR_UG_LITERA_1, ug_work_1, constants_k.ADDR_UG_LITERA_2, ug_work_2, constants_k.ADDR_UG_LITERA_3, ug_work_3]])
-        signaller.emit_signal('interfer_off_all')
+        print_debug('Выход из сцены')
+        #mashine_timer.stop()
+        #prd_k_module.cmd_array.append([unit_prd_k.CmdCode.WRITE_ISA, [constants_k.ADDR_UG_LITERA_1, ug_work_1, constants_k.ADDR_UG_LITERA_2, ug_work_2, constants_k.ADDR_UG_LITERA_3, ug_work_3]])
+        #signaller.emit_signal('interfer_off_all')
    else:
-        set_default_state()
-        control_prd_k.state = control_prd_k.STATE_MASHINE.INIT
-        mashine_timer.start()
+        print_debug('Вход в сцену')
+        #set_default_state()
+        #control_prd_k.state = control_prd_k.STATE_MASHINE.INIT
+        #mashine_timer.start()


 func power_fill(pow_dic: Dictionary, fs_result: Dictionary) -> void:
@@ -193,7 +201,7 @@ func power_fill(pow_dic: Dictionary, fs_result: Dictionary) -> void:

 func on_control_result(result_dic: Dictionary, power_dic: Dictionary) -> void:
    mashine_timer.stop()
-    block_kasseta_y5_prd_config_k = control_prd_k.block_kasseta_y5_config
+    block_kasseta_y5_prd_config_k = unit_prd_k.block_kasseta_y5_config
    var nodes_y5: Array = get_tree().get_nodes_in_group('y-5')
    for node_y5 in nodes_y5:
        var meta_y5  = node_y5.get_meta('y5')
@@ -203,7 +211,7 @@ func on_control_result(result_dic: Dictionary, power_dic: Dictionary) -> void:
                break
            node_y5.state = STATE_VAL.GOOD if block_kasseta_y5_prd_config_k[meta_y5] else STATE_VAL.ERROR

-    block_ip_config_k = control_prd_k.block_ip_config
+    block_ip_config_k = 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 meta_ip  = power_supply.get_meta('ip')
@@ -240,13 +248,8 @@ func on_control_result(result_dic: Dictionary, power_dic: Dictionary) -> void:
        if not device:
            result = false

-    var name_prd = control_prd_k.self_name
-    if result:
-        $control_result.text = 'Прибор ПРД-%s исправен' % name_prd
-        $control_result.add_theme_color_override('font_color', Color.GREEN)
-    else:
-        $control_result.text = 'Прибор ПРД-%s неисправен' % name_prd
-        $control_result.add_theme_color_override('font_color', Color.RED)
+    var name_prd = unit_prd_k.self_name
+    log.message(Logger.INFO, 'Прибор ПРД-%s %s' % [name_prd, ['неисправен', 'исправен'][int(result)]])


 func find_labels(node1: Node):
--- a/scenes/pribor-prd-n/pribor-prd-n.gd
+++ b/scenes/pribor-prd-n/pribor-prd-n.gd
@@ -78,7 +78,10 @@ func on_state_mashine() -> void:
 func _ready() -> void:
    if Engine.is_editor_hint():
        return
+    print_debug('В сцене ПРД-Н!')

+
+func start_control() -> void:
    initialize_connections()
    setup_timer()
    set_default_state()
@@ -111,10 +114,11 @@ func initialize_connections() -> void:


 func setup_timer() -> void:
-    add_child(mashine_timer)
-    mashine_timer.connect('timeout', Callable(self, 'on_state_mashine'))
-    mashine_timer.wait_time = constants_n.STATE_MASHINE_TIMER
-    mashine_timer.start()
+    pass
+    #add_child(mashine_timer)
+    #mashine_timer.connect('timeout', Callable(self, 'on_state_mashine'))
+    #mashine_timer.wait_time = constants_n.STATE_MASHINE_TIMER
+    #mashine_timer.start()


 func set_default_state() -> void:
@@ -140,7 +144,7 @@ func _enter_tree() -> void:
 func _exit_tree() -> void:
    if Engine.is_editor_hint():
        return
-    prd_n_module.cmd_array.append([unit_prd_n.CmdCode.WRITE_ISA, [constants_n.ADDR_UG_LITERA_1, ug_work_1, constants_n.ADDR_UG_LITERA_2, ug_work_2]])
+    #prd_n_module.cmd_array.append([unit_prd_n.CmdCode.WRITE_ISA, [constants_n.ADDR_UG_LITERA_1, ug_work_1, constants_n.ADDR_UG_LITERA_2, ug_work_2]])


 func on_line_changed(unit_pribor: Object) -> void:
@@ -149,14 +153,15 @@ func on_line_changed(unit_pribor: Object) -> void:


 func on_mode_changed(in_tree: bool) -> void:
-    if not in_tree:
-        mashine_timer.stop()
-        signaller.emit_signal('interfer_off_all')
-        prd_n_module.cmd_array.append([unit_prd_n.CmdCode.WRITE_ISA, [constants_n.ADDR_UG_LITERA_1, ug_work_1, constants_n.ADDR_UG_LITERA_2, ug_work_2]])
-    else:
-        set_default_state()
-        control_prd_n.state = control_prd_n.STATE_MASHINE.INIT
-        mashine_timer.start()
+    print_debug('Выход из сцены')
+    #if not in_tree:
+        #mashine_timer.stop()
+        #signaller.emit_signal('interfer_off_all')
+        #prd_n_module.cmd_array.append([unit_prd_n.CmdCode.WRITE_ISA, [constants_n.ADDR_UG_LITERA_1, ug_work_1, constants_n.ADDR_UG_LITERA_2, ug_work_2]])
+    #else:
+        #set_default_state()
+        #control_prd_n.state = control_prd_n.STATE_MASHINE.INIT
+        #mashine_timer.start()


 func power_fill(pow_dic: Dictionary, fs_result: Dictionary) -> void:
--- a/scenes/pribor-prd-v/pribor-prd-v.gd
+++ b/scenes/pribor-prd-v/pribor-prd-v.gd
@@ -79,7 +79,10 @@ func on_state_mashine() -> void:
 func _ready() -> void:
    if Engine.is_editor_hint():
        return
+    print_debug('В сцене ПРД-В!')

+
+func start_control() -> void:
    initialize_connections()
    setup_timer()
    set_default_state()
@@ -142,7 +145,7 @@ func _enter_tree() -> void:
 func _exit_tree() -> void:
    if Engine.is_editor_hint():
        return
-    prd_v_module.cmd_array.append([unit_prd_v.CmdCode.WRITE_ISA, [constants_v.ADDR_UG_LITERA_1, ug_work_1, constants_v.ADDR_UG_LITERA_2, ug_work_2]])
+    #prd_v_module.cmd_array.append([unit_prd_v.CmdCode.WRITE_ISA, [constants_v.ADDR_UG_LITERA_1, ug_work_1, constants_v.ADDR_UG_LITERA_2, ug_work_2]])


 func on_line_changed(unit_pribor: Object) -> void:
@@ -151,14 +154,15 @@ func on_line_changed(unit_pribor: Object) -> void:


 func on_mode_changed(in_tree: bool) -> void:
-    if not in_tree:
-        mashine_timer.stop()
-        prd_v_module.cmd_array.append([unit_prd_v.CmdCode.WRITE_ISA, [constants_v.ADDR_UG_LITERA_1, ug_work_1, constants_v.ADDR_UG_LITERA_2, ug_work_2]])
-        signaller.emit_signal('interfer_off_all')
-    else:
-        set_default_state()
-        control_prd_v.state = control_prd_v.STATE_MASHINE.INIT
-        mashine_timer.start()
+    print_debug('Выход из сцены')
+    #if not in_tree:
+        #mashine_timer.stop()
+        #prd_v_module.cmd_array.append([unit_prd_v.CmdCode.WRITE_ISA, [constants_v.ADDR_UG_LITERA_1, ug_work_1, constants_v.ADDR_UG_LITERA_2, ug_work_2]])
+        #signaller.emit_signal('interfer_off_all')
+    #else:
+        #set_default_state()
+        #control_prd_v.state = control_prd_v.STATE_MASHINE.INIT
+        #mashine_timer.start()


 func power_fill(pow_dic: Dictionary, fs_result: Dictionary) -> void:
--- a/scenes/tilemap/tilemap.gd
+++ b/scenes/tilemap/tilemap.gd
@@ -368,12 +368,12 @@ func _process(delta) -> void:
        _queue.erase(tile.i)
        req.request_completed.connect(_response.bind(req, tile))

-        if req.request(tile.url) != OK:
-            tile.t = now
-            remove_child(req)
-            req.queue_free()
-            _req_count -= 1
-            push_error('запрос \"%s\" не отправлен' % tile.url)
+        #if req.request(tile.url) != OK:
+            #tile.t = now
+            #remove_child(req)
+            #req.queue_free()
+            #_req_count -= 1
+            # push_error('запрос \"%s\" не отправлен' % tile.url)  TODO: For Deugs 
        if _queue.is_empty():
            emit_signal('load_completed')

--- a/scenes/контроль/кнопка-прибора.gd
+++ b/scenes/контроль/кнопка-прибора.gd
@@ -1,12 +1,16 @@
@tool

 extends TextureButton
-
+@onready var tween: Tween
@export var state_colors: Array

-func _on_toggled(toggled_on): $frame.visible = toggled_on
+func _on_toggled(toggled_on) -> void: $frame.visible = toggled_on
 func _enter_tree() -> void: $label.self_modulate = state_colors[state]
-
+func update_progress_bar(target_value) -> void:
+    if tween:
+        tween.kill()
+    tween = create_tween()
+    tween.tween_property($control_progress, "value", target_value, 0.3)

@export var state: int:
    set(v):
@@ -14,3 +18,35 @@ func _enter_tree() -> void: $label.self_modulate = state_colors[state]
        state = v
        if is_inside_tree():
            $label.self_modulate = state_colors[v]
+
+
+@export var progress_value: float = 0.0:
+    set(v):
+        progress_value = v
+        
+        if is_inside_tree():
+            update_progress_bar(v)
+            var max_val = $control_progress.get('max_value')
+            var percentage = (v / max_val) * 100.0
+            $control_progress.tooltip_text = 'Процесс контроля %01d%%' % percentage
+
+
+@export var progress_visible: bool:
+    set(v):
+        progress_visible = v
+        if is_inside_tree():
+            $control_progress.visible = v
+
+
+@export var progress_max_value: int:
+    set(v):
+        progress_max_value = v
+        if is_inside_tree():
+            $control_progress.max_value = v
+
+
+@export var progress_min_value: int:
+    set(v):
+        progress_min_value = v
+        if is_inside_tree():
+            $control_progress.min_value = v
--- a/scenes/контроль/контроль.tscn
+++ b/scenes/контроль/контроль.tscn
@@ -1,4 +1,4 @@
-[gd_scene load_steps=18 format=3 uid="uid://lwmw4egynmd1"]
+[gd_scene load_steps=20 format=3 uid="uid://lwmw4egynmd1"]

 [ext_resource type="Texture2D" uid="uid://bar8k5qef7kch" path="res://data/УФ.png" id="2_0nvm1"]
 [ext_resource type="Script" uid="uid://q3gmpsqspjfp" path="res://scenes/контроль/внешний.gd" id="2_8r80x"]
@@ -14,6 +14,8 @@
 [ext_resource type="Texture2D" uid="uid://dnreyfh3cd1k2" path="res://data/состояние-исправности-1.png" id="8_isjua"]
 [ext_resource type="Texture2D" uid="uid://b4isaggma6q3" path="res://data/Грани22.png" id="9_iqgf5"]
 [ext_resource type="Texture2D" uid="uid://c6booa8753u5t" path="res://data/состояние-исправности-2.png" id="9_ll0vs"]
+[ext_resource type="Texture2D" uid="uid://00871pb6moln" path="res://data/прогресс-фон-1.png" id="9_w6m6a"]
+[ext_resource type="Texture2D" uid="uid://c1k856fxhrjnh" path="res://data/прогресс-заполнение-1.png" id="10_lbx5w"]
 [ext_resource type="Script" uid="uid://bncy1x53jp73d" path="res://scenes/контроль/connect_pribor.gd" id="11_u7tym"]

 [sub_resource type="GDScript" id="GDScript_iqgf5"]
@@ -84,6 +86,8 @@ func _ready():
            if prd.prd_dict.has(item):
                var prd_module = prd.prd_dict[item]
                prd_module.connect('update_serviceability', Callable(self, 'on_serviceability_changed').bind(prd_module, pribor_node))
+                prd_module.unit_control.connect('update_progress', Callable(self, 'on_update_progress').bind(pribor_node))
+                prd_module.unit_control.connect('update_max_value_progress', Callable(self, 'on_update_max_value_progress').bind(pribor_node))
            if item == 'уарэп-эмс':
                signaller.connect('update_uf_serviceability', Callable(self, 'on_update_uf_serviceability').bind(pribor_node))
    # Пиктограммы приборов, которые отображают состояние подключения только
@@ -143,8 +147,20 @@ func on_serviceability_changed(prd_module: Object, prd_pribor:Node)-> void:


 func on_update_uf_serviceability(uf_serviceaability: bool, uf_pribor: Node)-> void:
-
    uf_pribor.state = 1 if uf_serviceaability else 2
+
+
+func _on_control_prd_pressed() -> void:
+    signaller.emit_signal('start_contol_device')
+
+
+func on_update_progress(value_progress: float, pribor_node: Node) -> void:
+    pribor_node.progress_value = value_progress
+    pribor_node.progress_visible = value_progress > 0
+
+
+func on_update_max_value_progress(max_value_progress: int, pribor_node: Node) -> void:
+    pribor_node.progress_max_value = max_value_progress
 "

 [sub_resource type="SpriteFrames" id="SpriteFrames_foasq"]
@@ -360,6 +376,8 @@ stretch_mode = 4
 flip_h = true
 script = ExtResource("3_4pt7j")
 state_colors = [Color(1, 1, 1, 1), Color(0, 0.87, 0, 1), Color(0.65, 0.0715, 0.0715, 1)]
+progress_max_value = 0.0
+progress_min_value = 0.0
 metadata/online_proc = "on_line_changed"
 metadata/unit_name = ["уарэп-яу07-1н"]

@@ -396,6 +414,29 @@ sprite_frames = SubResource("SpriteFrames_foasq")
 frame_progress = 0.72355
 script = ExtResource("11_u7tym")

+[node name="control_progress" type="TextureProgressBar" parent="pribor_prd_n_1"]
+visible = false
+layout_mode = 0
+offset_left = -4.0
+offset_top = 124.0
+offset_right = 89.0
+offset_bottom = 134.0
+size_flags_horizontal = 3
+size_flags_vertical = 3
+tooltip_text = "
+Текущее: 0.00"
+mouse_filter = 0
+max_value = 30.0
+nine_patch_stretch = true
+stretch_margin_left = 5
+stretch_margin_top = 5
+stretch_margin_right = 5
+stretch_margin_bottom = 5
+texture_under = ExtResource("9_w6m6a")
+texture_progress = ExtResource("10_lbx5w")
+tint_under = Color(1, 1, 1, 0.419608)
+tint_progress = Color(0.890196, 0.486275, 0.196078, 1)
+
 [node name="pribor_uf" type="TextureButton" parent="." groups=["pribor_buttons"]]
 editor_description = "Кнопка для выбора прибора."
 layout_mode = 0
@@ -412,6 +453,8 @@ stretch_mode = 0
 script = ExtResource("3_4pt7j")
 state_colors = [Color(1, 1, 1, 1), Color(0, 1, 0, 1), Color(1, 0, 0, 1)]
 state = 1
+progress_max_value = 0.0
+progress_min_value = 0.0
 metadata/unit_name = ["уарэп-эмс"]
 metadata/online_proc = "on_line_changed"

@@ -465,6 +508,8 @@ texture_normal = ExtResource("3_hhadv")
 stretch_mode = 0
 script = ExtResource("3_4pt7j")
 state_colors = [Color(1, 1, 1, 1), Color(0, 1, 0, 1), Color(1, 0, 0, 1)]
+progress_max_value = 0.0
+progress_min_value = 0.0
 metadata/unit_name = [&"уарэп-бпо-1", &"уарэп-бпо-2"]
 metadata/online_proc = "online_change_arr"

@@ -528,6 +573,8 @@ texture_normal = ExtResource("9_iqgf5")
 stretch_mode = 0
 script = ExtResource("3_4pt7j")
 state_colors = [Color(1, 1, 1, 1), Color(0, 1, 0, 1), Color(1, 0, 0, 1)]
+progress_max_value = 0.0
+progress_min_value = 0.0
 metadata/unit_name = [&"уарэп-афсп-левый"]
 metadata/online_proc = "on_line_changed"

@@ -595,6 +642,8 @@ stretch_mode = 0
 flip_h = true
 script = ExtResource("3_4pt7j")
 state_colors = [Color(1, 1, 1, 1), Color(0, 1, 0, 1), Color(1, 0, 0, 1)]
+progress_max_value = 0.0
+progress_min_value = 0.0
 metadata/unit_name = [&"уарэп-афсп-правый"]
 metadata/online_proc = "on_line_changed"

@@ -659,6 +708,8 @@ texture_normal = ExtResource("5_kvnex")
 stretch_mode = 0
 script = ExtResource("3_4pt7j")
 state_colors = [Color(1, 1, 1, 1), Color(0, 1, 0, 1), Color(1, 0, 0, 1)]
+progress_max_value = 0.0
+progress_min_value = 0.0
 metadata/unit_name = ["уарэп-щ3", "уарэп-спт25-1", "уарэп-спт25-2"]
 metadata/online_proc = "online_change_arr"

@@ -711,6 +762,8 @@ stretch_mode = 4
 flip_h = true
 script = ExtResource("3_4pt7j")
 state_colors = [Color(1, 1, 1, 1), Color(0, 1, 0, 1), Color(1, 0, 0, 1)]
+progress_max_value = 0.0
+progress_min_value = 0.0
 metadata/unit_name = ["уарэп-яу07-2в"]
 metadata/online_proc = "on_line_changed"

@@ -747,6 +800,29 @@ sprite_frames = SubResource("SpriteFrames_foasq")
 frame_progress = 0.72355
 script = ExtResource("11_u7tym")

+[node name="control_progress" type="TextureProgressBar" parent="pribor_prd_v_2"]
+visible = false
+layout_mode = 0
+offset_left = -4.0
+offset_top = 124.0
+offset_right = 89.0
+offset_bottom = 134.0
+size_flags_horizontal = 3
+size_flags_vertical = 3
+tooltip_text = "
+Текущее: 0.00"
+mouse_filter = 0
+max_value = 30.0
+nine_patch_stretch = true
+stretch_margin_left = 5
+stretch_margin_top = 5
+stretch_margin_right = 5
+stretch_margin_bottom = 5
+texture_under = ExtResource("9_w6m6a")
+texture_progress = ExtResource("10_lbx5w")
+tint_under = Color(1, 1, 1, 0.419608)
+tint_progress = Color(0.890196, 0.486275, 0.196078, 1)
+
 [node name="pribor_prd_n_2" type="TextureButton" parent="." groups=["pribor_buttons"]]
 editor_description = "Кнопка для выбора прибора."
 layout_mode = 0
@@ -763,6 +839,8 @@ stretch_mode = 4
 flip_h = true
 script = ExtResource("3_4pt7j")
 state_colors = [Color(1, 1, 1, 1), Color(0, 1, 0, 1), Color(1, 0, 0, 1)]
+progress_max_value = 0.0
+progress_min_value = 0.0
 metadata/unit_name = ["уарэп-яу07-2н"]
 metadata/online_proc = "on_line_changed"

@@ -801,6 +879,29 @@ sprite_frames = SubResource("SpriteFrames_foasq")
 frame_progress = 0.72355
 script = ExtResource("11_u7tym")

+[node name="control_progress" type="TextureProgressBar" parent="pribor_prd_n_2"]
+visible = false
+layout_mode = 0
+offset_left = -4.0
+offset_top = 124.0
+offset_right = 89.0
+offset_bottom = 134.0
+size_flags_horizontal = 3
+size_flags_vertical = 3
+tooltip_text = "
+Текущее: 0.00"
+mouse_filter = 0
+max_value = 30.0
+nine_patch_stretch = true
+stretch_margin_left = 5
+stretch_margin_top = 5
+stretch_margin_right = 5
+stretch_margin_bottom = 5
+texture_under = ExtResource("9_w6m6a")
+texture_progress = ExtResource("10_lbx5w")
+tint_under = Color(1, 1, 1, 0.419608)
+tint_progress = Color(0.890196, 0.486275, 0.196078, 1)
+
 [node name="pribor_prd_k_2" type="TextureButton" parent="." groups=["pribor_buttons"]]
 editor_description = "Кнопка для выбора прибора."
 layout_mode = 0
@@ -817,6 +918,8 @@ stretch_mode = 4
 flip_h = true
 script = ExtResource("3_4pt7j")
 state_colors = [Color(1, 1, 1, 1), Color(0, 1, 0, 1), Color(1, 0, 0, 1)]
+progress_max_value = 0.0
+progress_min_value = 0.0
 metadata/unit_name = ["уарэп-яу07-2к"]
 metadata/online_proc = "on_line_changed"

@@ -853,6 +956,29 @@ sprite_frames = SubResource("SpriteFrames_foasq")
 frame_progress = 0.72355
 script = ExtResource("11_u7tym")

+[node name="control_progress" type="TextureProgressBar" parent="pribor_prd_k_2"]
+visible = false
+layout_mode = 0
+offset_left = -4.0
+offset_top = 124.0
+offset_right = 89.0
+offset_bottom = 134.0
+size_flags_horizontal = 3
+size_flags_vertical = 3
+tooltip_text = "
+Текущее: 0.00"
+mouse_filter = 0
+max_value = 30.0
+nine_patch_stretch = true
+stretch_margin_left = 5
+stretch_margin_top = 5
+stretch_margin_right = 5
+stretch_margin_bottom = 5
+texture_under = ExtResource("9_w6m6a")
+texture_progress = ExtResource("10_lbx5w")
+tint_under = Color(1, 1, 1, 0.419608)
+tint_progress = Color(0.890196, 0.486275, 0.196078, 1)
+
 [node name="pribor_prd_v_3" type="TextureButton" parent="." groups=["pribor_buttons"]]
 editor_description = "Кнопка для выбора прибора."
 layout_mode = 0
@@ -869,6 +995,8 @@ stretch_mode = 4
 flip_h = true
 script = ExtResource("3_4pt7j")
 state_colors = [Color(1, 1, 1, 1), Color(0, 1, 0, 1), Color(1, 0, 0, 1)]
+progress_max_value = 0.0
+progress_min_value = 0.0
 metadata/unit_name = ["уарэп-яу07-3в"]
 metadata/online_proc = "on_line_changed"

@@ -905,6 +1033,29 @@ sprite_frames = SubResource("SpriteFrames_foasq")
 frame_progress = 0.72355
 script = ExtResource("11_u7tym")

+[node name="control_progress" type="TextureProgressBar" parent="pribor_prd_v_3"]
+visible = false
+layout_mode = 0
+offset_left = -4.0
+offset_top = 124.0
+offset_right = 89.0
+offset_bottom = 134.0
+size_flags_horizontal = 3
+size_flags_vertical = 3
+tooltip_text = "
+Текущее: 0.00"
+mouse_filter = 0
+max_value = 30.0
+nine_patch_stretch = true
+stretch_margin_left = 5
+stretch_margin_top = 5
+stretch_margin_right = 5
+stretch_margin_bottom = 5
+texture_under = ExtResource("9_w6m6a")
+texture_progress = ExtResource("10_lbx5w")
+tint_under = Color(1, 1, 1, 0.419608)
+tint_progress = Color(0.890196, 0.486275, 0.196078, 1)
+
 [node name="pribor_prd_n_3" type="TextureButton" parent="." groups=["pribor_buttons"]]
 editor_description = "Кнопка для выбора прибора."
 layout_mode = 0
@@ -921,6 +1072,8 @@ stretch_mode = 4
 flip_h = true
 script = ExtResource("3_4pt7j")
 state_colors = [Color(1, 1, 1, 1), Color(0, 1, 0, 1), Color(1, 0, 0, 1)]
+progress_max_value = 0.0
+progress_min_value = 0.0
 metadata/unit_name = ["уарэп-яу07-3н"]
 metadata/online_proc = "on_line_changed"

@@ -957,6 +1110,29 @@ sprite_frames = SubResource("SpriteFrames_foasq")
 frame_progress = 0.72355
 script = ExtResource("11_u7tym")

+[node name="control_progress" type="TextureProgressBar" parent="pribor_prd_n_3"]
+visible = false
+layout_mode = 0
+offset_left = -4.0
+offset_top = 124.0
+offset_right = 89.0
+offset_bottom = 134.0
+size_flags_horizontal = 3
+size_flags_vertical = 3
+tooltip_text = "
+Текущее: 0.00"
+mouse_filter = 0
+max_value = 30.0
+nine_patch_stretch = true
+stretch_margin_left = 5
+stretch_margin_top = 5
+stretch_margin_right = 5
+stretch_margin_bottom = 5
+texture_under = ExtResource("9_w6m6a")
+texture_progress = ExtResource("10_lbx5w")
+tint_under = Color(1, 1, 1, 0.419608)
+tint_progress = Color(0.890196, 0.486275, 0.196078, 1)
+
 [node name="pribor_prd_k_3" type="TextureButton" parent="." groups=["pribor_buttons"]]
 editor_description = "Кнопка для выбора прибора."
 layout_mode = 0
@@ -973,6 +1149,8 @@ stretch_mode = 4
 flip_h = true
 script = ExtResource("3_4pt7j")
 state_colors = [Color(1, 1, 1, 1), Color(0, 1, 0, 1), Color(1, 0, 0, 1)]
+progress_max_value = 0.0
+progress_min_value = 0.0
 metadata/unit_name = ["уарэп-яу07-3к"]
 metadata/online_proc = "on_line_changed"

@@ -1009,6 +1187,29 @@ sprite_frames = SubResource("SpriteFrames_foasq")
 frame_progress = 0.72355
 script = ExtResource("11_u7tym")

+[node name="control_progress" type="TextureProgressBar" parent="pribor_prd_k_3"]
+visible = false
+layout_mode = 0
+offset_left = -4.0
+offset_top = 124.0
+offset_right = 89.0
+offset_bottom = 134.0
+size_flags_horizontal = 3
+size_flags_vertical = 3
+tooltip_text = "
+Текущее: 0.00"
+mouse_filter = 0
+max_value = 30.0
+nine_patch_stretch = true
+stretch_margin_left = 5
+stretch_margin_top = 5
+stretch_margin_right = 5
+stretch_margin_bottom = 5
+texture_under = ExtResource("9_w6m6a")
+texture_progress = ExtResource("10_lbx5w")
+tint_under = Color(1, 1, 1, 0.419608)
+tint_progress = Color(0.890196, 0.486275, 0.196078, 1)
+
 [node name="pribor_prd_v_1" type="TextureButton" parent="." groups=["pribor_buttons"]]
 editor_description = "Кнопка для выбора прибора."
 layout_mode = 0
@@ -1025,6 +1226,8 @@ stretch_mode = 4
 flip_h = true
 script = ExtResource("3_4pt7j")
 state_colors = [Color(1, 1, 1, 1), Color(0, 0.87, 0, 1), Color(0.65, 0.0715, 0.0715, 1)]
+progress_max_value = 0.0
+progress_min_value = 0.0
 metadata/unit_name = ["уарэп-яу07-1в"]
 metadata/online_proc = "on_line_changed"

@@ -1061,6 +1264,29 @@ sprite_frames = SubResource("SpriteFrames_foasq")
 frame_progress = 0.72355
 script = ExtResource("11_u7tym")

+[node name="control_progress" type="TextureProgressBar" parent="pribor_prd_v_1"]
+visible = false
+layout_mode = 0
+offset_left = -4.0
+offset_top = 124.0
+offset_right = 89.0
+offset_bottom = 134.0
+size_flags_horizontal = 3
+size_flags_vertical = 3
+tooltip_text = "
+Текущее: 0.00"
+mouse_filter = 0
+max_value = 30.0
+nine_patch_stretch = true
+stretch_margin_left = 5
+stretch_margin_top = 5
+stretch_margin_right = 5
+stretch_margin_bottom = 5
+texture_under = ExtResource("9_w6m6a")
+texture_progress = ExtResource("10_lbx5w")
+tint_under = Color(1, 1, 1, 0.419608)
+tint_progress = Color(0.890196, 0.486275, 0.196078, 1)
+
 [node name="pribor_prd_k_1" type="TextureButton" parent="." groups=["pribor_buttons"]]
 editor_description = "Кнопка для выбора прибора."
 layout_mode = 0
@@ -1077,6 +1303,8 @@ stretch_mode = 4
 flip_h = true
 script = ExtResource("3_4pt7j")
 state_colors = [Color(1, 1, 1, 1), Color(0, 0.87, 0, 1), Color(0.65, 0.0715, 0.0715, 1)]
+progress_max_value = 0.0
+progress_min_value = 0.0
 metadata/unit_name = ["уарэп-яу07-1к"]
 metadata/online_proc = "on_line_changed"

@@ -1113,6 +1341,29 @@ sprite_frames = SubResource("SpriteFrames_foasq")
 frame_progress = 0.72355
 script = ExtResource("11_u7tym")

+[node name="control_progress" type="TextureProgressBar" parent="pribor_prd_k_1"]
+visible = false
+layout_mode = 0
+offset_left = -4.0
+offset_top = 124.0
+offset_right = 89.0
+offset_bottom = 134.0
+size_flags_horizontal = 3
+size_flags_vertical = 3
+tooltip_text = "
+Текущее: 0.00"
+mouse_filter = 0
+max_value = 30.0
+nine_patch_stretch = true
+stretch_margin_left = 5
+stretch_margin_top = 5
+stretch_margin_right = 5
+stretch_margin_bottom = 5
+texture_under = ExtResource("9_w6m6a")
+texture_progress = ExtResource("10_lbx5w")
+tint_under = Color(1, 1, 1, 0.419608)
+tint_progress = Color(0.890196, 0.486275, 0.196078, 1)
+
 [node name="pribor_prd_v_4" type="TextureButton" parent="." groups=["pribor_buttons"]]
 editor_description = "Кнопка для выбора прибора."
 layout_mode = 0
@@ -1128,6 +1379,8 @@ texture_normal = ExtResource("6_i1yfn")
 stretch_mode = 4
 script = ExtResource("3_4pt7j")
 state_colors = [Color(1, 1, 1, 1), Color(0, 0.87, 0, 1), Color(0.65, 0.0715, 0.0715, 1)]
+progress_max_value = 0.0
+progress_min_value = 0.0
 metadata/unit_name = ["уарэп-яу07-4в"]
 metadata/online_proc = "on_line_changed"

@@ -1164,6 +1417,29 @@ sprite_frames = SubResource("SpriteFrames_foasq")
 frame_progress = 0.72355
 script = ExtResource("11_u7tym")

+[node name="control_progress" type="TextureProgressBar" parent="pribor_prd_v_4"]
+visible = false
+layout_mode = 0
+offset_left = -4.0
+offset_top = 124.0
+offset_right = 89.0
+offset_bottom = 134.0
+size_flags_horizontal = 3
+size_flags_vertical = 3
+tooltip_text = "
+Текущее: 0.00"
+mouse_filter = 0
+max_value = 30.0
+nine_patch_stretch = true
+stretch_margin_left = 5
+stretch_margin_top = 5
+stretch_margin_right = 5
+stretch_margin_bottom = 5
+texture_under = ExtResource("9_w6m6a")
+texture_progress = ExtResource("10_lbx5w")
+tint_under = Color(1, 1, 1, 0.419608)
+tint_progress = Color(0.890196, 0.486275, 0.196078, 1)
+
 [node name="pribor_prd_n_4" type="TextureButton" parent="." groups=["pribor_buttons"]]
 editor_description = "Кнопка для выбора прибора."
 layout_mode = 0
@@ -1179,6 +1455,8 @@ texture_normal = ExtResource("6_i1yfn")
 stretch_mode = 4
 script = ExtResource("3_4pt7j")
 state_colors = [Color(1, 1, 1, 1), Color(0, 0.87, 0, 1), Color(0.65, 0.0715, 0.0715, 1)]
+progress_max_value = 0.0
+progress_min_value = 0.0
 metadata/unit_name = ["уарэп-яу07-4н"]
 metadata/online_proc = "on_line_changed"

@@ -1215,6 +1493,29 @@ sprite_frames = SubResource("SpriteFrames_foasq")
 frame_progress = 0.72355
 script = ExtResource("11_u7tym")

+[node name="control_progress" type="TextureProgressBar" parent="pribor_prd_n_4"]
+visible = false
+layout_mode = 0
+offset_left = -4.0
+offset_top = 124.0
+offset_right = 89.0
+offset_bottom = 134.0
+size_flags_horizontal = 3
+size_flags_vertical = 3
+tooltip_text = "
+Текущее: 0.00"
+mouse_filter = 0
+max_value = 30.0
+nine_patch_stretch = true
+stretch_margin_left = 5
+stretch_margin_top = 5
+stretch_margin_right = 5
+stretch_margin_bottom = 5
+texture_under = ExtResource("9_w6m6a")
+texture_progress = ExtResource("10_lbx5w")
+tint_under = Color(1, 1, 1, 0.419608)
+tint_progress = Color(0.890196, 0.486275, 0.196078, 1)
+
 [node name="pribor_prd_k_4" type="TextureButton" parent="." groups=["pribor_buttons"]]
 editor_description = "Кнопка для выбора прибора."
 layout_mode = 0
@@ -1230,6 +1531,8 @@ texture_normal = ExtResource("6_i1yfn")
 stretch_mode = 4
 script = ExtResource("3_4pt7j")
 state_colors = [Color(1, 1, 1, 1), Color(0, 0.87, 0, 1), Color(0.65, 0.0715, 0.0715, 1)]
+progress_max_value = 0.0
+progress_min_value = 0.0
 metadata/unit_name = ["уарэп-яу07-4к"]
 metadata/online_proc = "on_line_changed"

@@ -1266,6 +1569,29 @@ sprite_frames = SubResource("SpriteFrames_foasq")
 frame_progress = 0.72355
 script = ExtResource("11_u7tym")

+[node name="control_progress" type="TextureProgressBar" parent="pribor_prd_k_4"]
+visible = false
+layout_mode = 0
+offset_left = -4.0
+offset_top = 124.0
+offset_right = 89.0
+offset_bottom = 134.0
+size_flags_horizontal = 3
+size_flags_vertical = 3
+tooltip_text = "
+Текущее: 0.00"
+mouse_filter = 0
+max_value = 30.0
+nine_patch_stretch = true
+stretch_margin_left = 5
+stretch_margin_top = 5
+stretch_margin_right = 5
+stretch_margin_bottom = 5
+texture_under = ExtResource("9_w6m6a")
+texture_progress = ExtResource("10_lbx5w")
+tint_under = Color(1, 1, 1, 0.419608)
+tint_progress = Color(0.890196, 0.486275, 0.196078, 1)
+
 [node name="txr_legend0" type="TextureRect" parent="."]
 layout_mode = 0
 offset_left = 219.0
@@ -1387,6 +1713,15 @@ points = PackedVector2Array(-8, 0, 608, 0)
 width = 2.0
 default_color = Color(1, 1, 1, 0.352941)

+[node name="control_prd" type="Button" parent="."]
+layout_mode = 0
+offset_left = 1101.0
+offset_top = 64.0
+offset_right = 1326.0
+offset_bottom = 104.0
+focus_mode = 0
+text = "Запуск контроля"
+
 [connection signal="toggled" from="pribor_prd_n_1" to="pribor_prd_n_1" method="_on_toggled"]
 [connection signal="toggled" from="pribor_uf" to="pribor_uf" method="_on_toggled"]
 [connection signal="toggled" from="pribor_rtr" to="pribor_rtr" method="_on_toggled"]
@@ -1404,3 +1739,4 @@ default_color = Color(1, 1, 1, 0.352941)
 [connection signal="toggled" from="pribor_prd_v_4" to="pribor_prd_v_4" method="_on_toggled"]
 [connection signal="toggled" from="pribor_prd_n_4" to="pribor_prd_n_4" method="_on_toggled"]
 [connection signal="toggled" from="pribor_prd_k_4" to="pribor_prd_k_4" method="_on_toggled"]
+[connection signal="pressed" from="control_prd" to="." method="_on_control_prd_pressed"]
--- a/scenes/эмс2/эмс_тг.gd
+++ b/scenes/эмс2/эмс_тг.gd
@@ -29,7 +29,7 @@ func on_trassa_line_changed(unit_trassa):
        $"СкруглённыйПрямоугольникБелый/Label10".text = '-'


-func on_sector_klaster(data, unit_trassa):
+func on_sector_klaster(_data, unit_trassa):
    $"СкруглённыйПрямоугольникБелый/Label6".text = str(unit_trassa.dap)
    $"СкруглённыйПрямоугольникБелый/Label7".text = str(unit_trassa.daa)
    $"СкруглённыйПрямоугольникБелый/Label8".text = '1'