From efd717d0fedb5e4abd1b2f03004cecfb9d217d7d Mon Sep 17 00:00:00 2001
From: lepshiy <knkolesova@yandex.ru>
Date: Mon, 28 Oct 2024 10:02:15 +0300
Subject: [PATCH] =?UTF-8?q?=D0=9A=D0=BE=D1=80=D1=80=D0=B5=D0=BA=D1=82?=
 =?UTF-8?q?=D0=B8=D1=80=D0=BE=D0=B2=D0=BA=D0=B0=20=D1=82=D0=B0=D0=B1=D0=BB?=
 =?UTF-8?q?=D0=B8=D1=86=20=D0=B2=20"=D0=BA=D0=BE=D0=BD=D1=82=D1=80=D0=BE?=
 =?UTF-8?q?=D0=BB=D1=8C"?=
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/pribor-prd-n/pribor-prd-n.tscn | 38 +++++++++++++--------------
 scenes/pribor-prd-v/pribor-prd-v.tscn | 38 +++++++++++++--------------
 scenes/контроль/кассета.gd            |  3 ++-
 4 files changed, 52 insertions(+), 51 deletions(-)

diff --git a/scenes/pribor-prd-k/pribor-prd-k.tscn b/scenes/pribor-prd-k/pribor-prd-k.tscn
index 9c9cb6bf..00c58b4d 100644
--- a/scenes/pribor-prd-k/pribor-prd-k.tscn
+++ b/scenes/pribor-prd-k/pribor-prd-k.tscn
@@ -30,7 +30,7 @@ fname = "Кассета У5"
 [node name="lbl_header" type="Label" parent="."]
 layout_mode = 0
 offset_left = 20.0
-offset_top = 210.0
+offset_top = 214.0
 offset_right = 640.0
 offset_bottom = 240.0
 theme_override_font_sizes/font_size = 22
@@ -42,7 +42,7 @@ vertical_alignment = 1
 layout_mode = 0
 offset_left = 485.0
 offset_top = 907.0
-offset_right = 645.0
+offset_right = 652.0
 offset_bottom = 949.0
 fname = "MAA2000"
 rname = "A27"
@@ -51,7 +51,7 @@ rname = "A27"
 layout_mode = 0
 offset_left = 8.0
 offset_top = 862.0
-offset_right = 168.0
+offset_right = 175.0
 offset_bottom = 907.0
 fname = "ДОУ-6"
 rname = "A7"
@@ -60,7 +60,7 @@ rname = "A7"
 layout_mode = 0
 offset_left = 8.0
 offset_top = 907.0
-offset_right = 168.0
+offset_right = 175.0
 offset_bottom = 949.0
 fname = "MAA2000"
 rname = "A28"
@@ -69,7 +69,7 @@ rname = "A28"
 layout_mode = 0
 offset_left = 8.0
 offset_top = 812.0
-offset_right = 168.0
+offset_right = 175.0
 offset_bottom = 860.0
 fname = "ДОУ-7"
 rname = "A8"
@@ -102,7 +102,7 @@ vertical_alignment = 1
 layout_mode = 0
 offset_left = 485.0
 offset_top = 242.0
-offset_right = 645.0
+offset_right = 652.0
 offset_bottom = 337.0
 value0 = 28.0
 value1 = 70.0
@@ -121,7 +121,7 @@ rname = "A10"
 layout_mode = 0
 offset_left = 485.0
 offset_top = 337.0
-offset_right = 645.0
+offset_right = 652.0
 offset_bottom = 432.0
 value0 = 28.0
 value1 = 57.0
@@ -140,7 +140,7 @@ rname = "A11"
 layout_mode = 0
 offset_left = 485.0
 offset_top = 432.0
-offset_right = 645.0
+offset_right = 652.0
 offset_bottom = 527.0
 value0 = 28.0
 value1 = 57.0
@@ -159,7 +159,7 @@ rname = "A12"
 layout_mode = 0
 offset_left = 485.0
 offset_top = 527.0
-offset_right = 645.0
+offset_right = 652.0
 offset_bottom = 622.0
 value0 = 28.0
 value1 = 57.0
@@ -178,7 +178,7 @@ rname = "A13"
 layout_mode = 0
 offset_left = 485.0
 offset_top = 622.0
-offset_right = 645.0
+offset_right = 652.0
 offset_bottom = 717.0
 value0 = 28.0
 value1 = 57.0
@@ -197,7 +197,7 @@ rname = "A14"
 layout_mode = 0
 offset_left = 485.0
 offset_top = 717.0
-offset_right = 645.0
+offset_right = 652.0
 offset_bottom = 812.0
 value0 = 28.0
 value1 = 57.0
@@ -216,7 +216,7 @@ rname = "A15"
 layout_mode = 0
 offset_left = 485.0
 offset_top = 812.0
-offset_right = 645.0
+offset_right = 652.0
 offset_bottom = 907.0
 value0 = 28.0
 value1 = 57.0
diff --git a/scenes/pribor-prd-n/pribor-prd-n.tscn b/scenes/pribor-prd-n/pribor-prd-n.tscn
index c649affb..f9d1bcd8 100644
--- a/scenes/pribor-prd-n/pribor-prd-n.tscn
+++ b/scenes/pribor-prd-n/pribor-prd-n.tscn
@@ -21,8 +21,8 @@ script = ExtResource("1_mcea3")
 layout_mode = 2
 offset_left = 485.0
 offset_top = 877.0
-offset_right = 645.0
-offset_bottom = 942.0
+offset_right = 652.0
+offset_bottom = 949.0
 fname = "MAA2000"
 rname = "A22"
 
@@ -30,23 +30,23 @@ rname = "A22"
 layout_mode = 2
 offset_left = 485.0
 offset_top = 812.0
-offset_right = 645.0
+offset_right = 652.0
 offset_bottom = 877.0
 fname = "ДОУ-2"
 rname = "A5"
 
 [node name="maa2000_A23" parent="." instance=ExtResource("2_lpj3d")]
 layout_mode = 2
-offset_left = 15.0
+offset_left = 8.0
 offset_top = 877.0
 offset_right = 175.0
-offset_bottom = 942.0
+offset_bottom = 949.0
 fname = "MAA2000"
 rname = "A23"
 
 [node name="dou2_A6" parent="." instance=ExtResource("2_lpj3d")]
 layout_mode = 2
-offset_left = 15.0
+offset_left = 8.0
 offset_top = 812.0
 offset_right = 175.0
 offset_bottom = 877.0
@@ -58,7 +58,7 @@ layout_mode = 0
 offset_left = 175.0
 offset_top = 812.0
 offset_right = 485.0
-offset_bottom = 942.0
+offset_bottom = 949.0
 texture = ExtResource("4_i1no5")
 patch_margin_left = 16
 patch_margin_top = 16
@@ -207,7 +207,7 @@ vertical_alignment = 1
 layout_mode = 0
 offset_left = 485.0
 offset_top = 242.0
-offset_right = 645.0
+offset_right = 652.0
 offset_bottom = 337.0
 value0 = 27.0
 value1 = 56.0
@@ -224,7 +224,7 @@ rname = "A7"
 layout_mode = 0
 offset_left = 485.0
 offset_top = 337.0
-offset_right = 645.0
+offset_right = 652.0
 offset_bottom = 432.0
 value0 = 27.0
 value1 = 56.0
@@ -241,7 +241,7 @@ rname = "A8"
 layout_mode = 0
 offset_left = 485.0
 offset_top = 432.0
-offset_right = 645.0
+offset_right = 652.0
 offset_bottom = 527.0
 value0 = 27.0
 value1 = 56.0
@@ -258,7 +258,7 @@ rname = "A9"
 layout_mode = 0
 offset_left = 485.0
 offset_top = 527.0
-offset_right = 645.0
+offset_right = 652.0
 offset_bottom = 622.0
 value0 = 27.0
 value1 = 56.0
@@ -275,7 +275,7 @@ rname = "A10"
 layout_mode = 0
 offset_left = 485.0
 offset_top = 622.0
-offset_right = 645.0
+offset_right = 652.0
 offset_bottom = 717.0
 value0 = 27.0
 value1 = 56.0
