From f15f3775a9ec1024eaefd7b2239a8a8aae7ea61a Mon Sep 17 00:00:00 2001 From: MaD_CaT Date: Tue, 25 Jul 2023 14:42:52 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9D=D0=B0=D1=81=D1=82=D1=80=D0=BE=D0=B9?= =?UTF-8?q?=D0=BA=D0=B0=20=D0=A1=D0=9A=D0=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scenes/журнал.gd | 3 +++ scenes/работа.gd | 5 +++++ scripts/repsettings.gd | 6 ++++++ scripts/threats.gd | 3 +++ table/table.gd | 21 +++++++++++++++++++++ 5 files changed, 38 insertions(+) diff --git a/scenes/журнал.gd b/scenes/журнал.gd index 416fc57..81ef5e0 100644 --- a/scenes/журнал.gd +++ b/scenes/журнал.gd @@ -14,6 +14,9 @@ func _on_clear_button_down() -> void: $content.clear() Log.info('Cодержание журнала очищено оператором') <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> sasha/master +======= >>>>>>> sasha/master ======= >>>>>>> sasha/master diff --git a/scenes/работа.gd b/scenes/работа.gd index ce778d9..f070dde 100644 --- a/scenes/работа.gd +++ b/scenes/работа.gd @@ -156,6 +156,7 @@ func toggle_full_screen(id: int): func _on_full_screen(): <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD toggle_full_screen(window_1_id) toggle_full_screen(window_0_id) @@ -171,3 +172,7 @@ func _on_btn_down(signal_name: String) -> void: toggle_full_screen(window_0_id) >>>>>>> sasha/master +======= + toggle_full_screen(window_0_id) + +>>>>>>> sasha/master diff --git a/scripts/repsettings.gd b/scripts/repsettings.gd index 1ca6155..0e152e1 100644 --- a/scripts/repsettings.gd +++ b/scripts/repsettings.gd @@ -1,5 +1,6 @@ extends Node +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD @export var addr: Dictionary = { \ @@ -24,6 +25,8 @@ extends Node ======= ======= >>>>>>> sasha/master +======= +>>>>>>> sasha/master @export var addr: = { \ # Название Протокол Адрес Порт Широков. Привяз. Комментарий @@ -50,6 +53,9 @@ extends Node func _ready() -> void: Log.info('Модуль настроек готов') <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> sasha/master +======= >>>>>>> sasha/master ======= >>>>>>> sasha/master diff --git a/scripts/threats.gd b/scripts/threats.gd index 1ec94e3..3b7d9d6 100644 --- a/scripts/threats.gd +++ b/scripts/threats.gd @@ -82,7 +82,10 @@ var _threats = {} func _ready() -> void: Log.info('Модуль обработки целей готов') +<<<<<<< HEAD <<<<<<< HEAD >>>>>>> sasha/master ======= >>>>>>> sasha/master +======= +>>>>>>> sasha/master diff --git a/table/table.gd b/table/table.gd index 653bfd5..69496b9 100644 --- a/table/table.gd +++ b/table/table.gd @@ -106,6 +106,7 @@ func _ready(): assert(ScnNode) +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD func align_to_left_bottom(header, gap: = Vector2(0, 0)): @@ -116,12 +117,17 @@ func align_to_left_bottom(header, gap: = Vector2(0, 0)): ======= ======= >>>>>>> sasha/master +======= +>>>>>>> sasha/master func align_to_left_bottompos(hdr: Control, gap: = Vector2(0, 0)): """ Выравнивает по нижнему левому углу. Используется для выравнивания по заголовку """ position.x = hdr.position.x + gap.x position.y = hdr.position.y + hdr.size.y + gap.y <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> sasha/master +======= >>>>>>> sasha/master ======= >>>>>>> sasha/master @@ -255,6 +261,9 @@ func check_event_pos(event_pos: Vector2, obj: Control): and (event_pos.y > obj.position.y) \ and (event_pos.y < (obj.position.y + obj.size.y)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> sasha/master +======= >>>>>>> sasha/master ======= >>>>>>> sasha/master @@ -288,6 +297,9 @@ func default_selector_size_proc(i_row: int, rect: Array) -> void: rect[2] += node_gap.x rect[3] += node_gap.y <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> sasha/master +======= >>>>>>> sasha/master ======= >>>>>>> sasha/master @@ -362,6 +374,9 @@ func get_selected_rows(i_rows: Array) -> void: var indexes = get_key_indexes(key) i_rows.append(indexes[1]) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> sasha/master +======= >>>>>>> sasha/master ======= >>>>>>> sasha/master @@ -603,6 +618,7 @@ func clear_rows() -> void: remove_row(i_row) +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD func set_callbacks(dest_node: Node, event_name: String, callback: String, clmns: Array, user_data: Array) -> void: @@ -629,6 +645,8 @@ func set_callbacks(dest_node: Node, event_name: String, callback: String, clmns: ======= ======= >>>>>>> sasha/master +======= +>>>>>>> sasha/master func connect_columns(dest_node: Node, event_name: String, callback: String, clmns: Array, user_data: Array) -> void: """ Настраивает обратные вызовы для колонок. :dest_node: Получатель события @@ -722,12 +740,15 @@ func get_row_text(i_row: int) -> Array: func set_row_text(i_row: int, row: Array, i_begin: int = 0, key_format: String = NODE_KEY_FORMAT) -> void: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD for i_col in columns - i_begin: var key: = get_node_key(key_format, i_col + i_begin, i_row) nodes[key].text = row[i_col] ======= ======= +>>>>>>> sasha/master +======= >>>>>>> sasha/master assert(i_begin >= 0) assert((columns - i_begin) <= row.size())