Исправление кнопки ФС-Э2 по рекомендации комиссии

This commit is contained in:
MaD_CaT
2025-12-09 15:48:30 +03:00
parent 9156249e74
commit 115004194b
2 changed files with 35 additions and 19 deletions

View File

@@ -61,8 +61,8 @@ script = ExtResource("1_ui6sg")
visible = false
z_as_relative = false
layout_mode = 2
border_color = Color(0, 0.549509, 0.921779, 1)
border_width = 5.0
border_color = Color(0, 0.51, 0.85, 1)
border_width = 7.0
editor_only = false
[node name="back" type="Sprite2D" parent="."]

View File

@@ -1,4 +1,4 @@
[gd_scene load_steps=32 format=3 uid="uid://lwmw4egynmd1"]
[gd_scene load_steps=33 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"]
@@ -68,8 +68,8 @@ func on_serv_changed(u, pribor_node, _pribor_meta): pribor_node.state = int(u.se
func on_mode_changed():
clean_pribor_items()
reset_pribor_buttons()
$chk_show_functional.disabled = true
$chk_show_functional.button_pressed = false
$frame_button/chk_show_functional.disabled = true
$frame_button/chk_show_functional.button_pressed = false
func reset_pribor_buttons():
@@ -145,8 +145,8 @@ func clean_pribor_items():
func on_pribor_press(pribor_path, header_text, pribor_node):
if cur_pribor_node:
cur_pribor_node.show_functional = false
$chk_show_functional.disabled = false
$chk_show_functional.button_pressed = false
$frame_button/chk_show_functional.disabled = false
$frame_button/chk_show_functional.button_pressed = false
cur_pribor_node = pribor_node
clean_pribor_items()
var pribor_obj = load(pribor_path)
@@ -158,7 +158,7 @@ func on_pribor_press(pribor_path, header_text, pribor_node):
push_error('экземпляр не создан: \\\"%s\\\" (%s)' % [pribor_path, header_text])
return
$lbl_header.text = header_text
$chk_show_functional.disabled = false
$frame_button/chk_show_functional.disabled = false
var meta_list = pribor_node.get_meta_list()
if meta_list.find('unit_name') > -1:
var unit_name = pribor_node.get_meta('unit_name')
@@ -222,8 +222,8 @@ func _on_gui_input(event: InputEvent) -> void:
node.button_pressed = false
clean_pribor_items()
cur_pribor_node = null
$chk_show_functional.button_pressed = false
$chk_show_functional.disabled = true
$frame_button/chk_show_functional.button_pressed = false
$frame_button/chk_show_functional.disabled = true
func on_control_button_pressed(state: bool) -> void:
@@ -255,10 +255,17 @@ animations = [{
[sub_resource type="ShaderMaterial" id="ShaderMaterial_71ec4"]
shader = ExtResource("9_71ec4")
shader_parameter/white = Vector3(0.14, 0.13, 0.13)
shader_parameter/black = Vector3(0.95, 0.55, 0.05)
shader_parameter/white = Vector3(0, 0, 0)
shader_parameter/black = Vector3(1, 1, 1)
shader_parameter/gamma = 2.0
[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_6hcgs"]
bg_color = Color(0.6, 0.6, 0.6, 0)
border_width_left = 2
border_width_top = 2
border_width_right = 2
border_width_bottom = 2
[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_l5wui"]
bg_color = Color(0.47451, 0.47451, 0.47451, 1)
border_width_left = 2
@@ -1928,15 +1935,24 @@ text = "Контроль исправности прибора"
horizontal_alignment = 1
vertical_alignment = 1
[node name="chk_show_functional" type="CheckButton" parent="."]
[node name="frame_button" type="Panel" parent="."]
layout_mode = 0
offset_left = 1029.0
offset_top = 15.0
offset_right = 1408.0
offset_bottom = 49.0
offset_left = 1040.0
offset_top = 12.0
offset_right = 1416.0
offset_bottom = 52.0
theme_override_styles/panel = SubResource("StyleBoxFlat_6hcgs")
[node name="chk_show_functional" type="CheckButton" parent="frame_button"]
layout_mode = 0
offset_left = 2.0
offset_top = 3.0
offset_right = 374.0
offset_bottom = 37.0
focus_mode = 0
theme_override_font_sizes/font_size = 22
disabled = true
text = "Показать функциональную схему Э2"
text = "Функциональная схема Э2"
flat = true
[node name="connect_legend0" type="AnimatedSprite2D" parent="."]
@@ -2037,5 +2053,5 @@ texture = ExtResource("22_1s34a")
[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="toggled" from="chk_show_functional" to="." method="_on_chk_show_functional_toggled"]
[connection signal="toggled" from="frame_button/chk_show_functional" to="." method="_on_chk_show_functional_toggled"]
[connection signal="pressed" from="control_prd_button" to="." method="_on_control_prd_pressed"]