Исправления. Исправления работы выбора угла места.

This commit is contained in:
MaD_CaT
2025-09-29 13:22:41 +03:00
parent 9a03434fe1
commit 37ca1aced6
6 changed files with 18 additions and 16 deletions

View File

@@ -56,7 +56,6 @@ offset_right = 20.0
offset_bottom = 20.0
theme_override_styles/panel = SubResource("1")
script = ExtResource("1_ui6sg")
font_size = null
[node name="back" type="Sprite2D" parent="."]
material = SubResource("ShaderMaterial_hhdyc")

View File

@@ -57,7 +57,7 @@ size_flags_vertical = 3
tooltip_text = "Включает принудительную помеху"
strips_rotation = 15.0
text = "СРН"
font_size = null
font_size = 1
metadata/rfi_name = "srn"
[node name="btn_jtids" parent="grd_forced" groups=["группа-принудительно"] instance=ExtResource("4_7ys3c")]
@@ -67,7 +67,7 @@ size_flags_horizontal = 3
size_flags_vertical = 3
strips_rotation = 15.0
text = "СПРС"
font_size = null
font_size = 1
metadata/rfi_name = "sprs"
[node name="btn_kupd" parent="grd_forced" groups=["группа-принудительно"] instance=ExtResource("4_7ys3c")]
@@ -77,7 +77,7 @@ size_flags_vertical = 3
tooltip_text = "Кнопка для принудительного включения группы секторов в режим КУПД"
strips_rotation = 15.0
text = "КУПД"
font_size = null
font_size = 1
metadata/rfi_name = "kupd"
[node name="btn_panika" parent="grd_forced" groups=["группа-принудительно"] instance=ExtResource("4_7ys3c")]
@@ -87,7 +87,7 @@ size_flags_vertical = 3
tooltip_text = "Кнопка для принудительного включения группы секторов в режим КУПД"
strips_rotation = 15.0
text = "Паника"
font_size = null
font_size = 1
metadata/rfi_name = "<off>"
[node name="btn_cancel" parent="grd_forced" groups=["прин-секторы-срн"] instance=ExtResource("4_7ys3c")]
@@ -96,5 +96,5 @@ size_flags_horizontal = 3
size_flags_vertical = 3
strips_rotation = 15.0
text = "Очистить"
font_size = null
font_size = 1
metadata/rfi_name = "<off>"

View File

@@ -174,7 +174,7 @@ size_flags_vertical = 3
tooltip_text = "Кнопка для выбора сектора при помощи клика мышкой"
strips_rotation = 25.0
text = "Строб"
font_size = null
font_size = 1
metadata/state = 0
[node name="btn_threats" parent="btns_select" groups=["группа-режим-выбора"] instance=ExtResource("8_k0iv2")]
@@ -184,7 +184,7 @@ size_flags_vertical = 3
tooltip_text = "Кнопка для выбора сектора при помощи клика мышкой"
strips_rotation = 25.0
text = "Цель"
font_size = null
font_size = 1
metadata/state = 1
[node name="btn_fs_sector" parent="btns_select" groups=["группа-режим-выбора"] instance=ExtResource("8_k0iv2")]
@@ -194,7 +194,7 @@ size_flags_vertical = 3
tooltip_text = "Кнопка для выбора сектора при помощи клика мышкой"
strips_rotation = 25.0
text = "Сектор"
font_size = null
font_size = 1
metadata/state = 2
[node name="chk_auto" type="CheckBox" parent="."]
@@ -308,6 +308,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"]

View File

@@ -81,7 +81,7 @@ offset_right = 1583.0
offset_bottom = 85.0
strips_rotation = 10.0
text = "Прочитать"
font_size = null
font_size = 1
[node name="btn_flash_write" parent="." instance=ExtResource("2_eju8r")]
layout_mode = 0
@@ -91,7 +91,7 @@ offset_right = 1583.0
offset_bottom = 129.0
strips_rotation = 10.0
text = "Записать"
font_size = null
font_size = 1
[node name="btn_save" type="Button" parent="."]
layout_mode = 0

View File

@@ -402,6 +402,8 @@ func interfer_create(u, interfer_name, ecms, param, kni, id, dict, source_interf
func send_ecm(ecm, unit0) -> void:
if ecm.krp != INTERFER_OFF:
if not emit_enable:
ecm.svk = 0
call_deferred('emit_signal', 'interfer_update', ecm)
return
msg6_num += 1
var json_data = ecm.get_msg6_data(msg6_num)

View File

@@ -93,11 +93,11 @@ var fs_caps_id: Dictionary ## Словарь соответствия номе
class Fs:
const UM_PORTS: Dictionary = {
1 : 0x106,
2 : 0x10A,
2 : 0x108,
3 : 0x106,
4 : 0x10A,
4 : 0x108,
5 : 0x106,
6 : 0x10A }
6 : 0x108 }
const CODE_UM: Array = [
[-5, 0],
@@ -145,7 +145,7 @@ class Fs:
if UM_PORTS.has(index/4):
var val = um_code_tx
if u.isa_ports.has(um_port):
val = tools.set_bits(u.isa_ports[um_port], um_code_tx, 0x0003)
val = tools.set_bits(u.isa_ports[um_port], um_code_tx, 0x0007)
data_arr.append(um_port)
data_arr.append(val)
@@ -225,6 +225,7 @@ class PRD:
func execute_cmd():
if not len(cmd_array): return
if unit_yau07.cmd_state != unit_yau07.CmdState.DONE: return
var cmd: Array = cmd_array.pop_front()
unit_yau07.send_isa(cmd[0], cmd[1])