diff --git a/scenes/работа/работа.gd b/scenes/работа/работа.gd index 75123d4..c0e23f1 100644 --- a/scenes/работа/работа.gd +++ b/scenes/работа/работа.gd @@ -311,7 +311,7 @@ func on_button_pressed(btn_this, btn_others) -> void: for btn_other in btn_others: btn_other.set_pressed(btn_this == btn_other) var interfer_name: String = btn_this.get_meta('rfi_name') for key in fs_selected.keys(): - fs_arr.append(get_fs_param(key)) + fs_arr.append(prd.get_fs_param(key)) signaller.emit_signal('interfer_init', interfer_name, fs_arr) @@ -468,15 +468,6 @@ func set_ecm_btns_state(value: bool): set_btns_disabled(value, btn) -func get_fs_param(index: int) -> Array: - var freq = (prd.FS_FREQ[index / 4][2]) - var sector = (prd.FS_SECTORS[index % 4][0] + prd.FS_SECTORS[index % 4][1])/2 - 45.0 - if sector < 0: - sector += 360.0 - var width = prd.FS_FREQ[index / 4][1] - prd.FS_FREQ[index / 4][0] - return [sector, freq, width, index] - - func on_fs_selected(ecm): var fs_index_arr: Array = [] prd.get_fs_index(ecm, fs_index_arr) @@ -506,7 +497,7 @@ func on_interfer_prinuditelno (prenuditelno_sectors, btns): for key in prenuditelno_sectors: var sectors = [] for sector in prenuditelno_sectors[key]: - sectors.append(get_fs_param(sector)) + sectors.append(prd.get_fs_param(sector)) signaller.emit_signal('interfer_init', key, sectors) update_fs_colors() for btn in btns: diff --git a/scripts/prd.gd b/scripts/prd.gd index 7809ffd..51f58cc 100644 --- a/scripts/prd.gd +++ b/scripts/prd.gd @@ -282,6 +282,15 @@ func _ready() -> void: unit_caps.connect('data_received', Callable(self, 'on_data_capsrpb_received')) +func get_fs_param(index: int) -> Array: + var freq = (FS_FREQ[index / 4][2]) + var sector = (FS_SECTORS[index % 4][0] + FS_SECTORS[index % 4][1])/2 - 45.0 + if sector < 0: + sector += 360.0 + var width = FS_FREQ[index / 4][1] - FS_FREQ[index / 4][0] + return [sector, freq, width, index] + + ## Функция возвращает массив с индексами модулей ФС для выбранной помехи func get_fs_index(ecm, fs_index_arr): var sector: int