Merge remote-tracking branch 'refs/remotes/sasha/master'

2025-11-24 15:11:09 +03:00
parent 6b8f767a89 88ff8c215f
commit fe10598005
20 changed files with 110 additions and 91 deletions
--- a/scenes/tilemap/23900.png
+++ b/scenes/tilemap/23900.png
--- a/scenes/tilemap/23900.png.import
+++ b/scenes/tilemap/23900.png.import
@@ -3,15 +3,15 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://cj1f2uy6qfvki"
-path="res://.godot/imported/23900.png-aba6c607cdfb6350afef981f7b82f108.ctex"
+path="res://.godot/imported/23900.png-d040ccca5d0a90ed3fecc02e14cd833c.ctex"
 metadata={
 "vram_texture": false
 }

 [deps]

-source_file="res://scenes/tilemap/23900.png"
-dest_files=["res://.godot/imported/23900.png-aba6c607cdfb6350afef981f7b82f108.ctex"]
+source_file="res://data/23900.png"
+dest_files=["res://.godot/imported/23900.png-d040ccca5d0a90ed3fecc02e14cd833c.ctex"]

 [params]

--- a/scenes/tilemap/dot.png
+++ b/scenes/tilemap/dot.png
--- a/scenes/tilemap/dot.png.import
+++ b/scenes/tilemap/dot.png.import
@@ -3,15 +3,15 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://cgqo5gucd2be0"
-path="res://.godot/imported/dot.png-e35f44878005aaa12b3432f2608ddde5.ctex"
+path="res://.godot/imported/dot.png-5d2b863cff34eea0d0b20ed5476ff90e.ctex"
 metadata={
 "vram_texture": false
 }

 [deps]

-source_file="res://scenes/tilemap/dot.png"
-dest_files=["res://.godot/imported/dot.png-e35f44878005aaa12b3432f2608ddde5.ctex"]
+source_file="res://data/dot.png"
+dest_files=["res://.godot/imported/dot.png-5d2b863cff34eea0d0b20ed5476ff90e.ctex"]

 [params]

