From 49a926cceebaa11237a29e349e1999fdb414b9dd Mon Sep 17 00:00:00 2001 From: sasha80 Date: Fri, 12 Jan 2024 10:54:50 +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.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scenes/pribor-prd-n-1/pribor-prd-n-1.tscn | 86 +++++++++++------------ scripts/yau07.gd | 4 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/scenes/pribor-prd-n-1/pribor-prd-n-1.tscn b/scenes/pribor-prd-n-1/pribor-prd-n-1.tscn index 3879341..9e7989c 100644 --- a/scenes/pribor-prd-n-1/pribor-prd-n-1.tscn +++ b/scenes/pribor-prd-n-1/pribor-prd-n-1.tscn @@ -27,9 +27,9 @@ rname = "A13" [node name="ref_A13R" parent="." instance=ExtResource("2_lpj3d")] layout_mode = 2 offset_left = 490.0 -offset_top = 235.0 +offset_top = 230.0 offset_right = 650.0 -offset_bottom = 285.0 +offset_bottom = 280.0 fname = "Ячейка" rname = "A13" @@ -44,9 +44,9 @@ rname = "A14" [node name="ref_A14R" parent="." instance=ExtResource("2_lpj3d")] layout_mode = 2 offset_left = 490.0 -offset_top = 305.0 +offset_top = 300.0 offset_right = 650.0 -offset_bottom = 355.0 +offset_bottom = 350.0 fname = "Ячейка" rname = "A14" @@ -61,9 +61,9 @@ rname = "A15" [node name="ref_A15R" parent="." instance=ExtResource("2_lpj3d")] layout_mode = 2 offset_left = 490.0 -offset_top = 405.0 +offset_top = 400.0 offset_right = 650.0 -offset_bottom = 455.0 +offset_bottom = 450.0 fname = "Ячейка" rname = "A15" @@ -78,9 +78,9 @@ rname = "A16" [node name="ref_A16R" parent="." instance=ExtResource("2_lpj3d")] layout_mode = 2 offset_left = 490.0 -offset_top = 480.0 +offset_top = 475.0 offset_right = 650.0 -offset_bottom = 530.0 +offset_bottom = 525.0 fname = "Ячейка" rname = "A16" @@ -95,9 +95,9 @@ rname = "A17" [node name="ref_A17R" parent="." instance=ExtResource("2_lpj3d")] layout_mode = 2 offset_left = 490.0 -offset_top = 580.0 +offset_top = 575.0 offset_right = 650.0 -offset_bottom = 630.0 +offset_bottom = 625.0 fname = "Ячейка" rname = "A17" @@ -112,9 +112,9 @@ rname = "A18" [node name="ref_A18R" parent="." instance=ExtResource("2_lpj3d")] layout_mode = 2 offset_left = 490.0 -offset_top = 655.0 +offset_top = 650.0 offset_right = 650.0 -offset_bottom = 705.0 +offset_bottom = 700.0 fname = "Ячейка" rname = "A18" @@ -530,10 +530,10 @@ vertical_alignment = 1 [node name="txr_state" type="TextureRect" parent="ref_ZZ4"] layout_mode = 0 -offset_left = -620.0 -offset_top = 695.0 -offset_right = -396.0 -offset_bottom = 919.0 +offset_left = 12.0 +offset_top = 9.0 +offset_right = 236.0 +offset_bottom = 233.0 scale = Vector2(0.1, 0.1) texture = ExtResource("5_n0aaa") @@ -779,31 +779,12 @@ offset_bottom = 233.0 scale = Vector2(0.1, 0.1) texture = ExtResource("5_n0aaa") -[node name="txr_legend3" type="TextureRect" parent="."] -layout_mode = 0 -offset_left = 668.0 -offset_top = 246.0 -offset_right = 892.0 -offset_bottom = 470.0 -scale = Vector2(0.1, 0.1) -texture = ExtResource("5_n0aaa") - -[node name="lbl_legend1" type="Label" parent="."] -self_modulate = Color(1, 1, 1, 0.627451) -layout_mode = 0 -offset_left = 56.0 -offset_top = 930.0 -offset_right = 129.0 -offset_bottom = 950.0 -theme_override_font_sizes/font_size = 17 -text = "Исправно" - [node name="txr_legend0" type="TextureRect" parent="."] layout_mode = 0 offset_left = 223.0 -offset_top = 930.0 +offset_top = 925.0 offset_right = 447.0 -offset_bottom = 1154.0 +offset_bottom = 1149.0 scale = Vector2(0.1, 0.1) texture = ExtResource("6_sj3be") @@ -811,18 +792,37 @@ texture = ExtResource("6_sj3be") self_modulate = Color(1, 1, 1, 0.627451) layout_mode = 0 offset_left = 251.0 -offset_top = 930.0 +offset_top = 925.0 offset_right = 407.0 -offset_bottom = 950.0 +offset_bottom = 945.0 theme_override_font_sizes/font_size = 17 text = "Ожидание результата" +[node name="lbl_legend1" type="Label" parent="."] +self_modulate = Color(1, 1, 1, 0.627451) +layout_mode = 0 +offset_left = 56.0 +offset_top = 925.0 +offset_right = 129.0 +offset_bottom = 945.0 +theme_override_font_sizes/font_size = 17 +text = "Исправно" + +[node name="txr_legend1" type="TextureRect" parent="."] +layout_mode = 0 +offset_left = 32.0 +offset_top = 925.0 +offset_right = 256.0 +offset_bottom = 1149.0 +scale = Vector2(0.1, 0.1) +texture = ExtResource("5_n0aaa") + [node name="txr_legend2" type="TextureRect" parent="."] layout_mode = 0 offset_left = 480.0 -offset_top = 930.0 +offset_top = 925.0 offset_right = 704.0 -offset_bottom = 1154.0 +offset_bottom = 1149.0 scale = Vector2(0.1, 0.1) texture = ExtResource("7_rhdhp") @@ -830,9 +830,9 @@ texture = ExtResource("7_rhdhp") self_modulate = Color(1, 1, 1, 0.627451) layout_mode = 0 offset_left = 508.0 -offset_top = 930.0 +offset_top = 925.0 offset_right = 664.0 -offset_bottom = 950.0 +offset_bottom = 945.0 theme_override_font_sizes/font_size = 17 text = "Сбой" diff --git a/scripts/yau07.gd b/scripts/yau07.gd index 3cb37f2..f49e5fc 100644 --- a/scripts/yau07.gd +++ b/scripts/yau07.gd @@ -134,8 +134,8 @@ class YaU07: tx_data.encode_u16(9, int(port[0])) cmd_state = CmdState.SEND return true - - + + ## Возвращает код команды ЯУ-07. ## [param rx_data] - Принятые данные.[br] ## Возвращает [b]null[/b] - Если код команды не найден.[br]