maxim/uarep-ctl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Доработка. Режим Контроль. Расположение приборов ближе к реальному

Browse Source
This commit is contained in:
sasha80
2025-07-29 09:42:22 +03:00
parent 89da0caac8
commit b180a5959c
5 changed files with 97 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
data/arrow-ninepatch-0.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 149 B

34
data/arrow-ninepatch-0.png.import
View File

@@ -1,34 +0,0 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://c4erjbms6c1em"
path="res://.godot/imported/arrow-ninepatch-0.png-dfdc5d78f833b20c0b46412eab73b9fe.ctex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://data/arrow-ninepatch-0.png"
dest_files=["res://.godot/imported/arrow-ninepatch-0.png-dfdc5d78f833b20c0b46412eab73b9fe.ctex"]
[params]
compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1

2
scenes/tilemap/tilemap.gd
View File

@@ -362,7 +362,7 @@ func _process(delta) -> void:
push_error('запрос \"%s\" не отправлен' % tile.url) push_error('запрос \"%s\" не отправлен' % tile.url)
if _queue.is_empty(): if _queue.is_empty():
emit_signal('load_completed') emit_signal('load_completed')
update_scale_label() update_scale_label()

187
scenes/контроль/контроль.tscn
View File

@@ -41,10 +41,10 @@ metadata/_edit_lock_ = true
[node name="pribor_uf" type="TextureButton" parent="." groups=["pribor_buttons"]] [node name="pribor_uf" type="TextureButton" parent="." groups=["pribor_buttons"]]
editor_description = "Кнопка для выбора прибора." editor_description = "Кнопка для выбора прибора."
layout_mode = 0 layout_mode = 0
offset_left = 1194.0 offset_left = 1150.0
offset_top = 473.0 offset_top = 565.0
offset_right = 1305.0 offset_right = 1261.0
offset_bottom = 658.0 offset_bottom = 750.0
size_flags_horizontal = 15 size_flags_horizontal = 15
size_flags_vertical = 15 size_flags_vertical = 15
toggle_mode = true toggle_mode = true
@@ -93,10 +93,10 @@ script = ExtResource("11_u7tym")
[node name="pribor_rtr" type="TextureButton" parent="." groups=["pribor_buttons"]] [node name="pribor_rtr" type="TextureButton" parent="." groups=["pribor_buttons"]]
editor_description = "Кнопка для выбора прибора." editor_description = "Кнопка для выбора прибора."
layout_mode = 0 layout_mode = 0
offset_left = 1198.0 offset_left = 1025.0
offset_top = 264.0 offset_top = 595.0
offset_right = 1304.0 offset_right = 1131.0
offset_bottom = 420.0 offset_bottom = 751.0
pivot_offset = Vector2(-10, -65) pivot_offset = Vector2(-10, -65)
size_flags_horizontal = 15 size_flags_horizontal = 15
size_flags_vertical = 15 size_flags_vertical = 15
@@ -144,10 +144,10 @@ script = ExtResource("11_u7tym")
[node name="pribor_afsp_1" type="TextureButton" parent="." groups=["pribor_buttons"]] [node name="pribor_afsp_1" type="TextureButton" parent="." groups=["pribor_buttons"]]
editor_description = "Кнопка для выбора прибора." editor_description = "Кнопка для выбора прибора."
layout_mode = 0 layout_mode = 0
offset_left = 980.0 offset_left = 1020.0
offset_top = 330.0 offset_top = 420.0
offset_right = 1813.0 offset_right = 1853.0
offset_bottom = 970.0 offset_bottom = 1060.0
scale = Vector2(0.2, 0.2) scale = Vector2(0.2, 0.2)
pivot_offset = Vector2(-10, -65) pivot_offset = Vector2(-10, -65)
size_flags_horizontal = 15 size_flags_horizontal = 15
@@ -198,10 +198,10 @@ script = ExtResource("11_u7tym")
[node name="pribor_afsp_2" type="TextureButton" parent="." groups=["pribor_buttons"]] [node name="pribor_afsp_2" type="TextureButton" parent="." groups=["pribor_buttons"]]
editor_description = "Кнопка для выбора прибора." editor_description = "Кнопка для выбора прибора."
layout_mode = 0 layout_mode = 0
offset_left = 1368.0 offset_left = 1210.0
offset_top = 330.0 offset_top = 420.0
offset_right = 2201.0 offset_right = 2043.0
offset_bottom = 970.0 offset_bottom = 1060.0
scale = Vector2(0.2, 0.2) scale = Vector2(0.2, 0.2)
pivot_offset = Vector2(-10, -65) pivot_offset = Vector2(-10, -65)
size_flags_horizontal = 15 size_flags_horizontal = 15
@@ -253,10 +253,10 @@ script = ExtResource("11_u7tym")
[node name="pribor_uyep" type="TextureButton" parent="." groups=["pribor_buttons"]] [node name="pribor_uyep" type="TextureButton" parent="." groups=["pribor_buttons"]]
editor_description = "Кнопка для выбора прибора." editor_description = "Кнопка для выбора прибора."
layout_mode = 0 layout_mode = 0
offset_left = 1201.0 offset_left = 1280.0
offset_top = 712.0 offset_top = 565.0
offset_right = 1295.0 offset_right = 1374.0
offset_bottom = 898.0 offset_bottom = 751.0
size_flags_horizontal = 15 size_flags_horizontal = 15
size_flags_vertical = 15 size_flags_vertical = 15
toggle_mode = true toggle_mode = true
@@ -305,16 +305,17 @@ script = ExtResource("11_u7tym")
[node name="pribor_prd_v_2" type="TextureButton" parent="." groups=["pribor_buttons"]] [node name="pribor_prd_v_2" type="TextureButton" parent="." groups=["pribor_buttons"]]
editor_description = "Кнопка для выбора прибора." editor_description = "Кнопка для выбора прибора."
layout_mode = 0 layout_mode = 0
offset_left = 960.0 offset_left = 1435.0
offset_top = 475.0 offset_top = 680.0
offset_right = 1037.0 offset_right = 1512.0
offset_bottom = 591.0 offset_bottom = 796.0
size_flags_horizontal = 15 size_flags_horizontal = 15
size_flags_vertical = 15 size_flags_vertical = 15
toggle_mode = true toggle_mode = true
action_mode = 0 action_mode = 0
texture_normal = ExtResource("6_i1yfn") texture_normal = ExtResource("6_i1yfn")
stretch_mode = 4 stretch_mode = 4
flip_h = true
script = ExtResource("3_4pt7j") script = ExtResource("3_4pt7j")
state_colors = [Color(1, 1, 1, 1), Color(0, 0.87, 0, 1), Color(0.65, 0.0715, 0.0715, 1)] state_colors = [Color(1, 1, 1, 1), Color(0, 0.87, 0, 1), Color(0.65, 0.0715, 0.0715, 1)]
metadata/unit_name = ["уарэп-яу07-2в"] metadata/unit_name = ["уарэп-яу07-2в"]
@@ -357,16 +358,17 @@ script = ExtResource("11_u7tym")
[node name="pribor_prd_n_2" type="TextureButton" parent="." groups=["pribor_buttons"]] [node name="pribor_prd_n_2" type="TextureButton" parent="." groups=["pribor_buttons"]]
editor_description = "Кнопка для выбора прибора." editor_description = "Кнопка для выбора прибора."
layout_mode = 0 layout_mode = 0
offset_left = 960.0 offset_left = 1435.0
offset_top = 635.0 offset_top = 345.0
offset_right = 1037.0 offset_right = 1512.0
offset_bottom = 751.0 offset_bottom = 461.0
size_flags_horizontal = 15 size_flags_horizontal = 15
size_flags_vertical = 15 size_flags_vertical = 15
toggle_mode = true toggle_mode = true
action_mode = 0 action_mode = 0
texture_normal = ExtResource("6_i1yfn") texture_normal = ExtResource("6_i1yfn")
stretch_mode = 4 stretch_mode = 4
flip_h = true
script = ExtResource("3_4pt7j") script = ExtResource("3_4pt7j")
state_colors = [Color(1, 1, 1, 1), Color(0, 0.87, 0, 1), Color(0.65, 0.0715, 0.0715, 1)] state_colors = [Color(1, 1, 1, 1), Color(0, 0.87, 0, 1), Color(0.65, 0.0715, 0.0715, 1)]
metadata/unit_name = ["уарэп-яу07-2н"] metadata/unit_name = ["уарэп-яу07-2н"]
@@ -411,16 +413,17 @@ script = ExtResource("11_u7tym")
[node name="pribor_prd_k_2" type="TextureButton" parent="." groups=["pribor_buttons"]] [node name="pribor_prd_k_2" type="TextureButton" parent="." groups=["pribor_buttons"]]
editor_description = "Кнопка для выбора прибора." editor_description = "Кнопка для выбора прибора."
layout_mode = 0 layout_mode = 0
offset_left = 1077.0 offset_left = 1435.0
offset_top = 474.0 offset_top = 515.0
offset_right = 1154.0 offset_right = 1512.0
offset_bottom = 590.0 offset_bottom = 631.0
size_flags_horizontal = 15 size_flags_horizontal = 15
size_flags_vertical = 15 size_flags_vertical = 15
toggle_mode = true toggle_mode = true
action_mode = 0 action_mode = 0
texture_normal = ExtResource("6_i1yfn") texture_normal = ExtResource("6_i1yfn")
stretch_mode = 4 stretch_mode = 4
flip_h = true
script = ExtResource("3_4pt7j") script = ExtResource("3_4pt7j")
state_colors = [Color(1, 1, 1, 1), Color(0, 0.87, 0, 1), Color(0.65, 0.0715, 0.0715, 1)] state_colors = [Color(1, 1, 1, 1), Color(0, 0.87, 0, 1), Color(0.65, 0.0715, 0.0715, 1)]
metadata/unit_name = ["уарэп-яу07-2к"] metadata/unit_name = ["уарэп-яу07-2к"]
@@ -463,10 +466,10 @@ script = ExtResource("11_u7tym")
[node name="pribor_prd_v_3" type="TextureButton" parent="." groups=["pribor_buttons"]] [node name="pribor_prd_v_3" type="TextureButton" parent="." groups=["pribor_buttons"]]
editor_description = "Кнопка для выбора прибора." editor_description = "Кнопка для выбора прибора."
layout_mode = 0 layout_mode = 0
offset_left = 1344.0 offset_left = 1015.0
offset_top = 797.0 offset_top = 865.0
offset_right = 1421.0 offset_right = 1092.0
offset_bottom = 913.0 offset_bottom = 981.0
size_flags_horizontal = 15 size_flags_horizontal = 15
size_flags_vertical = 15 size_flags_vertical = 15
toggle_mode = true toggle_mode = true
@@ -516,10 +519,10 @@ script = ExtResource("11_u7tym")
[node name="pribor_prd_n_3" type="TextureButton" parent="." groups=["pribor_buttons"]] [node name="pribor_prd_n_3" type="TextureButton" parent="." groups=["pribor_buttons"]]
editor_description = "Кнопка для выбора прибора." editor_description = "Кнопка для выбора прибора."
layout_mode = 0 layout_mode = 0
offset_left = 1457.0 offset_left = 1290.0
offset_top = 798.0 offset_top = 865.0
offset_right = 1534.0 offset_right = 1367.0
offset_bottom = 914.0 offset_bottom = 981.0
size_flags_horizontal = 15 size_flags_horizontal = 15
size_flags_vertical = 15 size_flags_vertical = 15
toggle_mode = true toggle_mode = true
@@ -569,10 +572,10 @@ script = ExtResource("11_u7tym")
[node name="pribor_prd_k_3" type="TextureButton" parent="." groups=["pribor_buttons"]] [node name="pribor_prd_k_3" type="TextureButton" parent="." groups=["pribor_buttons"]]
editor_description = "Кнопка для выбора прибора." editor_description = "Кнопка для выбора прибора."
layout_mode = 0 layout_mode = 0
offset_left = 1344.0 offset_left = 1155.0
offset_top = 635.0 offset_top = 865.0
offset_right = 1421.0 offset_right = 1232.0
offset_bottom = 751.0 offset_bottom = 981.0
size_flags_horizontal = 15 size_flags_horizontal = 15
size_flags_vertical = 15 size_flags_vertical = 15
toggle_mode = true toggle_mode = true
@@ -622,10 +625,10 @@ script = ExtResource("11_u7tym")
[node name="pribor_prd_v_1" type="TextureButton" parent="." groups=["pribor_buttons"]] [node name="pribor_prd_v_1" type="TextureButton" parent="." groups=["pribor_buttons"]]
editor_description = "Кнопка для выбора прибора." editor_description = "Кнопка для выбора прибора."
layout_mode = 0 layout_mode = 0
offset_left = 1457.0 offset_left = 1295.0
offset_top = 475.0 offset_top = 180.0
offset_right = 1534.0 offset_right = 1372.0
offset_bottom = 591.0 offset_bottom = 296.0
size_flags_horizontal = 15 size_flags_horizontal = 15
size_flags_vertical = 15 size_flags_vertical = 15
toggle_mode = true toggle_mode = true
@@ -675,10 +678,10 @@ script = ExtResource("11_u7tym")
[node name="pribor_prd_n_1" type="TextureButton" parent="." groups=["pribor_buttons"]] [node name="pribor_prd_n_1" type="TextureButton" parent="." groups=["pribor_buttons"]]
editor_description = "Кнопка для выбора прибора." editor_description = "Кнопка для выбора прибора."
layout_mode = 0 layout_mode = 0
offset_left = 1457.0 offset_left = 1015.0
offset_top = 634.0 offset_top = 175.0
offset_right = 1534.0 offset_right = 1092.0
offset_bottom = 750.0 offset_bottom = 291.0
size_flags_horizontal = 15 size_flags_horizontal = 15
size_flags_vertical = 15 size_flags_vertical = 15
toggle_mode = true toggle_mode = true
@@ -728,10 +731,10 @@ script = ExtResource("11_u7tym")
[node name="pribor_prd_k_1" type="TextureButton" parent="." groups=["pribor_buttons"]] [node name="pribor_prd_k_1" type="TextureButton" parent="." groups=["pribor_buttons"]]
editor_description = "Кнопка для выбора прибора." editor_description = "Кнопка для выбора прибора."
layout_mode = 0 layout_mode = 0
offset_left = 1344.0 offset_left = 1150.0
offset_top = 473.0 offset_top = 175.0
offset_right = 1421.0 offset_right = 1227.0
offset_bottom = 589.0 offset_bottom = 291.0
size_flags_horizontal = 15 size_flags_horizontal = 15
size_flags_vertical = 15 size_flags_vertical = 15
toggle_mode = true toggle_mode = true
@@ -781,10 +784,10 @@ script = ExtResource("11_u7tym")
[node name="pribor_prd_v_4" type="TextureButton" parent="." groups=["pribor_buttons"]] [node name="pribor_prd_v_4" type="TextureButton" parent="." groups=["pribor_buttons"]]
editor_description = "Кнопка для выбора прибора." editor_description = "Кнопка для выбора прибора."
layout_mode = 0 layout_mode = 0
offset_left = 1077.0 offset_left = 890.0
offset_top = 797.0 offset_top = 345.0
offset_right = 1154.0 offset_right = 967.0
offset_bottom = 913.0 offset_bottom = 461.0
size_flags_horizontal = 15 size_flags_horizontal = 15
size_flags_vertical = 15 size_flags_vertical = 15
toggle_mode = true toggle_mode = true
@@ -833,10 +836,10 @@ script = ExtResource("11_u7tym")
[node name="pribor_prd_n_4" type="TextureButton" parent="." groups=["pribor_buttons"]] [node name="pribor_prd_n_4" type="TextureButton" parent="." groups=["pribor_buttons"]]
editor_description = "Кнопка для выбора прибора." editor_description = "Кнопка для выбора прибора."
layout_mode = 0 layout_mode = 0
offset_left = 960.0 offset_left = 885.0
offset_top = 797.0 offset_top = 685.0
offset_right = 1037.0 offset_right = 962.0
offset_bottom = 913.0 offset_bottom = 801.0
size_flags_horizontal = 15 size_flags_horizontal = 15
size_flags_vertical = 15 size_flags_vertical = 15
toggle_mode = true toggle_mode = true
@@ -885,10 +888,10 @@ script = ExtResource("11_u7tym")
[node name="pribor_prd_k_4" type="TextureButton" parent="." groups=["pribor_buttons"]] [node name="pribor_prd_k_4" type="TextureButton" parent="." groups=["pribor_buttons"]]
editor_description = "Кнопка для выбора прибора." editor_description = "Кнопка для выбора прибора."
layout_mode = 0 layout_mode = 0
offset_left = 1077.0 offset_left = 890.0
offset_top = 635.0 offset_top = 515.0
offset_right = 1154.0 offset_right = 967.0
offset_bottom = 751.0 offset_bottom = 631.0
size_flags_horizontal = 15 size_flags_horizontal = 15
size_flags_vertical = 15 size_flags_vertical = 15
toggle_mode = true toggle_mode = true
@@ -936,58 +939,58 @@ script = ExtResource("11_u7tym")
[node name="txr_legend0" type="TextureRect" parent="."] [node name="txr_legend0" type="TextureRect" parent="."]
layout_mode = 0 layout_mode = 0
offset_left = 1176.0 offset_left = 1198.0
offset_top = 960.0 offset_top = 1135.0
offset_right = 1400.0 offset_right = 1422.0
offset_bottom = 1184.0 offset_bottom = 1359.0
scale = Vector2(0.1, 0.1) scale = Vector2(0.1, 0.1)
texture = ExtResource("7_6j01w") texture = ExtResource("7_6j01w")
[node name="lbl_legend0" type="Label" parent="."] [node name="lbl_legend0" type="Label" parent="."]
self_modulate = Color(1, 1, 1, 0.627451) self_modulate = Color(1, 1, 1, 0.627451)
layout_mode = 0 layout_mode = 0
offset_left = 1204.0 offset_left = 1226.0
offset_top = 961.0 offset_top = 1136.0
offset_right = 1360.0 offset_right = 1382.0
offset_bottom = 981.0 offset_bottom = 1156.0
theme_override_font_sizes/font_size = 17 theme_override_font_sizes/font_size = 17
text = "Ожидание результата" text = "Ожидание результата"
[node name="lbl_legend1" type="Label" parent="."] [node name="lbl_legend1" type="Label" parent="."]
self_modulate = Color(1, 1, 1, 0.627451) self_modulate = Color(1, 1, 1, 0.627451)
layout_mode = 0 layout_mode = 0
offset_left = 1009.0 offset_left = 1031.0
offset_top = 961.0 offset_top = 1136.0
offset_right = 1082.0 offset_right = 1104.0
offset_bottom = 981.0 offset_bottom = 1156.0
theme_override_font_sizes/font_size = 17 theme_override_font_sizes/font_size = 17
text = "Исправно" text = "Исправно"
[node name="txr_legend1" type="TextureRect" parent="."] [node name="txr_legend1" type="TextureRect" parent="."]
layout_mode = 0 layout_mode = 0
offset_left = 983.0 offset_left = 1005.0
offset_top = 960.0 offset_top = 1135.0
offset_right = 1207.0 offset_right = 1229.0
offset_bottom = 1184.0 offset_bottom = 1359.0
scale = Vector2(0.1, 0.1) scale = Vector2(0.1, 0.1)
texture = ExtResource("8_isjua") texture = ExtResource("8_isjua")
[node name="txr_legend2" type="TextureRect" parent="."] [node name="txr_legend2" type="TextureRect" parent="."]
layout_mode = 0 layout_mode = 0
offset_left = 1433.0 offset_left = 1455.0
offset_top = 960.0 offset_top = 1135.0
offset_right = 1657.0 offset_right = 1679.0
offset_bottom = 1184.0 offset_bottom = 1359.0
scale = Vector2(0.1, 0.1) scale = Vector2(0.1, 0.1)
texture = ExtResource("9_ll0vs") texture = ExtResource("9_ll0vs")
[node name="lbl_legend2" type="Label" parent="."] [node name="lbl_legend2" type="Label" parent="."]
self_modulate = Color(1, 1, 1, 0.627451) self_modulate = Color(1, 1, 1, 0.627451)
layout_mode = 0 layout_mode = 0
offset_left = 1461.0 offset_left = 1483.0
offset_top = 961.0 offset_top = 1136.0
offset_right = 1505.0 offset_right = 1527.0
offset_bottom = 981.0 offset_bottom = 1156.0
theme_override_font_sizes/font_size = 17 theme_override_font_sizes/font_size = 17
text = "Сбой" text = "Сбой"

2
scenes/работа/работа.tscn
View File

@@ -304,6 +304,6 @@ text = "Масштаб:"
[connection signal="drag_continue" from="." to="." method="_on_drag_continue"] [connection signal="drag_continue" from="." to="." method="_on_drag_continue"]
[connection signal="toggled" from="btn_view" to="." method="on_button_view_toggled"] [connection signal="toggled" from="btn_view" to="." method="on_button_view_toggled"]
[connection signal="toggled" from="chk_auto" to="." method="on_value_changed"] [connection signal="toggled" from="chk_auto" to="." method="on_value_changed"]
[connection signal="toggled" from="btn_activate" to="." method="on_btn_activate"]
[connection signal="toggled" from="btn_activate" to="." method="on_btn_activate_toggled"] [connection signal="toggled" from="btn_activate" to="." method="on_btn_activate_toggled"]
[connection signal="toggled" from="btn_activate" to="." method="on_btn_activate"]
[connection signal="toggled" from="btn_center" to="." method="on_btn_center_toggled"] [connection signal="toggled" from="btn_center" to="." method="on_btn_center_toggled"]