после мерджа с данилом

This commit is contained in:
danil_tim
2025-02-12 08:37:32 +03:00
parent f79f82a350
commit bb50790ce8
4 changed files with 5 additions and 1050 deletions

File diff suppressed because it is too large Load Diff

View File

@@ -1,42 +0,0 @@
[gd_scene load_steps=6 format=3 uid="uid://cvor2jm4xk3ha"]
[ext_resource type="Script" path="res://PRD.gd" id="1_v273n"]
[ext_resource type="Script" path="res://table/table.gd" id="2_vmbyo"]
[sub_resource type="StyleBoxTexture" id="StyleBoxTexture_5yjx2"]
[sub_resource type="StyleBoxTexture" id="StyleBoxTexture_kofy6"]
[sub_resource type="StyleBoxTexture" id="StyleBoxTexture_hdj8q"]
[node name="Node2D" type="Node2D"]
script = ExtResource("1_v273n")
[node name="Background" type="ColorRect" parent="."]
offset_right = 1321.0
offset_bottom = 790.0
color = Color(0.356863, 0.278431, 0.356863, 1)
metadata/_edit_lock_ = true
[node name="scroll1" type="ScrollContainer" parent="."]
offset_left = 586.0
offset_top = 45.0
offset_right = 949.0
offset_bottom = 629.0
[node name="table1" type="GridContainer" parent="scroll1"]
layout_mode = 2
script = ExtResource("2_vmbyo")
metadata/_edit_lock_ = true
[node name="TextEdit" type="TextEdit" parent="."]
offset_left = 1028.0
offset_top = 602.0
offset_right = 1140.0
offset_bottom = 640.0
theme_override_colors/font_readonly_color = Color(1, 1, 1, 1)
theme_override_styles/normal = SubResource("StyleBoxTexture_5yjx2")
theme_override_styles/focus = SubResource("StyleBoxTexture_kofy6")
theme_override_styles/read_only = SubResource("StyleBoxTexture_hdj8q")
text = "Test PRD"
editable = false

View File

@@ -294,12 +294,11 @@ theme_override_styles/tab_selected = SubResource("StyleBoxTexture_k08q3")
theme_override_styles/tab_hovered = SubResource("StyleBoxTexture_dklg6")
theme_override_styles/tab_unselected = SubResource("StyleBoxTexture_17le6")
tab_alignment = 2
current_tab = 2
current_tab = 0
tab_focus_mode = 0
metadata/_edit_lock_ = true
[node name="PRD" type="Panel" parent="TabContainer"]
visible = false
layout_mode = 2
theme_override_styles/panel = SubResource("StyleBoxTexture_7u7p7")
metadata/_tab_index = 0
@@ -746,6 +745,7 @@ offset_right = 1616.0
offset_bottom = 847.0
[node name="EMS_G" type="Panel" parent="TabContainer"]
visible = false
layout_mode = 2
theme_override_styles/panel = SubResource("StyleBoxTexture_ooo4i")
script = ExtResource("9_g1wia")

View File

@@ -14,13 +14,13 @@ func _ready() -> void:
$soc_y5/ay07,
$soc_y5/ems_g,
$soc_y5/ug,
$soc_y5/ukp_1,
$soc_y5/ukp_2,
$soc_y5/ukp_1,
$soc_P1/MAA_1,
$soc_P1/MAA_2,
$soc_P1/IP9_50_1,
$soc_P1/IP9_50_2,
$soc_P1/IP9_50_1,
$soc_P1/IP12_50,
$soc_P2/IP9_50,
@@ -46,7 +46,7 @@ func _on_timer(pribor_prd):
func _status_cell(status):
var status_board: int = status.decode_u8(Constants.DataIndices.STATUS_BOARD)
var dry_contact: int = status.decode_u8(Constants.DataIndices.DRY_CONTACT+1)
var dry_contact: int = status.decode_u8(Constants.DataIndices.DRY_CONTACT)
# status_board
for i in range(1, count_cell-8):