diff --git a/scenes/pribor-prd-k/pribor-prd-k.gd b/scenes/pribor-prd-k/pribor-prd-k.gd index a475211..97c387c 100644 --- a/scenes/pribor-prd-k/pribor-prd-k.gd +++ b/scenes/pribor-prd-k/pribor-prd-k.gd @@ -166,8 +166,8 @@ func on_mode_changed(in_tree: bool) -> void: func power_fill(pow_dic: Dictionary) -> void: - if not control_prd_k.block_kasseta_y5_config.yau07 or not control_prd_k.block_kasseta_y5_config.ukp1 or not control_prd_k.block_kasseta_y5_config.ukp2: - return + #if not control_prd_k.block_kasseta_y5_config.yau07 or not control_prd_k.block_kasseta_y5_config.ukp1 or not control_prd_k.block_kasseta_y5_config.ukp2: + #return var power_amplifier: Array = get_tree().get_nodes_in_group('power_amplifier') for i_powapm in power_amplifier: var powamp_meta: String = i_powapm.get_meta('um') diff --git a/scenes/pribor-prd-k/pribor-prd-k.tscn b/scenes/pribor-prd-k/pribor-prd-k.tscn index b7def9a..7d4bf59 100644 --- a/scenes/pribor-prd-k/pribor-prd-k.tscn +++ b/scenes/pribor-prd-k/pribor-prd-k.tscn @@ -94,6 +94,7 @@ offset_left = 485.0 offset_top = 242.0 offset_right = 652.0 offset_bottom = 337.0 +animation_duration = null value0 = [0.0, 0.0, 0.0, 0.0, 0.0, 0.0] fname = "УМ1535Б" rname = "A10" @@ -107,6 +108,7 @@ offset_left = 485.0 offset_top = 337.0 offset_right = 652.0 offset_bottom = 432.0 +animation_duration = null fname = "УМ1535Б" rname = "A11" value0_info = "Мощность, Вт" @@ -119,6 +121,7 @@ offset_left = 485.0 offset_top = 432.0 offset_right = 652.0 offset_bottom = 527.0 +animation_duration = null fname = "УМ1535Б" rname = "A12" value0_info = "Мощность, Вт" @@ -131,6 +134,7 @@ offset_left = 485.0 offset_top = 527.0 offset_right = 652.0 offset_bottom = 622.0 +animation_duration = null fname = "УМ1535Б" rname = "A13" value0_info = "Мощность, Вт" @@ -143,6 +147,7 @@ offset_left = 485.0 offset_top = 622.0 offset_right = 652.0 offset_bottom = 717.0 +animation_duration = null fname = "УМ1535Б" rname = "A14" value0_info = "Мощность, Вт" @@ -155,6 +160,7 @@ offset_left = 485.0 offset_top = 717.0 offset_right = 652.0 offset_bottom = 812.0 +animation_duration = null fname = "УМ1535Б" rname = "A15" value0_info = "Мощность, Вт" @@ -167,6 +173,7 @@ offset_left = 485.0 offset_top = 812.0 offset_right = 652.0 offset_bottom = 907.0 +animation_duration = null fname = "УТМ80" rname = "A9" value0_info = "Мощность, Вт" @@ -179,6 +186,7 @@ offset_left = 8.0 offset_top = 242.0 offset_right = 175.0 offset_bottom = 337.0 +animation_duration = null fname = "УМ1535Б" rname = "A16" value0_info = "Мощность, Вт" @@ -191,6 +199,7 @@ offset_left = 8.0 offset_top = 337.0 offset_right = 173.0 offset_bottom = 432.0 +animation_duration = null fname = "УМ1535Б" rname = "A17" value0_info = "Мощность, Вт" @@ -203,6 +212,7 @@ offset_left = 8.0 offset_top = 432.0 offset_right = 175.0 offset_bottom = 527.0 +animation_duration = null fname = "УМ1535Б" rname = "A18" value0_info = "Мощность, Вт" @@ -215,6 +225,7 @@ offset_left = 8.0 offset_top = 527.0 offset_right = 175.0 offset_bottom = 622.0 +animation_duration = null fname = "УМ1535Б" rname = "A19" value0_info = "Мощность, Вт" @@ -227,6 +238,7 @@ offset_left = 8.0 offset_top = 622.0 offset_right = 175.0 offset_bottom = 717.0 +animation_duration = null fname = "УМ1535Б" rname = "A20" value0_info = "Мощность, Вт" @@ -239,6 +251,7 @@ offset_left = 8.0 offset_top = 717.0 offset_right = 175.0 offset_bottom = 812.0 +animation_duration = null fname = "УМ1535Б" rname = "A21" value0_info = "Мощность, Вт" @@ -319,8 +332,6 @@ offset_left = 9.0 offset_top = 960.0 offset_right = 649.0 offset_bottom = 1003.0 -theme_override_colors/font_color = Color(0.862745, 0.0784314, 0.235294, 1) -theme_override_font_sizes/font_size = 28 text = "Прибор ПРД- неисправен" horizontal_alignment = 1 metadata/_edit_lock_ = true diff --git a/scenes/pribor-prd-n/pribor-prd-n.gd b/scenes/pribor-prd-n/pribor-prd-n.gd index 7148e3c..3d314ef 100644 --- a/scenes/pribor-prd-n/pribor-prd-n.gd +++ b/scenes/pribor-prd-n/pribor-prd-n.gd @@ -159,8 +159,8 @@ func on_mode_changed(in_tree: bool) -> void: func power_fill(pow_dic: Dictionary) -> void: - if not control_prd_n.block_kasseta_y5_config.yau07 or not control_prd_n.block_kasseta_y5_config.ukp1 or not control_prd_n.block_kasseta_y5_config.ukp2: - return + #if not control_prd_n.block_kasseta_y5_config.yau07 or not control_prd_n.block_kasseta_y5_config.ukp1 or not control_prd_n.block_kasseta_y5_config.ukp2: + #return var power_amplifier: Array = get_tree().get_nodes_in_group('power_amplifier') for i_powapm in power_amplifier: var powamp_meta: String = i_powapm.get_meta('um') diff --git a/scenes/pribor-prd-n/pribor-prd-n.tscn b/scenes/pribor-prd-n/pribor-prd-n.tscn index 0b67fd4..9d14845 100644 --- a/scenes/pribor-prd-n/pribor-prd-n.tscn +++ b/scenes/pribor-prd-n/pribor-prd-n.tscn @@ -204,6 +204,7 @@ offset_left = 485.0 offset_top = 242.0 offset_right = 652.0 offset_bottom = 337.0 +animation_duration = null fname = "УМ1535Б" rname = "A7" value0_info = "Мощность, Вт" @@ -216,6 +217,7 @@ offset_left = 485.0 offset_top = 337.0 offset_right = 652.0 offset_bottom = 432.0 +animation_duration = null fname = "УМ1535А" rname = "A8" value0_info = "Мощность, Вт" @@ -228,6 +230,7 @@ offset_left = 485.0 offset_top = 432.0 offset_right = 652.0 offset_bottom = 527.0 +animation_duration = null fname = "УМ1535А" rname = "A9" value0_info = "Мощность, Вт" @@ -240,6 +243,7 @@ offset_left = 485.0 offset_top = 527.0 offset_right = 652.0 offset_bottom = 622.0 +animation_duration = null fname = "УМ1535А" rname = "A10" value0_info = "Мощность, Вт" @@ -252,6 +256,7 @@ offset_left = 485.0 offset_top = 622.0 offset_right = 652.0 offset_bottom = 717.0 +animation_duration = null fname = "УМ1535А" rname = "A11" value0_info = "Мощность, Вт" @@ -264,6 +269,7 @@ offset_left = 485.0 offset_top = 717.0 offset_right = 652.0 offset_bottom = 812.0 +animation_duration = null fname = "УМ1535А" rname = "A12" value0_info = "Мощность, Вт" @@ -276,6 +282,7 @@ offset_left = 8.0 offset_top = 242.0 offset_right = 175.0 offset_bottom = 337.0 +animation_duration = null fname = "УМ1535А" rname = "A13" value0_info = "Мощность, Вт" @@ -288,6 +295,7 @@ offset_left = 8.0 offset_top = 337.0 offset_right = 175.0 offset_bottom = 432.0 +animation_duration = null fname = "УМ1535А" rname = "A14" value0_info = "Мощность, Вт" @@ -300,6 +308,7 @@ offset_left = 8.0 offset_top = 432.0 offset_right = 175.0 offset_bottom = 527.0 +animation_duration = null fname = "УМ1535А" rname = "A15" value0_info = "Мощность, Вт" @@ -312,6 +321,7 @@ offset_left = 8.0 offset_top = 527.0 offset_right = 175.0 offset_bottom = 622.0 +animation_duration = null fname = "УМ1535А" rname = "A16" value0_info = "Мощность, Вт" @@ -324,6 +334,7 @@ offset_left = 8.0 offset_top = 622.0 offset_right = 175.0 offset_bottom = 717.0 +animation_duration = null fname = "УМ1535А" rname = "A17" value0_info = "Мощность, Вт" @@ -336,6 +347,7 @@ offset_left = 8.0 offset_top = 717.0 offset_right = 175.0 offset_bottom = 812.0 +animation_duration = null fname = "УМ1535А" rname = "A18" value0_info = "Мощность, Вт" @@ -348,7 +360,5 @@ offset_left = 9.0 offset_top = 960.0 offset_right = 649.0 offset_bottom = 1003.0 -theme_override_colors/font_color = Color(0.862745, 0.0784314, 0.235294, 1) -theme_override_font_sizes/font_size = 28 horizontal_alignment = 1 metadata/_edit_lock_ = true diff --git a/scenes/pribor-prd-v/pribor-prd-v.gd b/scenes/pribor-prd-v/pribor-prd-v.gd index d5a123f..2afcc85 100644 --- a/scenes/pribor-prd-v/pribor-prd-v.gd +++ b/scenes/pribor-prd-v/pribor-prd-v.gd @@ -159,8 +159,8 @@ func on_mode_changed(in_tree: bool) -> void: func power_fill(pow_dic: Dictionary) -> void: - if not control_prd_v.block_kasseta_y5_config.yau07 or not control_prd_v.block_kasseta_y5_config.ukp1 or not control_prd_v.block_kasseta_y5_config.ukp2: - return + #if not control_prd_v.block_kasseta_y5_config.yau07 or not control_prd_v.block_kasseta_y5_config.ukp1 or not control_prd_v.block_kasseta_y5_config.ukp2: + #return var power_amplifier: Array = get_tree().get_nodes_in_group('power_amplifier') for i_powapm in power_amplifier: var powamp_meta: String = i_powapm.get_meta('um') diff --git a/scenes/pribor-prd-v/pribor-prd-v.tscn b/scenes/pribor-prd-v/pribor-prd-v.tscn index 6a8ac26..98c49b0 100644 --- a/scenes/pribor-prd-v/pribor-prd-v.tscn +++ b/scenes/pribor-prd-v/pribor-prd-v.tscn @@ -153,6 +153,7 @@ offset_left = 485.0 offset_top = 242.0 offset_right = 652.0 offset_bottom = 337.0 +animation_duration = null fname = "УМ1535Б" rname = "A7" value0_info = "Мощность, Вт" @@ -165,6 +166,7 @@ offset_left = 485.0 offset_top = 337.0 offset_right = 652.0 offset_bottom = 432.0 +animation_duration = null fname = "УМ1535А" rname = "A8" value0_info = "Мощность, Вт" @@ -177,6 +179,7 @@ offset_left = 485.0 offset_top = 432.0 offset_right = 652.0 offset_bottom = 527.0 +animation_duration = null fname = "УМ1535А" rname = "A9" value0_info = "Мощность, Вт" @@ -189,6 +192,7 @@ offset_left = 485.0 offset_top = 527.0 offset_right = 652.0 offset_bottom = 622.0 +animation_duration = null fname = "УМ1535А" rname = "A10" value0_info = "Мощность, Вт" @@ -201,6 +205,7 @@ offset_left = 485.0 offset_top = 622.0 offset_right = 652.0 offset_bottom = 717.0 +animation_duration = null fname = "УМ1535А" rname = "A11" value0_info = "Мощность, Вт" @@ -213,6 +218,7 @@ offset_left = 485.0 offset_top = 717.0 offset_right = 652.0 offset_bottom = 812.0 +animation_duration = null fname = "УМ1535А" rname = "A12" value0_info = "Мощность, Вт" @@ -225,6 +231,7 @@ offset_left = 8.0 offset_top = 242.0 offset_right = 175.0 offset_bottom = 337.0 +animation_duration = null fname = "УМ1535А" rname = "A13" value0_info = "Мощность, Вт" @@ -237,6 +244,7 @@ offset_left = 8.0 offset_top = 337.0 offset_right = 175.0 offset_bottom = 432.0 +animation_duration = null fname = "УМ1535А" rname = "A14" value0_info = "Мощность, Вт" @@ -249,6 +257,7 @@ offset_left = 8.0 offset_top = 432.0 offset_right = 175.0 offset_bottom = 527.0 +animation_duration = null fname = "УМ1535А" rname = "A15" value0_info = "Мощность, Вт" @@ -261,6 +270,7 @@ offset_left = 8.0 offset_top = 527.0 offset_right = 175.0 offset_bottom = 622.0 +animation_duration = null fname = "УМ1535А" rname = "A16" value0_info = "Мощность, Вт" @@ -273,6 +283,7 @@ offset_left = 8.0 offset_top = 622.0 offset_right = 175.0 offset_bottom = 717.0 +animation_duration = null fname = "УМ1535А" rname = "A17" value0_info = "Мощность, Вт" @@ -285,6 +296,7 @@ offset_left = 8.0 offset_top = 717.0 offset_right = 175.0 offset_bottom = 812.0 +animation_duration = null fname = "УМ1535А" rname = "A18" value0_info = "Мощность, Вт" @@ -297,7 +309,5 @@ offset_left = 9.0 offset_top = 960.0 offset_right = 649.0 offset_bottom = 1003.0 -theme_override_colors/font_color = Color(0.862745, 0.0784314, 0.235294, 1) -theme_override_font_sizes/font_size = 28 horizontal_alignment = 1 metadata/_edit_lock_ = true diff --git a/scenes/контроль/блок-в.tscn b/scenes/контроль/блок-в.tscn index b8e9a74..cb83b95 100644 --- a/scenes/контроль/блок-в.tscn +++ b/scenes/контроль/блок-в.tscn @@ -14,7 +14,7 @@ script/source = "@tool class_name blok_v extends PanelContainer @export var textures: Array - +@export var animation_duration: float = 1.5 signal pressed(control: PanelContainer) @@ -25,7 +25,8 @@ signal pressed(control: PanelContainer) var items: Array = get_level_nodes() var count: int = min(items.size(), v.size()) for i in count: - items[i].value = v[i] + set_value0_animated(items[i], v[i]) + #items[i].value = v[i] ## Значение уровня @@ -220,6 +221,14 @@ func get_name_nodes() -> Array: $margin/vbox/grid2/lbl4, $margin/vbox/grid2/lbl5, $margin/vbox/grid2/lbl6 ] + + +func set_value0_animated(target_node, target_value: float) -> void: + var tween = create_tween() + tween.set_ease(Tween.EASE_OUT) + tween.set_trans(Tween.TRANS_QUINT) + + tween.tween_property(target_node, \"value\", target_value, animation_duration) " [sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_rceim"] @@ -264,6 +273,7 @@ offset_bottom = 88.0 theme_override_styles/panel = SubResource("StyleBoxEmpty_3nd2u") script = SubResource("GDScript_oj3k3") textures = [ExtResource("1_n1aqt"), ExtResource("2_rim3u"), ExtResource("3_3w8fg")] +animation_duration = null value0 = [20.0, 30.0, 40.0, 50.0, 60.0, 70.0] value1 = 56.0 min_value1 = -50.0 diff --git a/scripts/pribor-prd.gd b/scripts/pribor-prd.gd index 4c165f1..167323b 100644 --- a/scripts/pribor-prd.gd +++ b/scripts/pribor-prd.gd @@ -208,7 +208,6 @@ class TestPRD extends Node: else: 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_MASHINE.AWAIT