--- a/table/nine-patch.png
+++ b/table/nine-patch.png
--- a/data/nine-patch.png.import
+++ b/data/nine-patch.png.import
@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://c0xt35lvgd5nx"
+path="res://.godot/imported/nine-patch.png-b3022b5c868bc85e271b731e8fa2ec8a.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://data/nine-patch.png"
+dest_files=["res://.godot/imported/nine-patch.png-b3022b5c868bc85e271b731e8fa2ec8a.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
--- a/scenes/tilemap/threat.png
+++ b/scenes/tilemap/threat.png
--- a/scenes/tilemap/threat.png.import
+++ b/scenes/tilemap/threat.png.import
@@ -3,15 +3,15 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://mobingoxskg1"
-path="res://.godot/imported/threat.png-602b9c318dc5f1342d23490e047ca526.ctex"
+path="res://.godot/imported/threat.png-1a67637e693cb1772ca6118255edb5e4.ctex"
 metadata={
 "vram_texture": false
 }

 [deps]

-source_file="res://scenes/tilemap/threat.png"
-dest_files=["res://.godot/imported/threat.png-602b9c318dc5f1342d23490e047ca526.ctex"]
+source_file="res://data/threat.png"
+dest_files=["res://.godot/imported/threat.png-1a67637e693cb1772ca6118255edb5e4.ctex"]

 [params]

--- a/docs/build.sh
+++ b/docs/build.sh
@@ -1,4 +0,0 @@
-#!/usr/bin/env bash
-
-dot -Tpng "структура.dot" -o "структура.png"
-pandoc -f markdown_strict --verbose "README.md" > "README.doc"
--- a/docs/струкура-по.dot
+++ b/docs/струкура-по.dot
@@ -1,38 +0,0 @@
-digraph "Прибор УФ"
-{
-  graph [nodesep=0.5, overlap = false];
-  node [shape=box, overlap = false];
-  eth0           [label="eth0", shape=cds];
-  eth1           [label="eth1", shape=cds];
-  eth2           [label="eth2", shape=cds];
-  tty0           [label="tty0", shape=cds];
-  tty1           [label="tty1", shape=cds];
-  tty2           [label="tty2", shape=cds];
-  proto_capsrpb  [label="Протокол КАПС-РПБ"];
-  proto_5p28     [label="Протокол 5П-28"];
-  uarep_uart     [label="UART ModBus"];
-  uarep_ctl      [label="ПО УАРЭП"];
-  caps_rpb       [label="СПО \"КАПС РПБ\""];
-  p16            [label="П16", shape=plaintext, style=filled];
-  spt25left      [label="СПТ25 левый борт", shape=plaintext, style=filled];
-  spt25right     [label="СПТ25 правый борт", shape=plaintext, style=filled];
-
-  eth0 -> proto_5p28;
-  eth1 -> proto_5p28;
-  eth0 -> proto_capsrpb;
-  eth1 -> proto_capsrpb;
-  eth0 -> uarep_uart;
-  eth1 -> uarep_uart;
-  eth2 -> caps_rpb;
-  proto_5p28 -> uarep_ctl;
-  uarep_uart -> uarep_ctl;
-  uarep_uart -> tty0;
-  uarep_uart -> tty1;
-  uarep_uart -> tty2;
-  uarep_ctl -> caps_rpb;
-  proto_capsrpb -> caps_rpb;
-  p16 -> eth0 [style=invis]
-  p16 -> eth1 [style=invis]
-  spt25left -> tty0 [style=invis]
-  spt25right -> tty1 [style=invis]
-}
--- a/scenes/tabs-switch/tab-switch.tscn
+++ b/scenes/tabs-switch/tab-switch.tscn
@@ -8,7 +8,7 @@
 [ext_resource type="PackedScene" uid="uid://musb21x2u0xs" path="res://scenes/эмс2/эмс2.tscn" id="6_41d34"]
 [ext_resource type="PackedScene" uid="uid://bnptm4rlp60dq" path="res://scenes/настройки/настройки.tscn" id="6_i8iv3"]
 [ext_resource type="Script" uid="uid://b5ykwyk5vpi6" path="res://scenes/tabs-switch/lbl_ready.gd" id="8_tidwt"]
-[ext_resource type="Script" uid="uid://roajn6c6wvc1" path="res://scenes/tabs-switch/тренаж_режим.gd" id="9_41d34"]
+[ext_resource type="Script" path="res://scenes/tabs-switch/тренаж_режим.gd" id="9_41d34"]

 [sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_tidwt"]

--- a/scenes/tilemap/mark.tscn
+++ b/scenes/tilemap/mark.tscn
@@ -1,6 +1,6 @@
 [gd_scene load_steps=2 format=3 uid="uid://ce5mtxqd1ndru"]

-[ext_resource type="Texture2D" uid="uid://cgqo5gucd2be0" path="res://scenes/tilemap/dot.png" id="2_rq0y0"]
+[ext_resource type="Texture2D" uid="uid://cgqo5gucd2be0" path="res://data/dot.png" id="2_rq0y0"]

 [node name="rect" type="TextureRect"]
 offset_left = -16.0
--- a/scenes/tilemap/ship_mark.tscn
+++ b/scenes/tilemap/ship_mark.tscn
@@ -1,6 +1,6 @@
 [gd_scene load_steps=2 format=3 uid="uid://c2523fcn14gn4"]

-[ext_resource type="Texture2D" uid="uid://cj1f2uy6qfvki" path="res://scenes/tilemap/23900.png" id="1_v0nwa"]
+[ext_resource type="Texture2D" uid="uid://cj1f2uy6qfvki" path="res://data/23900.png" id="1_v0nwa"]

 [node name="23900" type="Sprite2D"]
 scale = Vector2(0.496934, 0.496934)
--- a/scenes/tilemap/threat.tscn
+++ b/scenes/tilemap/threat.tscn
@@ -1,6 +1,6 @@
 [gd_scene load_steps=2 format=3 uid="uid://cv342kc1jj5hb"]

-[ext_resource type="Texture2D" uid="uid://mobingoxskg1" path="res://scenes/tilemap/threat.png" id="1_pvxsy"]
+[ext_resource type="Texture2D" uid="uid://mobingoxskg1" path="res://data/threat.png" id="1_pvxsy"]

 [node name="Threat" type="Sprite2D"]
 scale = Vector2(0.0244268, 0.0244268)
--- a/scenes/контроль/кнопка-прибора.gd
+++ b/scenes/контроль/кнопка-прибора.gd
@@ -5,7 +5,23 @@ extends TextureButton
@export var state_colors: Array

 func _on_toggled(toggled_on): $frame.visible = toggled_on
-func _enter_tree() -> void: $label.self_modulate = state_colors[state]
+
+
+func _enter_tree() -> void:
+    $label.self_modulate = state_colors[state]
+    ProjectSettings.connect('settings_changed', _on_settings_changed)
+
+
+func _exit_tree() -> void:
+    ProjectSettings.disconnect('settings_changed', _on_settings_changed)
+
+
+func _on_settings_changed():
+    if not is_inside_tree(): return
+    var white_color = ProjectSettings.get_setting('Схема прибора. Белый цвет', Color.DIM_GRAY)
+    var black_color = ProjectSettings.get_setting('Схема прибора. Чёрный цвет', Color.CORAL)
+    $pic_functional.material.set('shader_parameter/white', white_color)
+    $pic_functional.material.set('shader_parameter/black', black_color)


@export var state: int:
--- a/scenes/контроль/контроль.tscn
+++ b/scenes/контроль/контроль.tscn
@@ -1,4 +1,4 @@
-[gd_scene load_steps=27 format=3 uid="uid://lwmw4egynmd1"]
+[gd_scene load_steps=26 format=3 uid="uid://lwmw4egynmd1"]

 [ext_resource type="Texture2D" uid="uid://bar8k5qef7kch" path="res://data/УФ.png" id="2_0nvm1"]
 [ext_resource type="Script" uid="uid://q3gmpsqspjfp" path="res://scenes/контроль/внешний.gd" id="2_8r80x"]
@@ -22,7 +22,6 @@
 [ext_resource type="Texture2D" uid="uid://vdhmga62vjsj" path="res://data/АФСП-РТР.png" id="13_32yvq"]
 [ext_resource type="Texture2D" uid="uid://dm350ta8noa0v" path="res://data/У-РЭП-РПД-К.png" id="16_32yvq"]
 [ext_resource type="Texture2D" uid="uid://c3cyog3gy24ft" path="res://data/У-ЭП.png" id="16_gjf0t"]
-[ext_resource type="Texture2D" uid="uid://cllxcfa130vqu" path="res://data/УА-РЭП.png" id="22_1s34a"]

 [sub_resource type="GDScript" id="GDScript_iqgf5"]
 script/source = "extends Panel
@@ -131,7 +130,7 @@ func clean_pribor_items():
 func on_pribor_press(pribor_path, header_text, pribor_node):
    if cur_pribor_node:
        cur_pribor_node.show_functional = false
-        $lbl_header/chk_show_functional.button_pressed = false
+        $chk_show_functional.button_pressed = false
    cur_pribor_node = pribor_node
    clean_pribor_items()
    var pribor_obj = load(pribor_path)
@@ -143,6 +142,7 @@ func on_pribor_press(pribor_path, header_text, pribor_node):
        push_error('экземпляр не создан: \\\"%s\\\" (%s)' % [pribor_path, header_text])
        return
    $lbl_header.text = header_text
+    $chk_show_functional.disabled = false
    var meta_list = pribor_node.get_meta_list()
    if meta_list.find('unit_name') > -1:
        var unit_name = pribor_node.get_meta('unit_name')
@@ -183,8 +183,8 @@ animations = [{

 [sub_resource type="ShaderMaterial" id="ShaderMaterial_71ec4"]
 shader = ExtResource("9_71ec4")
-shader_parameter/grey = Vector3(0.14, 0.13, 0.13)
-shader_parameter/orange = Vector3(0.95, 0.55, 0.05)
+shader_parameter/white = Vector3(0.14, 0.13, 0.13)
+shader_parameter/black = Vector3(0.95, 0.55, 0.05)
 shader_parameter/gamma = 2.0

 [node name="Контроль" type="Panel"]
@@ -1568,16 +1568,6 @@ text = "Контроль исправности прибора"
 horizontal_alignment = 1
 vertical_alignment = 1

-[node name="chk_show_functional" type="CheckButton" parent="lbl_header"]
-layout_mode = 0
-offset_left = 972.0
-offset_top = -1.0
-offset_right = 1351.0
-offset_bottom = 33.0
-theme_override_font_sizes/font_size = 22
-text = "Показть функциональную схему Э2"
-flat = true
-
 [node name="connect_legend0" type="AnimatedSprite2D" parent="."]
 light_mask = 3
 position = Vector2(1219, 1151)
@@ -1631,17 +1621,17 @@ points = PackedVector2Array(-8, 0, 608, 0)
 width = 2.0
 default_color = Color(1, 1, 1, 0.352941)

-[node name="pic_functional" type="TextureRect" parent="."]
-visible = false
+[node name="chk_show_functional" type="CheckButton" parent="."]
 layout_mode = 0
-offset_left = -962.0
-offset_top = 73.0
-offset_right = 96.9999
-offset_bottom = 746.0
-scale = Vector2(5, 5)
-texture = ExtResource("22_1s34a")
+offset_left = 1050.0
+offset_top = 26.0
+offset_right = 1429.0
+offset_bottom = 60.0
+theme_override_font_sizes/font_size = 22
+disabled = true
+text = "Показть функциональную схему Э2"
+flat = true

-[connection signal="gui_input" from="." to="." method="_on_gui_input"]
 [connection signal="toggled" from="pribor_prd_n_1" to="pribor_prd_n_1" 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"]
@@ -1659,4 +1649,4 @@ texture = ExtResource("22_1s34a")
 [connection signal="toggled" from="pribor_prd_v_4" to="pribor_prd_v_4" method="_on_toggled"]
 [connection signal="toggled" from="pribor_prd_n_4" to="pribor_prd_n_4" method="_on_toggled"]
 [connection signal="toggled" from="pribor_prd_k_4" to="pribor_prd_k_4" method="_on_toggled"]
-[connection signal="toggled" from="lbl_header/chk_show_functional" to="." method="_on_chk_show_functional_toggled"]
+[connection signal="toggled" from="chk_show_functional" to="." method="_on_chk_show_functional_toggled"]
--- a/settings.json
+++ b/settings.json
@@ -4,6 +4,7 @@
  "Адрес БПО левого борта": "http://172.22.246.13:8081/selftest?presetType=bpo&400000000",
  "Адрес БПО правого борта": "http://172.22.246.11:8082/selftest?presetType=bpo&400000000",
  "Виртуальная клавиатура": false,
+  "Включить работу по своим целям": true,
  "Внешнее указание Трасса": false,
  "Внешнее управление": false,
  "Кнопка «JTIDS»": false,
@@ -26,29 +27,31 @@
  "Период опроса состояния АФСП, секунды": "30",
  "Период опроса состояния БПО, секунды": "30",
  "Скрыть вкладку ЭМС 2": true,
+  "Список своих протоколов": "j11",
+  "Схема прибора. Белый цвет": [1.0, 1.0, 1.0],
+  "Схема прибора. Чёрный цвет": [0.0, 0.0, 0.0],
  "Текущая версия ПО УАРЭП": "master b2633d8 Thu Sep 11 16:26:39 2025 +0300",
-  "Шаблон адреса сервера карт": "http://10.1.1.2:8001/osm_tiles/{z}/{x}/{y}.png",
+  "Шаблон адреса сервера карт": "http://169.254.27.71:8001/osm_tiles/{z}/{x}/{y}.png",
  "навигация": [
    "*",
    60000,
    true,
    true
  ],
-  "уареп-трасса": "127.0.0.1,127.0.0.1,50200,10004",
  "уарэп-5п28": [
    "127.0.0.1",
    50777
  ],
  "уарэп-капсрпб": [
-    "192.168.11.102",
-    "192.168.11.105",
+    "127.0.0.1",
+    "127.0.0.1",
    42023,
    42022,
    false,
    true
  ],
  "уарэп-спт25-1": [
-    "/home/user/tty0",
+    "/home/sasha/dev/tty0",
    0,
    19200,
    "N",
@@ -56,15 +59,23 @@
    1
  ],
  "уарэп-спт25-2": [
-    "/home/user/tty1",
+    "/home/sasha/dev/tty4",
    0,
    19200,
    "N",
    8,
    1
  ],
+  "уарэп-трасса": [
+    "127.0.0.1",
+    "127.0.0.1",
+    50200,
+    10004,
+    false,
+    true
+  ],
  "уарэп-щ3": [
-    "/home/user/tty3",
+    "/home/sasha/dev/tty2",
    7,
    19200,
    "N",
--- a/shaders/blur.gdshader
+++ b/shaders/blur.gdshader
@@ -0,0 +1,9 @@
+// A Gaussian blur shader for Godot 4.3
+shader_type canvas_item;
+uniform sampler2D SCREEN_TEXTURE : hint_screen_texture, filter_linear_mipmap;
+uniform float lod: hint_range(0.0, 3.0) = 2.0;
+
+void fragment()
+{
+    COLOR.rgb = texture(SCREEN_TEXTURE, SCREEN_UV, lod).rgb;
+}
--- a/shaders/blur.gdshader.uid
+++ b/shaders/blur.gdshader.uid
@@ -0,0 +1 @@
+uid://qe0q7aqqbe4u
--- a/shaders/two-color.gdshader
+++ b/shaders/two-color.gdshader
@@ -1,7 +1,7 @@
 shader_type canvas_item;

-uniform vec3 grey = vec3(0.14, 0.13, 0.13);
-uniform vec3 orange = vec3(0.95, 0.55, 0.05);
+uniform vec3 white = vec3(0.14, 0.13, 0.13);
+uniform vec3 black = vec3(0.95, 0.55, 0.05);
 uniform float gamma = 2.0;

 vec3 bw_to_2color(vec3 c, vec3 dark, vec3 light)
@@ -13,5 +13,5 @@ vec3 bw_to_2color(vec3 c, vec3 dark, vec3 light)

 void fragment()
 {
-	COLOR.rgb = bw_to_2color(texture(TEXTURE, UV).rgb, grey, orange);
+	COLOR.rgb = bw_to_2color(texture(TEXTURE, UV).rgb, white, black);
 }