@@ -292,7 +292,7 @@ rname = "A11"
 layout_mode = 0
 offset_left = 485.0
 offset_top = 717.0
-offset_right = 645.0
+offset_right = 652.0
 offset_bottom = 812.0
 value0 = 27.0
 value1 = 56.0
@@ -307,7 +307,7 @@ rname = "A12"
 
 [node name="um1535_A13" parent="." instance=ExtResource("8_u7eqo")]
 layout_mode = 0
-offset_left = 15.0
+offset_left = 8.0
 offset_top = 242.0
 offset_right = 175.0
 offset_bottom = 337.0
@@ -326,7 +326,7 @@ rname = "A13"
 
 [node name="um1535_A14" parent="." instance=ExtResource("8_u7eqo")]
 layout_mode = 0
-offset_left = 15.0
+offset_left = 8.0
 offset_top = 337.0
 offset_right = 175.0
 offset_bottom = 432.0
@@ -343,7 +343,7 @@ rname = "A14"
 
 [node name="um1535_A15" parent="." instance=ExtResource("8_u7eqo")]
 layout_mode = 0
-offset_left = 15.0
+offset_left = 8.0
 offset_top = 432.0
 offset_right = 175.0
 offset_bottom = 527.0
@@ -360,7 +360,7 @@ rname = "A15"
 
 [node name="um1535_A16" parent="." instance=ExtResource("8_u7eqo")]
 layout_mode = 0
-offset_left = 15.0
+offset_left = 8.0
 offset_top = 527.0
 offset_right = 175.0
 offset_bottom = 622.0
@@ -377,7 +377,7 @@ rname = "A16"
 
 [node name="um1535_A17" parent="." instance=ExtResource("8_u7eqo")]
 layout_mode = 0
-offset_left = 15.0
+offset_left = 8.0
 offset_top = 622.0
 offset_right = 175.0
 offset_bottom = 717.0
@@ -394,7 +394,7 @@ rname = "A17"
 
 [node name="um1535_A18" parent="." instance=ExtResource("8_u7eqo")]
 layout_mode = 0
-offset_left = 15.0
+offset_left = 8.0
 offset_top = 717.0
 offset_right = 175.0
 offset_bottom = 812.0
diff --git a/scenes/pribor-prd-v/pribor-prd-v.tscn b/scenes/pribor-prd-v/pribor-prd-v.tscn
index 900676db..75b2c6a3 100644
--- a/scenes/pribor-prd-v/pribor-prd-v.tscn
+++ b/scenes/pribor-prd-v/pribor-prd-v.tscn
@@ -22,8 +22,8 @@ script = ExtResource("1_dl7rt")
 layout_mode = 2
 offset_left = 485.0
 offset_top = 877.0
-offset_right = 645.0
-offset_bottom = 942.0
+offset_right = 652.0
+offset_bottom = 949.0
 fname = "MAA2000"
 rname = "A22"
 
@@ -31,23 +31,23 @@ rname = "A22"
 layout_mode = 2
 offset_left = 485.0
 offset_top = 812.0
-offset_right = 645.0
+offset_right = 652.0
 offset_bottom = 877.0
 fname = "ДОУ-4"
 rname = "A5"
 
 [node name="maa2000_A23" parent="." instance=ExtResource("2_xpo4b")]
 layout_mode = 2
-offset_left = 15.0
+offset_left = 8.0
 offset_top = 877.0
 offset_right = 175.0
-offset_bottom = 942.0
+offset_bottom = 949.0
 fname = "MAA2000"
 rname = "A23"
 
 [node name="dou5_A6" parent="." instance=ExtResource("2_xpo4b")]
 layout_mode = 2
-offset_left = 15.0
+offset_left = 8.0
 offset_top = 812.0
 offset_right = 175.0
 offset_bottom = 877.0
@@ -59,7 +59,7 @@ layout_mode = 0
 offset_left = 175.0
 offset_top = 812.0
 offset_right = 485.0
-offset_bottom = 942.0
+offset_bottom = 949.0
 texture = ExtResource("3_wyy1b")
 patch_margin_left = 16
 patch_margin_top = 16
