From 2a9ade595d88aec272bf81d3d55ffde27cefbf87 Mon Sep 17 00:00:00 2001 From: sasha80 Date: Fri, 22 Aug 2025 08:19:34 +0300 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D1=80=D0=B0=D0=B1=D0=BE=D1=82?= =?UTF-8?q?=D0=BA=D0=B0.=20=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B0=20=D0=BF=D0=BE=D0=B4=D1=81=D0=BA=D0=B0=D0=B7=D0=BA?= =?UTF-8?q?=D0=B0=20=D0=B4=D0=BB=D1=8F=20=D0=BF=D0=B0=D1=80=D0=BC=D0=B5?= =?UTF-8?q?=D1=82=D1=80=D0=BE=D0=B2=20=D1=83=D1=80=D0=BE=D0=B2=D0=BD=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scenes/pribor-prd-k/pribor-prd-k.tscn | 24 ++++++++++++ scenes/контроль/блок-в.tscn | 54 ++++++++++++++++++++++++++- 2 files changed, 77 insertions(+), 1 deletion(-) diff --git a/scenes/pribor-prd-k/pribor-prd-k.tscn b/scenes/pribor-prd-k/pribor-prd-k.tscn index 1c35e7dc..a3601a78 100644 --- a/scenes/pribor-prd-k/pribor-prd-k.tscn +++ b/scenes/pribor-prd-k/pribor-prd-k.tscn @@ -122,6 +122,8 @@ offset_right = 652.0 offset_bottom = 337.0 fname = "УМ1535Б" rname = "A10" +value0_info = "Мощность, Вт" +value1_info = "Температура,°C" [node name="um1535_A11" parent="." groups=["power_amplifier"] instance=ExtResource("5_c7lv8")] layout_mode = 0 @@ -131,6 +133,8 @@ offset_right = 652.0 offset_bottom = 432.0 fname = "УМ1535Б" rname = "A11" +value0_info = "Мощность, Вт" +value1_info = "Температура,°C" [node name="um1535_A12" parent="." groups=["power_amplifier"] instance=ExtResource("5_c7lv8")] layout_mode = 0 @@ -140,6 +144,8 @@ offset_right = 652.0 offset_bottom = 527.0 fname = "УМ1535Б" rname = "A12" +value0_info = "Мощность, Вт" +value1_info = "Температура,°C" [node name="um1535_A13" parent="." groups=["power_amplifier"] instance=ExtResource("5_c7lv8")] layout_mode = 0 @@ -149,6 +155,8 @@ offset_right = 652.0 offset_bottom = 622.0 fname = "УМ1535Б" rname = "A13" +value0_info = "Мощность, Вт" +value1_info = "Температура,°C" [node name="um1535_A14" parent="." groups=["power_amplifier"] instance=ExtResource("5_c7lv8")] layout_mode = 0 @@ -158,6 +166,8 @@ offset_right = 652.0 offset_bottom = 717.0 fname = "УМ1535Б" rname = "A14" +value0_info = "Мощность, Вт" +value1_info = "Температура,°C" [node name="um1535_A15" parent="." groups=["power_amplifier"] instance=ExtResource("5_c7lv8")] layout_mode = 0 @@ -167,6 +177,8 @@ offset_right = 652.0 offset_bottom = 812.0 fname = "УМ1535Б" rname = "A15" +value0_info = "Мощность, Вт" +value1_info = "Температура,°C" [node name="utm80_A9" parent="." groups=["power_amplifier"] instance=ExtResource("6_fmhtx")] layout_mode = 0 @@ -187,6 +199,8 @@ offset_right = 175.0 offset_bottom = 337.0 fname = "РМ16-20М" rname = "A16" +value0_info = "Мощность, Вт" +value1_info = "Температура,°C" [node name="rm1620m_A17" parent="." groups=["power_amplifier"] instance=ExtResource("5_c7lv8")] layout_mode = 0 @@ -196,6 +210,8 @@ offset_right = 173.0 offset_bottom = 432.0 fname = "РМ16-20М" rname = "A17" +value0_info = "Мощность, Вт" +value1_info = "Температура,°C" [node name="rm1620m_A18" parent="." groups=["power_amplifier"] instance=ExtResource("5_c7lv8")] layout_mode = 0 @@ -205,6 +221,8 @@ offset_right = 175.0 offset_bottom = 527.0 fname = "РМ16-20М" rname = "A18" +value0_info = "Мощность, Вт" +value1_info = "Температура,°C" [node name="rm1620m_A19" parent="." groups=["power_amplifier"] instance=ExtResource("5_c7lv8")] layout_mode = 0 @@ -214,6 +232,8 @@ offset_right = 175.0 offset_bottom = 622.0 fname = "РМ16-20М" rname = "A19" +value0_info = "Мощность, Вт" +value1_info = "Температура,°C" [node name="rm1620m_A20" parent="." groups=["power_amplifier"] instance=ExtResource("5_c7lv8")] layout_mode = 0 @@ -223,6 +243,8 @@ offset_right = 175.0 offset_bottom = 717.0 fname = "РМ16-20М" rname = "A20" +value0_info = "Мощность, Вт" +value1_info = "Температура,°C" [node name="rm1620m_A21" parent="." groups=["power_amplifier"] instance=ExtResource("5_c7lv8")] layout_mode = 0 @@ -232,6 +254,8 @@ offset_right = 175.0 offset_bottom = 812.0 fname = "РМ16-20М" rname = "A21" +value0_info = "Мощность, Вт" +value1_info = "Температура,°C" [node name="kasseta_fs_kd" parent="." instance=ExtResource("7_ia27q")] layout_mode = 0 diff --git a/scenes/контроль/блок-в.tscn b/scenes/контроль/блок-в.tscn index 9a341f5f..6b63ae64 100644 --- a/scenes/контроль/блок-в.tscn +++ b/scenes/контроль/блок-в.tscn @@ -129,11 +129,35 @@ signal pressed(control: PanelContainer) $margin/vbox.alignment = v +@export var value0_info: String: + set(v): + value0_info = v + + +@export var value1_info: String: + set(v): + value1_info = v + + func _on_button_pressed(): emit_signal('pressed', self) func _enter_tree() -> void: call_deferred('_enter_tree_defered') func set_value0(value: Array): value0.assign(value) +func _ready(): + var items: Array= get_level_nodes() + for item in items: + item.connect('value_changed', on_level_changed.bind(item, value1_info)) + on_level_changed(item.value, item, value0_info) + var level7 = $margin/vbox/grid1/level7 + level7.connect('value_changed', on_level_changed.bind(level7, value1_info)) + on_level_changed(level7.value, level7, value1_info) + + +func on_level_changed(_val: float, item: TextureProgressBar, info: String): + item.tooltip_text = '%s\\nТекущее: %0.2f\\nДиапазон: %0.2f…%0.2f' % [info, item.value, item.min_value, item.max_value] + + func set_group_param(items: Array, param: StringName, v) -> void: if not is_inside_tree(): return @@ -169,7 +193,7 @@ func _enter_tree_defered(): $margin/vbox/grid0/fname.text = fname $margin/vbox/grid0/state.texture = textures[state] else: - push_warning('%s - вне дерева' % self) + push_warning('обращение к %s вне дерева' % self) func get_level_nodes() -> Array: @@ -325,6 +349,10 @@ columns = 7 layout_mode = 2 size_flags_horizontal = 3 size_flags_vertical = 3 +tooltip_text = " +Текущее: 20.00 +Диапазон: 0.00…100.00" +mouse_filter = 0 value = 20.0 fill_mode = 3 nine_patch_stretch = true @@ -341,6 +369,10 @@ tint_progress = Color(0.890196, 0.486275, 0.196078, 1) layout_mode = 2 size_flags_horizontal = 3 size_flags_vertical = 3 +tooltip_text = " +Текущее: 30.00 +Диапазон: 0.00…100.00" +mouse_filter = 0 value = 30.0 fill_mode = 3 nine_patch_stretch = true @@ -357,6 +389,10 @@ tint_progress = Color(0.890196, 0.486275, 0.196078, 1) layout_mode = 2 size_flags_horizontal = 3 size_flags_vertical = 3 +tooltip_text = " +Текущее: 40.00 +Диапазон: 0.00…100.00" +mouse_filter = 0 value = 40.0 fill_mode = 3 nine_patch_stretch = true @@ -373,6 +409,10 @@ tint_progress = Color(0.890196, 0.486275, 0.196078, 1) layout_mode = 2 size_flags_horizontal = 3 size_flags_vertical = 3 +tooltip_text = " +Текущее: 50.00 +Диапазон: 0.00…100.00" +mouse_filter = 0 value = 50.0 fill_mode = 3 nine_patch_stretch = true @@ -389,6 +429,10 @@ tint_progress = Color(0.890196, 0.486275, 0.196078, 1) layout_mode = 2 size_flags_horizontal = 3 size_flags_vertical = 3 +tooltip_text = " +Текущее: 60.00 +Диапазон: 0.00…100.00" +mouse_filter = 0 value = 60.0 fill_mode = 3 nine_patch_stretch = true @@ -405,6 +449,10 @@ tint_progress = Color(0.890196, 0.486275, 0.196078, 1) layout_mode = 2 size_flags_horizontal = 3 size_flags_vertical = 3 +tooltip_text = " +Текущее: 70.00 +Диапазон: 0.00…100.00" +mouse_filter = 0 value = 70.0 fill_mode = 3 nine_patch_stretch = true @@ -421,6 +469,10 @@ tint_progress = Color(0.890196, 0.486275, 0.196078, 1) layout_mode = 2 size_flags_horizontal = 3 size_flags_vertical = 3 +tooltip_text = " +Текущее: 56.00 +Диапазон: -50.00…120.00" +mouse_filter = 0 min_value = -50.0 max_value = 120.0 value = 56.0