diff --git a/scenes/контроль/контроль.tscn b/scenes/контроль/контроль.tscn index 6b6eb5e9..18cbb08a 100644 --- a/scenes/контроль/контроль.tscn +++ b/scenes/контроль/контроль.tscn @@ -121,23 +121,18 @@ grow_vertical = 2 script = SubResource("GDScript_iqgf5") metadata/_edit_lock_ = true -[node name="capsrpb" type="TextureButton" parent="."] +[node name="capsrpb" type="TextureRect" parent="."] editor_description = "Кнопка для отображения внешних соединений." self_modulate = Color(0.788235, 0.788235, 0.788235, 1) layout_mode = 0 offset_left = 941.0 -offset_top = 992.0 +offset_top = 1021.0 offset_right = 1197.0 -offset_bottom = 1248.0 +offset_bottom = 1277.0 scale = Vector2(0.25, 0.25) size_flags_horizontal = 15 size_flags_vertical = 15 -toggle_mode = true -action_mode = 0 -texture_normal = ExtResource("2_oysma") -stretch_mode = 0 -script = ExtResource("3_4pt7j") -state_colors = [Color(1, 1, 1, 1), Color(0, 0.74, 0.37, 1), Color(0.854902, 0.0705882, 0.0705882, 1)] +texture = ExtResource("2_oysma") [node name="label" type="Label" parent="capsrpb"] layout_mode = 0 @@ -150,22 +145,6 @@ text = "КАПС РПБ" horizontal_alignment = 1 vertical_alignment = 1 -[node name="frame" type="NinePatchRect" parent="capsrpb"] -visible = false -self_modulate = Color(0.890196, 0.486275, 0.196078, 1) -layout_mode = 0 -offset_left = -32.0 -offset_top = -12.0 -offset_right = 123.0 -offset_bottom = 111.0 -scale = Vector2(2, 2) -texture = ExtResource("4_rasbe") -region_rect = Rect2(-3, -3, 89, 89) -patch_margin_left = 16 -patch_margin_top = 16 -patch_margin_right = 16 -patch_margin_bottom = 16 - [node name="connect_pribor" type="AnimatedSprite2D" parent="capsrpb"] light_mask = 3 position = Vector2(56, -4) @@ -174,23 +153,18 @@ sprite_frames = SubResource("SpriteFrames_foasq") frame_progress = 0.72355 script = ExtResource("11_u7tym") -[node name="5p28" type="TextureButton" parent="."] +[node name="5p28" type="TextureRect" parent="."] editor_description = "Кнопка для отображения внешних соединений." self_modulate = Color(0.788235, 0.788235, 0.788235, 1) layout_mode = 0 offset_left = 1123.0 -offset_top = 992.0 +offset_top = 1021.0 offset_right = 1379.0 -offset_bottom = 1248.0 +offset_bottom = 1277.0 scale = Vector2(0.25, 0.25) size_flags_horizontal = 15 size_flags_vertical = 15 -toggle_mode = true -action_mode = 0 -texture_normal = ExtResource("2_oysma") -stretch_mode = 0 -script = ExtResource("3_4pt7j") -state_colors = [Color(1, 1, 1, 1), Color(0, 0.74, 0.37, 1), Color(0.854902, 0.0705882, 0.0705882, 1)] +texture = ExtResource("2_oysma") [node name="label" type="Label" parent="5p28"] layout_mode = 0 @@ -203,22 +177,6 @@ text = "5П28" horizontal_alignment = 1 vertical_alignment = 1 -[node name="frame" type="NinePatchRect" parent="5p28"] -visible = false -self_modulate = Color(0.890196, 0.486275, 0.196078, 1) -layout_mode = 0 -offset_left = -32.0 -offset_top = -12.0 -offset_right = 123.0 -offset_bottom = 111.0 -scale = Vector2(2, 2) -texture = ExtResource("4_rasbe") -region_rect = Rect2(-3, -3, 89, 89) -patch_margin_left = 16 -patch_margin_top = 16 -patch_margin_right = 16 -patch_margin_bottom = 16 - [node name="connect_pribor" type="AnimatedSprite2D" parent="5p28"] light_mask = 3 position = Vector2(52, -4) @@ -227,23 +185,18 @@ sprite_frames = SubResource("SpriteFrames_foasq") frame_progress = 0.72355 script = ExtResource("11_u7tym") -[node name="akng" type="TextureButton" parent="."] +[node name="akng" type="TextureRect" parent="."] editor_description = "Кнопка для отображения внешних соединений." self_modulate = Color(0.788235, 0.788235, 0.788235, 1) layout_mode = 0 offset_left = 1299.0 -offset_top = 992.0 +offset_top = 1021.0 offset_right = 1555.0 -offset_bottom = 1248.0 +offset_bottom = 1277.0 scale = Vector2(0.25, 0.25) size_flags_horizontal = 15 size_flags_vertical = 15 -toggle_mode = true -action_mode = 0 -texture_normal = ExtResource("2_oysma") -stretch_mode = 0 -script = ExtResource("3_4pt7j") -state_colors = [Color(1, 1, 1, 1), Color(0, 0.74, 0.37, 1), Color(0.854902, 0.0705882, 0.0705882, 1)] +texture = ExtResource("2_oysma") [node name="label" type="Label" parent="akng"] layout_mode = 0 @@ -256,22 +209,6 @@ text = "АКНГ" horizontal_alignment = 1 vertical_alignment = 1 -[node name="frame" type="NinePatchRect" parent="akng"] -visible = false -self_modulate = Color(0.890196, 0.486275, 0.196078, 1) -layout_mode = 0 -offset_left = -32.0 -offset_top = -12.0 -offset_right = 123.0 -offset_bottom = 111.0 -scale = Vector2(2, 2) -texture = ExtResource("4_rasbe") -region_rect = Rect2(-3, -3, 89, 89) -patch_margin_left = 16 -patch_margin_top = 16 -patch_margin_right = 16 -patch_margin_bottom = 16 - [node name="connect_pribor" type="AnimatedSprite2D" parent="akng"] light_mask = 3 position = Vector2(47.9999, -4) @@ -280,23 +217,18 @@ sprite_frames = SubResource("SpriteFrames_foasq") frame_progress = 0.72355 script = ExtResource("11_u7tym") -[node name="maps" type="TextureButton" parent="."] +[node name="maps" type="TextureRect" parent="."] editor_description = "Кнопка для отображения внешних соединений." self_modulate = Color(0.788235, 0.788235, 0.788235, 1) layout_mode = 0 offset_left = 1458.0 -offset_top = 992.0 +offset_top = 1021.0 offset_right = 1714.0 -offset_bottom = 1248.0 +offset_bottom = 1277.0 scale = Vector2(0.25, 0.25) size_flags_horizontal = 15 size_flags_vertical = 15 -toggle_mode = true -action_mode = 0 -texture_normal = ExtResource("2_oysma") -stretch_mode = 0 -script = ExtResource("3_4pt7j") -state_colors = [Color(1, 1, 1, 1), Color(0, 0.74, 0.37, 1), Color(0.854902, 0.0705882, 0.0705882, 1)] +texture = ExtResource("2_oysma") [node name="label" type="Label" parent="maps"] layout_mode = 0 @@ -309,22 +241,6 @@ text = "Карты" horizontal_alignment = 1 vertical_alignment = 1 -[node name="frame" type="NinePatchRect" parent="maps"] -visible = false -self_modulate = Color(0.890196, 0.486275, 0.196078, 1) -layout_mode = 0 -offset_left = -32.0 -offset_top = -12.0 -offset_right = 123.0 -offset_bottom = 111.0 -scale = Vector2(2, 2) -texture = ExtResource("4_rasbe") -region_rect = Rect2(-3, -3, 89, 89) -patch_margin_left = 16 -patch_margin_top = 16 -patch_margin_right = 16 -patch_margin_bottom = 16 - [node name="connect_pribor" type="AnimatedSprite2D" parent="maps"] light_mask = 3 position = Vector2(47.9999, -4) @@ -1249,9 +1165,9 @@ script = ExtResource("11_u7tym") [node name="txr_legend0" type="TextureRect" parent="."] layout_mode = 0 offset_left = 219.0 -offset_top = 1135.0 +offset_top = 1141.0 offset_right = 443.0 -offset_bottom = 1359.0 +offset_bottom = 1365.0 scale = Vector2(0.1, 0.1) texture = ExtResource("7_6j01w") @@ -1259,9 +1175,9 @@ texture = ExtResource("7_6j01w") self_modulate = Color(1, 1, 1, 0.627451) layout_mode = 0 offset_left = 247.0 -offset_top = 1136.0 +offset_top = 1142.0 offset_right = 403.0 -offset_bottom = 1156.0 +offset_bottom = 1162.0 theme_override_font_sizes/font_size = 17 text = "Ожидание результата" @@ -1269,27 +1185,27 @@ text = "Ожидание результата" self_modulate = Color(1, 1, 1, 0.627451) layout_mode = 0 offset_left = 52.0 -offset_top = 1136.0 +offset_top = 1142.0 offset_right = 125.0 -offset_bottom = 1156.0 +offset_bottom = 1162.0 theme_override_font_sizes/font_size = 17 text = "Исправно" [node name="txr_legend1" type="TextureRect" parent="."] layout_mode = 0 offset_left = 26.0001 -offset_top = 1135.0 +offset_top = 1141.0 offset_right = 250.0 -offset_bottom = 1359.0 +offset_bottom = 1365.0 scale = Vector2(0.1, 0.1) texture = ExtResource("8_isjua") [node name="txr_legend2" type="TextureRect" parent="."] layout_mode = 0 offset_left = 476.0 -offset_top = 1135.0 +offset_top = 1141.0 offset_right = 700.0 -offset_bottom = 1359.0 +offset_bottom = 1365.0 scale = Vector2(0.1, 0.1) texture = ExtResource("9_ll0vs") @@ -1297,9 +1213,9 @@ texture = ExtResource("9_ll0vs") self_modulate = Color(1, 1, 1, 0.627451) layout_mode = 0 offset_left = 504.0 -offset_top = 1136.0 +offset_top = 1142.0 offset_right = 548.0 -offset_bottom = 1156.0 +offset_bottom = 1162.0 theme_override_font_sizes/font_size = 17 text = "Сбой" @@ -1316,7 +1232,7 @@ vertical_alignment = 1 [node name="connect_legend0" type="AnimatedSprite2D" parent="."] light_mask = 3 -position = Vector2(1219, 1136) +position = Vector2(1219, 1151) scale = Vector2(0.65, 0.65) sprite_frames = SubResource("SpriteFrames_foasq") frame_progress = 0.72355 @@ -1329,11 +1245,12 @@ offset_right = 103.923 offset_bottom = 3.61538 scale = Vector2(1.54, 1.54) text = "Отключен" +metadata/_edit_use_anchors_ = true [node name="connect_legend1" type="AnimatedSprite2D" parent="."] self_modulate = Color(0, 1, 0, 1) light_mask = 3 -position = Vector2(975, 1136) +position = Vector2(975, 1152) scale = Vector2(0.65, 0.65) sprite_frames = SubResource("SpriteFrames_foasq") frame = 1 @@ -1346,11 +1263,26 @@ offset_right = 99.9231 offset_bottom = 5.15385 scale = Vector2(1.54, 1.54) text = "На связи" +metadata/_edit_use_anchors_ = true + +[node name="line0" type="Line2D" parent="."] +position = Vector2(936, 936) +points = PackedVector2Array(-8, 0, 608, 0) +width = 2.0 +default_color = Color(1, 1, 1, 0.352941) + +[node name="line1" type="Line2D" parent="."] +position = Vector2(936, 1128) +points = PackedVector2Array(-8, 0, 608, 0) +width = 2.0 +default_color = Color(1, 1, 1, 0.352941) + +[node name="line2" type="Line2D" parent="."] +position = Vector2(32, 1128) +points = PackedVector2Array(-8, 0, 608, 0) +width = 2.0 +default_color = Color(1, 1, 1, 0.352941) -[connection signal="toggled" from="capsrpb" to="capsrpb" method="_on_toggled"] -[connection signal="toggled" from="5p28" to="5p28" method="_on_toggled"] -[connection signal="toggled" from="akng" to="akng" method="_on_toggled"] -[connection signal="toggled" from="maps" to="maps" method="_on_toggled"] [connection signal="toggled" from="pribor_uf" to="pribor_uf" method="_on_toggled"] [connection signal="toggled" from="pribor_rtr" to="pribor_rtr" method="_on_toggled"] [connection signal="toggled" from="pribor_afsp_1" to="pribor_afsp_1" method="_on_toggled"] diff --git a/scenes/работа/работа.tscn b/scenes/работа/работа.tscn index 6d645182..64b1bbd5 100644 --- a/scenes/работа/работа.tscn +++ b/scenes/работа/работа.tscn @@ -305,6 +305,6 @@ text = "Масштаб:" [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="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"] [connection signal="toggled" from="btn_center" to="." method="on_btn_center_toggled"]