@@ -158,7 +158,7 @@ vertical_alignment = 1
 layout_mode = 0
 offset_left = 485.0
 offset_top = 242.0
-offset_right = 645.0
+offset_right = 652.0
 offset_bottom = 337.0
 value0 = 91.0
 value1 = 22.0
@@ -177,7 +177,7 @@ rname = "A7"
 layout_mode = 0
 offset_left = 485.0
 offset_top = 337.0
-offset_right = 645.0
+offset_right = 652.0
 offset_bottom = 432.0
 value0 = 91.0
 value1 = 22.0
@@ -196,7 +196,7 @@ rname = "A8"
 layout_mode = 0
 offset_left = 485.0
 offset_top = 432.0
-offset_right = 645.0
+offset_right = 652.0
 offset_bottom = 527.0
 value0 = 91.0
 value1 = 22.0
@@ -215,7 +215,7 @@ rname = "A9"
 layout_mode = 0
 offset_left = 485.0
 offset_top = 527.0
-offset_right = 645.0
+offset_right = 652.0
 offset_bottom = 622.0
 value0 = 91.0
 value1 = 22.0
@@ -234,7 +234,7 @@ rname = "A10"
 layout_mode = 0
 offset_left = 485.0
 offset_top = 622.0
-offset_right = 645.0
+offset_right = 652.0
 offset_bottom = 717.0
 value0 = 91.0
 value1 = 22.0
@@ -253,7 +253,7 @@ rname = "A11"
 layout_mode = 0
 offset_left = 485.0
 offset_top = 717.0
-offset_right = 645.0
+offset_right = 652.0
 offset_bottom = 812.0
 value0 = 91.0
 value1 = 22.0
@@ -270,7 +270,7 @@ rname = "A12"
 
 [node name="um1535_A13" parent="." instance=ExtResource("7_e22c6")]
 layout_mode = 0
-offset_left = 15.0
+offset_left = 8.0
 offset_top = 242.0
 offset_right = 175.0
 offset_bottom = 337.0
@@ -289,7 +289,7 @@ rname = "A13"
 
 [node name="um1535_A14" parent="." instance=ExtResource("7_e22c6")]
 layout_mode = 0
-offset_left = 15.0
+offset_left = 8.0
 offset_top = 337.0
 offset_right = 175.0
 offset_bottom = 432.0
@@ -308,7 +308,7 @@ rname = "A14"
 
 [node name="um1535_A15" parent="." instance=ExtResource("7_e22c6")]
 layout_mode = 0
-offset_left = 15.0
+offset_left = 8.0
 offset_top = 432.0
 offset_right = 175.0
 offset_bottom = 527.0
@@ -327,7 +327,7 @@ rname = "A15"
 
 [node name="um1535_A16" parent="." instance=ExtResource("7_e22c6")]
 layout_mode = 0
-offset_left = 15.0
+offset_left = 8.0
 offset_top = 527.0
 offset_right = 175.0
 offset_bottom = 622.0
@@ -346,7 +346,7 @@ rname = "A16"
 
 [node name="um1535_A17" parent="." instance=ExtResource("7_e22c6")]
 layout_mode = 0
-offset_left = 15.0
+offset_left = 8.0
 offset_top = 622.0
 offset_right = 175.0
 offset_bottom = 717.0
@@ -365,7 +365,7 @@ rname = "A17"
 
 [node name="um1535_A18" parent="." instance=ExtResource("7_e22c6")]
 layout_mode = 0
-offset_left = 15.0
+offset_left = 8.0
 offset_top = 717.0
 offset_right = 175.0
 offset_bottom = 812.0
diff --git a/scenes/контроль/кассета.gd b/scenes/контроль/кассета.gd
index fb83827d..a91fc7a1 100644
--- a/scenes/контроль/кассета.gd
+++ b/scenes/контроль/кассета.gd
@@ -9,7 +9,8 @@ extends NinePatchRect
 @export var fname: String:
     set(v):
         fname = v
-        $lbl_fname.text = v
+        if is_inside_tree():
+            $lbl_fname.text = v
 
 
 @export var rname: String: