Доработка от Паши. От 10.11.2025

scenes/контроль/кнопка-прибора.gd

@@ -24,15 +24,14 @@ func update_progress_bar(target_value) -> void:
     set(v):
         progress_value = v
         if is_inside_tree():
-            #$progress.value = progress_value
-            #update_progress_bar(v)
+            update_progress_bar(v)
             var result = (progress_value/20.0) * 100.0
             $progress.tooltip_text = 'Процесс контроля %s' % progress_value + '%'
 
 
 @export var progress_visible: bool:
     set(v):
-        progress_value = v
+        progress_visible = v
         if is_inside_tree():
             $progress.visible = v
 

scenes/контроль/контроль.tscn

@@ -151,13 +151,11 @@ func on_update_uf_serviceability(uf_serviceaability: bool, uf_pribor: Node)-> vo
 
 func _on_control_prd_pressed() -> void:
     var prim = prd.prd_dict['уарэп-яу07-1н'].unit_control
+    prim._determine_self_name()
     prim.machine_timer.start()
 
 
 func on_update_progress(value_progress: float, pribor_node: Node) -> void: # Пока не надо
-    print([pribor_node.get_meta('unit_name'), value_progress])
-    var progress = get_node('pribor_prd_n_1/progress')
-    progress.value = value_progress
     pribor_node.progress_value = value_progress
     pribor_node.progress_visible = value_progress > 0
 "
@@ -414,6 +412,7 @@ frame_progress = 0.72355
 script = ExtResource("11_u7tym")
 
 [node name="progress" type="TextureProgressBar" parent="pribor_prd_n_1"]
+visible = false
 layout_mode = 0
 offset_left = -4.0
 offset_top = 123.0
@@ -427,7 +426,6 @@ tooltip_text = "
 mouse_filter = 0
 max_value = 20.0
 step = 0.1
-value = 3.0
 nine_patch_stretch = true
 stretch_margin_left = 2
 stretch_margin_top = 2

scripts/pribor-prd.gd

@@ -248,6 +248,7 @@ class TestPRD extends Node:
 
     func _ready() -> void:
         initialize_connections()
+        _determine_self_name()
         setup_timer()
 
 
@@ -382,13 +383,11 @@ class TestPRD extends Node:
                 state = STATE_MACHINE.STOP_CONTROL
             STATE_MACHINE.STOP_CONTROL:
                 _handle_stop_control_state()
-        if state != STATE_MACHINE.AWAIT:
-            progressbar_status()
+        ## В машине состояний вызов изменения состояния контроля
+        progressbar_status()
 
 
     func _handle_init_state() -> void:
-        print(current_litera)
-        #control_label.text = 'Выполняется инициализация ФС-%s' % current_litera
         if current_litera in [1, 2, 3, 4, 5, 6, 7]:
             if not ecms.size():
                 state = STATE_MACHINE.FS_TURN_ON
@@ -396,11 +395,11 @@ class TestPRD extends Node:
             control_results = on_control_result(block_ip_config, control_results)
             var send_power_pack = prep_power(power_result, self_name)
             emit_signal('control_is_over', control_results, send_power_pack)
-            state = STATE_MACHINE.AWAIT
+            print('control_is_over')
+            machine_timer.stop()
 
 
     func _handle_fs_turn_on_state() -> void:
-        #control_label.text = 'Выполняется включение ФС-%s' % current_litera
         manage_fs(true, self_name, pribor_config, fs_parameters, current_litera, constants.POWER_UM)
 
 
@@ -436,11 +435,6 @@ class TestPRD extends Node:
             dic_att['ATT_UM_1'] = constants.ATT_UM_2
             dic_att['ATT_UM_2'] = constants.ATT_UM_3
 
-        #var log_text = dic_att.ATT_UM_3 if current_litera == 1 else  dic_att.ATT_UM_1 if current_litera in [2, 4, 6] else dic_att.ATT_UM_2
-        #control_label.text = 'Выполняется настройка угла (%s) и атт (0x0%s)' % [
-            #dic_att.RAY_DOU_NUM,
-            #log_text
-        #]
         flag_write_isa = on_ug_setting(module_prd, unit_prd, dic_att)
 
 
@@ -449,13 +443,11 @@ class TestPRD extends Node:
 
 
     func _handle_fs_turn_off_state() -> void:
-        #control_label.text = 'Выполняется отключение ФС-%s' % current_litera
         flag_fs_status_ok = false
         manage_fs(false, self_name, pribor_config, fs_parameters, current_litera, constants.POWER_UM)
 
 
     func _handle_stop_control_state() -> void:
-        #control_label.text = 'Выполняется завершение проверки ФС-%s' % current_litera
         _advance_to_next_fs()
         state = STATE_MACHINE.INIT
 
@@ -473,7 +465,6 @@ class TestPRD extends Node:
 
     ######################################
     func initialize_connections() -> void:
-        _determine_self_name()
         var fs_mapping = _create_fs_mapping(self_name)
         signaller.conn(signaller.fs_update_state, Callable(self, 'on_fs_update_state').bind(fs_mapping))
         interfer.connect('interfer_resized', Callable(self, 'on_interfer_resized'))
@@ -489,7 +480,6 @@ class TestPRD extends Node:
         var parts = current_unit.split('-')
         self_name = parts[-1]
         if self_name == '1н' or self_name == '2н' or self_name == '3н' or self_name == '4н':
-            #module_prd = init_data['module_prd']
             constants = DEVICE_CONSTANT.PRD_N.CONSTANTS
             pribor_config = DEVICE_CONSTANT.PRD_N.PRIBOR_CONFIG
             fs_parameters = DEVICE_CONSTANT.PRD_N.FS_PARAMS
@@ -531,19 +521,18 @@ class TestPRD extends Node:
 
 
     func _on_machine_timer():
-        #print_debug(progress_value)
         state_control_machine()
 
+
     var cc: int = 0
     func progressbar_status() -> void:
         match state:
-            STATE_MACHINE.AWAIT:
-                cc = 0
             STATE_MACHINE.INIT:
                 cc += 10 if current_litera in [3, 5] else 20 if current_litera == 7 else 0
         if control_timer.get_time_left() > 0:
             progress_value = cc + control_timer.get_wait_time() - control_timer.get_time_left()
-        #print([cc, control_timer.get_wait_time() - control_timer.get_time_left(), state])
+        if current_litera == 0:
+            progress_value = 0
 
 
     func _process_dkm_status(status: PackedByteArray) -> void: