diff --git a/fs.gd b/fs.gd index e3b7a36..451e84c 100644 --- a/fs.gd +++ b/fs.gd @@ -5,13 +5,13 @@ const btn_txr1: Texture2D = preload('res://grey.png') const btn_txr2: Texture2D = preload('res://blue.png') const btn_txr3: Texture2D = preload('res://red.png') -const BANDS: Array = [[400, 1200], - [1200, 2000], - [2000, 2800], - [2800, 3600], - [3600, 4400], - [4400, 5200], - [5200, 6000] +const BANDS: Array = [[370, 800], + [800, 1065], + [1065, 1180], + [1180, 1450], + [1450, 2000], + [2000, 3500], + [3500, 6000] ] const SECTORS: Array = [[314.5, 44.5], [44.5, 134.5], @@ -98,13 +98,13 @@ class Fs: var sector: int var litera: int var interfer = null - + func _init(sec, lit, id): nmfs = id litera = lit sector = sec isg = 1 - + func fs_off(): freq = '' pow = '' @@ -116,34 +116,34 @@ class Fs: btn.set_texture_normal(btn_txr0) elif isg == 2: btn.set_texture_normal(btn_txr1) - - + + func init_lbls(tab, x0, y0): for i in range(len(LBLS_SEC)): var lbl_sec = Label.new() tab.add_child(lbl_sec) lbl_sec.position = Vector2(x0 - 100, y0 - 5 + i * 50) lbl_sec.text = LBLS_SEC[i] - + for i in range(len(LBLS_LIT)): var lbl_lit = Label.new() tab.add_child(lbl_lit) lbl_lit.position = Vector2(x0 -5 + i * 50, y0 - 25) lbl_lit.text = LBLS_LIT[i] - + for i in range(len(LBLS_PARAM)): var lbl_param = Label.new() tab.add_child(lbl_param) lbl_param.position = Vector2(x0 + 350, y0 - 25 + i * 25) lbl_param.text = LBLS_PARAM[i] - + for i in range(len(LBLS_PARAM) - 1): var lbl_param_val = Label.new() tab.add_child(lbl_param_val) lbls_param_val.append(lbl_param_val) lbl_param_val.position = Vector2(x0 + 600, y0 - 25 + i * 25) lbl_param_val.text = '' - + tab.add_child(g_opt_btn) g_opt_btn.position = Vector2(x0 + 550, y0 - 5 + 150) for opt in OPT_BTN_TEXT: @@ -228,7 +228,7 @@ func set_fs(interfer: Interfers.Interfer): for i in range(len(BANDS)): if (float(freq) >= BANDS[i][0]) and (float(freq) <= BANDS[i][1]): lit = i+1 - + if (float(interfer.options['kni']) < 0) or (float(interfer.options['kni'] > 360)): fs_of_old(interfer) return 2 diff --git a/interfers.gd b/interfers.gd index ba82fa6..7fd3acf 100644 --- a/interfers.gd +++ b/interfers.gd @@ -69,7 +69,7 @@ class Interfer: var svk: int = 0 var row_id: int var active_fs: fs.Fs - + func _init(data: Dictionary): options.merge(data, true) @@ -182,8 +182,8 @@ func get_msg7_data(): func on_row_pressed(i_row: int, table): pass - - + + func off_interfer(json_data): if not interfers.has(json_data['ispp']): return var row_id = interfers[json_data['ispp']].row_id diff --git a/main.gd b/main.gd index f10a98b..bb01577 100644 --- a/main.gd +++ b/main.gd @@ -15,12 +15,12 @@ var sock = PacketPeerUDP.new() # Called when the node enters the scene tree for the first time. func _ready(): var nodes: Dictionary = { - 'btn_add': btn_add_threats, - 'btn_del': btn_del_threats, - 'btn_save': btn_save_threats, - 'btn_load': btn_load_threats, - 'btn_rt': btn_rotate, - 'entry_rt': entry_rotate, + 'btn_add': btn_add_threats, + 'btn_del': btn_del_threats, + 'btn_save': btn_save_threats, + 'btn_load': btn_load_threats, + 'btn_rt': btn_rotate, + 'entry_rt': entry_rotate, 'chkbx_rt': chkbx_rotate} sock.bind(Consts.MAIN_ADDR[1], Consts.MAIN_ADDR[0]) sock.set_dest_address(Consts.DST_ADDR[0], Consts.DST_ADDR[1]) diff --git a/tools.gd b/tools.gd index 0f83f25..73388b8 100644 --- a/tools.gd +++ b/tools.gd @@ -15,14 +15,14 @@ func check_negative(val): # Проверка на отрицательно else: return val -func check_len(val, value): +func check_len(val, value): if len(val) < 1: return '' else: return value func check_empty(val): - + if str(val) == '': return false else: